From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 2F9B1351C0D for ; Wed, 29 Apr 2026 14:34:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777473282; cv=none; b=CR7IXtzFqrWgj2bxnEO6nN7s8/qNFYtZ7WJpXLcn6SvudZymHabKikYUeiml6FYp6Cj4rjy0ecMHQy8UU/mq02TdkA697n9kIQT9eZ2ulX+4KWoOkPPoEVQ0MvTpQyBTh2cJZy1d84W8TzQo1/tlEBS278egPxTzpzwx9thHl00= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777473282; c=relaxed/simple; bh=P1kmeBBxz6oLlrcr3TGMtgJ39fvP2CkFwTpn0Vo40DI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fFD+bmjpmF0hqUkR3uEEweiJac5zmo8qvlv0Bu0WqAdWT2x1wy5YMV2FPqF/PKq7/g7Kfb19D+R6ecAChLU66N5Y31FLGEB4bQRSLrzhok9w1+8dP14RRLppOzbsL9982JJe352tUjTPkZjehVtiUUhOUG6WvhvqVR515AiD3W8= 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=XnJvhO5B; arc=none smtp.client-ip=209.85.128.41 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="XnJvhO5B" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4852a9c6309so114745855e9.0 for ; Wed, 29 Apr 2026 07:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1777473279; x=1778078079; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=gzn0A233UxptBOFA9FIvgdlvl14jtwnlOOk9eQvvLMU=; b=XnJvhO5B1lUnINDyhfj9GqG0kU/o2NlQX0TfHJOHprZ2OZNuAKQJJ0pVJYwTlLk/Ge ILlexkEPCWxfA0lcGOtMXGqtIgMZ52OilawzJnMrZvk/3JM342QbVo9lifb2SPEG693Z Z36HkshPSLlvM8oymr+LeiusJGjt2WOzeo+Uhvesyr35JoHdBh2+hJyUzqK7UNorygx0 Jr7g7YwdiBr7CrlMef+sKGOMKjvM/2Q2CcoHbr9OZVMZpH+Jpe7EfaEC8leqNfW1ygPL Ovhth4+EMGkZ6lmAKgiUui8aE/7RIZzL2BMWxlUAChcE3qwzGxEWyyz15N2k3Rsd+7iu boAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777473279; x=1778078079; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gzn0A233UxptBOFA9FIvgdlvl14jtwnlOOk9eQvvLMU=; b=IbGpRjakgWwlvti+UqVF8PMRNdfcSz2NZ9HG6E9U2lI4pH5swUA1nGS6+lEtlzgvk6 d5Dkc07aHAxlPaytbxEPJyvviba6pNlYhro9eTvNIhC/1jJYCuz40rT2Wh2QohgWW63y +PRMgJS7ChOSuhf7AGgjdrrh+TxegFBWUH4v1e5lNBNA3AI9ObOE1XYzKax7IqotwGtB tTUyMcMtDAspBcdLtRdHJVfoZ3vUaYMkixxa9Ub1AP2TTffVl5lSDEKH1CG/3gY2pf+q N1Qi2hhg+3hDcmKyxDMZTD8TgyqGE90Q+p5tzQ0SVtbNvR6IFtVg6j8p/PyCR8hKqH6H CAjg== X-Forwarded-Encrypted: i=1; AFNElJ/es5xbOf9tNrSCb7WbFkB4IkfMlgvhFVYDEIH+ySepsUECAaFdZg7h5VMAQ4jZG0zRiZLN+VJq5mwttMQ=@vger.kernel.org X-Gm-Message-State: AOJu0YzHMIc8rv0E2MZZjvobfVgbHG37MyGAxkFbWbgVILPF+I9fII+9 DdhEIDVxPqz3IlF8l0VxpmKtTyFu8JdGvSjzZ5yNJp5jmxgSIkXtVGvkRfQ7euHQS1RhSanjQnY gJrXkCIM= X-Gm-Gg: AeBDieu8s6/22Svsp4S8P4T+KuvU6VJ4Bf2KS6pro9S8+eHVOBKSH9XDhOK4Ie7URb+ Pj9sgHMEHNfGjlnAcuZUTFn098SUa0JlLbH3pKL2iA2kdxP9ZWhIb90f1nZF27E3lFtoZnmdm2+ BaOxUrZfisB8Xj5sJCbslQO1g7AsvXXXibI/MLVl6vZCTf9MMah3CGMv3aYP3iN+HLHlBKZIZFu //hHL1TZEYrvVN3rlNlLCygL8RyBhqcuwZewA0vD+/s7XHGyA65YBXCQ/BPCfK47baf1Ff7u3Jx OOLrMX8yHEOlHsn2XmmKOYiEIJIihuESNQRtt3PywPe2XhrW4rqk6N8yHMs2QuDOuUe9ccsoXYJ qNN7IMbwSX/mF4Y2Ga1ZBMJO6bO8Nm8T883FYI7YWBN7fMMBb69hB+u5ptJwS3cH1Jh/Iviffgj 1lgtVBTrJ/0WHzAa6N9aRyuLqG X-Received: by 2002:a05:600c:a315:b0:485:ae14:8191 with SMTP id 5b1f17b1804b1-48a77af3e1bmr89089225e9.5.1777473279194; Wed, 29 Apr 2026 07:34:39 -0700 (PDT) Received: from localhost ([2804:7f0:b765:105d:ce28:aaff:fe86:149c]) by smtp.gmail.com with ESMTPSA id 71dfb90a1353d-573b6bbace7sm1225062e0c.5.2026.04.29.07.34.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Apr 2026 07:34:38 -0700 (PDT) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Wed, 29 Apr 2026 11:33:52 -0300 Subject: [PATCH bpf-next v9 10/11] selftests/bpf: Provide weak definitions for cross-test functions 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: 8bit Message-Id: <20260429-selftests-bpf_misconfig-v9-10-c311f06b4791@suse.com> References: <20260429-selftests-bpf_misconfig-v9-0-c311f06b4791@suse.com> In-Reply-To: <20260429-selftests-bpf_misconfig-v9-0-c311f06b4791@suse.com> To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, Alan Maguire , "Ricardo B. Marliere" X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openssh-sha256; t=1777473237; l=5203; i=rbm@suse.com; h=from:subject:message-id; bh=P1kmeBBxz6oLlrcr3TGMtgJ39fvP2CkFwTpn0Vo40DI=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QA1luf9LI1pFBWCJfQKemsD66feofwmQVmFsvvd6r8/8TrTb5z+2GlnP2XaRKBkpj8E7Gx00e/A gIUUIg8AjpAM= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g Some test files reference functions defined in other translation units that may not be compiled when skeletons are missing. Replace forward declarations of uprobe_multi_func_{1,2,3}() with weak no-op stubs so the linker resolves them regardless of which objects are present. Move stack_mprotect() from test_lsm.c into testing_helpers.c so it is always available. The previous weak-stub approach returned 0, which would cause callers expecting -1/EPERM to fail their assertions deterministically. Having the real implementation in a shared utility avoids this problem entirely. Signed-off-by: Ricardo B. Marlière --- .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 17 +++++++++++------ tools/testing/selftests/bpf/prog_tests/iters.c | 2 -- tools/testing/selftests/bpf/prog_tests/test_lsm.c | 22 ---------------------- tools/testing/selftests/bpf/testing_helpers.c | 17 +++++++++++++++++ tools/testing/selftests/bpf/testing_helpers.h | 1 + 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c index 35adc3f6d443..5a864cd8ad1b 100644 --- a/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c +++ b/tools/testing/selftests/bpf/prog_tests/bpf_cookie.c @@ -252,10 +252,17 @@ static void kprobe_multi_attach_api_subtest(void) kprobe_multi__destroy(skel); } -/* defined in prog_tests/uprobe_multi_test.c */ -void uprobe_multi_func_1(void); -void uprobe_multi_func_2(void); -void uprobe_multi_func_3(void); +/* + * Weak uprobe target stubs. noinline is required because + * uprobe_multi_test_run() takes their addresses to configure the BPF + * program's attachment points; an inlined function has no stable + * address in the binary to probe. The strong definitions in + * uprobe_multi_test.c take precedence when that translation unit is + * linked. + */ +noinline __weak void uprobe_multi_func_1(void) {} +noinline __weak void uprobe_multi_func_2(void) {} +noinline __weak void uprobe_multi_func_3(void) {} static void uprobe_multi_test_run(struct uprobe_multi *skel) { @@ -574,8 +581,6 @@ static void tracing_subtest(struct test_bpf_cookie *skel) close(fmod_ret_fd); } -int stack_mprotect(void); - static void lsm_subtest(struct test_bpf_cookie *skel) { __u64 cookie; diff --git a/tools/testing/selftests/bpf/prog_tests/iters.c b/tools/testing/selftests/bpf/prog_tests/iters.c index a539980a2fbe..c0b6082f345a 100644 --- a/tools/testing/selftests/bpf/prog_tests/iters.c +++ b/tools/testing/selftests/bpf/prog_tests/iters.c @@ -202,8 +202,6 @@ static void subtest_task_iters(void) iters_task__destroy(skel); } -extern int stack_mprotect(void); - static void subtest_css_task_iters(void) { struct iters_css_task *skel = NULL; diff --git a/tools/testing/selftests/bpf/prog_tests/test_lsm.c b/tools/testing/selftests/bpf/prog_tests/test_lsm.c index bdc4fc06bc5a..d7495efd4a56 100644 --- a/tools/testing/selftests/bpf/prog_tests/test_lsm.c +++ b/tools/testing/selftests/bpf/prog_tests/test_lsm.c @@ -5,36 +5,14 @@ */ #include -#include #include #include -#include -#include #include "lsm.skel.h" #include "lsm_tailcall.skel.h" char *CMD_ARGS[] = {"true", NULL}; -#define GET_PAGE_ADDR(ADDR, PAGE_SIZE) \ - (char *)(((unsigned long) (ADDR + PAGE_SIZE)) & ~(PAGE_SIZE-1)) - -int stack_mprotect(void) -{ - void *buf; - long sz; - int ret; - - sz = sysconf(_SC_PAGESIZE); - if (sz < 0) - return sz; - - buf = alloca(sz * 3); - ret = mprotect(GET_PAGE_ADDR(buf, sz), sz, - PROT_READ | PROT_WRITE | PROT_EXEC); - return ret; -} - int exec_cmd(int *monitored_pid) { int child_pid, child_status; diff --git a/tools/testing/selftests/bpf/testing_helpers.c b/tools/testing/selftests/bpf/testing_helpers.c index 6fbe1e995660..3f7ae76c209b 100644 --- a/tools/testing/selftests/bpf/testing_helpers.c +++ b/tools/testing/selftests/bpf/testing_helpers.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include "disasm.h" @@ -516,3 +517,19 @@ bool is_jit_enabled(void) return enabled; } + +int stack_mprotect(void) +{ + void *buf; + long sz; + int ret; + + sz = sysconf(_SC_PAGESIZE); + if (sz < 0) + return sz; + + buf = alloca(sz * 3); + ret = mprotect((void *)(((unsigned long)(buf + sz)) & ~(sz - 1)), sz, + PROT_READ | PROT_WRITE | PROT_EXEC); + return ret; +} diff --git a/tools/testing/selftests/bpf/testing_helpers.h b/tools/testing/selftests/bpf/testing_helpers.h index 2ca2356a0b58..2edc6fb7fc52 100644 --- a/tools/testing/selftests/bpf/testing_helpers.h +++ b/tools/testing/selftests/bpf/testing_helpers.h @@ -59,5 +59,6 @@ struct bpf_insn; int get_xlated_program(int fd_prog, struct bpf_insn **buf, __u32 *cnt); int testing_prog_flags(void); bool is_jit_enabled(void); +int stack_mprotect(void); #endif /* __TESTING_HELPERS_H */ -- 2.54.0