From patchwork Mon Nov 28 06:53:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 120186 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 4291DA0093; Mon, 28 Nov 2022 07:55:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E5D342D1D; Mon, 28 Nov 2022 07:54:33 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2138.outbound.protection.outlook.com [40.107.94.138]) by mails.dpdk.org (Postfix) with ESMTP id BB70C42D2A for ; Mon, 28 Nov 2022 07:54:31 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yjm/qTHtED/xwaO4GnIpqkgG2UdaTyJHs03N7eCm2g1t+xIAhaYhgahB3ZBGen+p8/jP6Ty36KdxTPsSNUfKELodUv3qkmJ7psKIJxBcfhJr8ObDcJRtGdSqEGIoRVkPt1YC8BOCicsHLTza0vKDqqcnGEc3soaus7Lj/5aIvBx0W8pLSC8H2IbEJ2SggDp8k5vKRs9vPTABUaf+nwZihwDB7aItS59iIlQnZ5tiqDXuPii/MoUyTcOeQw2M2n8GruOYdO8VGNhAofK5NKlPhEauw8XZ1w0vHJXfe67t4Z3/UOQ0uE+QzeE5yVkbsMJZyY+c8k7mcD7ErbBQVLDiEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zu6OjFM0vafAuehRPJYwGyfF5axibFj6TrMTK8x87oE=; b=k31Eej0g8BklaEr/Yc6nyCIyj1CQZpSDAcDFTmQjJHNTKzrvsTvmVjXEvi3G6zEoC5+QifH/VjV+pLzTbGXRisWXy132SYxTQvmGBmVpbDSzuQ6TJYhouZtvRSmnj2VQC2JFpogvqp9worpPeCIKvVqx8gVYn9LWTI6Ei+2X85SypXopuoDRaiYvjdjYgeOw4ves1lbQce6f637zTxyQ1SC3hFqstfwOGKEauYVgkJjIgk0oIeTzb4hfHg2ohkyWyJDYOi0fc/WTgZcB7mVmMFEw3L3aqqTNtC78pLYSyjqEzneXQzx2LSvwEv8byYFiy9mswj9Koz3V0dDLEU8akw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zu6OjFM0vafAuehRPJYwGyfF5axibFj6TrMTK8x87oE=; b=ezyebiKKb8a1d9LqTKYRdDCYqzTkzg5zJyzpFwtukN2ggrr8e+9AwvZFTrx2Qez2xPs8H+TCDj35TkOIr7Zm/9wJlbV9HZlpZVqSEpdmfcU/XbkvLQi1VM1Ol7sTWEGN6A0cF1o2xtTrekxB3OUCVw/nKARcdydM84n2JzupK6M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by CO1PR13MB4952.namprd13.prod.outlook.com (2603:10b6:303:d9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Mon, 28 Nov 2022 06:54:29 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::5122:8c31:51f3:4ee7%4]) with mapi id 15.20.5857.021; Mon, 28 Nov 2022 06:54:29 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Peng Zhang , Chaoyong He Subject: [PATCH 5/8] net/nfp: add support for VLAN strip V2 Date: Mon, 28 Nov 2022 14:53:56 +0800 Message-Id: <20221128065359.12737-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.29.3 In-Reply-To: <20221128065359.12737-1-chaoyong.he@corigine.com> References: <20221128065359.12737-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG3P274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::31) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|CO1PR13MB4952:EE_ X-MS-Office365-Filtering-Correlation-Id: e1f12981-47d2-4faf-9964-08dad10d65ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CqEwiuJcrxJTz57OGEi1BzrlHlBVD4VGEiizfCcRkU7zViWru+b9bHH3XFJhXq5wwA7VyA9WZzcC+mYlQ5oRtjJE3sq9yCFcZarfXGJgPaZsuZOkr1XkPMy8r0c5SdfCK3v1Y8Oc+FYxFvBE+j4aAqH3hVT5JmpBsMNpF836z9b1xaKYS4QEPCEDQXpUPGx84zqXp4780SvKlCS9otC/dr4Xb/Ymg4UfhRyzktjpFC0Ek4p5vPrM80SgHQli/rpEq7Nv+/cCf2aTFefg2pYLjsvBwewsAPDLsdz6mEDJ/p5KLJ3JWTylE8cz7f3zqKTLuYgRxU6yNGdGz0829Ftq8q7A35qEUV4uCkBbGrmoWYGvJViOuP2vVxmST8hJ7FWtqkrj2hm0CNmR6d+GaKHYZRjRP/jyp4038tG/Jyu/xa+6GQSwLRrXcZhULZNgpvDhuoc8iDDufbBH/ikgeHpOS3KVQJh+0X7dCkcLaWLCulscS9h+BXqMifZRA0nWXqmzpUi2UC+OnSCuF7bgFKsBR31Pe7S30NPdNUJo7suJMugfINsZvjxH+Q7S9Eb1asFoLSnai/yL8VNfpB4C1hpzNHV4QYlGHUCGjAE0tKr9uyBWnuM9YDDOZWe4LLFcJGIhZPCzTbW0JFV8k3Yj3L/YDt9DZEB/D/ZzKTLQFP4hRxWekX/gLrTrIzjZvPCQHiKyzNsvwTbAZPaJBZyjAaox7IFEpsTA5cKaMzoNlGmngCpJBP+D5NBTNaQsO2cdRA+X X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(39830400003)(366004)(346002)(396003)(136003)(376002)(451199015)(38350700002)(6486002)(38100700002)(66556008)(66476007)(66946007)(4326008)(41300700001)(107886003)(6666004)(478600001)(36756003)(8676002)(2906002)(54906003)(316002)(6916009)(8936002)(5660300002)(86362001)(44832011)(2616005)(83380400001)(66574015)(1076003)(186003)(26005)(6512007)(52116002)(6506007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?wp75+2HqCrs921+doc8G1vNHF+SG?= =?utf-8?q?OajWbjtXHLXCA2r1Xly7S1kNd8+1I6qfg5WvqXQM1tb+U3sl6QOmCWdmFmd2dQI97?= =?utf-8?q?wqpDGHopBw1deda9vUqTK5NWIsDBqmuHJ1nDaQiFWhoxIvMRudcKqPoFG9t83TWpP?= =?utf-8?q?5k6D4pPIKdIgR95iVX1OYcxRhocE2XOm8LPPmu11CN8nxJbFOKXAmN0xPMMxI2GiI?= =?utf-8?q?hgbPfUWghZk5756XfVfbDqdRp3bPf3oEmGIlsfKGThwmI6cAhTyjAoVtwfISkXuye?= =?utf-8?q?Vc4ZoM4gA4J/+nFrD8d7HHTQpX9KlSZCgSCDs1QSjdli312CrRed74lASvNnIY2Jj?= =?utf-8?q?Lei+oHY81iiHCokDVlqXbTCaZJyqoGLd5u0m17M/PT08YONSblocE4ftro7LYzDuX?= =?utf-8?q?cPMFhtTeMzRkWKBky1UWxaxcbi8ztDh128fsTDVf/uzapn6DcpTMfSTyZbl0AU9as?= =?utf-8?q?eMFtKvzkxw67j8U0axxsdQAdkSmR1/WNiSBLd/jXi84VWyMILinbT90ZRrpbeJFmr?= =?utf-8?q?1xt8mnGY3le+1Mid2bQIkpVQ6WQNUH4Nv8T2azLxIoB9fYHh0G9ZomFsQf8Hl+VMy?= =?utf-8?q?hRVkgHuGKnbXFwBMoFMnC3WzLPduZ+cm7YIDKZ+va92Uym2U80z0+Ks3jKOhgaOHh?= =?utf-8?q?eAPFzjHaKtoTTAkSALZxT2+NiyWz2CVM6JMSGTd6Sh1EHWUMGsTabW2LcJkOWi4/0?= =?utf-8?q?k20UkT0IzHU8K/Un3Onu1oukN2BYMV/xUWdrWWewpnSgQVLz+1OEJ2rI+2JT3EnXb?= =?utf-8?q?OhZh94ny+eJgeHB4vO8GjQc291yKe4UOaiQC/qIoTmKw0RABOYG/I2Xz15jWdXb/6?= =?utf-8?q?SJC9RxInczubFc0ORpPhzpQd/BIjAYXYpD52Ks/1J7ZbJqeuaRfXBeAYaUd6kEi/1?= =?utf-8?q?23hIGa7GEerWzAMYTNaytFMsZ3ToivIokjgUoRh0d+s+2YD4Tvxdh1rs13IrqqiFX?= =?utf-8?q?wPMLR3uXJ7cIGZ3PHjIGdjFzQHupoKRDo0N4DzHIs58ixW0qA6lXT8EPR5IxQzTBx?= =?utf-8?q?dWpUmOQhAMBARC+TfK75y0sC4VKC+BgoKhEfmgda290I1T6U1xTcce2grWfkcW2GS?= =?utf-8?q?K//Bz1NJgYdiP5tceQ2Y1rkEOQZCw2OgJpafUCAeK2ef/On/PZ3eqdLzlb6Vm94Jv?= =?utf-8?q?UacrHX0WTZzo4lHDLK2CbhYeqs2IO45vntARD+rk7U5U0vzXFgBQtgRsPvNJbI1HZ?= =?utf-8?q?uHsvYMXKGM9Klrnbr72kPmsr7TO/2bDcCr1IHwUmcqKPQnUpjAROaIhpn7HPlP6J5?= =?utf-8?q?jO8jVM5tSBe5teC9u6Q3CrK3fqWzFuhJSog2Jh9XFL2o4PdVoCrR2QCqhrlObMro0?= =?utf-8?q?2ju40eOFy/stgIKpW868Pj/QRP0lkzGOVlv0WCfrJhJdDB3jCJAAH/BeVPZDaVHBx?= =?utf-8?q?Bx4nTL3LFEbARZTd8jsvgdxJeojoSHaEuZpqxyceI/vutfSbTFmSaIHls4VI5XI+O?= =?utf-8?q?vsg++6olp4EKUTDE+5jVdDxMZbSESS1HcSN7mQoewG+TDfxYeQqrUPs6VE9tfgCx6?= =?utf-8?q?OGMFGLl7I1rlWlblckNxNRkIhOxP2qGnDw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1f12981-47d2-4faf-9964-08dad10d65ab X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 06:54:29.8914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VeFUVl1/+DOdcXCMUuNKa0FEPZF1kDnn3JE62FGTyNVLrgryulsnyt0ERPmEgQUXPfQFZ5IDLLK7XE1IYKRJO0GYGGmWl3xmbY/VKF9C0AE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR13MB4952 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: Peng Zhang The VLAN information can be stored in the descriptor or in the metadata. Add a new VLAN strip V2 bit to distinguish them. When VLAN strip is set, the vlan information is stored in the descriptor. When VLAN strip V2 is set, it is stored in the metadata. Signed-off-by: Peng Zhang Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 33 +++++++++++++++++++++------------ drivers/net/nfp/nfp_ctrl.h | 1 + drivers/net/nfp/nfp_rxtx.c | 25 ++++++++++++++++--------- 3 files changed, 38 insertions(+), 21 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index d1822f6b71..a62a7386ab 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -195,7 +195,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw) NFD_CFG_MAJOR_VERSION_of(hw->ver), NFD_CFG_MINOR_VERSION_of(hw->ver), hw->max_mtu); - PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap, + PMD_INIT_LOG(INFO, "CAP: %#x, %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s", hw->cap, hw->cap & NFP_NET_CFG_CTRL_PROMISC ? "PROMISC " : "", hw->cap & NFP_NET_CFG_CTRL_L2BC ? "L2BCFILT " : "", hw->cap & NFP_NET_CFG_CTRL_L2MC ? "L2MCFILT " : "", @@ -203,6 +203,7 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw) hw->cap & NFP_NET_CFG_CTRL_TXCSUM ? "TXCSUM " : "", hw->cap & NFP_NET_CFG_CTRL_RXVLAN ? "RXVLAN " : "", hw->cap & NFP_NET_CFG_CTRL_TXVLAN ? "TXVLAN " : "", + hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2 ? "RXVLANv2 " : "", hw->cap & NFP_NET_CFG_CTRL_RXQINQ ? "RXQINQ " : "", hw->cap & NFP_NET_CFG_CTRL_SCATTER ? "SCATTER " : "", hw->cap & NFP_NET_CFG_CTRL_GATHER ? "GATHER " : "", @@ -216,6 +217,15 @@ nfp_net_log_device_information(const struct nfp_net_hw *hw) hw->max_rx_queues, hw->max_tx_queues); } +static inline void +nfp_net_enbable_rxvlan_cap(struct nfp_net_hw *hw, uint32_t *ctrl) +{ + if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) + *ctrl |= NFP_NET_CFG_CTRL_RXVLAN_V2; + else if ((hw->cap & NFP_NET_CFG_CTRL_RXVLAN) != 0) + *ctrl |= NFP_NET_CFG_CTRL_RXVLAN; +} + void nfp_net_enable_queues(struct rte_eth_dev *dev) { @@ -397,10 +407,8 @@ nfp_check_offloads(struct rte_eth_dev *dev) ctrl |= NFP_NET_CFG_CTRL_RXCSUM; } - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) { - if (hw->cap & NFP_NET_CFG_CTRL_RXVLAN) - ctrl |= NFP_NET_CFG_CTRL_RXVLAN; - } + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) + nfp_net_enbable_rxvlan_cap(hw, &ctrl); if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP) { if (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) @@ -754,7 +762,7 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) /* Next should change when PF support is implemented */ dev_info->max_mac_addrs = 1; - if (hw->cap & NFP_NET_CFG_CTRL_RXVLAN) + if (hw->cap & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) dev_info->rx_offload_capa = RTE_ETH_RX_OFFLOAD_VLAN_STRIP; if (hw->cap & NFP_NET_CFG_CTRL_RXQINQ) @@ -1034,21 +1042,22 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask) uint32_t new_ctrl, update; struct nfp_net_hw *hw; struct rte_eth_conf *dev_conf; + uint32_t rxvlan_ctrl; int ret; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); dev_conf = &dev->data->dev_conf; new_ctrl = hw->ctrl; + rxvlan_ctrl = 0; - /* - * Vlan stripping setting - * Enable or disable VLAN stripping - */ + nfp_net_enbable_rxvlan_cap(hw, &rxvlan_ctrl); + + /* VLAN stripping setting */ if (mask & RTE_ETH_VLAN_STRIP_MASK) { if (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - new_ctrl |= NFP_NET_CFG_CTRL_RXVLAN; + new_ctrl |= rxvlan_ctrl; else - new_ctrl &= ~NFP_NET_CFG_CTRL_RXVLAN; + new_ctrl &= ~rxvlan_ctrl; } /* QinQ stripping setting */ diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h index 106779c080..c7ebcf43b3 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -94,6 +94,7 @@ #define NFP_NET_CFG_CTRL_GATHER (0x1 << 9) /* Gather DMA */ #define NFP_NET_CFG_CTRL_LSO (0x1 << 10) /* LSO/TSO */ #define NFP_NET_CFG_CTRL_RXQINQ (0x1 << 13) /* Enable QINQ strip */ +#define NFP_NET_CFG_CTRL_RXVLAN_V2 (0x1 << 15) /* Enable VLAN strip with metadata */ #define NFP_NET_CFG_CTRL_RINGCFG (0x1 << 16) /* Ring runtime changes */ #define NFP_NET_CFG_CTRL_RSS (0x1 << 17) /* RSS */ #define NFP_NET_CFG_CTRL_IRQMOD (0x1 << 18) /* Interrupt moderation */ diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 40f1702bde..2bc0eb2625 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -237,23 +237,30 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, { struct nfp_net_hw *hw = rxq->hw; - if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) == 0) + /* Skip if hardware don't support setting vlan. */ + if ((hw->ctrl & (NFP_NET_CFG_CTRL_RXVLAN | NFP_NET_CFG_CTRL_RXVLAN_V2)) == 0) return; /* * The nic support the two way to send the VLAN info, - * 1. According the metadata to send the VLAN info - * 2. According the descriptor to sned the VLAN info + * 1. According the metadata to send the VLAN info when NFP_NET_CFG_CTRL_RXVLAN_V2 + * is set + * 2. According the descriptor to sned the VLAN info when NFP_NET_CFG_CTRL_RXVLAN + * is set * * If the nic doesn't send the VLAN info, it is not necessary * to do anything. */ - if (meta->vlan_layer >= 1 && meta->vlan[0].offload != 0) { - mb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci); - mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; - } else if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { - mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.vlan); - mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN_V2) != 0) { + if (meta->vlan_layer >= 1 && meta->vlan[0].offload != 0) { + mb->vlan_tci = rte_cpu_to_le_32(meta->vlan[0].tci); + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } + } else if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) { + if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { + mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.vlan); + mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; + } } }