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 smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 E898FC531CC for ; Fri, 24 Jul 2026 01:53:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 8D1CC40AF5; Fri, 24 Jul 2026 01:53:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 2f7w7LSiZB5S; Fri, 24 Jul 2026 01:53:24 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.142; helo=lists1.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org F239B40AF1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=osuosl.org; s=default; t=1784858004; bh=nNjK3hvgwMNMUihtBE78N4FCcg/RQUsG7TcoKGDaIyQ=; h=From:To:Cc:Date:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=nlOjGQt8anjLUnABCqAJXnbqOApWtDqxCZ3OcDx/Xj+jlTN18vBqz9NAX1z8st/1B hvxNjsARF/NXQmINvURcRYiR872yGXvEEv0TWsowv+hM0hsEK52475OQrZ3afqOwJP YjkPbfjvq7GvlYLySsq2uraaGY9jBYxZhhZJ/xd6Oy+61O7Ap3TmL0QeHenzpB13tX waMPStqmSV4qtF4lETUYt5nGs36SsYOe9ed51c6ROoiBx69v9M0q0QEyr2RKyF6wJO 6I9lMxiROJ5mVQ7cfzKUJ1DR7yRObxphOVpp+4zw4qITubi6ejhLEldue0o/d7f74k 74nYVfY5tOgwQ== Received: from lists1.osuosl.org (lists1.osuosl.org [140.211.166.142]) by smtp4.osuosl.org (Postfix) with ESMTP id F239B40AF1; Fri, 24 Jul 2026 01:53:23 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists1.osuosl.org (Postfix) with ESMTP id E21284BF for ; Fri, 24 Jul 2026 01:53:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id C82BA8116B for ; Fri, 24 Jul 2026 01:53:22 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id o98dD-fMZKNr for ; Fri, 24 Jul 2026 01:53:21 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=95.215.58.182; helo=out-182.mta1.migadu.com; envelope-from=chenguang.zhao@linux.dev; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 8F97581169 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8F97581169 Received: from out-182.mta1.migadu.com (out-182.mta1.migadu.com [95.215.58.182]) by smtp1.osuosl.org (Postfix) with ESMTPS id 8F97581169 for ; Fri, 24 Jul 2026 01:53:18 +0000 (UTC) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Chenguang Zhao To: anthony.l.nguyen@intel.com, przemyslaw.kitszel@intel.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, chenguang.zhao@linux.dev, Chenguang Zhao , Aleksandr Loktionov , Jason Xing Date: Fri, 24 Jul 2026 09:53:28 +0800 Message-Id: <20260724015328.229726-1-chenguang.zhao@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1784857995; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=nNjK3hvgwMNMUihtBE78N4FCcg/RQUsG7TcoKGDaIyQ=; b=XGmwujHp3yE/szSv7OU2TTJpHMjn0V3gVDrX1t3Ll8xKSFvobA5GwWZ89cWMRmmJw8P1hV LcxoLzV/sRByejt9/AFLnmJN4TmvulggLKzwDgkKUsvq9if3TeQG/2CoHwnarOfYZ12r/4 cX5XCdwuXl8DWr9ttVWkLMsUxLpGi2U= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=linux.dev X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=XGmwujHp Subject: [Intel-wired-lan] [PATCH net v3] i40e: xsk: fix multi-buffer XDP_PASS skb construction X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Chenguang Zhao When AF_XDP ZC receives a multi-buffer frame and the XDP program returns XDP_PASS, i40e_construct_skb_zc() copies frags into a new skb. The copy used skb_frag_page() as the memcpy source (page metadata instead of packet data) and passed a virtual address to __skb_fill_page_desc_noacc(), which expects a struct page *. Use skb_frag_address() for the copy, attach frags with skb_add_rx_frag() so len/data_len/truesize are updated, and on dev_alloc_page() failure free the skb via the shared out path so xsk_buff_free() still runs and previously attached pages are released by kfree_skb. Fixes: 1c9ba9c14658 ("i40e: xsk: add RX multi-buffer support") Signed-off-by: Chenguang Zhao Reviewed-by: Aleksandr Loktionov Reviewed-by: Jason Xing --- v3: - To ensure backport compatibility for stable branches, this patch solely addresses bug fixes. The refactored version that replaces i40e_construct_skb_zc() with xdp_build_skb_from_zc() will be submitted to the -next tree. v2: - https://lore.kernel.org/all/20260717012416.168107-1-chenguang.zhao@linux.dev/ v1: - https://lore.kernel.org/all/20260714025112.284724-1-chenguang.zhao@linux.dev/ drivers/net/ethernet/intel/i40e/i40e_xsk.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c index 9f47388eaba5..a4247710c85b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c @@ -318,22 +318,19 @@ static struct sk_buff *i40e_construct_skb_zc(struct i40e_ring *rx_ring, goto out; for (int i = 0; i < nr_frags; i++) { - struct skb_shared_info *skinfo = skb_shinfo(skb); skb_frag_t *frag = &sinfo->frags[i]; + unsigned int frag_size = skb_frag_size(frag); struct page *page; - void *addr; page = dev_alloc_page(); if (!page) { dev_kfree_skb(skb); - return NULL; + skb = NULL; + goto out; } - addr = page_to_virt(page); - memcpy(addr, skb_frag_page(frag), skb_frag_size(frag)); - - __skb_fill_page_desc_noacc(skinfo, skinfo->nr_frags++, - addr, 0, skb_frag_size(frag)); + memcpy(page_to_virt(page), skb_frag_address(frag), frag_size); + skb_add_rx_frag(skb, i, page, 0, frag_size, PAGE_SIZE); } out: -- 2.25.1