From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50AC5C61DFD for ; Tue, 1 Sep 2026 03:07:37 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEA6640B8C; Tue, 1 Sep 2026 05:07:35 +0200 (CEST) Received: from cstnet.cn (smtp25.cstnet.cn [159.226.251.25]) by mails.dpdk.org (Postfix) with ESMTP id C867540A75; Tue, 1 Sep 2026 05:07:33 +0200 (CEST) Received: from localhost.localdomain (unknown [118.112.177.181]) by APP-05 (Coremail) with SMTP id zQCowABHsDpzQZZqZPghBw--.57997S2; Tue, 01 Sep 2026 11:07:32 +0800 (CST) From: liujie5@linkdatatechnology.com To: stephen@networkplumber.org Cc: dev@dpdk.org, Jie Liu , stable@dpdk.org Subject: [PATCH v8 23/49] net/sxe2: simplify switchdev representor matching Date: Tue, 1 Sep 2026 11:07:31 +0800 Message-ID: <20260901030731.3684822-1-liujie5@linkdatatechnology.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260831024549.3231744-1-liujie5@linkdatatechnology.com> References: <20260831024549.3231744-1-liujie5@linkdatatechnology.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowABHsDpzQZZqZPghBw--.57997S2 X-Coremail-Antispam: 1UD129KBjvJXoWxCrW5ZryDJrW7Cr45tw1rXrb_yoWrZF1kpF 48Ja43AFW5JF42g39xCan5uFyYkr4xK348Kr9Iv3WfCayUAr98AFWUK34Fvrn8C3WxXryf twsrZF1Uua4kWa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkv14x267AKxVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j 6r4UJwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x0267AKxVW8JV W8Jr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E 2Ix0cI8IcVAFwI0_Jw0_WrylYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE7xkEbVWUJV W8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lw4CEc2x0rVAKj4xx MxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr 0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUAVWUtwCIc40Y0x0E wIxGrwCI42IY6xIIjxv20xvE14v26ryj6F1UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJV W8Jr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF 0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JU4v38UUUUU= X-Originating-IP: [118.112.177.181] X-CM-SenderInfo: xolxyxrhv6zxpqngt3pdwhux5qro0w31of0z/ 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 From: Jie Liu sxe2_switchdev_repr_match() encodes the kernel representor ID and compares it against each requested port, which is fragile. Match the PF number and VF ID directly against the switchdev representor info instead, and drop the sxe2_switchdev_repr_id_encode_get() helper. Fixes: 635084db5d57 ("net/sxe2: support VF representors") Cc: stable@dpdk.org Cc: stephen@networkplumber.org Signed-off-by: Jie Liu --- drivers/net/sxe2/sxe2_ethdev.c | 72 +++++++++++++++++----------------- drivers/net/sxe2/sxe2_ethdev.h | 3 -- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/drivers/net/sxe2/sxe2_ethdev.c b/drivers/net/sxe2/sxe2_ethdev.c index 5bce710b29..08986e384f 100644 --- a/drivers/net/sxe2/sxe2_ethdev.c +++ b/drivers/net/sxe2/sxe2_ethdev.c @@ -2149,42 +2149,25 @@ static int32_t sxe2_fw_version_string_get(struct rte_eth_dev *dev, char *fw_vers return ret; } -static uint16_t sxe2_switchdev_repr_id_encode_get(struct sxe2_switchdev_info *switchdev_info) -{ - enum rte_eth_representor_type type; - uint16_t repr = switchdev_info->vf_num; - uint32_t pf = switchdev_info->pf_num; - - switch (switchdev_info->port_name_type) { - case SXE2_PHYS_PORT_NAME_TYPE_UPLINK: - if (!switchdev_info->representor) - return UINT16_MAX; - type = RTE_ETH_REPRESENTOR_PF; - pf = switchdev_info->mpesw_owner; - break; - case SXE2_PHYS_PORT_NAME_TYPE_PFVF: - default: - type = RTE_ETH_REPRESENTOR_VF; - break; - } - - return SXE2_REPRESENTOR_ID(pf, type, repr); -} - static bool sxe2_switchdev_repr_match(struct sxe2_adapter *adapter, struct rte_eth_devargs *req_eth_da) { - uint32_t port_idx = 0; - uint32_t repr_idx; - uint16_t kernel_repr_id = sxe2_switchdev_repr_id_encode_get(&adapter->switchdev_info); - uint16_t repr_id; + uint16_t port_idx; + uint16_t repr_idx; + uint16_t vf_id; + uint16_t i; switch (req_eth_da->type) { case RTE_ETH_REPRESENTOR_PF: + if (adapter->switchdev_info.port_name_type != + SXE2_PHYS_PORT_NAME_TYPE_UPLINK) { + rte_errno = EBUSY; + return false; + } break; case RTE_ETH_REPRESENTOR_VF: if (adapter->switchdev_info.port_name_type != - SXE2_PHYS_PORT_NAME_TYPE_PFVF) { + SXE2_PHYS_PORT_NAME_TYPE_PFVF) { rte_errno = EBUSY; return false; } @@ -2197,15 +2180,34 @@ static bool sxe2_switchdev_repr_match(struct sxe2_adapter *adapter, return false; } + if (req_eth_da->nb_ports > 0) { + for (port_idx = 0; port_idx < req_eth_da->nb_ports; ++port_idx) { + if (adapter->switchdev_info.pf_num == req_eth_da->ports[port_idx]) + break; + } + if (port_idx == req_eth_da->nb_ports) { + PMD_DEV_LOG_DEBUG(adapter, DRV, "switchdev pf %u not match req pf", + adapter->switchdev_info.pf_num); + rte_errno = EBUSY; + return false; + } + } + for (repr_idx = 0; repr_idx < req_eth_da->nb_representor_ports; ++repr_idx) { - repr_id = SXE2_REPRESENTOR_ID(req_eth_da->ports[port_idx], - req_eth_da->type, - req_eth_da->representor_ports[repr_idx]); - if (repr_id == kernel_repr_id) - return true; - } - rte_errno = EBUSY; - return false; + for (i = 0; i < adapter->repr_ctxt.nb_vf; ++i) { + vf_id = rte_le_to_cpu_16(adapter->repr_ctxt.repr_vf_id[i].func_id); + if (vf_id == req_eth_da->representor_ports[repr_idx]) + break; + } + if (i == adapter->repr_ctxt.nb_vf) { + PMD_DEV_LOG_DEBUG(adapter, DRV, "switchdev vf %u not match req vf(cnt:%u)", + req_eth_da->representor_ports[repr_idx], adapter->repr_ctxt.nb_vf); + rte_errno = EBUSY; + return false; + } + } + + return true; } static int32_t sxe2_eth_pmd_probe_pf(struct sxe2_common_device *cdev, diff --git a/drivers/net/sxe2/sxe2_ethdev.h b/drivers/net/sxe2/sxe2_ethdev.h index f2557b28c3..e818578319 100644 --- a/drivers/net/sxe2/sxe2_ethdev.h +++ b/drivers/net/sxe2/sxe2_ethdev.h @@ -65,9 +65,6 @@ enum sxe2_fnav_tunnel_flag_type { #define upper_32_bits(n) ((uint32_t)(((n) >> 16) >> 16)) #define lower_32_bits(n) ((uint32_t)((n) & 0xffffffff)) -#define SXE2_REPRESENTOR_ID(pf, type, repr) \ - (((pf) << 14) + ((type) << 12) + ((repr) & 0xfff)) - #define SXE2_I2C_EEPROM_DEV_ADDR 0xA0 #define SXE2_I2C_EEPROM_DEV_ADDR2 0xA2 #define SXE2_MODULE_TYPE_SFP 0x03 -- 2.52.0