From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.220 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793619640; b=yahuihwpjevZkkRhHga9TrdPv8Slu50ej+X+Ydu3Vz12wjn2fjiQR5zSJLnIX5eWDNpZ 2qxWCrqeo9Mnsxx1QSEUrQwJKUBoFTGahnHNXcA/v8Ac64M3YyEGE8Hl50RU8xJTjn8XA Y9lgcp4VqaLBU85mIg1blW1FRYe+ojKHur/YBDZH1JS/JeAp4qISN7UiBYjcVwGUB3m0U 0x3Fk1/TeSHQrmsctV1g57Dzjr8zBMnkoSk4qS5plSGCZX9Uhm+2HbkZYw9M4VFXGZm8c dmDQK6ze3DPsyTVqO0/bAwOuzK89YpQwu34nl1b61za7ricnX78d6e0cCfr3Y4ldjxw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793619640; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:Message-ID:Date:MIME-Version:User-Agent: Subject:To:Cc:References:From:In-Reply-To:Content-Type: Content-Transfer-Encoding; bh=nZUpp2hJQkWCrqySp0A90JTwPZ/iUSnZg01sx3a4r5Q=; b=O4rtOrAvmIofhk6RG1qXM8A6OG1N17Sg39Hy4ZtSClckzXE/7ayrCfrCrApO/7endXxk 3Z2QXkJg+6v2aAS1CuvH6LktzINuJHHbS82Xgr/QkenWEZhSAV4g5UenZzNOemZ0zjgPW OpHrvkxvqIQle78vp7+0rOHwiv0sIqclqSXgrRMinzc24hxTfOu/giY0IdC1PN5dpSVFL c66reYgomQGrbUOynZfxfxcG9XuzOfKazuh1+C56V6+If8dd2z374XfGYXi2yoWG7uCoQ W7x7k6sSuutwhjP+pHY67Zttg3tQu45pBe6jHwlbA0tpCXiR7kIFi3pwqBRB6SNzSZw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b="P/ol9UUp"; arc=none smtp.remote-ip=95.215.58.220 Received: from mta1.migadu.com (out-220.mta1.migadu.com [95.215.58.220]) (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 82AFE60A260D for ; Mon, 2 Nov 2026 11:40:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 82AFE60A260D Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=P/ol9UUp X-Envelope-To: bpf@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=z1ZM5tFFhllBjxmb1sXO2yzQnSQGhBe8JrM4BxDb5r8=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1793619637; v=1; x=1794224437; b=P/ol9UUpvgEJAW8jW+wq58bld8ShPF3/nav8imyyBGXLKtMui7r/ul2zHG02JF5vI/EyfSj5 fgGfTqPOCrsX4cXqAeHiYiDpOH+AqpuFjGH6w8Vcfa1dDVBmYJnqaHS7i/KkybYeWv3QEiTXOOJ pXhWAt+Xo+P6dzMhzw5AZQnk= X-Envelope-To: bpf@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 1443bbc0a505c443; Mon, 02 Nov 2026 11:40:33 +0000 X-Mizu-Trace-ID: 1443bbc0a505c443 X-Migadu-Flow: FLOW_OUT Message-ID: <9d399d69-1dfd-4848-bd55-be099b6dd792@linux.dev> Date: Mon, 2 Nov 2026 19:40:22 +0800 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 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH bpf v2 05/15] bpf, sockmap: Clear the resume state of a stopped psock To: Alexei Starovoitov , bpf@vger.kernel.org, netdev@vger.kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, john.fastabend@gmail.com, jakub@cloudflare.com, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, kuniyu@google.com, willemb@google.com, matttbe@kernel.org, mptcp@lists.linux.dev, mason@kernel.org, josef@toxicpanda.com References: <20261102072112.4160195-1-alexei.starovoitov@gmail.com> <20261102072112.4160195-6-alexei.starovoitov@gmail.com> From: Jiayuan Chen In-Reply-To: <20261102072112.4160195-6-alexei.starovoitov@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 11/2/26 3:21 PM, Alexei Starovoitov wrote: > From: Josef Bacik > > sk_psock_backlog() passes the skbs of psock->ingress_skb to the socket of > the psock. When the socket has no room, the function saves the length and > offset of the remaining data in psock->work_state. A later run continues at > this offset and clears the state when the skb is complete. > > sk_psock_skb_state() saves and clears the state, but only while > SK_PSOCK_TX_ENABLED is set. sk_psock_backlog() does not test this flag for > each skb. If the socket closes during the loop, sk_psock_stop() clears the > flag. The loop continues, but the state of the completed skb stays. The > loop uses this state for all subsequent skbs and sends only part of their > data. A closing socket may lose the end of a stream, but not the middle. > > The state belongs to the skb at the head of ingress_skb. Always clear the > state when this skb is complete. A stopped psock still saves no new state. > > Fixes: 3b4f14b79428 ("bpf, sockmap: fix duplicated data transmission") > Signed-off-by: Josef Bacik > Signed-off-by: Alexei Starovoitov > --- > net/core/skmsg.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/net/core/skmsg.c b/net/core/skmsg.c > index f03519468ad1..a5d498982848 100644 > --- a/net/core/skmsg.c > +++ b/net/core/skmsg.c > @@ -664,7 +664,8 @@ static void sk_psock_skb_state(struct sk_psock *psock, > int len, int off) > { > spin_lock_bh(&psock->ingress_lock); > - if (sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) { > + /* No new state once the psock is stopped, but never keep an old one */ > + if (!len || sk_psock_test_state(psock, SK_PSOCK_TX_ENABLED)) { > state->len = len; > state->off = off; > } Reviewed-by: Jiayuan Chen The 'state' should be clear unconditionally.