From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.227.130 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793764111; b=NXcsGeIdvzWi0R1DNzLpkcfgzVg/xbwyGkE2u7A7C3EgWHmQEtnI6wfjxMliDD0kH9Ql hdHFb7o8atzVBAAcF0bAUMazM8ZEYAxyuSsw8fIdHnHx8rkBZ4ZOjQ9kwsvtjjk/DPjre jUlVEw1cANbbbT5IUBPvQUmLV3fzl2zUQivtCREkmXpsBLmiwzcSlx5BCIA4Jz+P1VwLo T+bE96SRBrPBe3MYc+3jgql936WLlAbFH1BWP+6ilCXRRE6lAcZqa0+OhQ04Q2Tg+XqI9 +LDgzXIukiKvi+Ie4JjSTm9EbAyhyW7I/bLFoxYDWIwCd8DeAIJg//NB9pKfiNWt09A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793764111; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Gm-Gg:X-Received:Received:From:To:Cc:Subject: Date:Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=aUeirx3i31936fQIuPQmzE4OuL+xRIGfpGiZkYr9/q4=; b=nF9WGDj4ZUQ3MXJPq63a3oPwNcyvWd0O1IgnPpn2FhaF4OVHti1X5L0bFPthUiQ1nQvt V7mfQ9Snuv+/Gb6YYtn0jcTY90Lf5WW199HU/EZL692i81UNvdvHUWk+J8iKO/sqlKZku QpDN55yPWR4Gsqd5Aw6CUTidfI2v842Ra1ZjzoMWP0x5OoxOqlFCvsKhmw6LAJKLSqFKX KQ/bC9cPvJhtdIwM51+iHmJDCBq/nOZiIZZIGuV9wCoPMRmrNmteYgGFgUugLvPz/SZ1W dKN2wCvBB/hLBofhZQFSbMd61wOo+HxzjTUX9ECWHsl4t7OXG6tWAPk58nYjjXCNm5w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=nk5k7LmW; arc=none smtp.remote-ip=74.125.227.130 Received: from mail-pj2-f2.google.com (mail-pj2-f2.google.com [74.125.227.130]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02374606A329 for ; Wed, 4 Nov 2026 03:48:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 02374606A329 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, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=nk5k7LmW Received: by mail-pj2-f2.google.com with SMTP id 98e67ed59e1d1-3b092ea1afbso109689a91.0 for ; Tue, 03 Nov 2026 19:48:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793764110; x=1794368910; 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:content-type; bh=aUeirx3i31936fQIuPQmzE4OuL+xRIGfpGiZkYr9/q4=; b=nk5k7LmWzDwaBnhbGoTmgRM0iFvyEupNwgAGriyG/o0TunbdbFZbJwKFJOVFnJny8e Yn1RbuV3xKUsMfZy+zHWF/Oh07amD9eATAnRu+OVJakSIkxtJZhtSdz+4JorFvBiRIky fAzxvJ8+4SL1K/zh2b9i6xGRhCi863sr0825+luUyDjqE7ekP4Xxme1ytvNnkf+BJrCM U++IKulCpBXCo29TbxkK0XqgBysw5c8cIaC6RBPVA0fHk0JOSOzNd33yjVx6U1/fA56q UKzRgO2WT1zxusZVTfM7w+Zii4BhfJMqH+2CwTsP351OuqKJ2eOyVHHGu7kgfOLajBgk 6hTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793764110; x=1794368910; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=aUeirx3i31936fQIuPQmzE4OuL+xRIGfpGiZkYr9/q4=; b=OR7rptzeuGlwXs5qPsoghN1+khdNAwg3qcO1Btis5vtJXVrrA7Mn0q6C/0i5YGap1u +V25lAnX3+Yf20+3f9dAz4NPDxZUed+5s0aWuTTmBbGq4QBYV9jK4mFyLwYZPTr2+mao RIHtQc4mulWVRnE6BYfFEkr8da74xTxK9zCfgc4wJ0nGDYdjsu8GoUSRPtDx+77XbfH2 L2rv5yYAXS1bGHJ5QpqZfRVhhOQycivZS2oIKFhxmMjZoS2MQVRDessoOuC3xnnWkp86 15htQzX7hcYZrLT5VFSkX9v9z9HmcKC99W4EvzSgixLrMjgh474SEhPM/0pWUj3z64HD asOA== X-Gm-Message-State: APuU4Z/1hq0VdxyjjFJ4umqTyh+awZyrQTNcHAi3cfOcyhgq9d/K98Ew cGkpoEEVVSjRBCocKzy2S8ozC3w4YKy/ZFYuDSYbIPyNawrB8N/uwXv+p1ngS4ps7autyA== X-Gm-Gg: AYBFou1X5mqJkG5TQ0iTbPdLboxvDgxNw/+rh/ZLwPSPUyYgoUw9wTWWnGYdGy5t9Aq mMpiODZhiTmXaRvVdal3XNY+JNL+U4ATijQNIP22WBa0jNcn5sh4mGFAduX4lKeICGfZ3J9agde jpT/oi77Ves+ZyPS5BKeDkttHnWA0PzObaywEmK09eEnHylko/TkvK8dMuMqWH0t6ecsBGlWHB/ oRfoU1GIfFGqmC/0ObwDhIjQC8g2SINym9J481ZSx+LEeneTfiO/lr2kt/clD2jYom+9q47XU3n T495y2pi7eK0s0dgOA0x9YVh/Ay4yWGo6guOG1d9M9ggmMlWEoAaLgtgb0jk9r7mHQEmeJstzcy /iAKZ3aZg7bfnjRy6nabs4BI8lai18OJfGCNLhLZ6AcarVqyaUSWOU5VOhy/IJXBOoiXBQJ2cOA XCiqgco5pTOEvqsnKp+A/Ro7pkoPSvvG27JeTvAA5AbvAMSMJZtbXWn2bNZSv0cqWAkg89lhAoB uhMYQHxJYTC66l4T5PvqEsWnxtAsdvUTtSNsu/PINPHD6M4X88wz+DlKkf2LMvuJlzvbYM7An5I IlME3PbAeJwRQrtatA3UcnnEYkegn2aH7CXkpPEwGWio5at7NkOmzk8EYI2rujgDxrEf X-Received: by 2002:a17:90b:588d:b0:3ab:9c73:147 with SMTP id 98e67ed59e1d1-3ae8970ef58mr12252667a91.14.1793764110336; Tue, 03 Nov 2026 19:48:30 -0800 (PST) Received: from localhost.localdomain ([240e:46e:1a00:3fd3:e1be:ed6b:40ce:8dab]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3b0944a0ff7sm1705472a91.10.2026.11.03.19.48.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Nov 2026 19:48:30 -0800 (PST) From: Rongzheng Wang To: netdev@vger.kernel.org Cc: Maciej Fijalkowski , Magnus Karlsson , Jason Xing , Stanislav Fomichev , Jesper Dangaard Brouer , stable@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Rongzheng Wang Subject: [PATCH net v5 1/2] xsk: defer software checksum until the skb is complete Date: Wed, 4 Nov 2026 11:48:08 +0800 Message-Id: <20261104034809.24545-2-testwrzwrz@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261104034809.24545-1-testwrzwrz@gmail.com> References: <20261104034809.24545-1-testwrzwrz@gmail.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When XDP_UMEM_TX_SW_CSUM is used with multi-buffer TX, xsk_skb_metadata() calls skb_checksum_help() while only the first descriptor has been added to the skb. The checksum therefore covers just the first fragment, and skb_checksum_help() sets ip_summed to CHECKSUM_NONE, so the remaining fragments are never included in the checksum. Move the software checksum calculation to the point where the last descriptor has been added to the skb. On a checksum failure the packet is now dropped instead of being returned to the application for a retry. This path is not reachable with the existing metadata validation, but the behavior change is intentional. Fixes: 11614723af26 ("xsk: Add option to calculate TX checksum in SW") Cc: stable@vger.kernel.org Reviewed-by: Maciej Fijalkowski Acked-by: Stanislav Fomichev Reviewed-by: Jason Xing Signed-off-by: Rongzheng Wang --- net/xdp/xsk.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 33475b180ea6..27ec1d931fe8 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -1011,14 +1011,6 @@ static int xsk_skb_metadata(struct sk_buff *skb, void *buffer, skb->csum_start = hr + csum_start; skb->csum_offset = csum_offset; skb->ip_summed = CHECKSUM_PARTIAL; - - if (unlikely(pool->tx_sw_csum)) { - int err; - - err = skb_checksum_help(skb); - if (err) - return err; - } } if (flags & XDP_TXMD_FLAGS_LAUNCH_TIME) @@ -1030,6 +1022,15 @@ static int xsk_skb_metadata(struct sk_buff *skb, void *buffer, return 0; } +static int xsk_skb_sw_csum(struct sk_buff *skb, struct xsk_buff_pool *pool) +{ + if (unlikely(pool->tx_sw_csum && + skb->ip_summed == CHECKSUM_PARTIAL)) + return skb_checksum_help(skb); + + return 0; +} + static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs, struct xdp_desc *desc) { @@ -1277,6 +1278,12 @@ static int __xsk_generic_xmit(struct sock *sk) continue; } + err = xsk_skb_sw_csum(skb, xs->pool); + if (unlikely(err)) { + xsk_drop_skb(skb); + goto out; + } + err = __dev_direct_xmit(skb, xs->queue_id); if (err == NETDEV_TX_BUSY) { /* Tell user-space to retry the send */ -- 2.39.5 (Apple Git-154)