From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.229.139 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792851133; b=jVO8lZMRBUzjHCORsCNOEMZF/FuAfcbfEyia1BnEZM2Ix+JoQ1OwKGDFeC7PYg99O6m+ 9QGTLq41s7uy5giYpjPCRYT2WsjfmTYSv28jFVN5HZtZiyhB40TKxyJQjiMlRyw3Ld9Cv GqKKeeGaYdZY+WRobni+oysBwAkC6HlRuCfSf02LlHCZXjeobiQFIdzWpCPu4irrw8dnf 90O/C0oFazQE7n8pH5rHWRM2pT4WxDDD4bcrSEkTZcsL2eIfEezQora6aSFR2UmWCAQFX u+oi+HC0agtq0Ozlh9khX3vlVbbYaHOo/vR9ueTlfSisiXS8z52G+B1wwNA0AgRSL2Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792851133; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted: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=Fekl11tBwawdd/BmEQbPpvlBnrXS8QII5cBTf8ZjO9g=; b=0D5Oh8FmzXiAn3EQdUSV/FqlUJKo6JsagozX+PcBNEvClhBMvW+MyIYGlODOJzGTIGN8 ySt6TgDskep8ItXpx3aImVI2RIJ0LgRNE1seLkDNGYkhwzFWB2zs7DTcJhHWrCinAty2t 1tBXmdHgV4scj8KHRK6MtQddI+mSwIUmkOfcoHWsOgbnJ/MdxGbSzRLD/RwYvCmBPDU6N U7IS4dL8EDAGcBdhd4r8Y21pLfch/NxRfBnzNVaJvhiTkR+kpJ4j4/fzBSuRuwU75S0R8 UDdiqcNYYKRmmLMHM6ofaqAf3HEoAGaoxi650MZxmzpDPzQ6hAqfGwyvUvyiQnjAc/g== 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=20251104 header.b=CbMAjeUv; arc=none smtp.remote-ip=74.125.229.139 Received: from mail-dl2-f11.google.com (mail-dl2-f11.google.com [74.125.229.139]) (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 E139D606A323 for ; Sat, 24 Oct 2026 14:12:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E139D606A323 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=20251104 header.b=CbMAjeUv Received: by mail-dl2-f11.google.com with SMTP id a92af1059eb24-149f2b3f25dso435516c88.1 for ; Sat, 24 Oct 2026 07:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792851132; x=1793455932; 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=Fekl11tBwawdd/BmEQbPpvlBnrXS8QII5cBTf8ZjO9g=; b=CbMAjeUv8mLxRWlFV3E81UbgTZC/jPRqfKMSb6jhRfex2aBdmTAqRLEADWP61n12tf P082awDR5IZxWNfJAPPof3lxgpl10HTNo8IKj4IbXk2fj0J0Hiq/e9Vy1huFiFyB+dqH vOiaO0StoX6zqsY4SuDSS03YH1oWl//uORRTSVpNu9bF+qMdG+VNt5a9yeXXADklvCxq wJY0xTx/ShXmoVz62NNJeKhpqEsENC2naa74MKxm20zXGdZ6tb9JlCFV6u4tYMcZ+XlZ bwXWUBAoqejzLvln4pbXSQVNdS0Ju6Jo66ZebS4M3TZSwNgmRKt6qGTQ88iQo7IRgFuM HGwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792851132; x=1793455932; 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=Fekl11tBwawdd/BmEQbPpvlBnrXS8QII5cBTf8ZjO9g=; b=ZU1h3MT2zadhM1TYYaLFXhdVyo/9yLtHUPC6wF/et7A4/7AC5RefSQsMQMprJHu4uS SM2KdzFHbhse4hf+dvDCmYWD56xF7sdsdh4Y0qOmZsXrCix+WQeK2XpRZhGlJPlnjXqp /uqZHm8J4VZNcQIRnzhnVcrt67bWcqi6Ip3obBcq+JbU+nrx5+n2tahqt1VN/5uFTpzj 2E5p79Mp0KbFM4yMpMzYaaDor+sGGqEE9nlbrqnEz9U2lf2err5Uv9PfEqHdAkBL8oxd slK3LVY5hDedAVev9UCMARVSJ/RoS26mCpUrXB0wvR610wXoxmpQcC4hU5saxsC4J0tY GmVQ== X-Forwarded-Encrypted: i=1; AKwUvByOTqBOpZZr8P/797mvpYxLFBwsUf4Pl+cKQyhJGUdNWw2tftTnYKPf2uLlM3s8pSUh1R4=@vger.kernel.org X-Gm-Message-State: AFq9FYKjIAOl+GD0l1vvXs94+qIxW+IIzwyT8w+5RaNlxIPr+blTGpYP 5gI3c+0fUdbV+KUtj+3NeKnA7egF+HYGwbeMD8h1ZBeeDZPrIU6i6QNs X-Gm-Gg: AYBFou1GjsYEdIPQUbOUj/3NpHqjlkmpYP0UX1LXQObihm9B8N6Hm/N5VYqYq8DXF1D XLBS9HgqmK6aDjxSCYMqmoVf9kq+OI8hAPls8a+UK91K7c2WreJUyOvagOxtaLvNQROrRyqpqr+ F19kaZ2e3Qtp3tmdDBoG49BAGRn/wqOPTfUyYosmY+CX9PfN8Wmm6P+0of+/vYcKu9MMrmJ+tO2 LUgHGxAiRwcW2i/F1gtn3KZmkHn1qc380atrrtsE9C6HhadyRoy7u8XftYiaVpG4/W2Z9Rp1RiC pX3bpyYm77YZaKxKTA9Wjwek5GXClCcPhfWX6KegQb1aHhMMOj7Ha3VnDz7aKPbW2YQ47B2uq9V HwK+vynw1+tR6kUhIDt7tsuPi92B6kFhHOz23KX7DvyTFxwFkuX8wLkhJKCQQQF99XMLrP/Wz0z QIGX378V5dJb6OdBkYfd6TWgLzcRT9vQPFCwMShEnDKubAOQXn1VeXYRTZFIkoueGPlWizxiwqh XQzaSx5Q+kn8jAj4IqmZgYmEWJfZhKJaxMwAx80ddaURiQ2utXBzuDK7fzRoTlu2mEXeLJ4l6xo ua8boek+2QLGExcHhPvO2HBL X-Received: by 2002:a05:701b:2419:b0:163:c5eb:d42f with SMTP id a92af1059eb24-199291058eemr2330907c88.5.1792851131840; Sat, 24 Oct 2026 07:12:11 -0700 (PDT) Received: from 192.168.1.7 ([2409:8a1e:2330:4ef0:6887:87ec:7e6f:2a79]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-19a3736d16fsm6366905c88.12.2026.10.24.07.12.08 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 24 Oct 2026 07:12:11 -0700 (PDT) From: Rongzheng Wang To: Magnus Karlsson , Maciej Fijalkowski Cc: Jason Xing , Stanislav Fomichev , Jesper Dangaard Brouer , stable@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org, Rongzheng Wang Subject: [PATCH net v2 1/2] xsk: defer software checksum until the skb is complete Date: Sat, 24 Oct 2026 22:11:56 +0800 Message-Id: <20261024141157.59301-2-testwrzwrz@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20261024141157.59301-1-testwrzwrz@gmail.com> References: <20261024091256.17918-1-testwrzwrz@gmail.com> <20261024141157.59301-1-testwrzwrz@gmail.com> X-Mailing-List: bpf@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 Signed-off-by: Rongzheng Wang --- net/xdp/xsk.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 33475b180ea6..65be2a368325 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,14 @@ 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 (!pool->tx_sw_csum || skb->ip_summed != CHECKSUM_PARTIAL) + return 0; + + return skb_checksum_help(skb); +} + static struct sk_buff *xsk_build_skb_zerocopy(struct xdp_sock *xs, struct xdp_desc *desc) { @@ -1275,6 +1275,12 @@ static int __xsk_generic_xmit(struct sock *sk) if (xp_mb_desc(&desc)) { xs->skb = skb; continue; + } else { + 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); -- 2.39.5 (Apple Git-154)