From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 85C5D4483AB for ; Mon, 17 Aug 2026 15:50:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786981832; cv=none; b=jumezHAbesQrG868OUqR53gq2RmZMp27ECOhEhrqyudL4+OtNq3rC8EYfMeRQpJXcui5+isdwBn7xjOACzDb158sBHbdyWr45ORBsYsr3kp6mWVI6vmfhBPA97HJbJ3Ic85VbgO9yAjbwnBsw6gUECRLAqBTeM0dlmKT9cQBRyU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786981832; c=relaxed/simple; bh=UGaXKViydcNHgiIYJqkogJCCwyxdJr51ddIZCkZf78c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fWmDYeqa4BuFEDhO6Dg4OlHBzxioMRCJtPx3TMXYygM5XjVQoQipixDWjoD/DEJ0ieeqC+zuev0KG5u2M8wbe8srEvOu/no0bCW0qr+3naXf3xf43hzbBdKY25kYK58N4hFh822nbQmjGv3JPGHuxDmuyst+0/eletDAVyysDLU= 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=al+0ZHDV; arc=none smtp.client-ip=209.85.214.178 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="al+0ZHDV" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ce7d2adef4so60427905ad.3 for ; Mon, 17 Aug 2026 08:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786981828; x=1787586628; 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=Bm6tU6uRMhMFMi+BnhXh/n8qQcLZIiln365T8/pycxA=; b=al+0ZHDVRdxYbYdXpFtNT9yfLmChIiI5RiQ392qfOYF4+zr8F+21rmu8+bv1BCnbeM 4X/ETUbL1x6YtYQ4r04GNvdyNcYMK1FZb2qgdqS+UW9M+ZHa6LY6+vUsnbAOCLWro9Zc 3YyDx9TnMGAkY5+zfB9fTWYL2zLq/mouTT3B7zGKLDdHrbxCtziEo0Of6Xmd0XEkkRE3 5zNNJFgke6TyptSaQNZisOYTWuLRp8MTT7K1K6s1IBHMxZo2HU0gGDXej/+JLt4VGtAX HoiadL4OMcUlBspVtWTWPRZryZk865D8BDpg69secvNlMge6P50buRcLtLk70Uv2UFeK e8ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786981828; x=1787586628; 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=Bm6tU6uRMhMFMi+BnhXh/n8qQcLZIiln365T8/pycxA=; b=raHB9ifW7/qZV0evT0CEOOwGL1+X49WdYSw5KAqk6Chn2o2g9Jv2nSKB7d+Ni2Ak1s VviZeIpfAplDefSBf9pI5Sm3v9laSZxg+eYP/hr2UsgWA96w6aL3NFxUHJKQWtWQlDzl 8Hzx3I+6BPNVQ6vX1HQxp/VumFlUcGA8K8JELIBBFHWgbWGLG3mIKg7HES6dKDJjFDEG XD5Kw+wDNIa1NNJKPsCvwObElA9a8NUqOxBjNI6tLysU1mEXAO4bXVos9jbzkZrJkEhH yl2/S3/Hp+L8+SuwAluFjNcXu7/p5iLNTXeMLUwA+BBjrifCZctd6um3f38iDpsMzz+X b3vA== X-Forwarded-Encrypted: i=1; AHgh+RrcKtsvgj6/9KZVkQ6nu4fXC9fkOM9/Lwtxv0cRRErQSrofkYCrfKVEjyPUVtGIFJbW8F83TXQ5VQspttQ=@vger.kernel.org X-Gm-Message-State: AOJu0YycuS68x52bUDeY2yo9NlOD0Mm1k8x+bLy+vRRVwhiVSaJz2Elx 4iknz5ttdBnu02zMmYRbR3AD5klM4qTYZIAVFboq1frjfwh2aEzDN2fr X-Gm-Gg: AR+sD12qJJX2JDI0SD/FZSpPJ6bmmbreHjijW9VXEFJFEVPqVDf0kslozVffuhZO3WU bJwufe0w8QYBlwCijqqVPRj6ks6i1SGGu3RoWxworRtoHuv5f7XbI8pRFBTkz+JqVNC2nofnQH6 t1CKH2pclw0IapuNPU/7/UCCduef9FI8icGUkMNBVt9Noebk2Rh3tFtcIasUjWXkf4tUDdj0HEg SbHerpbf8HpQmU+pqN2lYzD/7ACs2nb6ofBvJnBrXo9eq0u0yOe9TTrYuYsRC+pSQhhXa+iUYpT Hl/1GueDT4XOMU4exuLEclz1V7dWcWRjNIos+QNcEf7UJG279JwtPW4K+oWc0ZbS6fPQAUSC8DX Gc5I1QjZYJC3yjNdnAtX0IZv06NSj6mQ/TPOjhZ1sxf/LAvoT1N4duzkJWV4HtOCHHi48VWbHcm uJDxUOzNxDUdMmcK3QAnPEg9hCINbAZ9TGVhx1Dkr2Ub8uKHNiU0S6VA0= X-Received: by 2002:a17:90b:4405:b0:381:792d:f993 with SMTP id 98e67ed59e1d1-3933b8c4cf1mr23467515a91.17.1786981828382; Mon, 17 Aug 2026 08:50:28 -0700 (PDT) Received: from omen-arch ([211.58.239.197]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39339b0d6f4sm4682766a91.0.2026.08.17.08.50.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 08:50:27 -0700 (PDT) From: Junseo Lim To: John Fastabend , Jakub Sitnicki , Jiayuan Chen Cc: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Andrii Nakryiko , Eduard Zingerman , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, Sechang Lim , Daniel Borkmann , Emil Tsalapatis Subject: [PATCH bpf v3 2/2] selftests/bpf: Cover strparser self-pass forward allocation Date: Tue, 18 Aug 2026 00:50:09 +0900 Message-ID: <20260817155009.232670-3-zirajs7@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260817155009.232670-1-zirajs7@gmail.com> References: <20260817155009.232670-1-zirajs7@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add a sockmap_strp regression test for strparser SK_PASS delivery to the same socket. A one-byte stream parser splits a single write into many messages, repeatedly exercising receive ownership transitions while the skbs remain queued. Verify through INET_DIAG_MEMINFO that sk_forward_alloc does not become negative after the self-pass path is exercised. Signed-off-by: Junseo Lim --- .../selftests/bpf/prog_tests/sockmap_strp.c | 171 ++++++++++++++++++ .../selftests/bpf/progs/test_sockmap_strp.c | 6 + 2 files changed, 177 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c b/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c index 1d7231728eaf..c7ad21d0bbf4 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_strp.c @@ -1,5 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include +#include +#include +#include #include #include #include "sockmap_helpers.h" @@ -460,6 +464,171 @@ static void test_sockmap_strp_parser_reject(void) test_sockmap_strp__destroy(strp); } +/* Read sk_forward_alloc through inet_diag meminfo. */ +static int sockmap_strp_get_fwd_alloc(int sock, int *fwd_alloc) +{ + struct sockaddr_storage local = {}, peer = {}; + struct sockaddr_in *local_in, *peer_in; + socklen_t addr_len = sizeof(local); + char buf[1024]; + struct { + struct nlmsghdr nlh; + struct inet_diag_req_v2 req; + } req = { + .nlh = { + .nlmsg_len = sizeof(req), + .nlmsg_type = SOCK_DIAG_BY_FAMILY, + .nlmsg_flags = NLM_F_REQUEST, + .nlmsg_seq = 1, + }, + .req = { + .sdiag_family = AF_INET, + .sdiag_protocol = IPPROTO_TCP, + .idiag_ext = 1 << (INET_DIAG_MEMINFO - 1), + .idiag_states = ~0U, + .id.idiag_cookie = { + INET_DIAG_NOCOOKIE, + INET_DIAG_NOCOOKIE, + }, + }, + }; + int diag_fd, ret, err = -ENOENT; + + if (getsockname(sock, (struct sockaddr *)&local, &addr_len)) + return -errno; + addr_len = sizeof(peer); + if (getpeername(sock, (struct sockaddr *)&peer, &addr_len)) + return -errno; + + local_in = (struct sockaddr_in *)&local; + peer_in = (struct sockaddr_in *)&peer; + req.req.id.idiag_sport = local_in->sin_port; + req.req.id.idiag_dport = peer_in->sin_port; + req.req.id.idiag_src[0] = local_in->sin_addr.s_addr; + req.req.id.idiag_dst[0] = peer_in->sin_addr.s_addr; + + diag_fd = socket(AF_NETLINK, SOCK_RAW | SOCK_CLOEXEC, + NETLINK_SOCK_DIAG); + if (diag_fd < 0) + return -errno; + + ret = send(diag_fd, &req, sizeof(req), 0); + if (ret < 0) { + err = -errno; + goto out; + } + if (ret != sizeof(req)) { + err = -EIO; + goto out; + } + + ret = recv(diag_fd, buf, sizeof(buf), 0); + if (ret < 0) { + err = -errno; + goto out; + } + + for (struct nlmsghdr *nlh = (struct nlmsghdr *)buf; + NLMSG_OK(nlh, ret); nlh = NLMSG_NEXT(nlh, ret)) { + struct inet_diag_msg *msg = NLMSG_DATA(nlh); + struct rtattr *attr; + int len; + + if (nlh->nlmsg_type == NLMSG_ERROR) { + err = -EINVAL; + goto out; + } + if (nlh->nlmsg_type == NLMSG_DONE) + break; + + len = nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*msg)); + for (attr = (struct rtattr *)(msg + 1); RTA_OK(attr, len); + attr = RTA_NEXT(attr, len)) { + struct inet_diag_meminfo *minfo; + + if (attr->rta_type != INET_DIAG_MEMINFO) + continue; + minfo = RTA_DATA(attr); + *fwd_alloc = (__s32)minfo->idiag_fmem; + err = 0; + goto out; + } + } + +out: + close(diag_fd); + return err; +} + +/* Test strparser SK_PASS delivery to the same socket. */ +static void test_sockmap_strp_self_pass_fwd_alloc(void) +{ + struct test_sockmap_strp *strp = NULL; + char snd[4 * 1024]; + int c = -1, p = -1; + int fwd_alloc; + int sndbuf = sizeof(snd); + int zero = 0; + char rcv; + int sent, recvd; + int map; + int err; + + memset(snd, 0xa5, sizeof(snd)); + + strp = test_sockmap_strp__open_and_load(); + if (!ASSERT_OK_PTR(strp, "test_sockmap_strp__open_and_load")) + return; + + map = bpf_map__fd(strp->maps.sock_map); + err = xbpf_prog_attach(bpf_program__fd(strp->progs.prog_skb_parser_one), + map, BPF_SK_SKB_STREAM_PARSER, 0); + if (err) + goto out_destroy; + + err = xbpf_prog_attach(bpf_program__fd(strp->progs.prog_skb_verdict_pass), + map, BPF_SK_SKB_STREAM_VERDICT, 0); + if (err) + goto out_destroy; + + err = create_pair(AF_INET, SOCK_STREAM, &c, &p); + if (!ASSERT_OK(err, "create_pair")) + goto out_destroy; + + err = xsetsockopt(c, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf)); + if (err) + goto out_destroy; + + err = xsetsockopt(p, SOL_SOCKET, SO_RCVBUF, &sndbuf, sizeof(sndbuf)); + if (err) + goto out_destroy; + + err = xbpf_map_update_elem(map, &zero, &p, BPF_NOEXIST); + if (err) + goto out_destroy; + + sent = send(c, snd, sizeof(snd), MSG_DONTWAIT); + if (!ASSERT_EQ(sent, sizeof(snd), "send")) + goto out_destroy; + + recvd = recv_timeout(p, &rcv, sizeof(rcv), MSG_DONTWAIT, + IO_TIMEOUT_SEC); + if (!ASSERT_EQ(recvd, sizeof(rcv), "recv_timeout") || + !ASSERT_EQ(rcv, snd[0], "data mismatch")) + goto out_destroy; + + err = sockmap_strp_get_fwd_alloc(p, &fwd_alloc); + if (!ASSERT_OK(err, "sockmap_strp_get_fwd_alloc") || + !ASSERT_GE(fwd_alloc, 0, "sk_forward_alloc")) + goto out_destroy; +out_destroy: + test_sockmap_strp__destroy(strp); + if (c >= 0) + close(c); + if (p >= 0) + close(p); +} + void test_sockmap_strp(void) { if (test__start_subtest("sockmap strp tcp pass")) @@ -482,4 +651,6 @@ void test_sockmap_strp(void) test_sockmap_strp_dispatch_pkt(AF_INET, SOCK_STREAM); if (test__start_subtest("sockmap strp parser reject pkt mod")) test_sockmap_strp_parser_reject(); + if (test__start_subtest("sockmap strp self pass fwd alloc")) + test_sockmap_strp_self_pass_fwd_alloc(); } diff --git a/tools/testing/selftests/bpf/progs/test_sockmap_strp.c b/tools/testing/selftests/bpf/progs/test_sockmap_strp.c index fe88fa6d40bc..682e53d40751 100644 --- a/tools/testing/selftests/bpf/progs/test_sockmap_strp.c +++ b/tools/testing/selftests/bpf/progs/test_sockmap_strp.c @@ -50,6 +50,12 @@ int prog_skb_parser_partial(struct __sk_buff *skb) return 10; } +SEC("sk_skb/stream_parser") +int prog_skb_parser_one(struct __sk_buff *skb) +{ + return 1; +} + SEC("sk_skb/stream_parser") int prog_skb_parser_resize(struct __sk_buff *skb) { -- 2.55.0