From nobody Mon Jun 15 07:33:55 2026 Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.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 18E50331A44 for ; Wed, 8 Apr 2026 18:36:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673372; cv=none; b=KvBiDFnvIJvl63B3jvaJcN1jvxxp+QBqCAFbitl5ucsIJihrsDI1NvOIfoULyDyyUNO4Np9D5IYI+TfDb1BT7F2oNXLfdNxDgycB3UcU1kQZpxMehZnqg7j3uyDXm4e8t08cbz2XXrOQnXSuFZj8mqfmOVsT/+odfCOI7kZxQXM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673372; c=relaxed/simple; bh=FoODtHK87ZLIsLT91VS2/t2ELTaMVveQekR6M37Rqe0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o1aiubSY0/SCsi2bebcBXP1LPpjrIOXL36siqc0FszhN3PAtD1UHOqPyza4ZxzqWt5nmkggpdwNRCEWCYtAbFci3GrOgRC0S0XJlhmWMThjfa0X0UM/bYTl47sZWHU5Q0BLMKJFKRyasgS7lNiYbaih7h7OJSFcdzbRL9WS+X2U= 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=BSKXLrPy; arc=none smtp.client-ip=209.85.210.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="BSKXLrPy" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-82cf976ecacso33649b3a.1 for ; Wed, 08 Apr 2026 11:36:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775673369; x=1776278169; 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=0wzDfLfgSZvbjTVt4w0u1g9djtPuy1licBUfHTLjI5M=; b=BSKXLrPy31xj0ggNBDzR0btuBXq5De423O67MYBxm4mKugB07CFwwhRpmJfcGdFMiV NesuKIXP2m+BjHQmfGNiyr1HZvLLGJiOMO7gybhzBwFZv2AhdDAjb9VfdvzcFymMO0wQ yJGGF/oQfxI2fmNfT8p3pGvRX+njp/FX4J3pU8dVZ3BJZSgteTRL/84yRzzf4WobPeIq hrxzlFj/wSWYBw7yASxqOHGFu+5SGhsWGEFPB2biuDvIzKfGAG3RUnQ1bSbQDRDSPdF6 0JQo599SczugsGyDI8+ZpAZIqkIaH02RyxticS3SszsfqUWeJl0DzuLNkYktzcOZHh1R Vhww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775673369; x=1776278169; 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=0wzDfLfgSZvbjTVt4w0u1g9djtPuy1licBUfHTLjI5M=; b=Pkm/KU9ZCbad1NE9vfb/TfAeu+vubE0Bnbqr6GMew8yf1WxiZL8+kon1vs9TvpsJgg UmfXGBlxdkWbLm1KRUCqZ8Ttvm7nQTn+f7oUchzTokwdcV2NtNUutWRuruIWerctMepy Ccqtar4cDn9MXvlYeOnRgyQ/zHi6Qwa1f2JhEcEAylphf7wByRhAJKC6YBJJ790RjO8K ffxWxE4IQ9jQ/D2a5fo/ngogZwLKBEtMQOjUz+9f6+Tn7+5UPoJUe6JRyxaxpDD9tSGq tnM1z+GExqibQjnDifboBUev1wkxMCNA84EhWPjLm2q41h9JdGqJmdbe3mfhyDWldmcE 1bvw== X-Forwarded-Encrypted: i=1; AJvYcCWFlhpXK2N2HSzQCDpi0gIYiwgyvVOVFk/ZvjPdLQ3OlR2Jl4gZbvi6P973zVSjoUSaH5KLjctz12JXy2Q=@vger.kernel.org X-Gm-Message-State: AOJu0YzCfoRVfAjptNqhg4qbJJb4W086LlnJvVAMn7fXC71oL7A8xRhJ QAW5RuziTbb1hOhdnkzItgxYVoshfpmdk7YCXRsZQ6eBIY665+ypPxc4 X-Gm-Gg: AeBDiev6IUt0wDlOepW95RKGtluiH8xwbshHfXGxJ+XlpZLXYFM3yM9VmRzR3SEC1KC LU865uTbEesOQKszRlXLecmunD6MepMjwDIM1N5QkHv4xNSEcReeLjN6kmz4V/tBtBlkEa2lyJJ 5D0sp1rB9FFrEdmPauCQzM9qn51p6BonsLJ/zCrrZDK6jKXcD5CzI+bi0EqhkYEGqEEfHDuoK+3 6WrMo7e14kkvGl+qOM2uv5sjHWxEE8gKFQNOvgfZ6zrrc8YqMNUyH+7nf1097/pLKEYZf2z2R68 sV+XP1t63/l7Q63pVfX+MlMHJ+kOIhN2aEJptdX4YifWHO2Vl8tqVyfNlhAMPGxcYFp4xQ6+W1O dCVXxcIt+h2l3uv3c8riS6brElNmfFi6APnuDEAVuCV9wFjTES5rna53rPytY6hT8S3fkIu2QNA 2WV6ooI/Ms/Bb8ytqewtuHrJPVqGw8yw2uoE2WzxopP9nKQmCrAKKpCQeubbvHIXLjSLJk X-Received: by 2002:a05:6a00:1304:b0:829:8942:2ca4 with SMTP id d2e1a72fcca58-82dd89aae52mr482081b3a.19.1775673369332; Wed, 08 Apr 2026 11:36:09 -0700 (PDT) Received: from computer.goose-salary.ts.net ([2a09:bac5:40b2:1a96::2a6:4e]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b21c92sm23113251b3a.11.2026.04.08.11.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 11:36:09 -0700 (PDT) From: Varun R Mallya To: bpf@vger.kernel.org, leon.hwang@linux.dev, memxor@gmail.com, jolsa@kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, yonghong.song@linux.dev, rostedt@goodmis.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, varunrmallya@gmail.com Subject: [PATCH bpf-next v4 1/2] bpf: Reject sleepable kprobe_multi programs at attach time Date: Thu, 9 Apr 2026 00:05:48 +0530 Message-ID: <20260408183549.92990-2-varunrmallya@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408183549.92990-1-varunrmallya@gmail.com> References: <20260408183549.92990-1-varunrmallya@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" kprobe.multi programs run in atomic/RCU context and cannot sleep. However, bpf_kprobe_multi_link_attach() did not validate whether the program being attached had the sleepable flag set, allowing sleepable helpers such as bpf_copy_from_user() to be invoked from a non-sleepable context. This causes a "sleeping function called from invalid context" splat: BUG: sleeping function called from invalid context at ./include/linux/uac= cess.h:169 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 1787, name: sudo preempt_count: 1, expected: 0 RCU nest depth: 2, expected: 0 Fix this by rejecting sleepable programs early in bpf_kprobe_multi_link_attach(), before any further processing. Fixes: 0dcac2725406 ("bpf: Add multi kprobe link") Signed-off-by: Varun R Mallya Acked-by: Kumar Kartikeya Dwivedi Acked-by: Leon Hwang Acked-by: Jiri Olsa --- kernel/trace/bpf_trace.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 0b040a417442..af7079aa0f36 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2752,6 +2752,10 @@ int bpf_kprobe_multi_link_attach(const union bpf_att= r *attr, struct bpf_prog *pr if (!is_kprobe_multi(prog)) return -EINVAL; =20 + /* kprobe_multi is not allowed to be sleepable. */ + if (prog->sleepable) + return -EINVAL; + /* Writing to context is not allowed for kprobes. */ if (prog->aux->kprobe_write_ctx) return -EINVAL; --=20 2.53.0 From nobody Mon Jun 15 07:33:55 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 2EEA4331A44 for ; Wed, 8 Apr 2026 18:36:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673377; cv=none; b=gZoAXZRQ/d+RToks8FwGIcQKbmFZDX/P92AGsMVZsGmgv13RNFY+7IjSuBXvH+pv8FGVpHl27dg7RcBX9JgCa1UQ5iJ6SWrvCtW5t2sf62WqQ0F3nxZA7rNcKIoBOLmb4pObYvHQeOPxMNRI0SvbmuFC0wdYLpF+mrRnpaSY13U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673377; c=relaxed/simple; bh=O2s8uGHtGDTM+CooH4aUZyAutlFsN8tZqF1i72fbLbk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nhM6o3MjH5sxi5P4EGuUviD7iq+wOB2lVB7ot6yZwml6CZadJ4lmt107h77eS/K+19gbvZZERYuVUfizt7Q2KYwEoGoC+RJcw9dvYpKLE+kjAxk/KSM28Ty4AavC1Oy02h9vmEgRS3dDrXRRqp/DDIs4JNTagdLEWIWjjzzSMN4= 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=rcZqtXjj; arc=none smtp.client-ip=209.85.210.182 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="rcZqtXjj" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-82cef263bedso39247b3a.0 for ; Wed, 08 Apr 2026 11:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775673376; x=1776278176; 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=yD3k6Q7y5NEPXrLGt2JK06kWKhKz/icejKZd6Cc4SCY=; b=rcZqtXjj+p7OgsGjIe9y0wOuhNUVpy77VBUmxwv86AmAinJ2x6NyteRBI+L0mAc/y5 ESrEkNAvI5q0zzK9VRUalyjbmkEZRCx1YJzdNBI2IfuYPX4ckA9fomCWKChByZ0xlxN0 Pra6854pM9o4mCdyJ30tkehQNT0bPsXuiPlUlZvYC7M+l+bJDzVU018tYPxilyA2I/uO Tt5WIRqTxtQjA+Y81UzHM1TW/CbR2MZHyrcouTCKeRmyXkxgpckOyz4QBupZMP/hESA4 olVnWADkorN7neGKVbS5QzcpDLmLBEHOjl/fQx+78i3Qr+mufIq0GkQ6nfq2svNSjQFs g2hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775673376; x=1776278176; 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=yD3k6Q7y5NEPXrLGt2JK06kWKhKz/icejKZd6Cc4SCY=; b=KZko84Lb1kCaoPx3aX1EuDP2V8oaZBsxxKyBWo+HL33yIfFAtI1W/qXYuX3lx5/K+5 /jxxs2hqvRoAFLmKBUCNMk5G7wvmzfFlaIN470/LaWbQWSlVGoKWF+f+VyhFNXbzPNAe 4DIhLsxmpG51qXMN6BYIet/yK8P6aCHifOY3o0Dg/VJoWzatmdPXp6vqiBUnE2qe6t+W G8PViGvzX1hZQnnerxkdpxx6KAjyXa0C92GWKtuaMt9wTmGrX4MJk/efuHfZgkIQiA5d 0lDpaATxk1ASA+oNf7qxal+zurtKBv47zhBEsMrh/alHfq5BRIQSKfXsZtkxYIuz4HtC ZR9A== X-Forwarded-Encrypted: i=1; AJvYcCUPaXUkclOQs3jnpxuuOIyulm+3Mp/6iKmPm5qgXU61C8WsIb/1AgSRRRzl7ui+GpXqa0l0LIZgVK2DfWw=@vger.kernel.org X-Gm-Message-State: AOJu0YzEeAvn1cVpj7ibmXysqTQzMcP4htV5CdNN8KFqu4ZrKpleBsc1 w3xHsd+OMM8qYQWaJlIgIVcMpNTsRjPSipz9lHlAn/6qfys39hyY2vp8 X-Gm-Gg: AeBDieuxKZalVTnWmza2D7U9WH5DPoCt55InlZ4xMHkj8bXJMs0eFSVBEEnnLBHQoTN Sqx5eH37XYiTN2GG24u9Du+JgMVzIoraVhWhOoZ3gDqaoGX610hsYRz9yrz1pzmQGoloL4mUz6K tzLfh8KlyMl1okd+78EQ3wc9NGZM9swb5mY5ugy4forrOJu1WgvLLb8XNAEM8ykMfkrQ1krYWwl trcPagp4mMl6gBNcU5VA7B0do6PPpj1lj7emQeNeq0odTwX/DzMiyrXAOPzm9DkqwaIQjscXaMZ NQpZkFhBWdEDaiL/5P5XTe5fEhFxYWWldVdN/7GqOAAThLMaRROSw4uZV/2sU3YgnzvQNq5sutN bd6t/kcZsZKwsErZQbaWa5kvY9b6aVV/rJtbonIXbOsnHEc1zHSEu8vLBykx0iPnS/5C4hMYs0u +gC9uLyM1rQhmv9SYbTVoBqwSy/0akrIVqGTUEA2DoYTnp1mmpgjSzXbrZvWpspx87svba X-Received: by 2002:a05:6a00:94dc:b0:82c:651f:3385 with SMTP id d2e1a72fcca58-82dd8a8a1d9mr524330b3a.34.1775673375464; Wed, 08 Apr 2026 11:36:15 -0700 (PDT) Received: from computer.goose-salary.ts.net ([2a09:bac5:40b2:1a96::2a6:4e]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82cf9b21c92sm23113251b3a.11.2026.04.08.11.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Apr 2026 11:36:15 -0700 (PDT) From: Varun R Mallya To: bpf@vger.kernel.org, leon.hwang@linux.dev, memxor@gmail.com, jolsa@kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, yonghong.song@linux.dev, rostedt@goodmis.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, varunrmallya@gmail.com Subject: [PATCH bpf-next v4 2/2] selftests/bpf: Add test to ensure kprobe_multi is not sleepable Date: Thu, 9 Apr 2026 00:05:49 +0530 Message-ID: <20260408183549.92990-3-varunrmallya@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408183549.92990-1-varunrmallya@gmail.com> References: <20260408183549.92990-1-varunrmallya@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a selftest to ensure that kprobe_multi programs cannot be attached using the BPF_F_SLEEPABLE flag. This test succeeds when the kernel rejects attachment of kprobe_multi when the BPF_F_SLEEPABLE flag is set. Suggested-by: Leon Hwang Signed-off-by: Varun R Mallya --- .../bpf/prog_tests/kprobe_multi_test.c | 78 ++++++++++++++++++- .../bpf/progs/kprobe_multi_sleepable.c | 25 ++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_sleepabl= e.c diff --git a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c b/t= ools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c index 78c974d4ea33..e4f9021a84ed 100644 --- a/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c +++ b/tools/testing/selftests/bpf/prog_tests/kprobe_multi_test.c @@ -10,6 +10,7 @@ #include "kprobe_multi_session_cookie.skel.h" #include "kprobe_multi_verifier.skel.h" #include "kprobe_write_ctx.skel.h" +#include "kprobe_multi_sleepable.skel.h" #include "bpf/libbpf_internal.h" #include "bpf/hashmap.h" =20 @@ -220,7 +221,9 @@ static void test_attach_api_syms(void) static void test_attach_api_fails(void) { LIBBPF_OPTS(bpf_kprobe_multi_opts, opts); + LIBBPF_OPTS(bpf_test_run_opts, topts); struct kprobe_multi *skel =3D NULL; + struct kprobe_multi_sleepable *sl_skel =3D NULL; struct bpf_link *link =3D NULL; unsigned long long addrs[2]; const char *syms[2] =3D { @@ -228,7 +231,7 @@ static void test_attach_api_fails(void) "bpf_fentry_test2", }; __u64 cookies[2]; - int saved_error; + int saved_error, err; =20 addrs[0] =3D ksym_get_addr("bpf_fentry_test1"); addrs[1] =3D ksym_get_addr("bpf_fentry_test2"); @@ -351,9 +354,39 @@ static void test_attach_api_fails(void) if (!ASSERT_EQ(saved_error, -ENOENT, "fail_8_error")) goto cleanup; =20 + /* fail_9 - sleepable kprobe multi should not attach */ + sl_skel =3D kprobe_multi_sleepable__open(); + if (!ASSERT_OK_PTR(sl_skel, "sleep_skel_open")) + goto cleanup; + + sl_skel->bss->user_ptr =3D sl_skel; + + err =3D bpf_program__set_flags(sl_skel->progs.handle_kprobe_multi_sleepab= le, + BPF_F_SLEEPABLE); + if (!ASSERT_OK(err, "sleep_skel_set_flags")) + goto cleanup; + + err =3D kprobe_multi_sleepable__load(sl_skel); + if (!ASSERT_OK(err, "sleep_skel_load")) + goto cleanup; + + link =3D bpf_program__attach_kprobe_multi_opts(sl_skel->progs.handle_kpro= be_multi_sleepable, + "bpf_fentry_test1", NULL); + saved_error =3D -errno; + + if (!ASSERT_ERR_PTR(link, "fail_9")) + goto cleanup; + + if (!ASSERT_EQ(saved_error, -EINVAL, "fail_9_error")) + goto cleanup; + + err =3D bpf_prog_test_run_opts(bpf_program__fd(sl_skel->progs.fentry), &t= opts); + ASSERT_OK(err, "bpf_prog_test_run_opts"); + cleanup: bpf_link__destroy(link); kprobe_multi__destroy(skel); + kprobe_multi_sleepable__destroy(sl_skel); } =20 static void test_session_skel_api(void) @@ -609,6 +642,47 @@ static void test_override(void) kprobe_multi_override__destroy(skel); } =20 +static void test_attach_multi_sleepable(void) +{ + struct kprobe_multi_sleepable *skel; + int err; + + LIBBPF_OPTS(bpf_test_run_opts, topts); + + skel =3D kprobe_multi_sleepable__open(); + if (!ASSERT_OK_PTR(skel, "kprobe_multi_sleepable__open")) + return; + + skel->bss->user_ptr =3D skel; + + err =3D bpf_program__set_flags(skel->progs.handle_kprobe_multi_sleepable, + BPF_F_SLEEPABLE); + if (!ASSERT_OK(err, "bpf_program__set_flags")) + goto cleanup; + + /* Load should succeed even with BPF_F_SLEEPABLE for KPROBE types */ + err =3D kprobe_multi_sleepable__load(skel); + if (!ASSERT_OK(err, "kprobe_multi_sleepable__load")) + goto cleanup; + + skel->links.handle_kprobe_multi_sleepable =3D + bpf_program__attach_kprobe_multi_opts(skel->progs.handle_kprobe_multi_sl= eepable, + "bpf_fentry_test1", NULL); + + ASSERT_EQ(libbpf_get_error(skel->links.handle_kprobe_multi_sleepable), + -EINVAL, "attach_multi_sleepable_err"); + + ASSERT_ERR_PTR(skel->links.handle_kprobe_multi_sleepable, + "bpf_program__attach_kprobe_multi_opts"); + + err =3D bpf_prog_test_run_opts(bpf_program__fd(skel->progs.fentry), &topt= s); + + ASSERT_OK(err, "bpf_prog_test_run_opts"); + +cleanup: + kprobe_multi_sleepable__destroy(skel); +} + #ifdef __x86_64__ static void test_attach_write_ctx(void) { @@ -676,5 +750,7 @@ void test_kprobe_multi_test(void) test_unique_match(); if (test__start_subtest("attach_write_ctx")) test_attach_write_ctx(); + if (test__start_subtest("attach_multi_sleepable")) + test_attach_multi_sleepable(); RUN_TESTS(kprobe_multi_verifier); } diff --git a/tools/testing/selftests/bpf/progs/kprobe_multi_sleepable.c b/t= ools/testing/selftests/bpf/progs/kprobe_multi_sleepable.c new file mode 100644 index 000000000000..932e1d9c72e2 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/kprobe_multi_sleepable.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include "vmlinux.h" +#include +#include + +void *user_ptr =3D 0; + +SEC("kprobe.multi") +int handle_kprobe_multi_sleepable(struct pt_regs *ctx) +{ + int a, err; + + err =3D bpf_copy_from_user(&a, sizeof(a), user_ptr); + barrier_var(a); + return err; +} + +SEC("fentry/bpf_fentry_test1") +int BPF_PROG(fentry) +{ + return 0; +} + +char _license[] SEC("license") =3D "GPL"; --=20 2.53.0