From nobody Tue Dec 2 02:03:30 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 4936F274B55 for ; Fri, 21 Nov 2025 08:14:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712856; cv=none; b=Fh1ms0yEwXVP1Shmeyb2R0LGzW72QfM953Vfl6VkQR+cbkm4j5uemqqXsjLDeiJSXeV0SVskHrWNbyYXYEd9t38UQKO1LdVvVBCSdb9H2Y7pBoM2UQsg0SL4BFfFhrrRx2sam8ZD1L5/i9/j/4TFPNAdBBVdPF3YlVWkNx5kCkQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763712856; c=relaxed/simple; bh=yRG8Nxy/l0LvjSvT/KrupkQ2EizRIh9OaEoODht8KYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eOIILONDtJKigICMSLMqR3B9Orv1xmOQQVUq8bQ9XWub44m/Fl46TR5z+8mgdNDi1lUW5kSyIvVsmcS2fkZIqWTpNK6j/2Q9uRTRLj6KaL6PGxsgZBp1ddcfK4Ko9bxADs8gNGxGRqCtMlXNXmoWS7y2B9Z4x0n2k90BT5hVM+4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=RcRBIxH4; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="RcRBIxH4" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4779adb38d3so12839245e9.2 for ; Fri, 21 Nov 2025 00:14:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763712851; x=1764317651; 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=Ps8UGCpaZwTjonsD4/+wCNz8vb5xTFCKH5GRNUH/TvA=; b=RcRBIxH4EfgqyJVlkycqJCMTSxWN49/fn1e2zx5opRW0ECHwcvM1qrnqzKpVzA1Vot LuLcGkzsKHHqKjsTR9waFbt4iBThUypKtwH2zUoEMQvG147Ze/HHkPbRKiM4cdT+Duux 3HsxF72sIAXjKQb38GX+OjMBXOj9oWkSrltoHgBe4AV//0GqcOownbJ6dSbhg8x7DIvD Rop219dQu1Kp6GsLawA1Im0ZI7re5uBzmYS2Kr/fOoEBvEQcWEPJaa0WyCiQzPdkYkKv UpouE4qvLXNR3hiHxjvAJGIN8Rhkwf/nxxHxFwzvv9VVZPGqGcSL8Tj94NX5C+WoEiQO 5QGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763712851; x=1764317651; 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=Ps8UGCpaZwTjonsD4/+wCNz8vb5xTFCKH5GRNUH/TvA=; b=WpY/7rYEz7QOZU+Ta4hidYL+PyZtSeQOEJ27vrgd5jGNV9fMuKffHILjKu4z9xPjyV 1cwFwHLwj8o0rvKI4YjTfSfQhkv085sASInCEN287QT3CWtthNnV5VVCuNj0VWd7ui2V TH1i/wR/GJG51X8j31dU3hOjzSxVG8AYOaMXMmfn+w1jQfE/4fpHo0Aoj0ScsJOiVIOc uoKzrU7ssGPU+RuZz7L2Y3wbqAeJ/gWk+MU8JYg13/yc/sEYRKLWjzFIX1vKDp/CpAEs FA1nJW+tXY4PuTYPY6emoM5DYgZ4XPtHXgTIVJCYtyC3mUecBHqo5a+bWSxRrss2AoY9 p/2A== X-Forwarded-Encrypted: i=1; AJvYcCVdhGkSYRf5Q35zxlLMP6Oui2o5ySAEVnGRsA++7mAt3sTQFiArwUpvHEOJObk65FF+X/SyEqqounuaJbQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxNEs1YA7m5ki9L45BVO1li2zM/69KkLsF9J3QUDP02uvFEvxkw YobVrKNjmgHxZ3Z9W655QEi+VFEPgGBoQUn5r6s/EyXc0h+0r2L7L0IoRQfNV708m04= X-Gm-Gg: ASbGncsHo0PYgNbTOev6G2SEPnL7W0mEqvXA2ixY0/vJNDCD6TJnk5NGzlbhAldYCAw xue5OfLobqiIeTzhb3qidbuaZ7mKBpyeZ4HfDvsJ1NCrb8eHR9E6KDxDyKRczNlob2Z4osnaSF1 LwPs2CyW2nK3zP6DelItxledItyHZscpOfu8VnYKofl/Nplvf0FIpeBV2/WxvRaf8qgJPSsf6vo WQ7QgSbizAwSdIOH4E6efITQfuk7UkF+G8ctcKMHcMB+6QijV8VtPo/9eHv8HgWhNQkIym0+ciO OoY796mem9NYGdSQZYTMefRwihr2gs07hgKheQ6Yfz5gEkYG7DKPR643mqEQ26HNC+PdmFP/qBw 48ylyEIVh35AAA5n48EGtgnKaJDne7PYxoO8dmwL/xHcTyMvHyvcxlrfEvRanmMWrynb6qlFC5x i5AXyNCBbC5CiEHenm4WX+VDoXKnmLA0tmO4hu5AOBD7Cy+/aEvg== X-Google-Smtp-Source: AGHT+IFnlEJswVxHvEMgc0ivtrXYrObVWG/nBBqizX/gmyv6vLPBOc/j5AsjkUbZkZCVsCuPkMfgHg== X-Received: by 2002:a05:600c:5491:b0:477:fcb:226b with SMTP id 5b1f17b1804b1-477c016e60cmr13674025e9.2.1763712851432; Fri, 21 Nov 2025 00:14:11 -0800 (PST) Received: from F15.localdomain ([121.167.230.140]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-bd75def6314sm4722370a12.7.2025.11.21.00.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 00:14:10 -0800 (PST) From: Hoyeon Lee To: bpf@vger.kernel.org Cc: andrii@kernel.org, eddyz87@gmail.com, ast@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, shuah@kernel.org, hoyeon.lee@suse.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v2 2/2] selftests/bpf: use sockaddr_storage instead of sa46 in select_reuseport test Date: Fri, 21 Nov 2025 17:13:32 +0900 Message-ID: <20251121081332.2309838-3-hoyeon.lee@suse.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251121081332.2309838-1-hoyeon.lee@suse.com> References: <20251121081332.2309838-1-hoyeon.lee@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The select_reuseport selftest uses a custom sa46 union to represent IPv4 and IPv6 addresses. This custom wrapper requires extra manual handling for address family and field extraction. Replace sa46 with sockaddr_storage and update the helper functions to operate on native socket structures. This simplifies the code and removes unnecessary custom address-handling logic. No functional changes intended. Signed-off-by: Hoyeon Lee --- .../bpf/prog_tests/select_reuseport.c | 67 ++++++++++--------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/to= ols/testing/selftests/bpf/prog_tests/select_reuseport.c index 036d4760d2c1..3dbcc091f16c 100644 --- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c +++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c @@ -41,11 +41,7 @@ static struct bpf_object *obj; static __u32 index_zero; static int epfd; =20 -static union sa46 { - struct sockaddr_in6 v6; - struct sockaddr_in v4; - sa_family_t family; -} srv_sa; +static struct sockaddr_storage srv_sa; =20 #define RET_IF(condition, tag, format...) ({ \ if (CHECK_FAIL(condition)) { \ @@ -135,24 +131,24 @@ static int prepare_bpf_obj(void) return 0; } =20 -static void sa46_init_loopback(union sa46 *sa, sa_family_t family) +static void ss_init_loopback(struct sockaddr_storage *sa, sa_family_t fami= ly) { memset(sa, 0, sizeof(*sa)); - sa->family =3D family; - if (sa->family =3D=3D AF_INET6) - sa->v6.sin6_addr =3D in6addr_loopback; + sa->ss_family =3D family; + if (sa->ss_family =3D=3D AF_INET6) + ((struct sockaddr_in6 *)sa)->sin6_addr =3D in6addr_loopback; else - sa->v4.sin_addr.s_addr =3D htonl(INADDR_LOOPBACK); + ((struct sockaddr_in *)sa)->sin_addr.s_addr =3D htonl(INADDR_LOOPBACK); } =20 -static void sa46_init_inany(union sa46 *sa, sa_family_t family) +static void ss_init_inany(struct sockaddr_storage *sa, sa_family_t family) { memset(sa, 0, sizeof(*sa)); - sa->family =3D family; - if (sa->family =3D=3D AF_INET6) - sa->v6.sin6_addr =3D in6addr_any; + sa->ss_family =3D family; + if (sa->ss_family =3D=3D AF_INET6) + ((struct sockaddr_in6 *)sa)->sin6_addr =3D in6addr_any; else - sa->v4.sin_addr.s_addr =3D INADDR_ANY; + ((struct sockaddr_in *)sa)->sin_addr.s_addr =3D INADDR_ANY; } =20 static int read_int_sysctl(const char *sysctl) @@ -228,7 +224,7 @@ static void check_data(int type, sa_family_t family, co= nst struct cmd *cmd, int cli_fd) { struct data_check expected =3D {}, result; - union sa46 cli_sa; + struct sockaddr_storage cli_sa; socklen_t addrlen; int err; =20 @@ -251,26 +247,32 @@ static void check_data(int type, sa_family_t family, = const struct cmd *cmd, } =20 if (family =3D=3D AF_INET6) { + struct sockaddr_in6 *srv_v6 =3D (struct sockaddr_in6 *)&srv_sa; + struct sockaddr_in6 *cli_v6 =3D (struct sockaddr_in6 *)&cli_sa; + expected.eth_protocol =3D htons(ETH_P_IPV6); - expected.bind_inany =3D !srv_sa.v6.sin6_addr.s6_addr32[3] && - !srv_sa.v6.sin6_addr.s6_addr32[2] && - !srv_sa.v6.sin6_addr.s6_addr32[1] && - !srv_sa.v6.sin6_addr.s6_addr32[0]; + expected.bind_inany =3D !srv_v6->sin6_addr.s6_addr32[3] && + !srv_v6->sin6_addr.s6_addr32[2] && + !srv_v6->sin6_addr.s6_addr32[1] && + !srv_v6->sin6_addr.s6_addr32[0]; =20 - memcpy(&expected.skb_addrs[0], cli_sa.v6.sin6_addr.s6_addr32, - sizeof(cli_sa.v6.sin6_addr)); + memcpy(&expected.skb_addrs[0], cli_v6->sin6_addr.s6_addr32, + sizeof(cli_v6->sin6_addr)); memcpy(&expected.skb_addrs[4], &in6addr_loopback, sizeof(in6addr_loopback)); - expected.skb_ports[0] =3D cli_sa.v6.sin6_port; - expected.skb_ports[1] =3D srv_sa.v6.sin6_port; + expected.skb_ports[0] =3D cli_v6->sin6_port; + expected.skb_ports[1] =3D srv_v6->sin6_port; } else { + struct sockaddr_in *srv_v4 =3D (struct sockaddr_in *)&srv_sa; + struct sockaddr_in *cli_v4 =3D (struct sockaddr_in *)&cli_sa; + expected.eth_protocol =3D htons(ETH_P_IP); - expected.bind_inany =3D !srv_sa.v4.sin_addr.s_addr; + expected.bind_inany =3D !srv_v4->sin_addr.s_addr; =20 - expected.skb_addrs[0] =3D cli_sa.v4.sin_addr.s_addr; + expected.skb_addrs[0] =3D cli_v4->sin_addr.s_addr; expected.skb_addrs[1] =3D htonl(INADDR_LOOPBACK); - expected.skb_ports[0] =3D cli_sa.v4.sin_port; - expected.skb_ports[1] =3D srv_sa.v4.sin_port; + expected.skb_ports[0] =3D cli_v4->sin_port; + expected.skb_ports[1] =3D srv_v4->sin_port; } =20 if (memcmp(&result, &expected, offsetof(struct data_check, @@ -364,16 +366,15 @@ static void check_results(void) static int send_data(int type, sa_family_t family, void *data, size_t len, enum result expected) { - union sa46 cli_sa; + struct sockaddr_storage cli_sa; int fd, err; =20 fd =3D socket(family, type, 0); RET_ERR(fd =3D=3D -1, "socket()", "fd:%d errno:%d\n", fd, errno); =20 - sa46_init_loopback(&cli_sa, family); + ss_init_loopback(&cli_sa, family); err =3D bind(fd, (struct sockaddr *)&cli_sa, sizeof(cli_sa)); RET_ERR(fd =3D=3D -1, "bind(cli_sa)", "err:%d errno:%d\n", err, errno); - err =3D sendto(fd, data, len, MSG_FASTOPEN, (struct sockaddr *)&srv_sa, sizeof(srv_sa)); RET_ERR(err !=3D len && expected >=3D PASS, @@ -589,9 +590,9 @@ static void prepare_sk_fds(int type, sa_family_t family= , bool inany) socklen_t addrlen; =20 if (inany) - sa46_init_inany(&srv_sa, family); + ss_init_inany(&srv_sa, family); else - sa46_init_loopback(&srv_sa, family); + ss_init_loopback(&srv_sa, family); addrlen =3D sizeof(srv_sa); =20 /* --=20 2.51.1