From patchwork Tue Jul 23 05:54:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814086 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 EE50713D28D; Tue, 23 Jul 2024 05:55: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=1721714131; cv=none; b=cCfYLVXxVBH0rGL2ti8JCYJ2OeQ5PepCFOKHQG08HjVToiQRTz/b2K10oJBxBxYkGrgCb2hWirFOkAYcu08C+BtmyFpQGnGglNP+PYtSUe+TdH0K3FM/JXv3RqlSgNJD6rklKnRmHau8kErGcjbgKla3zl4eeVtAptNd0rdx8SI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714131; c=relaxed/simple; bh=U6PSJHHsdoHQeuBdbe1AqOJi7Op40WqZje2dI0wkV7Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BayBelGpQrApV5gNntTsTrqYwSFSVSpLwabqI+LadjKmy0XgyFV1GteqWqTLdya06N5DJ3kiU69fCGFnCgUErrR34gq+QA5A2ZKnbZPSHx69VwR25BR/FU1wncqWahs0zUoVvvg5Z4zA3C14PSoS1f5XOISfxiP+08tHh+SxF6Y= 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=lr8AjGOm; 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="lr8AjGOm" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1fc6ee64512so26738955ad.0; Mon, 22 Jul 2024 22:55:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714129; x=1722318929; 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=E2BWuZk7cm8HTXBQSy2mvZgxSz8YUm7gyJDVbc+WOMQ=; b=lr8AjGOmlRmL1f03oNIxatF4WnpV6iAIh04fDbaQ8bfXKn/doRMtJTYghnmwIPUsnQ gUHP0ehWJ4u/akWbdATd66DwAdPC1dikKhhkxR7EergKOdfxalTWOkIZMmgkLTqH7nW3 zEkLSJIqQXv14r+APqjZg0unMSl2L471qOvPetk94WVf55IMefXesuxzdXkinjzDdhvF QKaQyG5Cv6E1ohxUxXf7vc5NhLe/RI3Nzgs4mYPM8UbZFr8b3NgU2ERIkMzTPyQEcQGd Aq/MX84s0zHy9Tnfk4vcNcZysdwR+ie4Lr0m791UdJh0ch7uSldL+UdkW+Wp9ZhO53zY frfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714129; x=1722318929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E2BWuZk7cm8HTXBQSy2mvZgxSz8YUm7gyJDVbc+WOMQ=; b=vZ+bvIIA7n0MK48r2HF2nrkFC7e9uW5WLTckeScaUzE1HBkgD+fjHZ3DqVQ650Ux4M SaeKsQtfux99QsTSITxLsaIN8quYW99sZSkwk2hLN8r+1GFk1zgP+wp7TfdtQjjRBlCv 2VBVexbGiMiOtbuzOy7ggHet22fiMJCM7/j8ObOT1cTuIAh+O0P6zqvgLKA7973AYc9v 4H+LazEpcsyDKdgtg0ENC8R74zP8F9UAyhkpAPytk9pe5sXVQOv3Wrolg1vEgL6yabNM ptaIu237qYImnsBQVIyOg2vqZKCT960LqZKfrmSqG07C6zHCzAiHDH/OPgGzdS8i9s+F z0qA== X-Forwarded-Encrypted: i=1; AJvYcCXZbBp8V+krONUgaz4n+glzk8RBDd/7/AFMcsOR46Hq5IDMS1qu1GqiegvLIZgKrh4ZdvtqNbXf1quhDtKj64w83agPwgPhBTOhNII9RK4r X-Gm-Message-State: AOJu0YzP+EpeZ/xFy10COHKHsIaljoCvA4yuCozC1LjL4j0xHcC+jtBx WecSXaVk6I9NuqWnu5zDo7F9Esy2760LSUhUJD/FAIHWSkob7W+YC6EshnBk X-Google-Smtp-Source: AGHT+IFp7G/dlEx9FOB0bLBzldRTnkBU4OEkOzZmYC5r3/vwUR2cl2S4ZiXsvNo6Cqyc45HLdC/HBw== X-Received: by 2002:a17:902:ce8c:b0:1f9:c508:acd5 with SMTP id d9443c01a7336-1fd7457344fmr63321155ad.5.1721714129057; Mon, 22 Jul 2024 22:55:29 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:28 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 02/19] selftests/bpf: Fix compile error from rlim_t in sk_storage_map.c Date: Mon, 22 Jul 2024 22:54:29 -0700 Message-Id: <1e00a1fa7acf91b4ca135c4102dc796d518bad86.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Cast 'rlim_t' argument to match expected type of printf() format and avoid compile errors seen building for mips64el/musl-libc: In file included from map_tests/sk_storage_map.c:20: map_tests/sk_storage_map.c: In function 'test_sk_storage_map_stress_free': map_tests/sk_storage_map.c:414:56: error: format '%lu' expects argument of type 'long unsigned int', but argument 2 has type 'rlim_t' {aka 'long long unsigned int'} [-Werror=format=] 414 | CHECK(err, "setrlimit(RLIMIT_NOFILE)", "rlim_new:%lu errno:%d", | ^~~~~~~~~~~~~~~~~~~~~~~ 415 | rlim_new.rlim_cur, errno); | ~~~~~~~~~~~~~~~~~ | | | rlim_t {aka long long unsigned int} ./test_maps.h:12:24: note: in definition of macro 'CHECK' 12 | printf(format); \ | ^~~~~~ map_tests/sk_storage_map.c:414:68: note: format string is defined here 414 | CHECK(err, "setrlimit(RLIMIT_NOFILE)", "rlim_new:%lu errno:%d", | ~~^ | | | long unsigned int | %llu cc1: all warnings being treated as errors Fixes: 51a0e301a563 ("bpf: Add BPF_MAP_TYPE_SK_STORAGE test to test_maps") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/map_tests/sk_storage_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/map_tests/sk_storage_map.c b/tools/testing/selftests/bpf/map_tests/sk_storage_map.c index 18405c3b7cee..af10c309359a 100644 --- a/tools/testing/selftests/bpf/map_tests/sk_storage_map.c +++ b/tools/testing/selftests/bpf/map_tests/sk_storage_map.c @@ -412,7 +412,7 @@ static void test_sk_storage_map_stress_free(void) rlim_new.rlim_max = rlim_new.rlim_cur + 128; err = setrlimit(RLIMIT_NOFILE, &rlim_new); CHECK(err, "setrlimit(RLIMIT_NOFILE)", "rlim_new:%lu errno:%d", - rlim_new.rlim_cur, errno); + (unsigned long) rlim_new.rlim_cur, errno); } err = do_sk_storage_map_stress_free(); From patchwork Tue Jul 23 05:54:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814085 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 CD414634; Tue, 23 Jul 2024 05:55:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714137; cv=none; b=eFsKcCddHVMaXBbtv/iVxVs3l2uVp7xOlTtfNUhKnvH+i4V67wMxom5KM7yQf8B9iwa4YEQGXrZeIBWS8DxnoODhM4WqW+MDVRYWng8aXwLCIc6gaImYeHl1s+RXvC6VlNaQrPzE44XVoh7fP20QAuFZBMq3s5OnCk2V7OXXiIo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714137; c=relaxed/simple; bh=xiObBQ5jb7XnfGSH1kzdorxlvHdwcVFjY3UhapO2kNA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M82m5yyT1BcIMKA9GQNhOQunjSnOoD+eztwxycODoLX4QEF/SfKrUTT045eiiA5kamSxAejJ5A+YXWKfmd/IMGaD7mq+0Y8/UToZr5uUTEBLn8lpgoLWckLDrTIQdFCAbBK79JGjUQOSIlBhxe5Sbqa7iuoaJd9lguKkJS9zbns= 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=mZVqV2oV; arc=none smtp.client-ip=209.85.214.180 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="mZVqV2oV" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1fc49c0aaffso35891765ad.3; Mon, 22 Jul 2024 22:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714135; x=1722318935; 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=RuQrhWzd1UjXmeSYi5wTmCmvLJfO0MqDL+TpdjPdJ6c=; b=mZVqV2oVAPF6XqZlDwaiBugRWlKssQDZ7TXfyPQ3NsG/KgYc1ELFmg8o2c4dWzjrsT Atl/AUorFgmRoXz5RdLRQzh9Er9LzoaaCsxDWfr4FCdBNo4c10g6v2+8hK2MIIWgoPmA 9zOIdCbfIIRi8gg76wkmozyTsnE3x/6HD38YR+wPFHTy9iXAT3hWmNASX1ki6txhagKl 0bkjN3JbhD8UKgCLnnrSceSXHdFChgPCm/CA+/4yBIinp4xL7pWFjfvTRH1k5MrJlOhF P02Om1z+uGcSZUUKRKKzJ8G1U/WGWI216PMwRo8haXyIwmDc5tt+kSs/e/YJgaVgqoZK JDzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714135; x=1722318935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RuQrhWzd1UjXmeSYi5wTmCmvLJfO0MqDL+TpdjPdJ6c=; b=OixX57zWcTKYviMvFfxiGN360lvA8K0h+MssYjbd/FZZUNQTS5b8PmZg9/CfYFTaeZ /72VxPWKsYMXxD0g8B9PvwCmMEzTP85kQX+8MTAVJH+65DrwNBwXVyLObVkZ9tOhru2t mXivfkrtSykbipN3Zoa+wRfqx+Jlx8yhhmukXinDc3vOleU1zLO+GyhYxQR8CGUzFpln cFJVPlE4MVkSkfG1a7XihXCttU41wrJBdx5r8xshiT8RrSESJudmX1lKw8htHa3crJWe /TD8JX+uPdEkdiZcwczdZXj2LVtpef7asknqSxQrjYgpV+2ghKwTV74VxNj3tPqVo5Ud oO5w== X-Forwarded-Encrypted: i=1; AJvYcCULcRjVJmQSFFYrysM3WmpHvaa8kmYHcR8xyo0pmgAttQjP+xh0rNJvmF1gc68+IrzkAzrzZWpSp+V3X+c/xAjyh4CENiz797vkxpcjdN1V X-Gm-Message-State: AOJu0YwFAThXK1k8ww0gVy+U3SH9ABw/qNke+MzNkMX6O3AawsZwpBQh CtFuK9ZPqQe8kxRE0IV4IW0SxEcOOcalXN8e6Qgoo496CA67Tx62CLg87a/7 X-Google-Smtp-Source: AGHT+IEAQc0RzjkOrFcnZqABFAncPUK4CCaUUSy0LKjJZJVcKS1kDWYNe0ICwk/APOGy+IRGcBbmsA== X-Received: by 2002:a17:902:f685:b0:1fd:8c25:415d with SMTP id d9443c01a7336-1fd8c254f58mr31605635ad.36.1721714134709; Mon, 22 Jul 2024 22:55:34 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:34 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 04/19] selftests/bpf: Drop unneeded include in unpriv_helpers.c Date: Mon, 22 Jul 2024 22:54:31 -0700 Message-Id: <5664367edf5fea4f3f4b4aec3b182bcfc6edff9c.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The addition of general support for unprivileged tests in test_loader.c breaks building test_verifier on non-glibc (e.g. musl) systems, due to the inclusion of glibc extension '' in 'unpriv_helpers.c'. However, the header is actually not needed, so remove it to restore building. Fixes: 1d56ade032a4 ("selftests/bpf: Unprivileged tests for test_loader.c") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/unpriv_helpers.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/unpriv_helpers.c b/tools/testing/selftests/bpf/unpriv_helpers.c index b6d016461fb0..220f6a963813 100644 --- a/tools/testing/selftests/bpf/unpriv_helpers.c +++ b/tools/testing/selftests/bpf/unpriv_helpers.c @@ -2,7 +2,6 @@ #include #include -#include #include #include #include From patchwork Tue Jul 23 05:54:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814084 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 E29D5367; Tue, 23 Jul 2024 05:55:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714145; cv=none; b=MFSIDQVbEpsHbJsyEqp+mEnMDwHFxwQV8iWE1WzXzm70BCAsGybEl8DosSt36j4fiGcka5d0ZUwBTh9Y79fZZqIGQ8iDpeDLvVX8oeM3Jb0hmD/RjqA4pn8E1JcbBUxNh3dhk6sb5jgGF8DVSzWWcHJ1wW2LHWYBA2IZhN5/PZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714145; c=relaxed/simple; bh=orjN7N45+/uSUw4tbpqsVXAphe9Gj4vBhZaUgHqwb0g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s+PAGKoPUgeGmYtmjqonrqTUebJYjxfYUVotOLfQ+H9WycrbfPcVPE3qPMcnhoZwOoVM1gN3U/UKDTsupgFNuQuym84uLD+E7sHsYKl0kddjitB0Sq3/AP2p+gRZ3Lfz7/NemnKEWe9wk55dU+gh6EySpWypG14KzXdv6LZJ7bI= 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=FdMYbG55; arc=none smtp.client-ip=209.85.214.180 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="FdMYbG55" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1fc587361b6so38479095ad.2; Mon, 22 Jul 2024 22:55:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714143; x=1722318943; 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=qzLKMhq/i0ZyAtmvpqGuB9Le2Uf8ZZ76gVE1oOnUGq4=; b=FdMYbG55FVu9KpDULCdYTcP/6bVh4IZfm3YXxvx9kHt3BlUkrNVG9zpsWWPBvBZC79 zNDq5P/tDDpNTKGqLuiegvwbXKZsILmR9pg3ZZRVA9T7gBrpXT2WBmFfnOmehjyJ9iJO D/8ODq0HEESObM8jLHIz0wH/9m7V/S29fAdiBTiUT/lHmha3HmBJ2vUAinAE4fLmOcJe VP8dmSpss8vcCR6GCqsliX3UjYZyTKyytIAA4ZeSDp+2NJho5CEPE3VpwMA7l46pjK8U 7VpR9SpcXHSIw+thDii+7mOBQit9LgPo4Khu7cyYqVZpkEaVlEjVtYhfIicffBROEFWr bPvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714143; x=1722318943; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qzLKMhq/i0ZyAtmvpqGuB9Le2Uf8ZZ76gVE1oOnUGq4=; b=QqyO8YKXvCdQqKJ2PCqVAgjzi1oRBKktb+UlpFI091YdJD7Bbzh5uexQFK/sH5x4gE QRd68egRYlx7XJTAZe8XHNr8JPtFZ1KpteTLZg+fFdV2L7meGBaQT1fyf8Nt9/pg/ACR 0K3eD+shgtd2ZXfDLWDxuqR4YjygidKS0OCDQWt/AjwWuzPX8/CCNvenAPYoY4a0Zd59 bNYnW3iGA/16XUcwpnhMbrgxcVG4SPv9ZAoAkPtowTlREELTNJo3A/cl51729m6WU369 W2c9UlA+QQI5ai8UmdRe5liaIMol2cK2E0AVmpIi+JXTX2D5zDw2ZkHTA12lzZXg69li SVnQ== X-Forwarded-Encrypted: i=1; AJvYcCWiLaPKrJG2y+88/9yQ0an9cCM+cadlMuAm/FsDFWIarJlxDIQt0yVdKetcKt8ZWU5jJLQJV2eV+qF7Pwew7W4wWEr+EARLYjkqI5Op0qJp X-Gm-Message-State: AOJu0YzSHECPGikSE3phE36d3K3Pn7W84B7UP45r0BgO9RBbIawCX3TG 0tzQ0HcGgCGyvyJx2X6/cBR5oQicmc8PXMPPGa2VA4rVXfw2TfeljDbYjQua X-Google-Smtp-Source: AGHT+IFEi9tn+WpGvX1s5XPxycwhrDJbDW+r35u/w7uuzaRmvB6yOSQmoFJGpNgvKL+njogBevZYFw== X-Received: by 2002:a17:903:234b:b0:1f6:f298:e50 with SMTP id d9443c01a7336-1fd74682b41mr58418855ad.58.1721714142976; Mon, 22 Jul 2024 22:55:42 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:42 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 06/19] selftests/bpf: Drop unneeded include in flow_dissector.c Date: Mon, 22 Jul 2024 22:54:33 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Test prog flow_dissector.c includes glibc extension '' and fails to build for non-glibc (i.e. musl) systems. However, the header is actually not needed, so remove it to allow more portable compilation. Fixes: 0905beec9f52 ("selftests/bpf: run flow dissector tests in skb-less mode") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c index 9e5f38739104..9625e6d21791 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include #include -#include #include #include From patchwork Tue Jul 23 05:54:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814083 Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) (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 A5F63367; Tue, 23 Jul 2024 05:55:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714150; cv=none; b=FIugZ+aONrq1ofJsG9M+tnUrv6vLvZ/wwPXe7Qm7UqaDrCPStXXkaclTG6vkAxYXuEm4IhyWMn4VoWYhsNYJONvzU41VlhgKGYU4Mf7XL9iujj4s1PuiUVpNAVMs5Ko0roUkV4LXQcT4HDuabr1uWofgAT00I7fiI0Ejgaxo/DE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714150; c=relaxed/simple; bh=2ssllKaNronxEnB4vH8yEfLpTO61CTJZ1bgpHM3sayk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qu64fJcWfaRiTO5kepGLuA/9BOrgEeMsmoSDLTe14VCWtp64enUVSFwTUXFz9PhcEL4DU6dyv7mb5DhqHTNxjn8eZFHga8IjlZWYKfw9v+gTf0CQk7G6KLw71HXwKda/OQhTDPFXnzYFy22Ljg+YV4y/qQsBGc4VtoT4N6ef9LE= 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=lyTUeAP0; arc=none smtp.client-ip=209.85.215.174 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="lyTUeAP0" Received: by mail-pg1-f174.google.com with SMTP id 41be03b00d2f7-79b530ba612so2696105a12.2; Mon, 22 Jul 2024 22:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714148; x=1722318948; 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=8mRv7fxGm8wGDSLiyp9Dtkgu4XAwa13vX4fcz6gE0zE=; b=lyTUeAP0mjrC7uPOS9Oo5YL7WYizmqquF7omZ7wUETpo4fvJC+O3GQZBgo0mQhGdqS koJa/uNfS5v/hQv1nsYF6tV0ZiI0G0AJs9YdUcq10Tub+wUhGGgb7UJ46zaIaeVmxbgj nZM68bULxHtQvHOCqOJlLHeprEMpGKG77ApyqFqGAx1bPN5sLfOA+0Sb0JX8bxnaOMTw BN+j0iiJiKhyuI7qUj9G4KErkx3/72evoRjVPVipDiO80iLISmtAHKhQ/wxNY8An0YqY Oi4Qd4sQQ5w3Ckr3AQiV8H3+w17L42xwfn9lCogs1wbckT1Cf8jVYnSbe3aa4N8pkcaF 4DCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714148; x=1722318948; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8mRv7fxGm8wGDSLiyp9Dtkgu4XAwa13vX4fcz6gE0zE=; b=WuXO1OWoj9jazJWNwbjAbLlCAP6rc3IHERmWmoH91NV/yZz7YzhEDzMntmtqPeRk7I bjv3Yjjy3yErB3SExgYXUtiYIh4oOoEOcSOhTggTAHqNVILddSmC6U4O3RnkiR0h0W8n enjdnLcZn25HqlJ6Y15N5eZ5X1aHBePhjV3Ue3PVEr+XiurkuI1rPxurJBbvtJXyQZt9 +QVgXHMGpAcQyQ2UOOlhMjtIbw49tHSj8XjBFBYxbts1YoWs7tWZVreyGi1g8XgD2CFU eEQvAQnP0iJTutQXkM2DtOuqGwZZBqK0fg7fQTaUyU6zLtQ/4jqJfFVCGhWbtGu5B0vm GXQw== X-Forwarded-Encrypted: i=1; AJvYcCXkjjLexLX29naDHxYWSWRo7/QaiI5po/BCDb9HYfFw6m8rj3+oOUl4tCPp8a6NMEwheoHhbRJnbOwk8vfEL1qxcb+vknqOcJMoYmf3HNSZ X-Gm-Message-State: AOJu0YxtUwol++rESWve9PVoQBtSFoWImjF5HBGI+t0qUdr9WmmU9NKQ +OqQgOL4h1JN3vxeLxC25AdDl3LBhOFF09/UsuRxiSTKWgtTzoZADA77RpqM X-Google-Smtp-Source: AGHT+IG2S8c7/eMss/LSzkOz87mSAGlZD/oxADnlBRju4cY9AXwPSj4cmDsB7hN2rwmE7jCr3epcYw== X-Received: by 2002:a05:6a20:72aa:b0:1c0:f080:ed51 with SMTP id adf61e73a8af0-1c42285defcmr9651578637.2.1721714147871; Mon, 22 Jul 2024 22:55:47 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:47 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 08/19] selftests/bpf: Fix missing UINT_MAX definitions in benchmarks Date: Mon, 22 Jul 2024 22:54:35 -0700 Message-Id: <8f64a9d9fcff40a7fca090a65a68a9b62a468e16.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Include in 'bench.h' to provide a UINT_MAX definition and avoid multiple compile errors against mips64el/musl-libc like: benchs/bench_local_storage.c: In function 'parse_arg': benchs/bench_local_storage.c:40:38: error: 'UINT_MAX' undeclared (first use in this function) 40 | if (ret < 1 || ret > UINT_MAX) { | ^~~~~~~~ benchs/bench_local_storage.c:11:1: note: 'UINT_MAX' is defined in header ''; did you forget to '#include '? 10 | #include +++ |+#include 11 | seen with bench_local_storage.c, bench_local_storage_rcu_tasks_trace.c, and bench_bpf_hashmap_lookup.c. Fixes: 73087489250d ("selftests/bpf: Add benchmark for local_storage get") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/bench.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/bench.h b/tools/testing/selftests/bpf/bench.h index 68180d8f8558..005c401b3e22 100644 --- a/tools/testing/selftests/bpf/bench.h +++ b/tools/testing/selftests/bpf/bench.h @@ -10,6 +10,7 @@ #include #include #include +#include struct cpu_set { bool *cpus; From patchwork Tue Jul 23 05:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814082 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 CFAF013D62A; Tue, 23 Jul 2024 05:55:52 +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=1721714154; cv=none; b=SdOKXB1K79fBduutLIDXT1KEDLjgXMP2egikJRw1Cos/1dml0vmpF0TAzZsWteLLrW2zIPwIxaWdTAo9TpVSWTJERX8qa0eJOTU3txXWSE0LIfKkPm7DprRsYMkCgx0UpBpvn6ydJravlFuHzro4MOEI8MrQ/vy6DXG22ceYoqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714154; c=relaxed/simple; bh=eRuII98XViD/0dSwBICuaSw1bvM26bbH0s8DROk7gjA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EK/QqGFHqUiZ8s4jgvv96gro5bFt3jmmYhiKIeejVpvcIRPDRgyKT0upmm9mxa+gz9ZUPlz6Rpk71gS3Ijt60GHWsJQetyM6VRo3lVBwy1x+H8pQJj7HfiUTLzVfgDZg44x7dkoquUBq/znKYVMOb3dDh9V7tq/3b/PtmImhYsU= 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=IL4kaT/3; 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="IL4kaT/3" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1fa9ecfb321so2814675ad.0; Mon, 22 Jul 2024 22:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714152; x=1722318952; 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=AL4DPYZgYlDk/NnjGykoigyFpJLr7PWYohg34iZoO9Y=; b=IL4kaT/3klHGnH7sveMkli7wqLvV0WuDjL4eCrPzROtphlSe+izAYDERHOVLn/0djf Mdn6PFlVHCHFq0rCMjWqtN52Z+AY9TK9VVdBipONZKvo1R1zctZWNJjleLU6Hv0XtqU/ XOOTd/nimYsoRsx93H3DGeXlhjj+j4ugD/jUj2DeClJIBxKxsveSv5YdvEQ41VJtlkun HJjAB5j9WO2e2ZvjcGpdmBhMlL3Uu+NukH1F9KKqdojoAV2FW5w8XCWGGWv4s5yDbmAK 4nmJ2rVfdCx1ioK2tCz/RL4PeNqkja/3dIImNafTNCGkM+BdBSf77Kk6SC4347V+R1pd AJVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714152; x=1722318952; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AL4DPYZgYlDk/NnjGykoigyFpJLr7PWYohg34iZoO9Y=; b=cvx99fgR5uYXJQMbmmuGCD9yoU6b5BrdrL1fm4RkFG7YE+KGclOb86EXJSoq6HtOzX wxEDKHp9HuNHr+UKuPaouEZrq4fbILLM/QA3O3Oc339L1sH1toDrIbiA5R+tbmFeisyd X0sPV1vFAUAtBN6MvyteHO6IWILeEyvcOCq4yDvlwlIeb+XsApXCgF9nOCkZB/D920nG GKPNKvLojBrkVhruya5p1KCRpyrl8Kq0ozQ/OaKzR9arLt/oO8wB1MaH3hyxzGc6liuh Awu8hW/fsxbXdC5ivOpWA/wMwU5dvLdUnP0vf2K2HOzveavYz398xBREyRSuKmGgOluS FQnw== X-Forwarded-Encrypted: i=1; AJvYcCX9xlWbcP6k4Sgfthhh9AtZSqL+00/jrW9u00Y9lBDHMI+1eI3knvDEWSb0mTlSYJ4+RMGjjJHqKNWiA0Qk/Kpp7sS2Thi1Lfu7/++szOza X-Gm-Message-State: AOJu0Yyx1J53K/uNMTullRd1eCiBtiTHJmQVK+QxOnZAOXRl/LAFxPNC /tKjDmdoUpez1MEtaU+SJuljDZ+oo9I7KOI/Ks9Etdo2Mqp8KDHovXH5hk+m X-Google-Smtp-Source: AGHT+IFJXgCrXg14DOLfGGc9zK9VKdvI9JTGxiNO2X/ubUh2bDZA5w+vUJgLgjDVFvWSqyGmTMUkZA== X-Received: by 2002:a17:902:c1c4:b0:1fb:58b8:2fbb with SMTP id d9443c01a7336-1fdb5ed65f8mr14409625ad.31.1721714151931; Mon, 22 Jul 2024 22:55:51 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:51 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 10/19] selftests/bpf: Fix include of Date: Mon, 22 Jul 2024 22:54:37 -0700 Message-Id: <8bdc869749177b575025bf69600a4ce591822609.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update ns_current_pid_tgid.c to use '#include ' and avoid compile error against mips64el/musl libc: In file included from .../prog_tests/ns_current_pid_tgid.c:14: .../include/sys/fcntl.h:1:2: error: #warning redirecting incorrect #include to [-Werror=cpp] 1 | #warning redirecting incorrect #include to | ^~~~~~~ cc1: all warnings being treated as errors Fixes: 09c02d553c49 ("bpf, selftests: Fold test_current_pid_tgid_new_ns into test_progs.") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c index e72d75d6baa7..c29787e092d6 100644 --- a/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c +++ b/tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include "network_helpers.h" #define STACK_SIZE (1024 * 1024) From patchwork Tue Jul 23 05:54:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814081 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 29FE713C8F6; Tue, 23 Jul 2024 05:55:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714159; cv=none; b=jFfz8qDVRzjs/4FNUAtsARFCG1WTUg2V8HCBP8bKPcPmnh6jSVQ4FUTJRjUQ7GJ3PMPlmAjsb7sgONHG/uqo2E6epuxYnToT3u2FHWfb5O0NSdeBwx6kfJ+snhiZsHYT+ykeQYtgLL9R5Pvwz3JFtSDWhkirhcZa/msQ6L0BwOY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714159; c=relaxed/simple; bh=EW2DH4rw9P1hXyVvvpPlJUkXeYjfh/hVonUvD+qOedc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pDRDsWqmR7dC2vJE1YmyY8f+ODxXPPUWrEOx78wKfWG+1DOa3Voprst5x8Y1vMSqZLGhCaeyB2KPdTw+p59+8GqdL8RrrXVwWFxxoLr7osgelcr31QKk0cO2GfJWO7eq2nz2s2b+gPjAwscF/bmDpM4/9H8IHPnN3e77rHWKspE= 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=m+dY1tq0; arc=none smtp.client-ip=209.85.214.174 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="m+dY1tq0" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1fd78c165eeso22262105ad.2; Mon, 22 Jul 2024 22:55:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714156; x=1722318956; 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=YirOn/8mFg8+FfZ2hOYhsi5cWrkxZXezo6GXBJXTZ74=; b=m+dY1tq09ZXNbFAOWt6ErtqyHuzvoA2guvRQVvJ66/U3qJc2uxumXeIek6LPLqBs1I BxniZzgQt4+zjfibgMK5nbBoNFWh6INymRWvx+gs9NYMSLL3P73d6lFVQ0i1vDvlvECN KuYWeaQY+cyheYgSqqJvTYhKF/eonqY41hCVwyP/hXmdLmReH80QjWLFNtBcFatwHmZ4 8tm/yEwYgliEeT1u1U5Sj0vSwxNWhlJZK/uACu/oiRVgVi9FykrkO9MuuUEYRAWuMA3c fNfMWNbfjPkchLbnBNEsr2qVv1F4XcDFjbV7m9Qi6uhzcPB6BYqy5PoZszxbvk0nxZ8x Ot4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714156; x=1722318956; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YirOn/8mFg8+FfZ2hOYhsi5cWrkxZXezo6GXBJXTZ74=; b=j01RoLkG8I9nzVdEEZyGhTuSsKTLjLRbuXWrL717EbcMwxL/ZHrocZEEcQzw52qiWH bSGqdG+LUnTIVBMTwT0TxiM73FW11LPvIQCBbVmMBtrZN1yqe+C+YYCGCXxZouCXiH/t MF6U6TYPF25mQVld1494UIaYfXqI2mv6QPClzcLMVf73zmw/gdkvIR38wEAHxP2m62Oj kUzW/sRR/Tgo+on7r4QV8FBpUr76N/0DDQ2pGWuDLRNY2jytS6cmJRzail7zKe3ILM+n ABCeRjdYQtj+9orodUHbntJWdIrFc0lcao6/UDTxCye1OiqTpTiDwjCJCQ3w9eCnfgjF RR0g== X-Forwarded-Encrypted: i=1; AJvYcCXjftLHJs49bP+Rf4zYkU5bnx7NVVNZ/LywCSUKCV6o2HvWvglBLvvnzQ53j7XjbwpyxOXRZpMJJCTnSbJaRxFiQWQwTL4uq8G64nmYYZIq X-Gm-Message-State: AOJu0YwAY1jLEt6gTL9VxE+Ex5pO4MocmDYeLdu6nDsPTmi99WqGK3Qb vscZZi+oFFXdNERDyx4BvjiSb9xOs2DLcdmwOjWis6DvsO68igwZ8IcuQMUM X-Google-Smtp-Source: AGHT+IF/wOchNpLDLP7DZxvjifw6FX4fgfsE+7tuSFDwBofr+9g2xk0Zi0ykAaKXdiAJ+uaQq74zwA== X-Received: by 2002:a17:903:2444:b0:1fc:a869:7fb7 with SMTP id d9443c01a7336-1fd746230d6mr82224645ad.54.1721714155963; Mon, 22 Jul 2024 22:55:55 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:55 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 12/19] selftests/bpf: Fix compiling kfree_skb.c with musl-libc Date: Mon, 22 Jul 2024 22:54:39 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The GNU version of 'struct tcphdr' with member 'doff' is not exposed by musl headers unless _GNU_SOURCE is defined. Add this definition to fix errors seen compiling for mips64el/musl-libc: In file included from kfree_skb.c:2: kfree_skb.c: In function 'on_sample': kfree_skb.c:45:30: error: 'struct tcphdr' has no member named 'doff' 45 | if (CHECK(pkt_v6->tcp.doff != 5, "check_tcp", | ^ Fixes: 580d656d80cf ("selftests/bpf: Add kfree_skb raw_tp test") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/kfree_skb.c b/tools/testing/selftests/bpf/prog_tests/kfree_skb.c index c07991544a78..34f8822fd221 100644 --- a/tools/testing/selftests/bpf/prog_tests/kfree_skb.c +++ b/tools/testing/selftests/bpf/prog_tests/kfree_skb.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE #include #include #include "kfree_skb.skel.h" From patchwork Tue Jul 23 05:54:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814080 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 0CD9E13D538; Tue, 23 Jul 2024 05:56:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714162; cv=none; b=X50wb65i3p+YNA3qL/jDe7Qt/JeKJIbw/VylJcygbZ5G3f5ulqMwlJ6OqzJvMnG4jdQPpb7CwqSy3yYQn4GDkPHcCF1V/awzvvGNRJqn9vX0BGpXPEefWLOZWsYYlbqvIKd3KR14/kqdt5x3qalK50ep2ErvG9f5OnX0W3UC/b4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714162; c=relaxed/simple; bh=DCYr8+TNLq880CaFvxJA3qBBgZNRmV5ZkEVnxPOYp0s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f1iWul1HRRYFc4OywSKkCdtSymu5t5WraxFOy4RgEalzLaiyl6IJnHlHSEYX04kI2NYCsRDnOWkPZxFeszY4mD/zsVZTJiB/ecVPGRbXp8BzQp3LFZry5Z8uSIiqBG/YfE/4WeTqeFW55+ajGbG0tbNueidblQEPJWsR5Xr3fCM= 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=gqqaTRbl; arc=none smtp.client-ip=209.85.215.179 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="gqqaTRbl" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-6e7b121be30so197956a12.1; Mon, 22 Jul 2024 22:56:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714160; x=1722318960; 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=CG0y/r8wSyWzN+dbWbXqoKJWdEZ0lVRyZSwfEfFYx+U=; b=gqqaTRblCfRx8SXaphPiu3jn8dylghFXlAxL3Iv/H01T9Opayf6bLjC+6o1nQ+nEFI FQpaxh2qachQg9oDFdckJuXlacdgN8aIN0JQcmqVkkexERi/e2nwIORsBh4PJZ0sx1Dl hmHRqDbYv1E18drIzpOjv/BMyU17nxUZXCH7M9u/3BN04JKvkWjQDjXGe46zo0AdsyD2 2sCOF9UiWm6/KE65+T4GW/+x5YZ1XLiVKBl4SfVoO2mnOF2kO8t2ToSOdPTAhu+9sS9A xKBTgZhMMoMKdqMIUuSgI3oPunadP6Hd0PJVdKqOek04w1toom3ZO4+8w1eCs1yfa+hX MT0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714160; x=1722318960; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CG0y/r8wSyWzN+dbWbXqoKJWdEZ0lVRyZSwfEfFYx+U=; b=VngQpo+Qfmoyp38qqOWj9Xgq+KOhA8OcTte+QL10+n7d+oJhciI9aN0/3s43vH55Ss 0eD0cP7KNlOQeb0/OUHO67R+hTbGoeKKdpLBYo8x4aAL1pnbxJfVKz48gO/LWyEAtRAF P9lFmz4mh5UviE5q+dRULlQDR85a40TqbO3LBT41Yfq2jY7Z+DCOvxcBSVX4ShwhOJLU B4yzFRbY4vHr8M8qCpRP29XSW2t+AVEou3B61tPKQlJ8QWst5Fc7tfoVzxVF+TNCzCCL byWu/C0hfr3PJ+1biIcbteMdzL7vL/QL2M17leXpUUBy4jURmaRGggWfQiMEHqecMZ3N 7u6Q== X-Forwarded-Encrypted: i=1; AJvYcCW0HluJ8JX5QwK63AjFDCglbASCZ7X3PAwx5tIzRMFUkdTpTY1UwVKHof2OdHEvePj4Y1eugKJ21XpGA2MVcCMTVudP+XOrfDRhxw746SMH X-Gm-Message-State: AOJu0Yxr28uvd8VnD4t0YIT/RBEfrzJ4lx2sFz8ev5Bh7/2VD++lLbnw r6j7FzPDrBVwibuKIshfqRxTniZL5wK3FEgQ04nJ8TFlXqMK/0OTdZsZTXf6 X-Google-Smtp-Source: AGHT+IECsm7+ewOr3xHp/9+mJUR810Oo7BHaMqWkkiTHb9+LItqvKhSRLUm1vOqr2ZngWAy2Yf06VQ== X-Received: by 2002:a05:6a21:710a:b0:1c2:8d30:accf with SMTP id adf61e73a8af0-1c42858ec27mr6559712637.19.1721714160109; Mon, 22 Jul 2024 22:56:00 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.55.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:55:59 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 14/19] selftests/bpf: Fix compiling tcp_rtt.c with musl-libc Date: Mon, 22 Jul 2024 22:54:41 -0700 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The GNU version of 'struct tcp_info' in 'netinet/tcp.h' is not exposed by musl headers unless _GNU_SOURCE is defined. Add this definition to fix errors seen compiling for mips64el/musl-libc: tcp_rtt.c: In function 'wait_for_ack': tcp_rtt.c:24:25: error: storage size of 'info' isn't known 24 | struct tcp_info info; | ^~~~ tcp_rtt.c:24:25: error: unused variable 'info' [-Werror=unused-variable] cc1: all warnings being treated as errors Fixes: 1f4f80fed217 ("selftests/bpf: test_progs: convert test_tcp_rtt") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c index f2b99d95d916..c38784c1c066 100644 --- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c +++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c @@ -1,4 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 +#define _GNU_SOURCE #include #include "cgroup_helpers.h" #include "network_helpers.h" From patchwork Tue Jul 23 05:54:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814079 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 2BD3C13D538; Tue, 23 Jul 2024 05:56:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714167; cv=none; b=rrJApyCq8aFWG8AdXEgVDcyUPVSADHYulQRNclkXuYFU0FP/RLjyGiPMDJTek7gEtJ4CX+ttzsN7gYiHad7p4f0mQ6zkxdkOcoqdzROV3WalxDxo8B3h6TzeqA0rk51OP869m6Tn2D9OCbCZvqcYJEDlZGgt7CW4F2MoLUCfvkM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714167; c=relaxed/simple; bh=iyYPpn+hXqyZjmPQO9B6qx+fPPrlP1Ik7gugpemYUw0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TSuQ4nmShKJAzghU2pjkzVG6oyetveGear+xavs9vrKOpsJ1mLFSJ3LP/3T6YQf68sgY64HgKAeJFF/mbsp0619L3/YoTBXkjY5wMjBtVeVZ8tgZ679/FvrwgVxcSnCy4MuIKDF8ZO1Ddk5DF7Z+OFVKi8BdCEu6ga64oUf/4lo= 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=iPzwlvAW; arc=none smtp.client-ip=209.85.214.175 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="iPzwlvAW" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1fc5239faebso2168345ad.1; Mon, 22 Jul 2024 22:56:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714165; x=1722318965; 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=y7Poq16VwrjI6K5TQu0XyFE0O+HO7fJqUE55lzfibYQ=; b=iPzwlvAWkYBp/8Zk8zaoDa6MJIvImZI46SyLbsmJqH13DX/ty5BLJXBtuyhd6hzJVf fJPEZ5g9SDkPlY/+o8yOpZpnd/qjLEbBQOEah0seyoRP/C9zC8i9oJyVtJpLT30FpgNU IxVuKGia+SlvusxqISTo8UHRP7CetOytwTbfv19uGkxWy5Ssb6HIpaRDlPZsXmUJV42c oyiHEyvi3fwrL6dlfmipjI0xJMq7BPoj+4XSREAqSG4mgzAmngNrL+8IXliaYf22mYBL IizNbIKcu5D+D/A6b//bEZopKNRXyswAMI9oCL5y4GPWhFfkBJV5/yqwTWxEBeE43Cr4 dqfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714165; x=1722318965; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y7Poq16VwrjI6K5TQu0XyFE0O+HO7fJqUE55lzfibYQ=; b=bSuuLMKKb69ME/bw8trg7jkSckqj6aDBKhOd4RalkdAtRZGbQc+6ZMaNRo9XjPyaHQ GcFah2EhLXeGEVq5t1boBK0ys3M9CyFppocRQmy7zzoeMePALj6v+h+VjcLjBmFpIeZb F5uq2glYaLM2DD2modJ9T5IECAH5c5BvmMCeGUaZScGYeYhXzazQjyYzqwgkwHf9MDSS khEeTVuhfdADFe4jwPFHFioRmPTpeR2t5u5Im6UEQW8db6pkM1YA6UKzuZpcdyPy9TKo OYmrroMJFtqtTZ94shNSLDJmUqWBvAZfKQT+ZCpO4ZOD908WKMgNO88vqNMb+2aIEHUe Hm7Q== X-Forwarded-Encrypted: i=1; AJvYcCU2v3k/7hnzeKwXGcbiXo58XuMoyTYIy28jYaAJsFG+wZaEQSBMzuXmHmwpooYFyVenNadhd47h6u30AJxxDHGCOvRFXncxHV8MhWSSj30Z X-Gm-Message-State: AOJu0YxBr8/fiHc8jx2Ee1R/Szrzg3pW37dBPui2pnSMNin8P5dNyRS2 mp4N5iIh1M1az/J+siOKyXkyZ5ABs5/GiDIgX2nNYI6VaZDBux5tE3Hot9j0 X-Google-Smtp-Source: AGHT+IHX8nDGUYAR1rrFPblUOqoY6qc03OpITbzbp6hgcUAkvpDy51TQ2F6RLswuRwt2fqOMih3QLw== X-Received: by 2002:a17:903:22cb:b0:1fa:a89:fd1a with SMTP id d9443c01a7336-1fd7452553dmr65970615ad.10.1721714164941; Mon, 22 Jul 2024 22:56:04 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:56:04 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 16/19] selftests/bpf: Fix errors compiling lwt_redirect.c with musl libc Date: Mon, 22 Jul 2024 22:54:43 -0700 Message-Id: <3869dda876d5206d2f8d4dd67331c739ceb0c7f8.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove a redundant include of '' which is already provided in 'lwt_helpers.h'. This avoids errors seen compiling for mips64el/musl-libc: In file included from .../arpa/inet.h:9, from lwt_redirect.c:51: .../netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ In file included from .../linux/icmp.h:24, from lwt_redirect.c:50: .../linux/in6.h:33:8: note: originally defined here 33 | struct in6_addr { | ^~~~~~~~ .../netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' 34 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../linux/in6.h:50:8: note: originally defined here 50 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' 42 | struct ipv6_mreq { | ^~~~~~~~~ .../linux/in6.h:60:8: note: originally defined here 60 | struct ipv6_mreq { | ^~~~~~~~~ Fixes: 43a7c3ef8a15 ("selftests/bpf: Add lwt_xmit tests for BPF_REDIRECT") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/lwt_redirect.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c index 835a1d756c16..b6e8d822e8e9 100644 --- a/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c +++ b/tools/testing/selftests/bpf/prog_tests/lwt_redirect.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include From patchwork Tue Jul 23 05:54:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 814078 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 F18CB13DDA7; Tue, 23 Jul 2024 05:56:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714171; cv=none; b=b3nBaBXwS8wsMFAU3Himebn630wGiAWriviRDy0MRKHlTZYkv/aa0HFLgJEyHC5vlk3Bp91+JmkzTlMlPu3dy2SwWKXaG2wnumtfKugxcBWdup4PO0uI+OemGqxaStGLpYC/LCLEAL1uccpINfR5X6nV7H60si+0qHYx/0sd9uo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721714171; c=relaxed/simple; bh=WBsVU5zJpQlgvjybeJEYrGnhmGHPlAyn499bj+m9Ha0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uYuI7oz/snAl5IqaS0rxw5Y/oKh3swJMjysE1+X9MoNMAKoEMkgE31RhE2iKKCRlouX3JC+v3f3OGDs6ai6INC1R3y/MmOclC7+G1WCD19vk/tWaYMPH1GPsljUhioei9/4j0HuSbGMS9JXDn5NHsZ0rWpKGkWapkJNksi390HI= 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=S+Ir9Ish; arc=none smtp.client-ip=209.85.214.172 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="S+Ir9Ish" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1fc569440e1so3180115ad.3; Mon, 22 Jul 2024 22:56:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721714169; x=1722318969; 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=RpPAliQNuZr1whRpDRhhXvNGzN+MtzAqRLS/eXyE1Xo=; b=S+Ir9IshfQT45rSVqciXVcmn5UMHYNfE2M6Fvlvfgs0BotTZudoJRnEY0zSeVwVYsV mvLy2daxU48/4TZfLR5gJFT/rj6HOOwuo7FKSRJX0ZnoFjwDt60H0MAI/kd6l2iESvEi pxO1JzHQwxXUrqZxDUIS4pkqRQ+syNKwRwViC2sSL5x5mk81VR2mGHcGa6bIYLrLlgbh FvPnj7RjjS5Scsyj7k+fmEJnzcLXXYVz4udrDdHlnCtckGuo8JsYY3PGcNRyZTWYStnP kQVZTpkIlQCEpUNa2GH/VF7i6aoXQdOCXSlDzVmpT/c6zCrPzN2NiBe/A49qfFtTYPmr JOfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721714169; x=1722318969; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RpPAliQNuZr1whRpDRhhXvNGzN+MtzAqRLS/eXyE1Xo=; b=gAxZKRFQ1n8zWBHlbhySp5gBLHLwW+L8o9QhAQ+pAF6VLlXmJsxJexXiRIJrxLshq1 xMlj4zA3ZxULlWvJeygYUg3RvuaTywZWE5IFsaOYAjbnVdBYomTJCQPKvsLUZvaqSxO3 R00j7vqrDjGjHa/zgfW0lDc+TZcUZqZ0wfM0YwdvOVaTppH+PSBEryrKz5iQv9CVExQu rKEhIWvMDKtNjLLxxiG97tOw7WwUPUKOZO9RuwDiaMnwKR23oP+Ulj08hsTZulOXzPsu /T//q7/VAOBzW0Bpozel3dJH8qnt6poCpE/WMjhQrdjyglLfA76T44psGMnoD05ASa1V sfyA== X-Forwarded-Encrypted: i=1; AJvYcCU7qykYcEwEhWp7rH5yQQBWVFjMSK08eFhAkyofg5YAapad7SAqECC1i0F/Wm+LwA75vrVc97E9QRqgIbxRukmPLXKu+A+5MEuS9zu/qE2x X-Gm-Message-State: AOJu0Yz0ykZwuu/FmvVoZrLGX0S/gQX+EX/20YDATFp7C9JBF1syd9Yx M9y3vVboTMIZD/X+OcH2lPkGmiFKDqrxpj1cyuwq1lF0XsgGNZHMhUKSYns7 X-Google-Smtp-Source: AGHT+IF9gLd25SGmUc4FjhG/nOQ4IRMZUktMmGUNeBrI95K/yTIJCzQ+KeSH1c6kWzJMTnYjlqn61Q== X-Received: by 2002:a17:903:244a:b0:1fb:7b01:7980 with SMTP id d9443c01a7336-1fdb5e6bd61mr20796225ad.0.1721714169229; Mon, 22 Jul 2024 22:56:09 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fd6f469df5sm65724685ad.254.2024.07.22.22.56.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jul 2024 22:56:09 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Yucong Sun , Eric Dumazet , Kuniyuki Iwashima , Jakub Sitnicki , Dave Marchevsky , David Vernet , Carlos Neira , Joanne Koong , Petar Penkov , Willem de Bruijn , Yan Zhai , Vadim Fedorenko , YiFei Zhu Subject: [PATCH bpf-next v1 18/19] selftests/bpf: Fix errors compiling crypto_sanity.c with musl libc Date: Mon, 22 Jul 2024 22:54:45 -0700 Message-Id: <911293968f424ad7b462d8805aeb3baee8f4985b.1721713597.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Remove a redundant include of '', whose needed definitions are already provided by 'test_progs.h'. This avoids errors seen compiling for mips64el/musl-libc: In file included from .../arpa/inet.h:9, from ./test_progs.h:17, from prog_tests/crypto_sanity.c:10: .../netinet/in.h:23:8: error: redefinition of 'struct in6_addr' 23 | struct in6_addr { | ^~~~~~~~ In file included from crypto_sanity.c:7: .../linux/in6.h:33:8: note: originally defined here 33 | struct in6_addr { | ^~~~~~~~ .../netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' 34 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../linux/in6.h:50:8: note: originally defined here 50 | struct sockaddr_in6 { | ^~~~~~~~~~~~ .../netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' 42 | struct ipv6_mreq { | ^~~~~~~~~ .../linux/in6.h:60:8: note: originally defined here 60 | struct ipv6_mreq { | ^~~~~~~~~ Fixes: 91541ab192fc ("selftests: bpf: crypto skcipher algo selftests") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/prog_tests/crypto_sanity.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c b/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c index b1a3a49a822a..42bd07f7218d 100644 --- a/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c +++ b/tools/testing/selftests/bpf/prog_tests/crypto_sanity.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include "test_progs.h"