ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

idxd: Make many internal idxd_user functions take an idxd_user object

Browse Source 
This reduces a lot of casting.

Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: Ibc04f422858642d0e20c9b020bb6c5d1b70256fe
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11534
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Ben Walker 2022-02-07 09:22:55 -07:00 committed by Tomasz Zawadzki
parent fd9ad0254a
commit e22c933edb
2 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/idxd/idxd_user.c
View File

@ -61,11 +61,10 @@ static struct spdk_idxd_device *idxd_attach(struct spdk_pci_device *device);
/* Used for control commands, not for descriptor submission. */ /* Used for control commands, not for descriptor submission. */
static int static int
idxd_wait_cmd(struct spdk_idxd_device *idxd, int _timeout) idxd_wait_cmd(struct spdk_user_idxd_device *user_idxd, int _timeout)
{ {
uint32_t timeout = _timeout; uint32_t timeout = _timeout;
union idxd_cmdsts_register cmd_status = {}; union idxd_cmdsts_register cmd_status = {};
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
cmd_status.raw = spdk_mmio_read_4(&user_idxd->registers->cmdsts.raw); cmd_status.raw = spdk_mmio_read_4(&user_idxd->registers->cmdsts.raw);
while (cmd_status.active && --timeout) { while (cmd_status.active && --timeout) {
@ -89,16 +88,15 @@ idxd_wait_cmd(struct spdk_idxd_device *idxd, int _timeout)
} }
static int static int
idxd_unmap_pci_bar(struct spdk_idxd_device *idxd, int bar) idxd_unmap_pci_bar(struct spdk_user_idxd_device *user_idxd, int bar)
{ {
int rc = 0; int rc = 0;
void *addr = NULL; void *addr = NULL;
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
if (bar == IDXD_MMIO_BAR) { if (bar == IDXD_MMIO_BAR) {
addr = (void *)user_idxd->registers; addr = (void *)user_idxd->registers;
} else if (bar == IDXD_WQ_BAR) { } else if (bar == IDXD_WQ_BAR) {
addr = (void *)idxd->portal; addr = (void *)user_idxd->idxd.portal;
} }
if (addr) { if (addr) {
@ -108,12 +106,11 @@ idxd_unmap_pci_bar(struct spdk_idxd_device *idxd, int bar)
} }
static int static int
idxd_map_pci_bars(struct spdk_idxd_device *idxd) idxd_map_pci_bars(struct spdk_user_idxd_device *user_idxd)
{ {
int rc; int rc;
void *addr; void *addr;
uint64_t phys_addr, size; uint64_t phys_addr, size;
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
rc = spdk_pci_device_map_bar(user_idxd->device, IDXD_MMIO_BAR, &addr, &phys_addr, &size); rc = spdk_pci_device_map_bar(user_idxd->device, IDXD_MMIO_BAR, &addr, &phys_addr, &size);
if (rc != 0 || addr == NULL) { if (rc != 0 || addr == NULL) {
@ -125,44 +122,42 @@ idxd_map_pci_bars(struct spdk_idxd_device *idxd)
rc = spdk_pci_device_map_bar(user_idxd->device, IDXD_WQ_BAR, &addr, &phys_addr, &size); rc = spdk_pci_device_map_bar(user_idxd->device, IDXD_WQ_BAR, &addr, &phys_addr, &size);
if (rc != 0 || addr == NULL) { if (rc != 0 || addr == NULL) {
SPDK_ERRLOG("pci_device_map_range failed with error code %d\n", rc); SPDK_ERRLOG("pci_device_map_range failed with error code %d\n", rc);
rc = idxd_unmap_pci_bar(idxd, IDXD_MMIO_BAR); rc = idxd_unmap_pci_bar(user_idxd, IDXD_MMIO_BAR);
if (rc) { if (rc) {
SPDK_ERRLOG("unable to unmap MMIO bar\n"); SPDK_ERRLOG("unable to unmap MMIO bar\n");
} }
return -EINVAL; return -EINVAL;
} }
idxd->portal = addr; user_idxd->idxd.portal = addr;
return 0; return 0;
} }
static void static void
idxd_disable_dev(struct spdk_idxd_device *idxd) idxd_disable_dev(struct spdk_user_idxd_device *user_idxd)
{ {
int rc; int rc;
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
union idxd_cmd_register cmd = {}; union idxd_cmd_register cmd = {};
cmd.command_code = IDXD_DISABLE_DEV; cmd.command_code = IDXD_DISABLE_DEV;
spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw); spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw);
rc = idxd_wait_cmd(idxd, IDXD_REGISTER_TIMEOUT_US); rc = idxd_wait_cmd(user_idxd, IDXD_REGISTER_TIMEOUT_US);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Error disabling device %u\n", rc); SPDK_ERRLOG("Error disabling device %u\n", rc);
} }
} }
static int static int
idxd_reset_dev(struct spdk_idxd_device *idxd) idxd_reset_dev(struct spdk_user_idxd_device *user_idxd)
{ {
int rc; int rc;
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
union idxd_cmd_register cmd = {}; union idxd_cmd_register cmd = {};
cmd.command_code = IDXD_RESET_DEVICE; cmd.command_code = IDXD_RESET_DEVICE;
spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw); spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw);
rc = idxd_wait_cmd(idxd, IDXD_REGISTER_TIMEOUT_US); rc = idxd_wait_cmd(user_idxd, IDXD_REGISTER_TIMEOUT_US);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Error resetting device %u\n", rc); SPDK_ERRLOG("Error resetting device %u\n", rc);
} }
@ -171,10 +166,9 @@ idxd_reset_dev(struct spdk_idxd_device *idxd)
} }
static int static int
idxd_group_config(struct spdk_idxd_device *idxd) idxd_group_config(struct spdk_user_idxd_device *user_idxd)
{ {
int i; int i;
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
union idxd_groupcap_register groupcap; union idxd_groupcap_register groupcap;
union idxd_enginecap_register enginecap; union idxd_enginecap_register enginecap;
union idxd_wqcap_register wqcap; union idxd_wqcap_register wqcap;
@ -273,13 +267,12 @@ idxd_device_configure(struct spdk_user_idxd_device *user_idxd)
{ {
int rc = 0; int rc = 0;
union idxd_gensts_register gensts_reg; union idxd_gensts_register gensts_reg;
struct spdk_idxd_device *idxd = &user_idxd->idxd;
union idxd_cmd_register cmd = {}; union idxd_cmd_register cmd = {};
/* /*
* Map BAR0 and BAR2 * Map BAR0 and BAR2
*/ */
rc = idxd_map_pci_bars(idxd); rc = idxd_map_pci_bars(user_idxd);
if (rc) { if (rc) {
return rc; return rc;
} }
@ -287,7 +280,7 @@ idxd_device_configure(struct spdk_user_idxd_device *user_idxd)
/* /*
* Reset the device * Reset the device
*/ */
rc = idxd_reset_dev(idxd); rc = idxd_reset_dev(user_idxd);
if (rc) { if (rc) {
goto err_reset; goto err_reset;
} }
@ -295,7 +288,7 @@ idxd_device_configure(struct spdk_user_idxd_device *user_idxd)
/* /*
* Configure groups and work queues. * Configure groups and work queues.
*/ */
rc = idxd_group_config(idxd); rc = idxd_group_config(user_idxd);
if (rc) { if (rc) {
goto err_group_cfg; goto err_group_cfg;
} }
@ -314,7 +307,7 @@ idxd_device_configure(struct spdk_user_idxd_device *user_idxd)
cmd.command_code = IDXD_ENABLE_DEV; cmd.command_code = IDXD_ENABLE_DEV;
spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw); spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw);
rc = idxd_wait_cmd(idxd, IDXD_REGISTER_TIMEOUT_US); rc = idxd_wait_cmd(user_idxd, IDXD_REGISTER_TIMEOUT_US);
gensts_reg.raw = spdk_mmio_read_4(&user_idxd->registers->gensts.raw); gensts_reg.raw = spdk_mmio_read_4(&user_idxd->registers->gensts.raw);
if ((rc < 0) || (gensts_reg.state != IDXD_DEVICE_STATE_ENABLED)) { if ((rc < 0) || (gensts_reg.state != IDXD_DEVICE_STATE_ENABLED)) {
rc = -EINVAL; rc = -EINVAL;
@ -329,7 +322,7 @@ idxd_device_configure(struct spdk_user_idxd_device *user_idxd)
cmd.operand = 0; cmd.operand = 0;
spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw); spdk_mmio_write_4(&user_idxd->registers->cmd.raw, cmd.raw);
rc = idxd_wait_cmd(idxd, IDXD_REGISTER_TIMEOUT_US); rc = idxd_wait_cmd(user_idxd, IDXD_REGISTER_TIMEOUT_US);
if (rc < 0) { if (rc < 0) {
SPDK_ERRLOG("Error enabling work queues 0x%x\n", rc); SPDK_ERRLOG("Error enabling work queues 0x%x\n", rc);
goto err_wq_enable; goto err_wq_enable;
@ -345,8 +338,8 @@ err_device_enable:
err_wq_cfg: err_wq_cfg:
err_group_cfg: err_group_cfg:
err_reset: err_reset:
idxd_unmap_pci_bar(idxd, IDXD_MMIO_BAR); idxd_unmap_pci_bar(user_idxd, IDXD_MMIO_BAR);
idxd_unmap_pci_bar(idxd, IDXD_MMIO_BAR); idxd_unmap_pci_bar(user_idxd, IDXD_MMIO_BAR);
return rc; return rc;
} }
@ -356,10 +349,10 @@ user_idxd_device_destruct(struct spdk_idxd_device *idxd)
{ {
struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd); struct spdk_user_idxd_device *user_idxd = __user_idxd(idxd);
idxd_disable_dev(idxd); idxd_disable_dev(user_idxd);
idxd_unmap_pci_bar(idxd, IDXD_MMIO_BAR); idxd_unmap_pci_bar(user_idxd, IDXD_MMIO_BAR);
idxd_unmap_pci_bar(idxd, IDXD_WQ_BAR); idxd_unmap_pci_bar(user_idxd, IDXD_WQ_BAR);
spdk_pci_device_detach(user_idxd->device); spdk_pci_device_detach(user_idxd->device);
free(user_idxd); free(user_idxd);

13
test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c
View File

@ -146,7 +146,6 @@ static int
test_idxd_group_config(void) test_idxd_group_config(void)
{ {
struct spdk_user_idxd_device user_idxd = {}; struct spdk_user_idxd_device user_idxd = {};
struct spdk_idxd_device *idxd = &user_idxd.idxd;
uint64_t wqs[MAX_ARRAY_SIZE] = {}; uint64_t wqs[MAX_ARRAY_SIZE] = {};
uint64_t engines[MAX_ARRAY_SIZE] = {}; uint64_t engines[MAX_ARRAY_SIZE] = {};
union idxd_group_flags flags[MAX_ARRAY_SIZE] = {}; union idxd_group_flags flags[MAX_ARRAY_SIZE] = {};
@ -165,7 +164,7 @@ test_idxd_group_config(void)
grptbl = (struct idxd_grptbl *)((uint8_t *)user_idxd.registers + grptbl = (struct idxd_grptbl *)((uint8_t *)user_idxd.registers +
(user_idxd.registers->offsets.grpcfg * IDXD_TABLE_OFFSET_MULT)); (user_idxd.registers->offsets.grpcfg * IDXD_TABLE_OFFSET_MULT));
rc = idxd_group_config(idxd); rc = idxd_group_config(&user_idxd);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
for (i = 0 ; i < user_idxd.registers->groupcap.num_groups; i++) { for (i = 0 ; i < user_idxd.registers->groupcap.num_groups; i++) {
wqs[i] = spdk_mmio_read_8(&grptbl->group[i].wqs[0]); wqs[i] = spdk_mmio_read_8(&grptbl->group[i].wqs[0]);
@ -195,12 +194,12 @@ test_idxd_reset_dev(void)
fake_cmd_status_reg = &user_idxd.registers->cmdsts; fake_cmd_status_reg = &user_idxd.registers->cmdsts;
/* Test happy path */ /* Test happy path */
rc = idxd_reset_dev(&user_idxd.idxd); rc = idxd_reset_dev(&user_idxd);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
/* Test error reported path */ /* Test error reported path */
fake_cmd_status_reg->err = 1; fake_cmd_status_reg->err = 1;
rc = idxd_reset_dev(&user_idxd.idxd); rc = idxd_reset_dev(&user_idxd);
CU_ASSERT(rc == -EINVAL); CU_ASSERT(rc == -EINVAL);
free(user_idxd.registers); free(user_idxd.registers);
@ -221,18 +220,18 @@ test_idxd_wait_cmd(void)
fake_cmd_status_reg = &user_idxd.registers->cmdsts; fake_cmd_status_reg = &user_idxd.registers->cmdsts;
/* Test happy path. */ /* Test happy path. */
rc = idxd_wait_cmd(&user_idxd.idxd, timeout); rc = idxd_wait_cmd(&user_idxd, timeout);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
/* Setup up our fake register to set the error bit. */ /* Setup up our fake register to set the error bit. */
fake_cmd_status_reg->err = 1; fake_cmd_status_reg->err = 1;
rc = idxd_wait_cmd(&user_idxd.idxd, timeout); rc = idxd_wait_cmd(&user_idxd, timeout);
CU_ASSERT(rc == -EINVAL); CU_ASSERT(rc == -EINVAL);
fake_cmd_status_reg->err = 0; fake_cmd_status_reg->err = 0;
/* Setup up our fake register to set the active bit. */ /* Setup up our fake register to set the active bit. */
fake_cmd_status_reg->active = 1; fake_cmd_status_reg->active = 1;
rc = idxd_wait_cmd(&user_idxd.idxd, timeout); rc = idxd_wait_cmd(&user_idxd, timeout);
CU_ASSERT(rc == -EBUSY); CU_ASSERT(rc == -EBUSY);
free(user_idxd.registers); free(user_idxd.registers);