From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72E59A034F; Mon, 11 Oct 2021 16:53:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2616141175; Mon, 11 Oct 2021 16:50:42 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 3A17F4115C for ; Mon, 11 Oct 2021 16:50:39 +0200 (CEST) Received: by shelob.oktetlabs.ru (Postfix, from userid 122) id 0E7887F710; Mon, 11 Oct 2021 17:50:39 +0300 (MSK) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shelob.oktetlabs.ru X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=ALL_TRUSTED, DKIM_ADSP_DISCARD, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from aros.oktetlabs.ru (aros.oktetlabs.ru [192.168.38.17]) by shelob.oktetlabs.ru (Postfix) with ESMTP id D473B7F71C; Mon, 11 Oct 2021 17:49:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru D473B7F71C Authentication-Results: shelob.oktetlabs.ru/D473B7F71C; dkim=none; dkim-atps=neutral From: Andrew Rybchenko To: dev@dpdk.org Cc: Viacheslav Galaktionov , Andy Moreton Date: Mon, 11 Oct 2021 17:48:56 +0300 Message-Id: <20211011144857.446802-38-andrew.rybchenko@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211011144857.446802-1-andrew.rybchenko@oktetlabs.ru> References: <20210827065717.1838258-1-andrew.rybchenko@oktetlabs.ru> <20211011144857.446802-1-andrew.rybchenko@oktetlabs.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 37/38] net/sfc: implement the representor info API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Viacheslav Galaktionov Let the driver provide the user with information about available representors by implementing the representor_info_get operation. Due to the lack of any structure to representor IDs, every ID range describes exactly one representor. Signed-off-by: Viacheslav Galaktionov Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- doc/guides/rel_notes/release_21_11.rst | 6 + drivers/net/sfc/sfc_ethdev.c | 229 +++++++++++++++++++++++++ drivers/net/sfc/sfc_switch.c | 104 +++++++++-- drivers/net/sfc/sfc_switch.h | 24 +++ 4 files changed, 352 insertions(+), 11 deletions(-) diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 89d4b33ef1..a89dcb2c63 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -101,6 +101,12 @@ New Features * Default VLAN strip behavior is changed. VLAN tag won't be stripped unless ``DEV_RX_OFFLOAD_VLAN_STRIP`` offload is enabled. +* **Updated Solarflare network PMD.** + + Updated the Solarflare ``sfc_efx`` driver with changes including: + + * Added port representors support on SN1000 SmartNICs + * **Updated Marvell cnxk crypto PMD.** * Added AES-CBC SHA1-HMAC support in lookaside protocol (IPsec) for CN10K. diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 69ab2a60b0..54711d349f 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -1923,7 +1923,11 @@ static efx_rc_t sfc_process_mport_journal_entry(struct sfc_mport_journal_ctx *ctx, efx_mport_desc_t *mport) { + struct sfc_mae_switch_port_request req; + efx_mport_sel_t entity_selector; efx_mport_sel_t ethdev_mport; + uint16_t switch_port_id; + efx_rc_t efx_rc; int rc; sfc_dbg(ctx->sa, @@ -1939,6 +1943,63 @@ sfc_process_mport_journal_entry(struct sfc_mport_journal_ctx *ctx, return rc; } + /* Build Mport selector */ + efx_rc = efx_mae_mport_by_pcie_mh_function(mport->emd_vnic.ev_intf, + mport->emd_vnic.ev_pf, + mport->emd_vnic.ev_vf, + &entity_selector); + if (efx_rc != 0) { + sfc_err(ctx->sa, "failed to build entity mport selector for c%upf%uvf%u", + mport->emd_vnic.ev_intf, + mport->emd_vnic.ev_pf, + mport->emd_vnic.ev_vf); + return efx_rc; + } + + rc = sfc_mae_switch_port_id_by_entity(ctx->switch_domain_id, + &entity_selector, + SFC_MAE_SWITCH_PORT_REPRESENTOR, + &switch_port_id); + switch (rc) { + case 0: + /* Already registered */ + break; + case ENOENT: + /* + * No representor has been created for this entity. + * Create a dummy switch registry entry with an invalid ethdev + * mport selector. When a corresponding representor is created, + * this entry will be updated. + */ + req.type = SFC_MAE_SWITCH_PORT_REPRESENTOR; + req.entity_mportp = &entity_selector; + req.ethdev_mportp = ðdev_mport; + req.ethdev_port_id = RTE_MAX_ETHPORTS; + req.port_data.repr.intf = mport->emd_vnic.ev_intf; + req.port_data.repr.pf = mport->emd_vnic.ev_pf; + req.port_data.repr.vf = mport->emd_vnic.ev_vf; + + rc = sfc_mae_assign_switch_port(ctx->switch_domain_id, + &req, &switch_port_id); + if (rc != 0) { + sfc_err(ctx->sa, + "failed to assign MAE switch port for c%upf%uvf%u: %s", + mport->emd_vnic.ev_intf, + mport->emd_vnic.ev_pf, + mport->emd_vnic.ev_vf, + rte_strerror(rc)); + return rc; + } + break; + default: + sfc_err(ctx->sa, "failed to find MAE switch port for c%upf%uvf%u: %s", + mport->emd_vnic.ev_intf, + mport->emd_vnic.ev_pf, + mport->emd_vnic.ev_vf, + rte_strerror(rc)); + return rc; + } + return 0; } @@ -2035,6 +2096,173 @@ sfc_process_mport_journal(struct sfc_adapter *sa) return 0; } +static void +sfc_count_representors_cb(enum sfc_mae_switch_port_type type, + const efx_mport_sel_t *ethdev_mportp __rte_unused, + uint16_t ethdev_port_id __rte_unused, + const efx_mport_sel_t *entity_mportp __rte_unused, + uint16_t switch_port_id __rte_unused, + union sfc_mae_switch_port_data *port_datap + __rte_unused, + void *user_datap) +{ + int *counter = user_datap; + + SFC_ASSERT(counter != NULL); + + if (type == SFC_MAE_SWITCH_PORT_REPRESENTOR) + (*counter)++; +} + +struct sfc_get_representors_ctx { + struct rte_eth_representor_info *info; + struct sfc_adapter *sa; + uint16_t switch_domain_id; + const efx_pcie_interface_t *controllers; + size_t nb_controllers; +}; + +static void +sfc_get_representors_cb(enum sfc_mae_switch_port_type type, + const efx_mport_sel_t *ethdev_mportp __rte_unused, + uint16_t ethdev_port_id __rte_unused, + const efx_mport_sel_t *entity_mportp __rte_unused, + uint16_t switch_port_id, + union sfc_mae_switch_port_data *port_datap, + void *user_datap) +{ + struct sfc_get_representors_ctx *ctx = user_datap; + struct rte_eth_representor_range *range; + int ret; + int rc; + + SFC_ASSERT(ctx != NULL); + SFC_ASSERT(ctx->info != NULL); + SFC_ASSERT(ctx->sa != NULL); + + if (type != SFC_MAE_SWITCH_PORT_REPRESENTOR) { + sfc_dbg(ctx->sa, "not a representor, skipping"); + return; + } + if (ctx->info->nb_ranges >= ctx->info->nb_ranges_alloc) { + sfc_dbg(ctx->sa, "info structure is full already"); + return; + } + + range = &ctx->info->ranges[ctx->info->nb_ranges]; + rc = sfc_mae_switch_controller_from_mapping(ctx->controllers, + ctx->nb_controllers, + port_datap->repr.intf, + &range->controller); + if (rc != 0) { + sfc_err(ctx->sa, "invalid representor controller: %d", + port_datap->repr.intf); + range->controller = -1; + } + range->pf = port_datap->repr.pf; + range->id_base = switch_port_id; + range->id_end = switch_port_id; + + if (port_datap->repr.vf != EFX_PCI_VF_INVALID) { + range->type = RTE_ETH_REPRESENTOR_VF; + range->vf = port_datap->repr.vf; + ret = snprintf(range->name, RTE_DEV_NAME_MAX_LEN, + "c%dpf%dvf%d", range->controller, range->pf, + range->vf); + } else { + range->type = RTE_ETH_REPRESENTOR_PF; + ret = snprintf(range->name, RTE_DEV_NAME_MAX_LEN, + "c%dpf%d", range->controller, range->pf); + } + if (ret >= RTE_DEV_NAME_MAX_LEN) { + sfc_err(ctx->sa, "representor name has been truncated: %s", + range->name); + } + + ctx->info->nb_ranges++; +} + +static int +sfc_representor_info_get(struct rte_eth_dev *dev, + struct rte_eth_representor_info *info) +{ + struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev); + struct sfc_get_representors_ctx get_repr_ctx; + const efx_nic_cfg_t *nic_cfg; + uint16_t switch_domain_id; + uint32_t nb_repr; + int controller; + int rc; + + sfc_adapter_lock(sa); + + if (sa->mae.status != SFC_MAE_STATUS_SUPPORTED) { + sfc_adapter_unlock(sa); + return -ENOTSUP; + } + + rc = sfc_process_mport_journal(sa); + if (rc != 0) { + sfc_adapter_unlock(sa); + SFC_ASSERT(rc > 0); + return -rc; + } + + switch_domain_id = sa->mae.switch_domain_id; + + nb_repr = 0; + rc = sfc_mae_switch_ports_iterate(switch_domain_id, + sfc_count_representors_cb, + &nb_repr); + if (rc != 0) { + sfc_adapter_unlock(sa); + SFC_ASSERT(rc > 0); + return -rc; + } + + if (info == NULL) { + sfc_adapter_unlock(sa); + return nb_repr; + } + + rc = sfc_mae_switch_domain_controllers(switch_domain_id, + &get_repr_ctx.controllers, + &get_repr_ctx.nb_controllers); + if (rc != 0) { + sfc_adapter_unlock(sa); + SFC_ASSERT(rc > 0); + return -rc; + } + + nic_cfg = efx_nic_cfg_get(sa->nic); + + rc = sfc_mae_switch_domain_get_controller(switch_domain_id, + nic_cfg->enc_intf, + &controller); + if (rc != 0) { + sfc_err(sa, "invalid controller: %d", nic_cfg->enc_intf); + controller = -1; + } + + info->controller = controller; + info->pf = nic_cfg->enc_pf; + + get_repr_ctx.info = info; + get_repr_ctx.sa = sa; + get_repr_ctx.switch_domain_id = switch_domain_id; + rc = sfc_mae_switch_ports_iterate(switch_domain_id, + sfc_get_representors_cb, + &get_repr_ctx); + if (rc != 0) { + sfc_adapter_unlock(sa); + SFC_ASSERT(rc > 0); + return -rc; + } + + sfc_adapter_unlock(sa); + return nb_repr; +} + static const struct eth_dev_ops sfc_eth_dev_ops = { .dev_configure = sfc_dev_configure, .dev_start = sfc_dev_start, @@ -2082,6 +2310,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = { .xstats_get_by_id = sfc_xstats_get_by_id, .xstats_get_names_by_id = sfc_xstats_get_names_by_id, .pool_ops_supported = sfc_pool_ops_supported, + .representor_info_get = sfc_representor_info_get, }; struct sfc_ethdev_init_data { diff --git a/drivers/net/sfc/sfc_switch.c b/drivers/net/sfc/sfc_switch.c index 5cd9b46d26..dc5b9a676c 100644 --- a/drivers/net/sfc/sfc_switch.c +++ b/drivers/net/sfc/sfc_switch.c @@ -151,6 +151,34 @@ sfc_mae_find_switch_domain_by_id(uint16_t switch_domain_id) return NULL; } +int +sfc_mae_switch_ports_iterate(uint16_t switch_domain_id, + sfc_mae_switch_port_iterator_cb *cb, + void *data) +{ + struct sfc_mae_switch_domain *domain; + struct sfc_mae_switch_port *port; + + if (cb == NULL) + return EINVAL; + + rte_spinlock_lock(&sfc_mae_switch.lock); + + domain = sfc_mae_find_switch_domain_by_id(switch_domain_id); + if (domain == NULL) { + rte_spinlock_unlock(&sfc_mae_switch.lock); + return EINVAL; + } + + TAILQ_FOREACH(port, &domain->ports, switch_domain_ports) { + cb(port->type, &port->ethdev_mport, port->ethdev_port_id, + &port->entity_mport, port->id, &port->data, data); + } + + rte_spinlock_unlock(&sfc_mae_switch.lock); + return 0; +} + /* This function expects to be called only when the lock is held */ static struct sfc_mae_switch_domain * sfc_mae_find_switch_domain_by_hw_switch_id(const struct sfc_hw_switch_id *id) @@ -280,19 +308,12 @@ sfc_mae_switch_domain_map_controllers(uint16_t switch_domain_id, } int -sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id, - efx_pcie_interface_t intf, - int *controller) +sfc_mae_switch_controller_from_mapping(const efx_pcie_interface_t *controllers, + size_t nb_controllers, + efx_pcie_interface_t intf, + int *controller) { - const efx_pcie_interface_t *controllers; - size_t nb_controllers; size_t i; - int rc; - - rc = sfc_mae_switch_domain_controllers(switch_domain_id, &controllers, - &nb_controllers); - if (rc != 0) - return rc; if (controllers == NULL) return ENOENT; @@ -307,6 +328,26 @@ sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id, return ENOENT; } +int +sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id, + efx_pcie_interface_t intf, + int *controller) +{ + const efx_pcie_interface_t *controllers; + size_t nb_controllers; + int rc; + + rc = sfc_mae_switch_domain_controllers(switch_domain_id, &controllers, + &nb_controllers); + if (rc != 0) + return rc; + + return sfc_mae_switch_controller_from_mapping(controllers, + nb_controllers, + intf, + controller); +} + int sfc_mae_switch_domain_get_intf(uint16_t switch_domain_id, int controller, efx_pcie_interface_t *intf) @@ -350,6 +391,30 @@ sfc_mae_find_switch_port_by_entity(const struct sfc_mae_switch_domain *domain, return NULL; } +/* This function expects to be called only when the lock is held */ +static int +sfc_mae_find_switch_port_id_by_entity(uint16_t switch_domain_id, + const efx_mport_sel_t *entity_mportp, + enum sfc_mae_switch_port_type type, + uint16_t *switch_port_id) +{ + struct sfc_mae_switch_domain *domain; + struct sfc_mae_switch_port *port; + + SFC_ASSERT(rte_spinlock_is_locked(&sfc_mae_switch.lock)); + + domain = sfc_mae_find_switch_domain_by_id(switch_domain_id); + if (domain == NULL) + return EINVAL; + + port = sfc_mae_find_switch_port_by_entity(domain, entity_mportp, type); + if (port == NULL) + return ENOENT; + + *switch_port_id = port->id; + return 0; +} + int sfc_mae_assign_switch_port(uint16_t switch_domain_id, const struct sfc_mae_switch_port_request *req, @@ -455,3 +520,20 @@ sfc_mae_switch_port_by_ethdev(uint16_t switch_domain_id, return rc; } + +int +sfc_mae_switch_port_id_by_entity(uint16_t switch_domain_id, + const efx_mport_sel_t *entity_mportp, + enum sfc_mae_switch_port_type type, + uint16_t *switch_port_id) +{ + int rc; + + rte_spinlock_lock(&sfc_mae_switch.lock); + rc = sfc_mae_find_switch_port_id_by_entity(switch_domain_id, + entity_mportp, type, + switch_port_id); + rte_spinlock_unlock(&sfc_mae_switch.lock); + + return rc; +} diff --git a/drivers/net/sfc/sfc_switch.h b/drivers/net/sfc/sfc_switch.h index d187c6dbbb..a77d2e6f28 100644 --- a/drivers/net/sfc/sfc_switch.h +++ b/drivers/net/sfc/sfc_switch.h @@ -52,6 +52,19 @@ struct sfc_mae_switch_port_request { union sfc_mae_switch_port_data port_data; }; +typedef void (sfc_mae_switch_port_iterator_cb)( + enum sfc_mae_switch_port_type type, + const efx_mport_sel_t *ethdev_mportp, + uint16_t ethdev_port_id, + const efx_mport_sel_t *entity_mportp, + uint16_t switch_port_id, + union sfc_mae_switch_port_data *port_datap, + void *user_datap); + +int sfc_mae_switch_ports_iterate(uint16_t switch_domain_id, + sfc_mae_switch_port_iterator_cb *cb, + void *data); + int sfc_mae_assign_switch_domain(struct sfc_adapter *sa, uint16_t *switch_domain_id); @@ -63,6 +76,12 @@ int sfc_mae_switch_domain_map_controllers(uint16_t switch_domain_id, efx_pcie_interface_t *controllers, size_t nb_controllers); +int sfc_mae_switch_controller_from_mapping( + const efx_pcie_interface_t *controllers, + size_t nb_controllers, + efx_pcie_interface_t intf, + int *controller); + int sfc_mae_switch_domain_get_controller(uint16_t switch_domain_id, efx_pcie_interface_t intf, int *controller); @@ -79,6 +98,11 @@ int sfc_mae_switch_port_by_ethdev(uint16_t switch_domain_id, uint16_t ethdev_port_id, efx_mport_sel_t *mport_sel); +int sfc_mae_switch_port_id_by_entity(uint16_t switch_domain_id, + const efx_mport_sel_t *entity_mportp, + enum sfc_mae_switch_port_type type, + uint16_t *switch_port_id); + #ifdef __cplusplus } #endif -- 2.30.2