From patchwork Tue Mar 11 12:18:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011698 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 975F4257AFA; Tue, 11 Mar 2025 12:19:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695540; cv=none; b=guOtNeOoFC2iu82DirUkEfRikSnHTajCRcTacgVWZjqq8ttqwzHCGpX9z8aX2Bvc9SyNOznxhtzBDrrb//8qar2CfrHeahrLMc/QqhR4rLead7etSQkZL8ceUaXo39w4xwkJsxVrflUi48LPNZaNtYhthJDYhabJLLLOQDLOzTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695540; c=relaxed/simple; bh=USZFGVWbz/e1RaRs2NXM0mQ04IIB7x/0EIOh9y03ySU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PUjuTURmzPJge8KcZUSajK4+N3g8NaCaShZnlg58BsHQHabYT/pf0VTIybCXAGlKvRNpD9i/mvo5Srgaj7H6OCVztYzoPMgN/cB+W2HNoAPeVoInhg4fUaqRmN23F0jTOnsl7hXFNtfhFUUggpkTAxzkk5XYAYdlk9zi5dtTR+8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oB2Mkk3h; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oB2Mkk3h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90A6DC113CF; Tue, 11 Mar 2025 12:18:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695540; bh=USZFGVWbz/e1RaRs2NXM0mQ04IIB7x/0EIOh9y03ySU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=oB2Mkk3hBvNB3izblm0qRhOfK4PEK8hibRGaEZRQvMUibbec9EvlXmivGInwdGNJM ptMAvd13ztY7+CJGWD/Lap9bPsddC9SF4Hl5KCQdRwckcNlR/8NZazyAFw5gAB2sjq JJ2IRdQFahbqwNe+a9VWCIkr6l1Mk48AmNm73ABXU5HWXegoin4isUNwLGlvhsMUDq RwheRwYDMxaSLWQAkpNcc0dZWgyuSCM0H+sKntBP8crvuoQTavLP+8KoCoDg8bMp/Q 8eMsyKXSUq8SGR23Jln+mWyP1INwHXCQXz/Pagtk/J1Gi36+ManpY661QdcPu8LXDy YdOYe6s7wPLtA== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:33 +0100 Subject: [PATCH net-next 1/7] net: mvneta: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-1-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in mvneta driver Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/mvneta.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 44b18c57390927e37eac267632cace656bb5526e..147571fdada378e430fd96f2fb4a7e7870b784a2 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2342,7 +2342,7 @@ mvneta_swbm_rx_frame(struct mvneta_port *pp, prefetch(data); xdp_buff_clear_frags_flag(xdp); xdp_prepare_buff(xdp, data, pp->rx_offset_correction + MVNETA_MH_SIZE, - data_len, false); + data_len, true); } static void @@ -2396,6 +2396,7 @@ mvneta_swbm_build_skb(struct mvneta_port *pp, struct page_pool *pool, struct xdp_buff *xdp, u32 desc_status) { struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp); + u32 metasize = xdp->data - xdp->data_meta; struct sk_buff *skb; u8 num_frags; @@ -2410,6 +2411,8 @@ mvneta_swbm_build_skb(struct mvneta_port *pp, struct page_pool *pool, skb_reserve(skb, xdp->data - xdp->data_hard_start); skb_put(skb, xdp->data_end - xdp->data); + if (metasize) + skb_metadata_set(skb, metasize); skb->ip_summed = mvneta_rx_csum(pp, desc_status); if (unlikely(xdp_buff_has_frags(xdp))) From patchwork Tue Mar 11 12:18:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011699 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47271256C6F; Tue, 11 Mar 2025 12:19:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695543; cv=none; b=FhZoW9FoAG7G15iJezwdoIaCYRaB6ckLiSL+/i84Pyj5OJxBfux+dFPEtmhi1bvKtYUuarfYOtQA+F5Defc0Lc6mmqzOJKsv7KWdXw0T3FzS++ifOSEUL1NyjOTEgJ6l31yBRusHJsfw0f+v6gXweiT/EVNsRsB4WpV8QI8sj5E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695543; c=relaxed/simple; bh=rofRa6M2JYCQa/vkknLX651Kx/C8RY4aT4P7HmN2O0I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Aqc6h5W48OK3n0oMNKDRxJMfSwgjQIW8wFDIDyA1zchtzdv0krGXw3gMqjRo/o7rbW1SFr7Uo69v853womxrTZKTiquZjx2Dip3jOHCOT5LGc7WiOSpVvfXXMjtGiu3zZ9Rd98qB9wvZstIvKG6t+sTAY5sCXuNE3XSUQGrZau4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kXzEDhTj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kXzEDhTj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 428A8C4CEE9; Tue, 11 Mar 2025 12:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695542; bh=rofRa6M2JYCQa/vkknLX651Kx/C8RY4aT4P7HmN2O0I=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kXzEDhTjP7E8dqzsyfbjc1vt1qaqAsXnSn0DKgOEIB04xhK9/x4AHqXgX2/8+9p9G jfG60a51j1kOaKXGAOdm2jw8s50z0i53ZtQv3pj327i7SILvsEXe7LS665TGpJkrqD /me8bN+ZsBjiNn0+i5g0PdEQu9Z5kdizyhTdbFpMidWO4+866rM6MLWewlecNZ5X0c K3K0Xc04YT29FV5zHX0xZ1deIFoFjvvN/at1codWjAtJWc/aZ14DT7pcGyQG67ytSW EOnxG7cQKzq6kEKMyI5wZ2co50Rbr/5tvJqIDjTni7SsXTPADus7BQuahAbKLUa6v/ U79D+XOdSJ2Mw== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:34 +0100 Subject: [PATCH net-next 2/7] net: mvpp2: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-2-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in mvpp2 driver Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index f166dc4e650372d66e248601a5c948819e1dcd79..54a235366a01bdba526a1956f27836bcdee210ae 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -3915,13 +3915,13 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, while (rx_done < rx_todo) { struct mvpp2_rx_desc *rx_desc = mvpp2_rxq_next_desc_get(rxq); + u32 rx_status, timestamp, metasize = 0; struct mvpp2_bm_pool *bm_pool; struct page_pool *pp = NULL; struct sk_buff *skb; unsigned int frag_size; dma_addr_t dma_addr; phys_addr_t phys_addr; - u32 rx_status, timestamp; int pool, rx_bytes, err, ret; struct page *page; void *data; @@ -3983,7 +3983,7 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, xdp_init_buff(&xdp, PAGE_SIZE, xdp_rxq); xdp_prepare_buff(&xdp, data, MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM, - rx_bytes, false); + rx_bytes, true); ret = mvpp2_run_xdp(port, xdp_prog, &xdp, pp, &ps); @@ -3999,6 +3999,8 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, ps.rx_bytes += rx_bytes; continue; } + + metasize = xdp.data - xdp.data_meta; } if (frag_size) @@ -4038,6 +4040,8 @@ static int mvpp2_rx(struct mvpp2_port *port, struct napi_struct *napi, skb_reserve(skb, MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM); skb_put(skb, rx_bytes); + if (metasize) + skb_metadata_set(skb, metasize); skb->ip_summed = mvpp2_rx_csum(port, rx_status); skb->protocol = eth_type_trans(skb, dev); From patchwork Tue Mar 11 12:18:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011700 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D60F4258CD2; Tue, 11 Mar 2025 12:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695546; cv=none; b=OW14eJEVP+W2XxJ+5GHndxRoqxfOLUxLIlsr6mc9Q5ppnjNQfgjifZq9BPUlcMmNK/6sAmRt6BXx7a4AR9re/kxZy4bFZJAj0SubCmIRFoIRdMl/sXNG1hTlxAa50MjHd3p33xXDOXlPhHqOVk5DLdfSZRiMC89choTdn8PHjlY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695546; c=relaxed/simple; bh=WlTKQ3kcPFy8Hxds+Qy4aCVKV8kY2r+qZ2PUzA/IBug=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=M5Mmv2R0fEoGt+A5qS/7sXTQrvKJSqje4ZGSiWOjfUsSgfl4l5vAS+jhYwb3Cj2KZRKOHCAFE58VJzWYnJQLMiFmPFDym6oWYfmoiSlO76Gs5mT7rJMFne5vWZ16Tk8pg0XJqAJFBARJXYEl3rSTzoUHECsKhawnn1JVRC/vTe8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eGYIcZt+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eGYIcZt+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DD207C4CEE9; Tue, 11 Mar 2025 12:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695545; bh=WlTKQ3kcPFy8Hxds+Qy4aCVKV8kY2r+qZ2PUzA/IBug=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eGYIcZt+Un/GTINujdFJtIr0Mdj8NtySDL9FVsZAqLLOXDruVRrxBRsdKxYb/mycm W9v1AbhrCHepRf0w4reU64wK2RSCX7G/nWHeuGxYpbRr2ud4gyTUCEStQnfu+vI806 VU8YGqYc3tlITLzZdAs9Sc4YyjqPQCAZPssUEV93gUyVtfC8oLS+RFT8EY7Ox+ofHD rn1gz07XdDV/dj31vYJc4Y3AGFBgCstiDp1oQKwIkO2Z2ytKAg8lNuGIcbUuz0p6QA uXFwAYz29Qd/wPW/6GDhjmIRrWxxE3yJ3f2CgNERitHfBJI8GH1daWFLTNZLadrx7v gZIbiwCDg8rhQ== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:35 +0100 Subject: [PATCH net-next 3/7] net: netsec: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-3-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in netsec driver Signed-off-by: Lorenzo Bianconi Acked-by: Ilias Apalodimas --- drivers/net/ethernet/socionext/netsec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index dc99821c6226fbaece65c8ade23899f610b44a9a..ee890de69ffe795dbdcc5331e36be86769f0d9a6 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -970,7 +970,7 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) struct netsec_de *de = dring->vaddr + (DESC_SZ * idx); struct netsec_desc *desc = &dring->desc[idx]; struct page *page = virt_to_page(desc->addr); - u32 xdp_result = NETSEC_XDP_PASS; + u32 metasize, xdp_result = NETSEC_XDP_PASS; struct sk_buff *skb = NULL; u16 pkt_len, desc_len; dma_addr_t dma_handle; @@ -1019,7 +1019,7 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) prefetch(desc->addr); xdp_prepare_buff(&xdp, desc->addr, NETSEC_RXBUF_HEADROOM, - pkt_len, false); + pkt_len, true); if (xdp_prog) { xdp_result = netsec_run_xdp(priv, xdp_prog, &xdp); @@ -1048,6 +1048,9 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) skb_reserve(skb, xdp.data - xdp.data_hard_start); skb_put(skb, xdp.data_end - xdp.data); + metasize = xdp.data - xdp.data_meta; + if (metasize) + skb_metadata_set(skb, metasize); skb->protocol = eth_type_trans(skb, priv->ndev); if (priv->rx_cksum_offload_flag && From patchwork Tue Mar 11 12:18:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011701 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B849258CD2; Tue, 11 Mar 2025 12:19:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695549; cv=none; b=STWEc5Qeyk8PYLkI7rHFkTsOl6moyZX52170EHbwhfFZ8zjmQVc41pDsUPI8wxsg83Zr/Ytb9JeA/RbYJ3yqnV2lTYgwNtKCPY0kxQvTSco4lvwNrZUoLgb9ipTPYQdXTOv6VaJjUo0F8PRCdLaxBBj/0sfoMEmgOOIBij52HdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695549; c=relaxed/simple; bh=LSjQ49wR95nB5Q5G/AIMKk08CggQRNScXhe5BjJKpeQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uNKMjmZHps6Huy6chBluYz0iQjscpD4i8HjvQlCTv4aAXBQ14gSNx1uPFgsfXLjWFd4TYLkkNc7dfPQ11lHMLUAD1XTf8sed+is7QUksQm5RP5L4ze/oaVyRoAPkwoLLIpVqCPkTd2WvawoqVlc2arG+Rtrzk8uawpkHLmWRz94= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WYyjIwf0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WYyjIwf0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8CF8DC4CEE9; Tue, 11 Mar 2025 12:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695549; bh=LSjQ49wR95nB5Q5G/AIMKk08CggQRNScXhe5BjJKpeQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WYyjIwf0NKoI9nJPBCgY1Bv65NklpAR8eJ8qZ8zW2R0VyFs6VlCIkgkVLsrRdX0kd vduu59iVdLoyGQzlh8+Vi+1XTCx8VslZ0Nstm8soITPVVeStTNVpt1pU+9/y8AcgO4 uUYIKFcAhgR/cD0T2oxWvkg1ik/eljslHbTv6u229C83Pyq9hiGOsWNfXlYhxvQg16 FY1k6EFypst6J/6Qy58gV4rAZMAUfn4+nGf9w5d0Zz1JtKa3jZTPUwFtNUO+Fvt8Ev LMkzqqtEld2lNu2aQEWixc1OatPITJIhoYARMzYTJjKxBDOlXFl1SR1DLnGZCrPEBj 8f1dzz9unFnww== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:36 +0100 Subject: [PATCH net-next 4/7] net: octeontx2: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-4-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in octeontx2 driver Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c index 6bc5ce5a9f61cc2830975e7cc5219344760b0e51..af8cabe828d05c8832085d24d183312f24d00330 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c @@ -41,7 +41,7 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf, struct bpf_prog *prog, struct nix_cqe_rx_s *cqe, struct otx2_cq_queue *cq, - bool *need_xdp_flush); + u32 *metasize, bool *need_xdp_flush); static void otx2_sq_set_sqe_base(struct otx2_snd_queue *sq, struct sk_buff *skb) @@ -336,6 +336,7 @@ static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf, struct nix_rx_sg_s *sg = &cqe->sg; struct sk_buff *skb = NULL; void *end, *start; + u32 metasize = 0; u64 *seg_addr; u16 *seg_size; int seg; @@ -346,7 +347,8 @@ static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf, } if (pfvf->xdp_prog) - if (otx2_xdp_rcv_pkt_handler(pfvf, pfvf->xdp_prog, cqe, cq, need_xdp_flush)) + if (otx2_xdp_rcv_pkt_handler(pfvf, pfvf->xdp_prog, cqe, cq, + &metasize, need_xdp_flush)) return; skb = napi_get_frags(napi); @@ -378,6 +380,8 @@ static void otx2_rcv_pkt_handler(struct otx2_nic *pfvf, skb->mark = parse->match_id; skb_mark_for_recycle(skb); + if (metasize) + skb_metadata_set(skb, metasize); napi_gro_frags(napi); } @@ -1482,7 +1486,7 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf, struct bpf_prog *prog, struct nix_cqe_rx_s *cqe, struct otx2_cq_queue *cq, - bool *need_xdp_flush) + u32 *metasize, bool *need_xdp_flush) { struct xdp_buff xdp, *xsk_buff = NULL; unsigned char *hard_start; @@ -1514,13 +1518,14 @@ static bool otx2_xdp_rcv_pkt_handler(struct otx2_nic *pfvf, hard_start = (unsigned char *)phys_to_virt(pa); xdp_prepare_buff(&xdp, hard_start, OTX2_HEAD_ROOM, - cqe->sg.seg_size, false); + cqe->sg.seg_size, true); act = bpf_prog_run_xdp(prog, &xdp); handle_xdp_verdict: switch (act) { case XDP_PASS: + *metasize = xdp.data - xdp.data_meta; break; case XDP_TX: qidx += pfvf->hw.tx_queues; From patchwork Tue Mar 11 12:18:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011702 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E6E25A2A2; Tue, 11 Mar 2025 12:19:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695552; cv=none; b=cSmM4l+C2e9IZvcLmNcoS3byIBU4pOiG6mgNvU7eeg06oRRITODgs63XDjF/6oThNDK/M8jL12qULSxhVoQrhs138x0HwqQZFLplkYDD6Za2uYIJUZ03gNA5w1NcDdQnGAOtqo8CcqpPxn3af+v3IU/4fZfPbiSTzNlkF9WaGI4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695552; c=relaxed/simple; bh=hM+Tb4R5v8bLINi/KffYzAfj9nxBFX9y1AOJMkEpWCk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SdY+xQvB1Xkq5RkLxkqZTE4CBP4LT0BRhLYTwPa3iWR9OfLly4LiX3JVLKqsRinFIG9iN/k7cmE2bkJIAV3C3RbiXDZeC2KXdhAhcbmfjo9chGyiT5Qvj+NRSzPECt7vA0hYTmmG+1MX6j/FFzAqLr4aGf861Bf/qu7nAIkaOGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mtvS7dUp; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="mtvS7dUp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21D98C4CEEE; Tue, 11 Mar 2025 12:19:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695551; bh=hM+Tb4R5v8bLINi/KffYzAfj9nxBFX9y1AOJMkEpWCk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mtvS7dUpX92xO/aWwKdRelwCLf5IKHFEHhw03H4yOPk+kGjXEOcMTnCxn1TIufoAR rbgN+CEuyzxrB9DFcjJnx6d/ZQpl7GRZbtQ4DE4L3TdbeNWcK4xMDzkEdGzWi4L8Fh GhnOsn8oFwdtku8OaN0lCJJhsK12LBxr3IYkrO/nZceHeVqRgKm5dRA+pzfq0amITL kh3cnGnkwpR2x9J+1p6bid8s0c5as08d1IOWundV5LmNn3pFMssapMIndBtG+8XNKV h8X+6fxlSOT6lyAjNXzkA93+kujQQUHn6XWPkoJ/NzB8ADekfC34H0+XNA+AYavzW6 uQou4/yOIttSg== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:37 +0100 Subject: [PATCH net-next 5/7] net: ethernet: mediatek: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-5-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in mediatek driver Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 922330b3f4d70421276ecd3f4ab175b3ae263f71..43197b28b3e745319e974c6022a6a51b6953f60a 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2122,7 +2122,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, if (ring->page_pool) { struct page *page = virt_to_head_page(data); struct xdp_buff xdp; - u32 ret; + u32 ret, metasize; new_data = mtk_page_pool_get_buff(ring->page_pool, &dma_addr, @@ -2138,7 +2138,7 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, xdp_init_buff(&xdp, PAGE_SIZE, &ring->xdp_q); xdp_prepare_buff(&xdp, data, MTK_PP_HEADROOM, pktlen, - false); + true); xdp_buff_clear_frags_flag(&xdp); ret = mtk_xdp_run(eth, ring, &xdp, netdev); @@ -2158,6 +2158,9 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, skb_reserve(skb, xdp.data - xdp.data_hard_start); skb_put(skb, xdp.data_end - xdp.data); + metasize = xdp.data - xdp.data_meta; + if (metasize) + skb_metadata_set(skb, metasize); skb_mark_for_recycle(skb); } else { if (ring->frag_size <= PAGE_SIZE) From patchwork Tue Mar 11 12:18:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011703 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 120D325A63F; Tue, 11 Mar 2025 12:19:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695555; cv=none; b=EYqMnR+lod54vyYCaXNqu7qYPWWz30aX1pX6Dg2my5dlfUTjdFgD6NuVJT67+dpiJ0Jbetlm9KZ+3MWXpBA2f31NmNUetAmW0ZsoUiJfQM2Z7U67eQucyZ6xpr8YpG5O5WvVrXDrdcdBGFebec3oAxu6TYVmZezBrBBVqlmHg3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695555; c=relaxed/simple; bh=x+krQGj/SL7R2wTdC09zi8Lq2AOOM9k7jWivDeJJS7E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Kh0x2fsFonW7uKwAkDhj2FWeRtXIZegBud60moeumpQdCpTgryWauxm7LbpcgWvy7OkModElRFEhXi24zNINz3FQyi2bhZZ9MAI/YG89mOTJdGLFd6812EJ9PfOQXb51RHLZXtfIDEdTyPsItwYzSdxd/YAwSKhZ/WNqVDV0wNM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r8AqGYmk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r8AqGYmk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 015E2C4CEEC; Tue, 11 Mar 2025 12:19:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695554; bh=x+krQGj/SL7R2wTdC09zi8Lq2AOOM9k7jWivDeJJS7E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=r8AqGYmkKFQQ/vy7x1cM404pF4kwW8b9mOnf9uhfwPUs7/J3vpKMzAJjfAXOquY1L 36qn3x0ZcN9kZFSINUG95beouVuvqQk51kt6TDGbq3BeFwB7FJUtrpcmFrxubQZOGU WaTwf6mK71Osy15xecOCW+flQF4dRFyi11XEAXOgo9ilG83bEoUrIqw5f2JS7AD5xh nYpQ1mna/BFRAoAtVl5aUD/Y+dckxhrzHEa5RLHCh8MHWzi5w5MOv1/X62hnh24n/d PUG1fyxAXOIOwqv8D4bs6uqN7OmRF9yI19BP/TSj8f5+bDPq0PutZZBw9SI7I+mQE8 IFJYpfJFuFyGQ== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:38 +0100 Subject: [PATCH net-next 6/7] net: mana: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-6-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in mana driver Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/microsoft/mana/mana_bpf.c | 2 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/microsoft/mana/mana_bpf.c b/drivers/net/ethernet/microsoft/mana/mana_bpf.c index 23b1521c0df96e7fd595daad8b49fa9be935090c..d30721d4516fc60cf8883f2b35cc561559082ccc 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_bpf.c +++ b/drivers/net/ethernet/microsoft/mana/mana_bpf.c @@ -91,7 +91,7 @@ u32 mana_run_xdp(struct net_device *ndev, struct mana_rxq *rxq, goto out; xdp_init_buff(xdp, PAGE_SIZE, &rxq->xdp_rxq); - xdp_prepare_buff(xdp, buf_va, XDP_PACKET_HEADROOM, pkt_len, false); + xdp_prepare_buff(xdp, buf_va, XDP_PACKET_HEADROOM, pkt_len, true); act = bpf_prog_run_xdp(prog, xdp); diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c index 2d826077d38cdac7ebe9c355cf883b0d727eeca2..a3986fc47b819dae1f8a1d62ebe1ff051b144236 100644 --- a/drivers/net/ethernet/microsoft/mana/mana_en.c +++ b/drivers/net/ethernet/microsoft/mana/mana_en.c @@ -1559,8 +1559,12 @@ static struct sk_buff *mana_build_skb(struct mana_rxq *rxq, void *buf_va, return NULL; if (xdp->data_hard_start) { + u32 metasize = xdp->data - xdp->data_meta; + skb_reserve(skb, xdp->data - xdp->data_hard_start); skb_put(skb, xdp->data_end - xdp->data); + if (metasize) + skb_metadata_set(skb, metasize); return skb; } From patchwork Tue Mar 11 12:18:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14011704 X-Patchwork-Delegate: kuba@kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD1C325A337; Tue, 11 Mar 2025 12:19:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695558; cv=none; b=GaxdlodhLspRbMKuRlAbNTHUe2yQvamDHhWUP/qVkZcXuqZnJfjOiZ79OYkDnQOLng8+D8F4lqgpsS2vCF/qXvBVqzqBy5KpgVYIlmXy+NqpvtsviavfLgRvZXLukpGuJmG566gyzEbxRw2x5s8HBfteRt7t74aJjRztTk5n97A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741695558; c=relaxed/simple; bh=MLsMpE992zK7c/rp7wDJ8MLFrQZSgP8o8puAp87Eh7g=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qXhtuVU2L5Mr3KE9mBCCJ2/MAOvYLmbPic4j6Pkqujn9zQQyYIfiB/cw+yhvybKP7qOfN9nPVg+XAjcnAWMBYW93Q/B1j1lATlWlzCa4wEZk21zH2652XgM/J26VxmWoYrJTnZ00L6c294SXNECUj5hsw5kJc7ykT4C6NaGFovo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eVaZnxYr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eVaZnxYr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C7E9AC4CEE9; Tue, 11 Mar 2025 12:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741695557; bh=MLsMpE992zK7c/rp7wDJ8MLFrQZSgP8o8puAp87Eh7g=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eVaZnxYrJmme1pRqmXuM0b7KlF/OsCyV+/1WVsamjyn0u1n98t+jSvcvDwE2PHdXo PeVg0AA7+PE2eWEIBt7YlT6EaBDzyHSwJX4/sJOX7We3veteDkIGBpYL+lfkidUtm7 6yxYSzKnThSg1nLR9QIZ8A3+r1GinXUhXsRUfZW67Ro29egFW2uB04XOYrnwUHmmoJ EI5iTq4Cyuk7wnoqTohDTwPaZdCbXNPmrLirmjt+s9OZ80yiPtugXvanuD964AXVE8 gutE3VOjt2KYzmtgfgaW6TgR5btcKlKKiX+MGgjailwJ855zg68zCeZI0IPtYMKiWn j8uhqOxX7IfWQ== From: Lorenzo Bianconi Date: Tue, 11 Mar 2025 13:18:39 +0100 Subject: [PATCH net-next 7/7] net: ti: cpsw: Add metadata support for xdp mode Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250311-mvneta-xdp-meta-v1-7-36cf1c99790e@kernel.org> References: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> In-Reply-To: <20250311-mvneta-xdp-meta-v1-0-36cf1c99790e@kernel.org> To: Marcin Wojtas , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Russell King , Ilias Apalodimas , Masahisa Kojima , Sunil Goutham , Geetha sowjanya , Subbaraya Sundeep , hariprasad , Bharat Bhushan , Felix Fietkau , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Siddharth Vadapalli , Roger Quadros Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-hyperv@vger.kernel.org, linux-omap@vger.kernel.org, Lorenzo Bianconi X-Mailer: b4 0.14.2 X-Patchwork-Delegate: kuba@kernel.org Set metadata size building the skb from xdp_buff in cpsw/cpsw_new drivers Signed-off-by: Lorenzo Bianconi --- drivers/net/ethernet/ti/cpsw.c | 6 +++++- drivers/net/ethernet/ti/cpsw_new.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 0cb6fa6e5b7d4fb9703633f0d67a7e95e6e7d8aa..a984b7d84e5e5917b83547c862924ccd30d83601 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -351,6 +351,7 @@ static void cpsw_rx_handler(void *token, int len, int status) int ret = 0, port, ch = xmeta->ch; int headroom = CPSW_HEADROOM_NA; struct net_device *ndev = xmeta->ndev; + u32 metasize = 0; struct cpsw_priv *priv; struct page_pool *pool; struct sk_buff *skb; @@ -400,7 +401,7 @@ static void cpsw_rx_handler(void *token, int len, int status) size -= CPSW_RX_VLAN_ENCAP_HDR_SIZE; } - xdp_prepare_buff(&xdp, pa, headroom, size, false); + xdp_prepare_buff(&xdp, pa, headroom, size, true); port = priv->emac_port + cpsw->data.dual_emac; ret = cpsw_run_xdp(priv, ch, &xdp, page, port, &len); @@ -408,6 +409,7 @@ static void cpsw_rx_handler(void *token, int len, int status) goto requeue; headroom = xdp.data - xdp.data_hard_start; + metasize = xdp.data - xdp.data_meta; /* XDP prog can modify vlan tag, so can't use encap header */ status &= ~CPDMA_RX_VLAN_ENCAP; @@ -423,6 +425,8 @@ static void cpsw_rx_handler(void *token, int len, int status) skb_reserve(skb, headroom); skb_put(skb, len); + if (metasize) + skb_metadata_set(skb, metasize); skb->dev = ndev; if (status & CPDMA_RX_VLAN_ENCAP) cpsw_rx_vlan_encap(skb); diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index 3da1c131335df1ff79b32ce0e3ea5200a2e53f4b..5b5b52e4e7a757a14965fe6df41935aed547111f 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -293,6 +293,7 @@ static void cpsw_rx_handler(void *token, int len, int status) struct page_pool *pool; struct sk_buff *skb; struct xdp_buff xdp; + u32 metasize = 0; int ret = 0; dma_addr_t dma; @@ -345,13 +346,14 @@ static void cpsw_rx_handler(void *token, int len, int status) size -= CPSW_RX_VLAN_ENCAP_HDR_SIZE; } - xdp_prepare_buff(&xdp, pa, headroom, size, false); + xdp_prepare_buff(&xdp, pa, headroom, size, true); ret = cpsw_run_xdp(priv, ch, &xdp, page, priv->emac_port, &len); if (ret != CPSW_XDP_PASS) goto requeue; headroom = xdp.data - xdp.data_hard_start; + metasize = xdp.data - xdp.data_meta; /* XDP prog can modify vlan tag, so can't use encap header */ status &= ~CPDMA_RX_VLAN_ENCAP; @@ -368,6 +370,8 @@ static void cpsw_rx_handler(void *token, int len, int status) skb->offload_fwd_mark = priv->offload_fwd_mark; skb_reserve(skb, headroom); skb_put(skb, len); + if (metasize) + skb_metadata_set(skb, metasize); skb->dev = ndev; if (status & CPDMA_RX_VLAN_ENCAP) cpsw_rx_vlan_encap(skb);