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: 14011746 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3CAEC28B2E for ; Tue, 11 Mar 2025 12:25:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vo4LTAc4KFtKswaYp2T7HXslGmfDZfEUYilwSHhdiyg=; b=jpKllO8q4ybco2OK7FNDZpJ3tT vLVJFGH5h776K3KrVopNne36cSbfIDw6kI/AjCYs9t0ttXCKUepq33kmoDCLTNa3hLjd4lPV1ZwLW exdiJVmUuKkY30KEtfADV+ZvF/EOl362NxYZJ9S0IdoR4zqGD82IHIf0dIG1zeFhCT6r0+c5UbmoY Tn5ksY1LpYMe8GDx75Ebzu4GMT10kTjFnqZgycoV7doZW940LJrxl8IZc6lP8chny0tjG3/6OCVNj meWwM3tVVihKq9AWb5tiagzl9Uwz3vVSI1xACbiAgMicTy6JNAD2+SIZc0xC8VkCqk+j2x5HfzcMO kQYEm/tA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tryfH-00000005ctQ-2PPt; Tue, 11 Mar 2025 12:24:55 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tryZb-00000005ba5-2Hsb; Tue, 11 Mar 2025 12:19:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 453415C3EFD; Tue, 11 Mar 2025 12:16:46 +0000 (UTC) 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250311_051903_671723_0CFD38DD X-CRM114-Status: GOOD ( 10.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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);