X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fcommon%2Fqat%2Fqat_device.c;h=9fa142b5e5bba9578f9e35cd6449c061ccaeeda7;hb=c8238116ece889fe356c54930bca791091ab1938;hp=2b41d9a1352eac65e20f91f359e13342fc242136;hpb=47c3f7a41a26c9943f9804691d03828b2ce09f40;p=dpdk.git diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c index 2b41d9a135..9fa142b5e5 100644 --- a/drivers/common/qat/qat_device.c +++ b/drivers/common/qat/qat_device.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2018 Intel Corporation + * Copyright(c) 2018-2020 Intel Corporation */ #include @@ -32,8 +32,8 @@ struct qat_gen_hw_data qat_gen_config[] = { }, }; - -static struct qat_pci_device qat_pci_devices[RTE_PMD_QAT_MAX_PCI_DEVICES]; +/* per-process array of device data */ +struct qat_device_info qat_pci_devs[RTE_PMD_QAT_MAX_PCI_DEVICES]; static int qat_nb_pci_devices; /* @@ -53,33 +53,30 @@ static const struct rte_pci_id pci_id_qat_map[] = { { RTE_PCI_DEVICE(0x8086, 0x6f55), }, + { + RTE_PCI_DEVICE(0x8086, 0x18ef), + }, { RTE_PCI_DEVICE(0x8086, 0x18a1), }, {.device_id = 0}, }; -static struct qat_pci_device * -qat_pci_get_dev(uint8_t dev_id) -{ - return &qat_pci_devices[dev_id]; -} - static struct qat_pci_device * qat_pci_get_named_dev(const char *name) { - struct qat_pci_device *dev; unsigned int i; if (name == NULL) return NULL; for (i = 0; i < RTE_PMD_QAT_MAX_PCI_DEVICES; i++) { - dev = &qat_pci_devices[i]; - - if ((dev->attached == QAT_ATTACHED) && - (strcmp(dev->name, name) == 0)) - return dev; + if (qat_pci_devs[i].mz && + (strcmp(((struct qat_pci_device *) + qat_pci_devs[i].mz->addr)->name, name) + == 0)) + return (struct qat_pci_device *) + qat_pci_devs[i].mz->addr; } return NULL; @@ -88,13 +85,14 @@ qat_pci_get_named_dev(const char *name) static uint8_t qat_pci_find_free_device_index(void) { - uint8_t dev_id; + uint8_t dev_id; - for (dev_id = 0; dev_id < RTE_PMD_QAT_MAX_PCI_DEVICES; dev_id++) { - if (qat_pci_devices[dev_id].attached == QAT_DETACHED) - break; - } - return dev_id; + for (dev_id = 0; dev_id < RTE_PMD_QAT_MAX_PCI_DEVICES; + dev_id++) { + if (qat_pci_devs[dev_id].mz == NULL) + break; + } + return dev_id; } struct qat_pci_device * @@ -169,12 +167,31 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, struct qat_dev_cmd_param *qat_dev_cmd_param) { struct qat_pci_device *qat_dev; - uint8_t qat_dev_id; + uint8_t qat_dev_id = 0; char name[QAT_DEV_NAME_MAX_LEN]; struct rte_devargs *devargs = pci_dev->device.devargs; rte_pci_device_name(&pci_dev->addr, name, sizeof(name)); snprintf(name+strlen(name), QAT_DEV_NAME_MAX_LEN-strlen(name), "_qat"); + + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + const struct rte_memzone *mz = rte_memzone_lookup(name); + + if (mz == NULL) { + QAT_LOG(ERR, + "Secondary can't find %s mz, did primary create device?", + name); + return NULL; + } + qat_dev = mz->addr; + qat_pci_devs[qat_dev->qat_dev_id].mz = mz; + qat_pci_devs[qat_dev->qat_dev_id].pci_dev = pci_dev; + qat_nb_pci_devices++; + QAT_LOG(DEBUG, "QAT device %d found, name %s, total QATs %d", + qat_dev->qat_dev_id, qat_dev->name, qat_nb_pci_devices); + return qat_dev; + } + if (qat_pci_get_named_dev(name) != NULL) { QAT_LOG(ERR, "QAT device with name %s already allocated!", name); @@ -187,18 +204,29 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, return NULL; } - qat_dev = qat_pci_get_dev(qat_dev_id); + qat_pci_devs[qat_dev_id].mz = rte_memzone_reserve(name, + sizeof(struct qat_pci_device), + rte_socket_id(), 0); + + if (qat_pci_devs[qat_dev_id].mz == NULL) { + QAT_LOG(ERR, "Error when allocating memzone for QAT_%d", + qat_dev_id); + return NULL; + } + + qat_dev = qat_pci_devs[qat_dev_id].mz->addr; memset(qat_dev, 0, sizeof(*qat_dev)); strlcpy(qat_dev->name, name, QAT_DEV_NAME_MAX_LEN); qat_dev->qat_dev_id = qat_dev_id; - qat_dev->pci_dev = pci_dev; - switch (qat_dev->pci_dev->id.device_id) { + qat_pci_devs[qat_dev_id].pci_dev = pci_dev; + switch (pci_dev->id.device_id) { case 0x0443: qat_dev->qat_dev_gen = QAT_GEN1; break; case 0x37c9: case 0x19e3: case 0x6f55: + case 0x18ef: qat_dev->qat_dev_gen = QAT_GEN2; break; case 0x18a1: @@ -206,6 +234,7 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, break; default: QAT_LOG(ERR, "Invalid dev_id, can't determine generation"); + rte_memzone_free(qat_pci_devs[qat_dev->qat_dev_id].mz); return NULL; } @@ -213,22 +242,20 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, qat_dev_parse_cmd(devargs->drv_str, qat_dev_cmd_param); rte_spinlock_init(&qat_dev->arb_csr_lock); - - qat_dev->attached = QAT_ATTACHED; - qat_nb_pci_devices++; - QAT_LOG(DEBUG, "QAT device %d allocated, name %s, total QATs %d", + QAT_LOG(DEBUG, "QAT device %d found, name %s, total QATs %d", qat_dev->qat_dev_id, qat_dev->name, qat_nb_pci_devices); return qat_dev; } -int +static int qat_pci_device_release(struct rte_pci_device *pci_dev) { struct qat_pci_device *qat_dev; char name[QAT_DEV_NAME_MAX_LEN]; + int busy = 0; if (pci_dev == NULL) return -EINVAL; @@ -238,15 +265,35 @@ qat_pci_device_release(struct rte_pci_device *pci_dev) qat_dev = qat_pci_get_named_dev(name); if (qat_dev != NULL) { + struct qat_device_info *inst = + &qat_pci_devs[qat_dev->qat_dev_id]; /* Check that there are no service devs still on pci device */ - if (qat_dev->sym_dev != NULL) - return -EBUSY; - qat_dev->attached = QAT_DETACHED; + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + if (qat_dev->sym_dev != NULL) { + QAT_LOG(DEBUG, "QAT sym device %s is busy", + name); + busy = 1; + } + if (qat_dev->asym_dev != NULL) { + QAT_LOG(DEBUG, "QAT asym device %s is busy", + name); + busy = 1; + } + if (qat_dev->comp_dev != NULL) { + QAT_LOG(DEBUG, "QAT comp device %s is busy", + name); + busy = 1; + } + if (busy) + return -EBUSY; + rte_memzone_free(inst->mz); + } + memset(inst, 0, sizeof(struct qat_device_info)); qat_nb_pci_devices--; + QAT_LOG(DEBUG, "QAT device %s released, total QATs %d", + name, qat_nb_pci_devices); } - QAT_LOG(DEBUG, "QAT device %s released, total QATs %d", - name, qat_nb_pci_devices); return 0; } @@ -376,3 +423,4 @@ qat_comp_dev_destroy(struct qat_pci_device *qat_pci_dev __rte_unused) RTE_PMD_REGISTER_PCI(QAT_PCI_NAME, rte_qat_pmd); RTE_PMD_REGISTER_PCI_TABLE(QAT_PCI_NAME, pci_id_qat_map); +RTE_PMD_REGISTER_KMOD_DEP(QAT_PCI_NAME, "* igb_uio | uio_pci_generic | vfio-pci");