From nobody Mon Sep 28 23:14:51 2026 Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (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 6ADA241A50B for ; Sat, 15 Aug 2026 12:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786798264; cv=none; b=GL8ui2vYmUHu8m/Z6iPpsrNOx3fPAEsUSt51PB066RTDHoPHm2RzbU5nHokn0mbsv5Sl6LppgKnHVTYrjYIb79GymHQ0XARgWGuI5FKsnYJZSz/P8j7pc27TorYO+Q+d2eGUH8E4xwkVs/zHSTPqNjhdZW/kHVMSD32jkN4RxHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786798264; c=relaxed/simple; bh=T8L9myqLCbmafmVDMKPx7Vbsuh0v9IopeQ01K1Xli54=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QfWxJnmu3uCHwlBsq9iMl0JhprV3uvP9E2R4jV7XNbuZEinPxOb5An5xz7dVJrTMEBPqKPLZG4N0A5qgbvwwt8D6XRGJ5BLtjV/3G4UdAc9qg2C9MHiYHk+QyGFpJ3o+mVkcyJOih/5Vo+ZgK1yfpC3k8CIU/IDqdCesR9wd4+I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=marliere.net header.i=@marliere.net header.b=ZjfT4ObY; arc=none smtp.client-ip=209.85.210.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net 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=marliere.net header.i=@marliere.net header.b="ZjfT4ObY" Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-7eb29ed2bbdso996160a34.2 for ; Sat, 15 Aug 2026 05:51:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786798261; x=1787403061; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=FgKVBrWkybUlNRGwgMsoJMUl4wNB/sV32q39f/BXyjo=; b=kqR/OhciY5+6wPlOrmcBII2Gs7fC4EJmCVm0phVFAtqmCrf+x1o8PDKMIfW2E04/Mb hnafHPgPZMtHShoXyHwqL3xQl0E0hwDdAuggaTaZI4VPt8Q1un0WaR5P/7Lk3jcxA113 Q7kr3x75QxKDEOQbjXCI9e+E8eBLvDWjLPkRywbJSYm9T8IDI251L7pY7aZU62+/HZiu AdiAl1TZVN3NGVINhHT0exm80BzCBS1bjyT1UkpiDqlfzORestdjbVKOKPX4OIFi2NJl VsYiIL1W07u8ZeJLvVTzVqDtVxk8XvImxxz9kGxaWCMy+C4C2fmCWKFMb7C+u8XxJtRn D5vw== X-Forwarded-Encrypted: i=1; AHgh+Rp/2oc+XmrhXvoGU7BLVqIP11m7fu9T+2e5J2cJYEj2gfHOD5Wi/vSp5HzLTncIxR7rimmAVGydz8T1128=@vger.kernel.org X-Gm-Message-State: AOJu0YzMEVafMYkPhGgDAODcK5KMWlagkXmNRQ4yysDA+b4Iph83LyT2 7A+sHLKemLUGS3Ez1Vg93cuJlExXIt1oGY03dput+xOG5QdwFLEjCdAd X-Gm-Gg: AR+sD108g4cGq9ySxGhxuTN0yoV2fnfq50PUFzJBRF5vsAH5aQVixz1DCktFQ+6O8fu tFEwA/x6iIRCfdU308YNYu7pMFpACBI4ynabwCqnB+90z9vEQPV1YfSmqXjWjslbQPRYrcV+R0N 4p9cc/3FDbcEorR6Eb/Mxqo8XTd+CroisNk2C15g7yzZDOswiO1fjWMi9RJNdwiIVCXxd4/8Dft 8CENWzUcusg+LksIRjC3FhhsnWJXqPy+4mWxcBbIxZuFfAxzKTy30ZgwSs7y8GzhqpAYHZAE7np cUaIf9jXOicBtcZpAg0BUu8BimjdCv03OAOu9uqO7CjP5KXkPjjw5gBB71O3LnmVa8+sfQ4WlrM C8FuEqfeNqOIwBN01pO24emJbfZuSQMlKGKN0SSu/G9NB61cOn8BXDg3u5vxG9hH6ZGUEwA2Hd9 nr7/78myp05fnzyPjunexWorEfnZgPsllMkykfNViAitJ3Fh8LLUyIts4ERw8qlSccsDDaDMq5y wF+a0bmi2oewpK/vEGWEpJYgFsWA2kWDcav8ofa2TiAu9vCq96Pj4f5U3IKQtoXPg== X-Received: by 2002:a05:6830:2106:b0:7e9:d277:6e2e with SMTP id 46e09a7af769-7f3de4dc011mr11851338a34.7.1786798261295; Sat, 15 Aug 2026 05:51:01 -0700 (PDT) Received: from mail.marliere.net (137.65.66.34.bc.googleusercontent.com. [34.66.65.137]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7f3e86a2271sm3958392a34.27.2026.08.15.05.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 05:51:00 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1E6D16132E; Sat, 15 Aug 2026 12:50:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marliere.net; s=dkim; t=1786798259; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=FgKVBrWkybUlNRGwgMsoJMUl4wNB/sV32q39f/BXyjo=; b=ZjfT4ObYmNSBqzr44xNiYecAh48ZzZ5ZbQWieKjXVGTciQp0McJ/2AHJVbuRdVoXkRJ7ap vBX8qNdPHKay4BOORgfLZL4O07Ssc7fBejLS1atNZSJNfaN/oUUy780Eqf1+JGMq7mZizz RRUnV0XGqm0r0r+wgoNhiWyWCiIOyJQVgZKAnMxQ9y/sH2yy0zVfQsllHxKtSQ/i5oSsA1 WCJXT18EvJkiv13JQyVhpuMH8hPf6/1sPpuxtUDBZELJrxdKuONCAk8hr9ZaVStNYUICwQ rMnnuwJcued3tzpACqfFmohWJ8y7JTQb9K1eE3Wq4l3S+30wsFsN+dXeAP5xNQ== From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= Date: Sat, 15 Aug 2026 09:50:38 -0300 Subject: [PATCH 7.1.y v2 1/2] selftests/bpf: Ensure UDP sockets are bound Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-1-c227473a2300@marliere.net> References: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-0-c227473a2300@marliere.net> In-Reply-To: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-0-c227473a2300@marliere.net> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , sashal@kernel.org, gregkh@linuxfoundation.org Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= , Michal Luczaj , Kuniyuki Iwashima , Jakub Sitnicki X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openssh-sha256; t=1786798251; l=1781; i=ricardo@marliere.net; h=from:subject:message-id; bh=GsJ6X/Uo1KEuhlD2ah/RZhTfW7ZY6s1IuXyLQAeSIF0=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QNX6cy7X/C9MB+XeNhQOg/LuOOmDrLvOGvRdbh9iN5DlRhSsQzOPkibhcDIG3cu01q2Sdwo47Pm knvwGCeYtMgg= X-Developer-Key: i=ricardo@marliere.net; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g X-Last-TLS-Session-Version: TLSv1.3 From: Michal Luczaj [ Upstream commit fe3ff273767ef22fe8a7cb3816f264927c190e50 ] Update sockmap_basic tests to bind sockets before they are used. This accommodates the recent change in sockmap that rejects unbound UDP sockets. Signed-off-by: Michal Luczaj Reviewed-by: Kuniyuki Iwashima Reviewed-by: Jakub Sitnicki Link: https://lore.kernel.org/bpf/20260707-sockmap-lookup-udp-leak-v4-1-f87= 8346f27ab@rbox.co Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Ricardo B. Marli=C3=A8re (SUSE) --- tools/testing/selftests/bpf/prog_tests/sockmap_basic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools= /testing/selftests/bpf/prog_tests/sockmap_basic.c index d2846579285f..b4019d1a5575 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c @@ -807,7 +807,7 @@ static void test_sockmap_many_socket(void) return; } =20 - udp =3D xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp =3D socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); @@ -876,7 +876,7 @@ static void test_sockmap_many_maps(void) return; } =20 - udp =3D xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp =3D socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); @@ -947,7 +947,7 @@ static void test_sockmap_same_sock(void) return; } =20 - udp =3D xsocket(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK, 0); + udp =3D socket_loopback(AF_INET, SOCK_DGRAM | SOCK_NONBLOCK); if (udp < 0) { close(dgram); close(tcp); --=20 2.55.0 From nobody Mon Sep 28 23:14:51 2026 Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) (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 8232338E8AD for ; Sat, 15 Aug 2026 12:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786798267; cv=none; b=lkvAEmnm08uW9qnaW/1SkP93YCYm7Yz8pa6h14eI0g0tOJZC0yYBk7vjai/bATLlrKQcp3mWwv9wWCoK/BnAwarhUGotXtV/7k70H97JisF2GlSwY2Tp49Oyjp96xNBcd7XHJX94zyNpKIGb/NJbmUCfyvUf2NBVbzhj+FE2u5o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786798267; c=relaxed/simple; bh=KE6rTX+Q3muQog0MKP2PpDD8qW91yzaqv4URNi2blZo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VP04+H8Jf8X1ZEE/C7PO/+LOggzrkN0ju47S/JQkdeyG9h9rNJd+bngz2IoRF54w8CaBwwZky0/dLWcOt0zeumWHf5U+x2eAr8wiSz+RsrzQHJZwf6fD8siHHgMcy+HbY7yScJgJ6xN9S5qOGNe8aG7dEvs5Kma18DepPdJTN/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=marliere.net header.i=@marliere.net header.b=CPk3YldL; arc=none smtp.client-ip=209.85.160.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=marliere.net 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=marliere.net header.i=@marliere.net header.b="CPk3YldL" Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-4518ad44e83so1213126fac.0 for ; Sat, 15 Aug 2026 05:51:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786798265; x=1787403065; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=NthXw1cvoONdGhBW0OtOd2XcLhJSsunw8nyGgyUAdh4=; b=Y0i0WFy2yPqrw6iGkNc2Y6j7ejWgVAaiAVW4T9W2nGmI7RL2H/IyvkbDNUzhtjgpnL Ke9xjHrUXBGAZCgRJ5TYe5whJWFcY9U7qPoEj/4AT7jIQv/ihlE7egdKqL9Q/os6jniO V7fyuMppDapjIp0GtEnON4DbC50UYzPAKz69WN6exb51xyhKnvGCnMAM/wuCYJfpu1TV 4iqzysmGOWUsjScANRN5WRMO2ftnVERQfs1DX1Oj97zDsPPkhs5S8EFdSBsWtzyW2NSN TW26RBkoKcm5BenstjbKj7/7p67/6GLx5owRaUl++bQdhQGqApPSsK/AWiFpwktEmpjO bTbA== X-Forwarded-Encrypted: i=1; AHgh+Ro3LK2aqSFyWa3wYWD5+IRKVtzGXbqRKOVbB1l2OYDowZH0wk26AMnEcFBa5nOPg3kygCnxudXdelUEGPM=@vger.kernel.org X-Gm-Message-State: AOJu0YzxCxdwMLW/+uJCsmpk1gDrDhdjyOR67tq3jnlfGAK6Add0aSHG qCxL8BbCCcGefugnnrqk3fXEt5zWUzs3kmOMfQ+1kQtjOInj6OgkF5z4 X-Gm-Gg: AR+sD107oyEus+rpG/dOMyorLCfqR8kiL9Lvg4woPZW53NnqKAqGv2S1Z/yP4zo7ZXx cV4ZLT/NSTxdO8Owj4yKXLgCDF9KbuO3gviLJp8FxqnNlfIdsqQaZ8v2gfSNnq3lhMFZXBfO5c3 ak0FxOZS5LXZvr4lnaCKyN64gqSR/urqjF5RWxANfvyiJl+mrtcjOCNORzuUfxtTmTJbosFftco 8t8hI0h3KObwSjjJzjSmc06NfujAy5RomTYe6r9yVIm393jfq3P/6uqT5/XdZWYNFOzWxfiedWY 6OQRBqky8Qr1dscMKNvzWiUqEc/9ORBNjKaxUsLg/NE5GRTmoaVCv+dUoIEARwydboqwwtrTp7d gKkLZgMb9250Si5RX45OOzcIPzv6xp5+Q1kzHv1oPmKyIVykWSz0v7+cT0SXH4Mw3SUVBkZEy8d jVvPdVfun4DC+Asxczj+8poDsWQ6FmYJOUFikC3U5be3I5JEATSrD+4klhLlucDz0BHfGvhVqgH BJP+vm0DTGmQqe9CVEz+C1AlhUlXE3EQjyKNlQ7d2u5ptEyOkYtomvJKGF/C4rxCA== X-Received: by 2002:a05:6820:180d:b0:6aa:e13e:ba26 with SMTP id 006d021491bc7-6b0d69164demr10829049eaf.33.1786798265135; Sat, 15 Aug 2026 05:51:05 -0700 (PDT) Received: from mail.marliere.net (137.65.66.34.bc.googleusercontent.com. [34.66.65.137]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7f3e86687f3sm3931954a34.20.2026.08.15.05.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Aug 2026 05:51:04 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 7C2C260791; Sat, 15 Aug 2026 12:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marliere.net; s=dkim; t=1786798262; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=NthXw1cvoONdGhBW0OtOd2XcLhJSsunw8nyGgyUAdh4=; b=CPk3YldL3RCgL5TmZcIvdBAwuyKz8SYYzju39akKENUry5zZ7k1ivcAmuKnI7IK1nUOome 1RrKkvfZI9E08gkrsCLUh7Oj20i32cAeHPO4BMi3D83wuPopTUHmlyC9Hc2ruavOlPkOiL HW+JHbzose8CNEQvOQzVqXHsA8dtzFhDsmMrI6MChSImD+eModkJrL7r6kh6FKLqMH8bbC jmbF0GiMKhiN/wfNs1ZtiUMA/lE2Tw2INWEQQbaiM4atQRrgwDZyS8r7u2VaoA8GO2T1AG 9CSLuwlOw0yZqeeGlc0ddpPbuokPCvh/Z2zj8nawTg6Ct0czLp2ITsSAjmCAHQ== From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= Date: Sat, 15 Aug 2026 09:50:39 -0300 Subject: [PATCH 7.1.y v2 2/2] selftests/bpf: Adapt sockmap update error handling Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-2-c227473a2300@marliere.net> References: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-0-c227473a2300@marliere.net> In-Reply-To: <20260815-7-1-y-selftests-bpf-udp_xsk-v2-0-c227473a2300@marliere.net> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , sashal@kernel.org, gregkh@linuxfoundation.org Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re_=28SUSE=29?= , Michal Luczaj , Kuniyuki Iwashima , Jakub Sitnicki X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openssh-sha256; t=1786798251; l=2951; i=ricardo@marliere.net; h=from:subject:message-id; bh=qQmp8P1bskQy6/17jPUYc2um6TvqJkCSlm4/2Y/x6W8=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QERbhI0Fsl3IfrWm5pNmGJzkJDRonKGSrxyDcGmHsumgKH5Lxmyeub9wr38+IX7z0Gs5KWnqKOV SAB/i3ERjMg0= X-Developer-Key: i=ricardo@marliere.net; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g X-Last-TLS-Session-Version: TLSv1.3 From: Michal Luczaj [ Upstream commit 30581eda4a07ff15db623612cac578e81869e96f ] Update sockmap_listen to accommodate the recent change in sockmap that rejects unbound UDP sockets. TCP: Reject unbound and bound (unless established or listening). UDP: Accept only bound sockets. While at it, migrate to ASSERT_* and enforce reverse xmas tree. Signed-off-by: Michal Luczaj Reviewed-by: Kuniyuki Iwashima Reviewed-by: Jakub Sitnicki Link: https://lore.kernel.org/bpf/20260707-sockmap-lookup-udp-leak-v4-3-f87= 8346f27ab@rbox.co Signed-off-by: Kumar Kartikeya Dwivedi Signed-off-by: Ricardo B. Marli=C3=A8re (SUSE) --- .../selftests/bpf/prog_tests/sockmap_listen.c | 21 +++++++++++------= ---- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tool= s/testing/selftests/bpf/prog_tests/sockmap_listen.c index cc0c68bab907..1c96a3cf4b97 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c @@ -53,8 +53,8 @@ static void test_insert_opened(struct test_sockmap_listen= *skel __always_unused, int family, int sotype, int mapfd) { u32 key =3D 0; - u64 value; int err, s; + u64 value; =20 s =3D xsocket(family, sotype, 0); if (s =3D=3D -1) @@ -63,11 +63,8 @@ static void test_insert_opened(struct test_sockmap_liste= n *skel __always_unused, errno =3D 0; value =3D s; err =3D bpf_map_update_elem(mapfd, &key, &value, BPF_NOEXIST); - if (sotype =3D=3D SOCK_STREAM) { - if (!err || errno !=3D EOPNOTSUPP) - FAIL_ERRNO("map_update: expected EOPNOTSUPP"); - } else if (err) - FAIL_ERRNO("map_update: expected success"); + ASSERT_ERR(err, "map_update"); + ASSERT_EQ(errno, EOPNOTSUPP, "errno"); xclose(s); } =20 @@ -77,8 +74,8 @@ static void test_insert_bound(struct test_sockmap_listen = *skel __always_unused, struct sockaddr_storage addr; socklen_t len =3D 0; u32 key =3D 0; - u64 value; int err, s; + u64 value; =20 init_addr_loopback(family, &addr, &len); =20 @@ -93,8 +90,12 @@ static void test_insert_bound(struct test_sockmap_listen= *skel __always_unused, errno =3D 0; value =3D s; err =3D bpf_map_update_elem(mapfd, &key, &value, BPF_NOEXIST); - if (!err || errno !=3D EOPNOTSUPP) - FAIL_ERRNO("map_update: expected EOPNOTSUPP"); + if (sotype =3D=3D SOCK_STREAM) { + ASSERT_ERR(err, "map_update"); + ASSERT_EQ(errno, EOPNOTSUPP, "errno"); + } else { + ASSERT_OK(err, "map_update"); + } close: xclose(s); } @@ -1289,7 +1290,7 @@ static void test_ops(struct test_sockmap_listen *skel= , struct bpf_map *map, /* insert */ TEST(test_insert_invalid), TEST(test_insert_opened), - TEST(test_insert_bound, SOCK_STREAM), + TEST(test_insert_bound), TEST(test_insert), /* delete */ TEST(test_delete_after_insert), --=20 2.55.0