From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 D903B47ECF8 for ; Fri, 15 May 2026 12:30:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778848260; cv=none; b=TmH/MaRsS5p18ovmHNE+E6ksrJ1bw5XEFPd4qjWpa9VLBOMHG0AgIJ29G7A4EhTvi36VpGRn8IbGpYinVTJDmKOYw4nKvXT9eCa3ftvI46bjE/OCeaLbvuinHfhxueTHxYPoMuHT7GZ5VtOzAc+kBm2gZbBbeQWjumJl1JJINXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778848260; c=relaxed/simple; bh=9SqdKDQGx21ETaJhqKRTVsLbBcKWXoFJC0PyhaYrgCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NmKSGsifT8L5g385F7wabK2LL3PWhymzQEPWNQZvAaPbEKEG1CM9fdc4UJAwAqqeL6pJaBuF5gp+/ipNLjjugEZ32WIPEDh3ZymGysv4t4jZVjrCSQO7mDNxyRw7Sz8ye1AjjFplY0dVbDYVBsG2vke/XRmSqGVRuWD0d/7CSIY= 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=VQH49pwU; arc=none smtp.client-ip=209.85.214.173 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="VQH49pwU" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2bccb978bd9so5271815ad.0 for ; Fri, 15 May 2026 05:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778848258; x=1779453058; 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=1QkSwi0tog8aJVBoGokTiFwWgsOPVBliCydrrha64Rk=; b=VQH49pwUEdDm5Ra7yh2TZNVFgFuhrfYUMewAmp6KgIjTm3Wkz492cgFNC4HKtNMY9u 6pzjIrE+KRObvDqO8L7qPlzSYswBl/mZl8drhaaNGq9fcOn2DLD95Qb0zoajJjsrrelr 2uRzpmjClmIk6A7EtMgXd/0oVO5FRpyNRAcdNAxUs6UNNsgBVTvxg2S7THMJnLQFAPqd hZmUoxBvofFOHM84ADigAgmjRP9c3tmy2dWDDYh8njZBybyS7NHA83wezOmmqTO2Mv4C MhD+lEA1W2o+fhu/nIfgUbZhcahnpyOQcHWxDZgJCkdYJ88L31PbsJL6opgkiw/jkRZw KdxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778848258; x=1779453058; 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; bh=1QkSwi0tog8aJVBoGokTiFwWgsOPVBliCydrrha64Rk=; b=UfeUJMoQFQKDEzkYBu5EmpfjuL1mpEvbQVO0KyQCPbTWvYTazwxoprX8op2dPx9m2U a6DL2xk8NWmGaaX9Ev5AB5cvvaSJkbF5HbwuKoeTCWvCJxOAbb9va0NkLUK6Dvna94b5 q9dzUrO3JA5jITg4BjLtcAysSaCiHdNOT2hEXeMAWpNc51YYjPe6O++EnlLKvyWA+4su 3BZb40QbLTBS5Wvl36GtvJ7A3LHIgsK/nf7j0Gchpl7vkhhgzNeqYCAvXYmBxzQbVuTt xpbOJp/w+UN8CJDwjdaOMugrntWBo6mdpLWViza0Bd3rHuwcliVj8pM6kY8SjMSO9Elv j4+Q== X-Forwarded-Encrypted: i=1; AFNElJ/7zsO1d7tMcdvaxEyvG5pnS2rJVZC4/4OcfHz89v2soLx4ccV03fyykmLY7nB3RFF7agiK0eE=@vger.kernel.org X-Gm-Message-State: AOJu0YwBkVIb6e+ST/3Ew6C+EgtsD5Yru+0fPVVir2Zq/rlb9Vki2cXJ APKJ2u85wjDsFKTWuhckP0W75AjrE5HgWtg/9FNqYC0K3n/DH+ctlPZnGYoCVsfsFLXMNmPT X-Gm-Gg: Acq92OEV+QKUbRYMOwctqSZdRQ9H/a3liUfoj7Y8UbByIr3VmevR+8rCamc+8cp6F2f f4prorBuzBTSPmfkFXhJWN3cbEeuxeEymQ/clLAcs7XVFV2X/+Ok3EmQGjTn3LayS25e2gL5krC jYkR139+zcFafQK5dLU80oFMWBm+v/Kfc6oetSynZRKurvdqJaLYcFnBoykC8/+mGFAD05l/gJ2 NmJrSWY/NMhAwpk+9hnFm3SjVDxywsLuC+z24jXkX0najDcF07uehazn/FlzZhyiNnyCqenNtgG Jx1x4Tso6EkaaRgDcvQV1zb9IieQIfW+LhrZLftybaJAQSaMV9oWfwyVKCjDAIBTo5qpt9kcJtH mAyXfCexNFNBaFveYB/gJVdcoF1JELMK+5fiVL15gjLROMEXMivpdTyCU94Pwcu9fuqK/RXPop3 wb+rjixh5RxQ83JN5w763cUxMQyjVX6BDJFZ1jB6blU43T4hvAHn4vvlv/LjsKqX7CYB5xkHg6M /q9m+8s189C6IHq+j3I21GPMfuKaCC73EfXgb9KQQ== X-Received: by 2002:a17:903:943:b0:2ba:5e99:93e8 with SMTP id d9443c01a7336-2bd52b6d778mr74236205ad.29.1778848257915; Fri, 15 May 2026 05:30:57 -0700 (PDT) Received: from KERNELXING-MC1.tencent.com ([2408:8207:1923:2c20:a48a:1116:aa2d:1122]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5cfe492asm60348885ad.48.2026.05.15.05.30.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2026 05:30:57 -0700 (PDT) From: Jason Xing To: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, bjorn@kernel.org, magnus.karlsson@intel.com, maciej.fijalkowski@intel.com, jonathan.lemon@gmail.com, sdf@fomichev.me, ast@kernel.org, daniel@iogearbox.net, hawk@kernel.org, john.fastabend@gmail.com, horms@kernel.org, andrew+netdev@lunn.ch Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Jason Xing Subject: [PATCH net v2 4/5] xsk: drain continuation descs on invalid descriptor in __xsk_generic_xmit() Date: Fri, 15 May 2026 20:30:17 +0800 Message-Id: <20260515123018.80147-5-kerneljasonxing@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20260515123018.80147-1-kerneljasonxing@gmail.com> References: <20260515123018.80147-1-kerneljasonxing@gmail.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jason Xing When the TX loop in __xsk_generic_xmit() encounters an invalid descriptor mid-packet (e.g. an out-of-bounds address), the partial skb is dropped and the offending descriptor is released. However, remaining continuation descriptors belonging to the same multi-buffer packet still sit in the TX ring. Since xs->skb becomes NULL after the drop, the next iteration treats the leftover continuation fragment as a brand-new packet, corrupting the packet stream. Fix this by setting the drain_cont flag when the released descriptor has XDP_PKT_CONTD set. On the next call to __xsk_generic_xmit(), the drain logic introduced in the previous patch handles the remaining fragments with normal CQ backpressure. Fixes: cf24f5a5feea ("xsk: add support for AF_XDP multi-buffer on Tx path") Signed-off-by: Jason Xing --- net/xdp/xsk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index f98a9553e536..3b604776f09f 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -1045,6 +1045,8 @@ static int __xsk_generic_xmit(struct sock *sk) if (xs->skb) xsk_drop_skb(xs->skb); xskq_cons_release(xs->tx); + if (xp_mb_desc(&desc)) + xs->drain_cont = true; } out: -- 2.41.3