From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.55 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795257166; b=T5jt6K4LcdnXAbbSit1ol58wynWPOzR1nS0ywfB4vFOFHBj0hz/qqFAkqByxKviCAanP yW67/at9RDy0iJJGuWGphG/VPjElYGcOdv4hAdott8bnWqybhD4aSdUo73mlTL0iwUr1E J02CGKSvWSfzCdWMhr6moernRnMGuFijl7BZ4ymq+6RAdPdOD1+697kY52cJU4YSNlpH0 smPorNip9SuKYpAG7UH9/tMmRJX1YlhraJnrOdqmL7X99h0uMmWnUVQexYm1a59xeRgiw nWxG6udk2tpCuaP8Hwvy/YLngi0g1blWUuU4Fl+YwrFfJIe67M+hcYuRt/j4VgcBcYg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795257166; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:MIME-Version:Content-Transfer-Encoding; bh=OvEjtdai0kpY7vmfUkOscZqwft6Dm3Bu6Xjzn36T494=; b=pEk1G99CJoiGcNDJ9mQaoy4/YSsR1MJxcS8rFiegiInQ1VsxxQMiiNaStw/DLkymo2n9 1lSZrzpn6O2HylADZPLnNbkPlDJPgkcFOJ+3d4kJltjfcBO+bSw6LNNG0cmia/tGlHVvT vhaJ+njILHMk4K93S6nadJVJYomWcFNaIemgMd5lyg7rbrVcKsTB5vbiKUtbGHJYKaSm6 V1tOzZTEa55krOW7na7e8r1xWrPLHaW/HdWHZGjdbezhtExfJ8mO81eLHlwL9ESXhC3Ls cbONzC2tVg7m2ZL4nbT6UhdkJ0224DRSSHMZ/oaNeoGm+ngMgbw72sknnol+2XRzB3A== 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=l0RLDlVu; arc=none smtp.remote-ip=95.215.58.55 Received: from mta1.migadu.com (out-55.mta1.migadu.com [95.215.58.55]) (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 BB9E5606A320 for ; Sat, 21 Nov 2026 10:32:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org BB9E5606A320 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=l0RLDlVu X-Envelope-To: linux-kselftest@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=jXBhceP3FXuZJgFiHDC3WWIwTQ/bMGes850E8yWRlIg=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795257163; v=1; x=1795861963; b=l0RLDlVu6ieMRKuOdaACtu9WKDxhgUNTfOkQqaxxEEfCQZFvlP8YlaKiSECwp6it0BNTBiGU lRf2qT8/cqBOhNtWgQXdcsm1ZwKgN2FPndwGEHVyemHL2KucJXeMbxUnDn5VY5VwthWrlk3crWL DQrVp1P6pb8gEDz4Fv9e3c+0= X-Envelope-To: linux-kselftest@vger.kernel.org Received: by smtp.migadu.com with ESMTPS id 0390872aa68e2c24; Sat, 21 Nov 2026 10:32:42 +0000 X-Mizu-Trace-ID: 0390872aa68e2c24 X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen To: bpf@vger.kernel.org, ast@kernel.org Cc: Jiayuan Chen , John Fastabend , Jakub Sitnicki , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Kuniyuki Iwashima , Willem de Bruijn , Neal Cardwell , Andrii Nakryiko , Eduard Zingerman , Ihor Solodrai , Daniel Borkmann , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Shuah Khan , Sechang Lim , Mattia Meleleo , Michal Luczaj , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf 00/11] fix misc sockmap issues Date: Sat, 21 Nov 2026 18:30:01 +0800 Message-ID: <20261121103222.88209-1-jiayuan.chen@linux.dev> X-Mailer: git-send-email 2.43.0 X-Mailing-List: linux-kselftest@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 This series fixes misc issues in sockmap. Most of them are old. Patches 1-2 fix copied_seq when a strparser is attached and SK_PASS data is left unread, with a selftest. It was reported by Vega and comes from my earlier fix, commit 36b62df5683c ("bpf: Fix wrong copied_seq calculation"). Patches 3, 4 and 7 are old issues I ran into while reading the code: 03 strparser is initialized again while the old one is still alive, after the parser link is removed and added back 04 an ingress redirect queues an empty sk_msg 07 sk_psock_backlog() takes the refcnt of the wrong psock The rest (patches 5, 6 and 8-11) are the old issues that came up in the review of Alexei's sockmap series [1]. They are not from that series, so they were left for a follow-up. Patch 05 returns -EBUSY to a second concurrent sender, and patch 06 rejects disconnect with -EOPNOTSUPP like TLS does. Both change what user space sees, see the commit messages for why. [1] https://lore.kernel.org/bpf/20261102072112.4160195-1-alexei.starovoitov@gmail.com/ Jiayuan Chen (11): bpf, sockmap: Fix copied_seq updates with strparser selftests/bpf: Add test for unread SK_PASS data with strparser bpf, sockmap: Fix strparser reinit after the parser link is removed bpf, sockmap: Fix empty sk_msg queued by ingress redirect bpf, sockmap: Fix concurrent senders on one psock bpf, sockmap: Fix reconnect with a psock by rejecting disconnect bpf, sockmap: Fix psock refcnt taken in sk_psock_backlog() bpf, sockmap: Fix socket lock taken on a child before accept() bpf, sockmap: Fix apply_bytes when a redirect sends only a part selftests/bpf: Fix errno expected by the wait send mem test of test_sockmap selftests/bpf: Add test for apply_bytes when a redirect sends a part include/linux/skmsg.h | 8 ++ net/core/skmsg.c | 44 +++++- net/core/sock_map.c | 67 +++++++++- net/ipv4/tcp_bpf.c | 79 +++++++++-- .../selftests/bpf/prog_tests/sockmap_basic.c | 126 ++++++++++++++++++ .../selftests/bpf/prog_tests/sockmap_strp.c | 86 ++++++++++++ .../bpf/progs/test_sockmap_msg_apply.c | 46 +++++++ tools/testing/selftests/bpf/test_sockmap.c | 3 +- 8 files changed, 436 insertions(+), 23 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/test_sockmap_msg_apply.c -- 2.43.0