From patchwork Mon Oct 25 11:04:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Malov X-Patchwork-Id: 102762 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 00A3CA0C52; Mon, 25 Oct 2021 13:04:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE8B741152; Mon, 25 Oct 2021 13:04:29 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 7F9E740E32 for ; Mon, 25 Oct 2021 13:04:23 +0200 (CEST) Received: from localhost.localdomain (unknown [5.144.121.149]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPSA id 33F837F6FA; Mon, 25 Oct 2021 14:04:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 33F837F6FA DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru; s=default; t=1635159863; bh=Vi693HbEbD5V0E8eQSLHnMKCQGusqfWKoC4CPsT/IpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xj1fE+OhFR0pqRLqcJG+XfjYxlZn17gFWyXjXJXSVGuFviDSGbcKy/A4i7ZxYrMe6 Q3yp3Wjg6e0/Kogx1uxrAUxQukZfRS+4zga+lqm/0GiA4fdvOIXhiNvEpkTOXf+cKV spzfRA2wOxWkcBqK3pp0/ppg633wsH+18wVaoLlU= From: Ivan Malov To: dev@dpdk.org Cc: Andrew Rybchenko Date: Mon, 25 Oct 2021 14:04:12 +0300 Message-Id: <20211025110415.20683-4-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20211025110415.20683-1-ivan.malov@oktetlabs.ru> References: <20211025110415.20683-1-ivan.malov@oktetlabs.ru> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/7] net/sfc: assign correct m-ports to independent switch ports 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" In accordance with patches [1-4], MAE admin ethdev represents a network port and not the PF which it sits on. Rework the way how "ethdev" and "entity" m-ports are assigned in SW switch port entries of independent ethdevs. Explain in comments. [1] commit 081e42dab11d ("ethdev: add port representor item to flow API") [2] commit 49863ae2bf95 ("ethdev: add represented port item to flow API") [3] commit 8edb6bc0263e ("ethdev: add port representor action to flow API") [4] commit 88caad251c8d ("ethdev: add represented port action to flow API") Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/sfc/sfc_mae.c | 41 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index a4a22f32c6..bd8a913a49 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -23,7 +23,7 @@ #include "sfc_service.h" static int -sfc_mae_assign_entity_mport(struct sfc_adapter *sa, +sfc_mae_assign_ethdev_mport(struct sfc_adapter *sa, efx_mport_sel_t *mportp) { const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); @@ -32,6 +32,35 @@ sfc_mae_assign_entity_mport(struct sfc_adapter *sa, mportp); } +static int +sfc_mae_assign_entity_mport(struct sfc_adapter *sa, + efx_mport_sel_t *mportp) +{ + const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); + int rc = 0; + + if (encp->enc_mae_admin) { + /* + * This ethdev sits on MAE admin PF. The represented + * entity is the network port assigned to that PF. + */ + rc = efx_mae_mport_by_phy_port(encp->enc_assigned_port, mportp); + } else { + /* + * This ethdev sits on unprivileged PF / VF. The entity + * represented by the ethdev can change dynamically + * as MAE admin changes default traffic rules. + * + * For the sake of simplicity, do not fill in the m-port + * and assume that flow rules should not be allowed to + * reference the entity represented by this ethdev. + */ + efx_mae_mport_invalid(mportp); + } + + return rc; +} + static int sfc_mae_counter_registry_init(struct sfc_mae_counter_registry *registry, uint32_t nb_counters_max) @@ -184,6 +213,7 @@ sfc_mae_attach(struct sfc_adapter *sa) struct sfc_adapter_shared * const sas = sfc_sa2shared(sa); struct sfc_mae_switch_port_request switch_port_request = {0}; const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); + efx_mport_sel_t ethdev_mport; efx_mport_sel_t entity_mport; struct sfc_mae *mae = &sa->mae; struct sfc_mae_bounce_eh *bounce_eh = &mae->bounce_eh; @@ -218,6 +248,11 @@ sfc_mae_attach(struct sfc_adapter *sa) } } + sfc_log_init(sa, "assign ethdev MPORT"); + rc = sfc_mae_assign_ethdev_mport(sa, ðdev_mport); + if (rc != 0) + goto fail_mae_assign_ethdev_mport; + sfc_log_init(sa, "assign entity MPORT"); rc = sfc_mae_assign_entity_mport(sa, &entity_mport); if (rc != 0) @@ -230,9 +265,8 @@ sfc_mae_attach(struct sfc_adapter *sa) sfc_log_init(sa, "assign RTE switch port"); switch_port_request.type = SFC_MAE_SWITCH_PORT_INDEPENDENT; + switch_port_request.ethdev_mportp = ðdev_mport; switch_port_request.entity_mportp = &entity_mport; - /* RTE ethdev MPORT matches that of the entity for independent ports. */ - switch_port_request.ethdev_mportp = &entity_mport; switch_port_request.ethdev_port_id = sas->port_id; switch_port_request.port_data.indep.mae_admin = encp->enc_mae_admin == B_TRUE; @@ -272,6 +306,7 @@ sfc_mae_attach(struct sfc_adapter *sa) fail_mae_assign_switch_port: fail_mae_assign_switch_domain: fail_mae_assign_entity_mport: +fail_mae_assign_ethdev_mport: if (encp->enc_mae_admin) sfc_mae_counter_registry_fini(&mae->counter_registry);