From nobody Fri Dec 19 20:17:14 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5255A1922D4; Sat, 26 Apr 2025 08:13:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745655230; cv=none; b=Slc1ap7016Z9kgliDJT9xyD+igJnyT8d++dWzVG31vIg+CkQOwTQtPsP5D4shcdlr7ndHYhkdpbbbRD5zpdDOxSY0PK+k9IBu3JfnFVd3U1tnWjSgwpNaujhvkyVnF1gIVaZ8tIp8GZNI82ARbCDgQInohg5mNLdpY9YkAKYRkU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745655230; c=relaxed/simple; bh=ZeOC/0bQwfUlXkNbSV+sIEvhEwR9r8ilFBcxOuW5p6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Is6ZAECtLilj6kGHkChTH13PW0yBI9JKgmfqinJxgWB3H2kK7/pKSON+TDRvp7tbgt7Nuc9RTQwRveC5PgOUV9PtdCl9Uex7i1+9T+PxRcCfvJl571cEZvMRRdR2oOvjOyPG/HoO7XivnSdJ4yVCW4Y15YVJzH6Gi58MwzbJx0g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Sny8U/Xy; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Sny8U/Xy" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-736b98acaadso3059065b3a.1; Sat, 26 Apr 2025 01:13:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745655227; x=1746260027; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HQXT5ONSAgbfp0TWcRRQZWRBJSmPHnOLUU8DG8CZBfg=; b=Sny8U/XymFHbRB+k3RnIRc/7oV+OgZjWUXQUZnz0rDKpZPjtGcfk7P/Pp2yY7+hK6X kyNCOh5jJrDdA4BvZkMI4ZnXqfjCJkFwr5bka7caLvvaWWZKp42lacC0CbPNu4ue8nOt cH0riVHr5deRzujgbVABZJB8Iw3OZI3ZNA1gsn681Zjq7nT1a6Nyu0pVSocsj/yfhDGA VoJSUjqAO/bI6S6fe2Hfs+4JjGkCvrK3+SIoSJ+cFp58se8xbf2Q6itDcpBhtSzBXzRb sFDpiDZUILpb0Oh7OQp6Pv2EnJAFs3xeWUn6uvBR4wdOA5LCeNW+ICn3y/8lzKMOjSQ8 m9Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745655227; x=1746260027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HQXT5ONSAgbfp0TWcRRQZWRBJSmPHnOLUU8DG8CZBfg=; b=k5J8tEefGHsfarVhh/t2c48/Owf3/osqRbC1DC+TgwkRe75K4Uoma3O44JfMz2J/EW W15mygzVC8OpWztm8LiuRggUwNt0UqWByIgQeSFcxnVpaaXoGvlWnbE5U4TwoyqyUqbY Fb37DYCSw94V2/lqC61ZtDD+Eg8aTDz3oDuoaslVk5cSQEpxxYOQgPJY56EAH9+liTLi hphteS51QaBryt9XXNebyuHp5gOVKzpE1CaFtrDrR6xQC6VBxr0vHfsV0uIRxuoI46nQ Lv6E7P55ZwKv6xBzRND2nJo2KJ6BkQMSB9N0MtXg8vEy+rYRdV8yb+/pGFHQTNxc2CXA 6FeQ== X-Forwarded-Encrypted: i=1; AJvYcCXcjReCOMGVFsu8IY7E/mVAxXaj3oAOTfD5JbbhhMWW4tOJKDkmtOzknKGqyndJyNxXZRxAJg1oDeNg3jId@vger.kernel.org, AJvYcCXyrioIQQkzgg2OHd+tISoq46oLPMU8ENLdpFFxRt/XuH04StzaoRDEvTrMXr342yLdm+g=@vger.kernel.org X-Gm-Message-State: AOJu0YzgBaw5kVE2pqDrLdx3cUoC/iWpwn0+ebA3H0KViAIUicX9vJY+ fBecOddglSjM/uWfYBMo8VeSvOOpB9JfEVU8u2sFb/s/5slGgNg4wuhE9fQQ X-Gm-Gg: ASbGncsoOUpNWMFFN+dH1/F/puaHzmoB7M8drrM/fKQ+peVVN27/U8Iyfmy4rrDRCv4 kVNLXPqbywTgiG+nEmSGiRx9ohmLJt7NkYadk+Zd2cS0kFCsJtAHlbtZIo3z6e46Cbs71sxsqDe aXpQbNvjr6ZxQ2cDH9eo8RHqaXyLWGtKpcpWBlWfSw0ID3m/Hu2SPbN6EaqvonNUJTF6b5+QIyt JSuUicXRULkV48seoOfvV1/QCieejFxDeFp9SZjpmPTNoN/7owRLTjUG0AwJIyjFijUqNynWnz8 jMIXl4yIQjOuSlKFTuiVZSqbFUPUY9qYWAXmcOYiAIcvKr8oTJQDyKAx X-Google-Smtp-Source: AGHT+IHKhaO9DT5JfKbjsMYuC7mapSx6vcuJwzV/0QqWB5mqu381bMPLef/vCjbQRlxoXzzQ0i8zIw== X-Received: by 2002:a05:6a21:10f:b0:1f5:6c94:2cd7 with SMTP id adf61e73a8af0-2045b9fdbd6mr7097430637.42.1745655227562; Sat, 26 Apr 2025 01:13:47 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:52b1:1f45:145e:af27]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73e25941bf7sm4503700b3a.68.2025.04.26.01.13.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 01:13:47 -0700 (PDT) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Eric Dumazet , Paolo Abeni , Simon Horman , Maciej Fijalkowski , Alexander Lobakin , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Bui Quang Minh Subject: [PATCH net-next v2 1/2] xsk: respect the offsets when copying frags Date: Sat, 26 Apr 2025 15:12:19 +0700 Message-ID: <20250426081220.40689-2-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426081220.40689-1-minhquangbui99@gmail.com> References: <20250426081220.40689-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In commit 560d958c6c68 ("xsk: add generic XSk &xdp_buff -> skb conversion"), we introduce a helper to convert zerocopy xdp_buff to skb. However, in the frag copy, we mistakenly ignore the frag's offset. This commit adds the missing offset when copying frags in xdp_copy_frags_from_zc(). This function is not used anywhere so no backport is needed. Signed-off-by: Bui Quang Minh --- net/core/xdp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/core/xdp.c b/net/core/xdp.c index ea819764ae39..89111c68e545 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -698,7 +698,8 @@ static noinline bool xdp_copy_frags_from_zc(struct sk_b= uff *skb, nr_frags =3D xinfo->nr_frags; =20 for (u32 i =3D 0; i < nr_frags; i++) { - u32 len =3D skb_frag_size(&xinfo->frags[i]); + const skb_frag_t *frag =3D &xinfo->frags[i]; + u32 len =3D skb_frag_size(frag); u32 offset, truesize =3D len; netmem_ref netmem; =20 @@ -708,8 +709,8 @@ static noinline bool xdp_copy_frags_from_zc(struct sk_b= uff *skb, return false; } =20 - memcpy(__netmem_address(netmem), - __netmem_address(xinfo->frags[i].netmem), + memcpy(__netmem_address(netmem) + offset, + __netmem_address(frag->netmem) + skb_frag_off(frag), LARGEST_ALIGN(len)); __skb_fill_netmem_desc_noacc(sinfo, i, netmem, offset, len); =20 --=20 2.43.0 From nobody Fri Dec 19 20:17:14 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A0E1F1922D4; Sat, 26 Apr 2025 08:13:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745655236; cv=none; b=XGWCUX465E7fGSVltXW805hANNX8CjTcudilr0e2In8BxF2/zcaKHY0RRJ54EeTdpKO6FECpGhzR8ENmfnBWRJaNB1yQY/Fo09xeXbxebR2r/znsbwDxi0mqWT7zhH3HINf0CGhSLkCNI2Yzjbp8oTxLXJIUC0Th1KQTqhf+On4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745655236; c=relaxed/simple; bh=RRgJ0M8WImGsVCT3LiCickwe65JTKgCkTOOLN+aRAdM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RP39WHzvZAugiPM5AMebHo6BhNdhxI12ubExwhobCxqxI28ZBhLLEBG4bDpBJoBbhgVFkj6rXZN+DOHT9XgFJMoFZgfABzMyRGWq4IqzSt4F3nW8gYRd+RLfzu2YRDpKOy6tO4QfUxGYXZpyr3keMXRCkucGDm39sSFMj5Bh6Lw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HFkvH3nT; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HFkvH3nT" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7376dd56f60so2346798b3a.3; Sat, 26 Apr 2025 01:13:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745655233; x=1746260033; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eH8QzBJQF0/lOlRD7wA47uCgpgIE30Df48r/OH+A7Vc=; b=HFkvH3nTaViOSV4SzoDwY0I5nliY4pbVAJxTcRCsE/1maYMjr1xnf3dwIgob+c/8bn /7JyXFwusU/XvoeHpMOPQICDcbvQ/b4mgMN6PGOZVuJET8MexfP5SE+gV7MwQDQZ01MR QwNb/e38ECyPXhTy03db6N3/gNC0n5K+Y8DFl+gGEflwOM+zRUs4RGaScoXieU0wH1ZM B62v8BqZ6EtCMW+BegHTuBqOHG3djQouZqcO9wVNi4VHqgciJPKfLrlZ0QEL01AVnMlH /QCRI6IyUWnsoFv5/aIOLcX8RAXieG4HuTFVZGVntPxDMDPgZdcdgGmie9uVFFOocSPB 10BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745655233; x=1746260033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eH8QzBJQF0/lOlRD7wA47uCgpgIE30Df48r/OH+A7Vc=; b=acy/GEg2YoVOmHsUJw6T5fICGGa7/8hPFdlX+OID+wW21001yy+MbszL3j6BCM+hq+ OLz+3W3CyoOxwRoAg0xi4yiM3b9aAFekueSNUqOfRSt96HW5wYd5pJQYLg/QYxV6MbV6 ixt11XhgLW2ufiiMzunU1kXVwxSitR0esmskNwtpwPYXM47JujkeJomPBva9EISB7EGW 1jCDCWxpy2zg8+eIoT9dvXwr8AdHK09WRWO7H2OrS5cxP/NGkEu4jrCvsgLbbBagl0Hc ULSUa/ldfUyf0fq4jnwKSRmy63dTN4XMaXnUjhjV+AIWVxBb+OO6y9J7UA/EHmM86/ul x3/w== X-Forwarded-Encrypted: i=1; AJvYcCWt74UqfQh0YxTRSS8xYNtvoflxNq014seD5vLI+aQHKLhJ24mWhYhNa40Q+OpOQSuC1jXn7TO1voNtbic6@vger.kernel.org, AJvYcCXkDOGt+Xf2kk09G6JOvx/Qn3HbhEKdj6N98bBgRETRydYDrfOkFpKUOQDa5D30OsuuSGc=@vger.kernel.org X-Gm-Message-State: AOJu0YxplYP8rwLtq3NmgcJIefjoJkkKEwNKTmho4oU6W0e0xVsp0MA4 7aGwvi6j6+6St3qniMyQndDN+RBtoQTpYMYH0G5QD3MuoSfUj5G44wGqZHvI X-Gm-Gg: ASbGnctt247ORRuQW/hzXKXGBN38zvp1ii5O4xyr0QvOFCIn9E5S9Qf3imcdCMpKhEW 3DsObQUO75MgDLrV2pUdcis7Zj7XgKS8xH/I7w+C4qwNJO/fkILZqUdrZOpD8PSQDszmKwGKPOj eoCvK/18qEUnwkQTVSfN2Ic9zB0CS4w0c2A8y7AK3maRbi1SBwrccmOxwD5wo4RJT3BrcsOG9qJ 7bbdbhrL7oczDfDV2gavRtzoPkUzLbnPF9FgC7zyk+sOF1jcdKJvS/OERocntSYHZHW80L5DNk5 oZQzfjPk0gy2MWiLy9/ylVWsgAuCknRVt8kvCUfwN/86MkSKwKI+E3g+ X-Google-Smtp-Source: AGHT+IEnU9oZyJ5GoaLkPDm5yq3VJd2HPNs7PPm0BnwPXq1TSM0GRuSCzfX7Q++U5KRAZsW8ctxlbw== X-Received: by 2002:a05:6a00:228e:b0:736:4d44:8b77 with SMTP id d2e1a72fcca58-73fd6de9577mr7983197b3a.8.1745655233008; Sat, 26 Apr 2025 01:13:53 -0700 (PDT) Received: from minh.192.168.1.1 ([2001:ee0:4f0e:fb30:52b1:1f45:145e:af27]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-73e25941bf7sm4503700b3a.68.2025.04.26.01.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 01:13:52 -0700 (PDT) From: Bui Quang Minh To: netdev@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Eric Dumazet , Paolo Abeni , Simon Horman , Maciej Fijalkowski , Alexander Lobakin , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Bui Quang Minh Subject: [PATCH net-next v2 2/2] xsk: convert xdp_copy_frags_from_zc() to use page_pool_dev_alloc() Date: Sat, 26 Apr 2025 15:12:20 +0700 Message-ID: <20250426081220.40689-3-minhquangbui99@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426081220.40689-1-minhquangbui99@gmail.com> References: <20250426081220.40689-1-minhquangbui99@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This commit makes xdp_copy_frags_from_zc() use page allocation API page_pool_dev_alloc() instead of page_pool_dev_alloc_netmem() to avoid possible confusion of the returned value. Suggested-by: Jakub Kicinski Signed-off-by: Bui Quang Minh --- net/core/xdp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/net/core/xdp.c b/net/core/xdp.c index 89111c68e545..4e91c7790671 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -701,21 +701,21 @@ static noinline bool xdp_copy_frags_from_zc(struct sk= _buff *skb, const skb_frag_t *frag =3D &xinfo->frags[i]; u32 len =3D skb_frag_size(frag); u32 offset, truesize =3D len; - netmem_ref netmem; + struct page *page; =20 - netmem =3D page_pool_dev_alloc_netmem(pp, &offset, &truesize); - if (unlikely(!netmem)) { + page =3D page_pool_dev_alloc(pp, &offset, &truesize); + if (unlikely(!page)) { sinfo->nr_frags =3D i; return false; } =20 - memcpy(__netmem_address(netmem) + offset, - __netmem_address(frag->netmem) + skb_frag_off(frag), + memcpy(page_address(page) + offset, + skb_frag_page(frag) + skb_frag_off(frag), LARGEST_ALIGN(len)); - __skb_fill_netmem_desc_noacc(sinfo, i, netmem, offset, len); + __skb_fill_page_desc_noacc(sinfo, i, page, offset, len); =20 tsize +=3D truesize; - pfmemalloc |=3D netmem_is_pfmemalloc(netmem); + pfmemalloc |=3D page_is_pfmemalloc(page); } =20 xdp_update_skb_shared_info(skb, nr_frags, xinfo->xdp_frags_size, --=20 2.43.0