From 8c6ab6ce3c48a3b17e262d5d131aa2049a22fac3 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Tue, 23 Nov 2021 19:20:23 +0800 Subject: [PATCH] nvmf/vfio-user: define NVME PCI configuration macro Change-Id: I8a43abe597fe7139ec578322e565c5aa52c2f312 Signed-off-by: Changpeng Liu Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10365 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Aleksey Marchuk Reviewed-by: Ben Walker Reviewed-by: Jim Harris --- lib/nvmf/vfio_user.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/nvmf/vfio_user.c b/lib/nvmf/vfio_user.c index 103559364..3fa269802 100644 --- a/lib/nvmf/vfio_user.c +++ b/lib/nvmf/vfio_user.c @@ -59,7 +59,7 @@ #define NVME_DOORBELLS_OFFSET 0x1000 #define NVMF_VFIO_USER_DOORBELLS_SIZE 0x1000 -#define NVME_REG_CFG_SIZE 0x1000 +#define NVME_REG_CFG_SIZE PCI_CFG_SPACE_EXP_SIZE #define NVME_REG_BAR0_SIZE (NVME_DOORBELLS_OFFSET + NVMF_VFIO_USER_DOORBELLS_SIZE) #define NVMF_VFIO_USER_MAX_QPAIRS_PER_CTRLR ((NVMF_VFIO_USER_DOORBELLS_SIZE) / 8) #define NVME_IRQ_MSIX_NUM NVMF_VFIO_USER_MAX_QPAIRS_PER_CTRLR @@ -1784,10 +1784,10 @@ access_pci_config(vfu_ctx_t *vfu_ctx, char *buf, size_t count, loff_t offset, return -1; } - if (offset + count > PCI_CFG_SPACE_EXP_SIZE) { + if (offset + count > NVME_REG_CFG_SIZE) { SPDK_ERRLOG("%s: access past end of extended PCI configuration space, want=%ld+%ld, max=%d\n", endpoint_id(endpoint), offset, count, - PCI_CFG_SPACE_EXP_SIZE); + NVME_REG_CFG_SIZE); errno = ERANGE; return -1; }