From patchwork Tue Mar 18 11:46:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 14020874 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 F1959C282EC for ; Tue, 18 Mar 2025 11:57:22 +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=s//yCSwzuJxCyaujFqCk41pWPJtNKfJ15rMKFZYWtoA=; b=A6pZwN0iQ7QPbBKo0YWPUxomYJ OvU2oTwYZMogEc2TF92NiGobXR+AdeWma8FiogqwLhpOcyCkHYJCAz1hNLSN/52Bc+luZ5NX1Cije wXfj/QuDQnnBYX8m2PWongOo76Jk8fQi7rfXtVgx4t0Bzud0lGzFvVJi+x7S9YLGkN1bUNu7yiieL f07VS/PZl9FroSJPBn7UnXWCkGKijQz5xxAasA0eGgJSLu+1tKM0RkdAmxciXJLHKhnezpTCDpiSe 0afDsBvDgriYur+hV3w8GfYxFcz6HOxmi+pD6RQhyYe0gYEk6d1XMNn07PFzWia6AW2z3MUCWaWy+ eUg5yBSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tuVZH-00000005nhr-398U; Tue, 18 Mar 2025 11:57:11 +0000 Received: from nyc.source.kernel.org ([2604:1380:45d1:ec00::3]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tuVOu-00000005lqG-3KhW; Tue, 18 Mar 2025 11:46:30 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 876FCA48F32; Tue, 18 Mar 2025 11:40:58 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46396C4CEDD; Tue, 18 Mar 2025 11:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742298387; bh=rCs+UrDUnktbdcw/dcYq2H0+m4LMlYoRtzFBUJPS9mM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=FO+/WkVRAwmPbiaKbNXqxIgsH2lu0e7EGaDmOohEAp6ewe9UFMMUwgjNDkfMecZ67 t9+bexBKdKF4l2aRqPMjh5ysoV+mZtkicBTHdlfSG75EdgGgzG+ItywjjiOtkw6b8N dAYaGJ6SPV2LZpZ+5Rk8DFxcLxBupSWV2NwUc3kapEbEq0a6RucKe88aM5x0+5rX5f MDcE5aBBEV8VgWLuD9H63kl32IOsSAfSc3lFlJUB2tHzP5DS6Q7SfSuehU5Dmhjrc3 OzXNn8hf54A9OmcPdrHmD/gfQAz9dgYJr6mNeK+Zwiuu48WrpzLS/O8kxYyy51EEDj F6vSBpkJdvccQ== From: Lorenzo Bianconi Date: Tue, 18 Mar 2025 12:46:09 +0100 Subject: [PATCH net-next v2 5/7] net: ethernet: mediatek: Add metadata support for xdp mode MIME-Version: 1.0 Message-Id: <20250318-mvneta-xdp-meta-v2-5-b6075778f61f@kernel.org> References: <20250318-mvneta-xdp-meta-v2-0-b6075778f61f@kernel.org> In-Reply-To: <20250318-mvneta-xdp-meta-v2-0-b6075778f61f@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 , Lorenzo Bianconi 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, Michal Kubiak X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250318_044628_963971_B31C9FCD X-CRM114-Status: GOOD ( 11.72 ) 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 mediatek driver. mtk_eth_soc driver sets xdp headroom to XDP_PACKET_HEADROOM so the headroom is large enough to contain xdp_frame and xdp metadata. Please note this patch is just compiled tested. Reviewed-by: Michal Kubiak 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)