From nobody Wed Apr 1 09:45:14 2026 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 5EDC831717F for ; Tue, 31 Mar 2026 15:25:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774970724; cv=none; b=jUpoQz2IbnYc+sXSE9xrWobdEURm6Ai2EIkXR163LhokHGjj5LcfQqBWkGn9BBiZZJs1t9SygdLRy3r7EmZu6eI/5IcHRurYQg9gHZ0+77adxX3N/sQVPbUVguElTRZKCjeY75CzcxD70NvmVstj/BChZSVfatY5WE7X86GdTPQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774970724; c=relaxed/simple; bh=387H1xti8ra1VEGk2s6IjY9AeXDEy+hfE2xNg++8Ljg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b25umKmiTp5LjLADOMhAgtd+QvCI6R6wyWxo8gXJFxrQAmJm/abSwQDr0kx8Jj1PrAZteZUPPAVfhl0EKw+tKwczURsyBZ0St9r0U3gKHp8sh7boYd5GM7QZiozCKvGCzJqjVvFzLyGSZVa+Kx2qtNnLgJ10C0R17pSDGQS49ik= 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=Q1APwItA; arc=none smtp.client-ip=209.85.218.42 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="Q1APwItA" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-b97ed4ad579so923552266b.3 for ; Tue, 31 Mar 2026 08:25:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1774970719; x=1775575519; 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=l28j6iJn6Eh1/pQq6D7Ym9WMmjNwSYO0NcwG/PxrV74=; b=Q1APwItAXWpfEFqcL6wrLaOtxDDsw4M3iozqHQKF31FTqZH0IRYwuPXw9bIwym0Eu7 jtz0msRcnto0LOFR9CZhhUZKuSVxXpNmk1Ltra64BjzVB5pqnyP8GMto+sfHZx6qTWOy xLjhNFFRCVhWuu1oinN+VxOeKHE5ba1q1zZo7ZjOeCr8sl3yryzY9fsOADIuPsfKuv3g c7vXHCgO50Fj+KX9+/NN7TK71Z9fXsaEPjYKaHkr0pOe7yshst4z0P8HEaKEl0QIl8AD 1rjXvB4pXLjJWbJ358Hb4PWnxHVjEwXaX/ldvK2OGRcZZQzH2Sh3Vr33msqF62RPIjfS Z9jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774970719; x=1775575519; 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=l28j6iJn6Eh1/pQq6D7Ym9WMmjNwSYO0NcwG/PxrV74=; b=N8XOhMcEBnCEUYx1DXD5vh9JR/lS2ntRMuskwtwrouqn6W5hPCjKdqjUPeKPScgw1g ffP15lj0AL7+fTkoUtawuUUN1k6iYYKaUctfHedmHpFumFJlV02qoE7H6VqH52Pd7Gtv oQ7CEVGyf/0l9dgRTMqlYYMiEVwSthxh6ovAWRFYvU8JKbFBZhxdL3yIrQe82QiSRB6A qd659utXYkWp9O9DvRj9zzxRTPX2O58o/Pf1KQnWgGcds/9xpu/NJYb8h1oCNH4w3hgC BTTSNU1GSSGMM97WMdIBdK++vghP+NZUGSekbit5pw3HtvDuk6dEbos8DadKQcEsggeL zpjA== X-Forwarded-Encrypted: i=1; AJvYcCVK9fZlQxhR2OXcRPT45B6WPwd58mZK1j6SrzRwPm5XkmWP66u5ukNc/LevUH0D3r7ilnJJghwznEonW1Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/O7S2n7zXTM/2vXLI1jQ6yr7Fku4DoJHn07NG/xp9stKnpdQa k2PWAJW1nX4rY+pDsDSpD5CtjmiOmZFSs8VL9rGTCtw8AGsGDDy2nnuci+ixmgVmA5I= X-Gm-Gg: ATEYQzws2LD6AM14NOd8Gmqc4R/19RZogiSnML6W0ADye48PVZXJIzr34KHTK034y1I L/qTO13H0Evctl1yuW6GDQqmEFdK91FAE6We8KdSYnwoXXYHO0VC1AfDRbf2cbRuVgE6FCH8dYQ v5x87jlZd0X2MW0wzjVfsbixWfmMauztILLBfKDRPwpBepnro55hN8RUP1wTD6RIuwlY1ZTMYdE BN2fxymDd4CrTo6LCMLiMHQezWkICUumDdMNDXh6zb+CzeMINTpdfv123wILuDrhrRzK0wB031z /3382TtAhNyHri3zzm7GfkzEbrsk8y8Mt2+uY8rhHgQqegA5hd3Ph7Pmx+TzCM5B/s8HGetx+yd GOyAoET1oIUSRhUKTHNKWbkRP1/hA/Up6O0DkOlgYc+MhWMgjiyyTD52mhtkR77mPJqCQq8EEOd jfj77AFsEQWtt32id+hlVyyOaG2bZzJ5Hw2PLR73zW4UFm27J6G2963zthSXTCUuh051iuYqwU X-Received: by 2002:a17:906:c38b:b0:b9a:7d8b:cda8 with SMTP id a640c23a62f3a-b9c13b7cd60mr1816466b.42.1774970719005; Tue, 31 Mar 2026 08:25:19 -0700 (PDT) Received: from f16.localdomain ([121.167.230.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dba558226sm1264003a91.2.2026.03.31.08.25.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:25:18 -0700 (PDT) From: Hoyeon Lee To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau Cc: Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , Feng Yang , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v4 1/2] libbpf: clarify raw-address single kprobe attach behavior Date: Wed, 1 Apr 2026 00:24:35 +0900 Message-ID: <20260331152509.70468-2-hoyeon.lee@suse.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260331152509.70468-1-hoyeon.lee@suse.com> References: <20260331152509.70468-1-hoyeon.lee@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" bpf_program__attach_kprobe_opts() documents single-kprobe attach through func_name, with an optional offset. For the PMU-based non-legacy path, func_name =3D NULL with an absolute address in offset already works as well, but that is not described in the API. This commit clarifies this existing non-legacy behavior. For PMU-based attach, callers can use func_name =3D NULL with an absolute address in offset as the raw-address form. For legacy tracefs/debugfs kprobes, reject this form explicitly. Signed-off-by: Hoyeon Lee --- tools/lib/bpf/libbpf.c | 21 ++++++++++++--------- tools/lib/bpf/libbpf.h | 3 ++- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 9ea41f40dc82..9083f542a3b0 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -11523,7 +11523,8 @@ static int determine_uprobe_retprobe_bit(void) #define PERF_UPROBE_REF_CTR_OFFSET_SHIFT 32 =20 static int perf_event_open_probe(bool uprobe, bool retprobe, const char *n= ame, - uint64_t offset, int pid, size_t ref_ctr_off) + uint64_t offset_or_addr, int pid, + size_t ref_ctr_off) { const size_t attr_sz =3D sizeof(struct perf_event_attr); struct perf_event_attr attr; @@ -11558,7 +11559,7 @@ static int perf_event_open_probe(bool uprobe, bool = retprobe, const char *name, attr.type =3D type; attr.config |=3D (__u64)ref_ctr_off << PERF_UPROBE_REF_CTR_OFFSET_SHIFT; attr.config1 =3D ptr_to_u64(name); /* kprobe_func or uprobe_path */ - attr.config2 =3D offset; /* kprobe_addr or probe_offset */ + attr.config2 =3D offset_or_addr; /* kprobe_addr or probe_offset */ =20 /* pid filter is meaningful only for uprobes */ pfd =3D syscall(__NR_perf_event_open, &attr, @@ -11816,6 +11817,8 @@ bpf_program__attach_kprobe_opts(const struct bpf_pr= ogram *prog, default: return libbpf_err_ptr(-EINVAL); } + if (!func_name && legacy) + return libbpf_err_ptr(-ENOTSUP); =20 if (!legacy) { pfd =3D perf_event_open_probe(false /* uprobe */, retprobe, @@ -11835,21 +11838,21 @@ bpf_program__attach_kprobe_opts(const struct bpf_= program *prog, offset, -1 /* pid */); } if (pfd < 0) { - err =3D -errno; - pr_warn("prog '%s': failed to create %s '%s+0x%zx' perf event: %s\n", + err =3D pfd; + pr_warn("prog '%s': failed to create %s '%s%s0x%zx' perf event: %s\n", prog->name, retprobe ? "kretprobe" : "kprobe", - func_name, offset, - errstr(err)); + func_name ?: "", func_name ? "+" : "", + offset, errstr(err)); goto err_out; } link =3D bpf_program__attach_perf_event_opts(prog, pfd, &pe_opts); err =3D libbpf_get_error(link); if (err) { close(pfd); - pr_warn("prog '%s': failed to attach to %s '%s+0x%zx': %s\n", + pr_warn("prog '%s': failed to attach to %s '%s%s0x%zx': %s\n", prog->name, retprobe ? "kretprobe" : "kprobe", - func_name, offset, - errstr(err)); + func_name ?: "", func_name ? "+" : "", + offset, errstr(err)); goto err_clean_legacy; } if (legacy) { diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 0be34852350f..f75f3ab0f20c 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -557,7 +557,7 @@ struct bpf_kprobe_opts { size_t sz; /* custom user-provided value fetchable through bpf_get_attach_cookie() */ __u64 bpf_cookie; - /* function's offset to install kprobe to */ + /* function offset, or raw address if func_name =3D=3D NULL (non-legacy) = */ size_t offset; /* kprobe is return probe */ bool retprobe; @@ -565,6 +565,7 @@ struct bpf_kprobe_opts { enum probe_attach_mode attach_mode; size_t :0; }; + #define bpf_kprobe_opts__last_field attach_mode =20 LIBBPF_API struct bpf_link * --=20 2.52.0 From nobody Wed Apr 1 09:45:14 2026 Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 0CCB74035B7 for ; Tue, 31 Mar 2026 15:25:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774970729; cv=none; b=AxsYXWZyvokwWILh5ngPDqwgZrNY0ivhY0WobwVXqwPQcnq8l8WtagcZVrlRKUE9UGwglBToRIalQkO7STIYkXkpQrx07rkMef0KPyJ2cNnysMhKYiX8mrT8vHHLVhL3hJwnfGtafJQcwUcfQVz9KBkOuGlEJc980Rq3vs45HEM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774970729; c=relaxed/simple; bh=rQBh02MaAajKMfKDC8YMNgw3hVbVvfm1kxuP49DEQG4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HRe6itUCUoTrqDCSglgZjpn15o2xmcNuBV1QqPaf0HI/JoqfUIt9CWfeRlnXBi4G/3e71h0PNrXwqTNlEye4YdFxyFOj6fxDR0tpqWvsJMLSYlfn3CCUgx1TRtjUaKlXp2z3yXw30jShKLFt3/BbOcvLEvclpleF736nM5IQ+Bc= 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=ckLFKafb; arc=none smtp.client-ip=209.85.218.44 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="ckLFKafb" Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-b97bca3797dso904511066b.0 for ; Tue, 31 Mar 2026 08:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1774970723; x=1775575523; 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=SsziD70VgpPgjTdfHcq7GvG3ra662CqVO4P1uVRU6Ec=; b=ckLFKafbvdz9cqr2ZRSkVDQVXu744rMOuN/MlVSTqcJf3JfvDMtLKm/hC6k00tkChi WE4IsezwxptukObTtAGC53RKlI6pDTJL8lbB7mMXGA8UdgmB1mQ8Eh/b4lQcgUmyO9ln SAGI1OxBpPmBqP2itNU18rq1EUBVxlFPDdBgJDf1uDiDeeGjjUmdhNTnHtWh+mJHKBYS REHEaX842O5YaUaUkNg6AqOVpFTWBPtaZdzAj9C/7skHmX1mfv3nLqlMcFtA8/L74HG1 Sq4ZCTorh4igPwV2ZTTr2LJ4oMqDF6zOL9+d4K6Zsquz65Jhx+8jneeXo41WwvpJiQpR M1vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774970723; x=1775575523; 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=SsziD70VgpPgjTdfHcq7GvG3ra662CqVO4P1uVRU6Ec=; b=MD5hrtEr8aqnxFJ/ltzC8FWCC67mLtAwcEIsQlUJqPvInM4j6UfkvrjC7RZKqaP9rM HWrmQr2QGDFx5XPnORCFvc+PgSJxMZwjAF9PDbMbi/q3v+1aUKeohttoSgAh6gACkSFP 7KHpz4yDRCaISMuHhzYQSBVljWjveQPQNplOnsCMajl955EVh+NP1pGsk6wieN0VUzQg ftT7qk4RkCe0y1ciWG5eut+qIziKCtiZ05YtZqZgntA8TgvQPHEYgOj2Kg7zw/zVULHb e1OajLCfS+hCQL2JcTfpFLI+4fExt7cSTph9ga9kr69YOH0wwaDxOP9/BC0RoUD2EDPr dElw== X-Forwarded-Encrypted: i=1; AJvYcCVfVGakHEhClVVn1ACUTCH4kvS+lre8xVfvmzFhG+7BKGCuaUyhhUqHW5QjP5jWgbuzYeIhsfLaLPOd+x4=@vger.kernel.org X-Gm-Message-State: AOJu0Yz9qpBnUs0Uu7h7l0sKM/NqQtbTOkBdVmpLTlc+rfAvpZ+eFGtd F7nvQ2/BnE1AfKeHqVEzmQG1CBA2SKUvIWGL/q4tH5GCe9dagM2fqIE6n0pxmpfv7Pk= X-Gm-Gg: ATEYQzxu7VGqiOfjZ9R+cPvpRr3CCLANh+VTqIY/8w/lTc73yqiBYUZXujAGVtAeRJ6 Zsuw2X3KK7op4xPi6MqjMrurL6uWj8F4XC7TujdaVM3GLuAdNhHXkwGgdkhtkyYZdjhySuFdJc7 mFEm82dhagVuDMvw4Hhb/Crwe243vcpP5u8jMaetZvmH7Kp4xGvGBb72HL00Rd3YKFLVUJkO6Sz lzAcIkxUmwZY6UbxbwzjvnVTtmmLMvqy+q/scoMeZO9PEyoDShT35lqkByEidf0pPTzmHqCzlr3 4c5htZcocepBL1zThphPMl7NXbL2EFI1fwpvwy27a9BmTmqRkYp7m+btb1fDb3uDo71zRAvVqAQ gIHnqGdBPaD4ppXVxHtpIVpbmOwQtcMXDv7d/BYA4iliyZ2i848o1EXNLzqxVkH8iMqApZEX/o6 7+a4qcepyoQtt/FySM16FhJOf1C7QWED3iln342ETk1q886WWEUQP4wkkewWNtGw== X-Received: by 2002:a17:907:e8a:b0:b97:eae9:d45e with SMTP id a640c23a62f3a-b9c13cc4dd3mr1812466b.50.1774970722671; Tue, 31 Mar 2026 08:25:22 -0700 (PDT) Received: from f16.localdomain ([121.167.230.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35dba558226sm1264003a91.2.2026.03.31.08.25.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Mar 2026 08:25:21 -0700 (PDT) From: Hoyeon Lee To: bpf@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau Cc: Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Shuah Khan , Feng Yang , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v4 2/2] selftests/bpf: add test for raw-address single kprobe attach Date: Wed, 1 Apr 2026 00:24:36 +0900 Message-ID: <20260331152509.70468-3-hoyeon.lee@suse.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260331152509.70468-1-hoyeon.lee@suse.com> References: <20260331152509.70468-1-hoyeon.lee@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, attach_probe covers manual single-kprobe attaches by func_name, but not the raw-address form that the PMU-based single-kprobe path can accept. This commit adds PERF and LINK raw-address subtests by resolving SYS_NANOSLEEP_KPROBE_NAME through kallsyms, passing the absolute address in bpf_kprobe_opts.offset with func_name =3D NULL, and verifying that kprobe and kretprobe are still triggered. It also verifies that LEGACY rejects the same form. Signed-off-by: Hoyeon Lee --- .../selftests/bpf/prog_tests/attach_probe.c | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/= testing/selftests/bpf/prog_tests/attach_probe.c index 9e77e5da7097..817c4794d54e 100644 --- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c +++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c @@ -123,6 +123,82 @@ static void test_attach_probe_manual(enum probe_attach= _mode attach_mode) test_attach_probe_manual__destroy(skel); } =20 +/* manual attach address-based kprobe/kretprobe testings */ +static void test_attach_kprobe_by_addr(enum probe_attach_mode attach_mode) +{ + DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, kprobe_opts); + struct test_attach_probe_manual *skel; + unsigned long func_addr; + + if (!ASSERT_OK(load_kallsyms(), "load_kallsyms")) + return; + + func_addr =3D ksym_get_addr(SYS_NANOSLEEP_KPROBE_NAME); + if (!ASSERT_NEQ(func_addr, 0UL, "func_addr")) + return; + + skel =3D test_attach_probe_manual__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_kprobe_manual_open_and_load")) + return; + + kprobe_opts.attach_mode =3D attach_mode; + kprobe_opts.retprobe =3D false; + kprobe_opts.offset =3D func_addr; + skel->links.handle_kprobe =3D + bpf_program__attach_kprobe_opts(skel->progs.handle_kprobe, + NULL, &kprobe_opts); + if (!ASSERT_OK_PTR(skel->links.handle_kprobe, "attach_kprobe_by_addr")) + goto cleanup; + + kprobe_opts.retprobe =3D true; + skel->links.handle_kretprobe =3D + bpf_program__attach_kprobe_opts(skel->progs.handle_kretprobe, + NULL, &kprobe_opts); + if (!ASSERT_OK_PTR(skel->links.handle_kretprobe, + "attach_kretprobe_by_addr")) + goto cleanup; + + /* trigger & validate kprobe && kretprobe */ + usleep(1); + + ASSERT_EQ(skel->bss->kprobe_res, 1, "check_kprobe_res"); + ASSERT_EQ(skel->bss->kretprobe_res, 2, "check_kretprobe_res"); + +cleanup: + test_attach_probe_manual__destroy(skel); +} + +/* reject legacy address-based kprobe attach */ +static void test_attach_kprobe_legacy_by_addr_reject(void) +{ + DECLARE_LIBBPF_OPTS(bpf_kprobe_opts, kprobe_opts); + struct test_attach_probe_manual *skel; + unsigned long func_addr; + + if (!ASSERT_OK(load_kallsyms(), "load_kallsyms")) + return; + + func_addr =3D ksym_get_addr(SYS_NANOSLEEP_KPROBE_NAME); + if (!ASSERT_NEQ(func_addr, 0UL, "func_addr")) + return; + + skel =3D test_attach_probe_manual__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_kprobe_manual_open_and_load")) + return; + + kprobe_opts.attach_mode =3D PROBE_ATTACH_MODE_LEGACY; + kprobe_opts.offset =3D func_addr; + skel->links.handle_kprobe =3D + bpf_program__attach_kprobe_opts(skel->progs.handle_kprobe, + NULL, &kprobe_opts); + if (ASSERT_ERR_PTR(skel->links.handle_kprobe, + "attach_kprobe_legacy_by_addr")) + ASSERT_EQ(libbpf_get_error(skel->links.handle_kprobe), -ENOTSUP, + "attach_kprobe_legacy_by_addr_err"); + + test_attach_probe_manual__destroy(skel); +} + /* attach uprobe/uretprobe long event name testings */ static void test_attach_uprobe_long_event_name(void) { @@ -416,6 +492,12 @@ void test_attach_probe(void) test_attach_probe_manual(PROBE_ATTACH_MODE_PERF); if (test__start_subtest("manual-link")) test_attach_probe_manual(PROBE_ATTACH_MODE_LINK); + if (test__start_subtest("kprobe-perf-by-addr")) + test_attach_kprobe_by_addr(PROBE_ATTACH_MODE_PERF); + if (test__start_subtest("kprobe-link-by-addr")) + test_attach_kprobe_by_addr(PROBE_ATTACH_MODE_LINK); + if (test__start_subtest("kprobe-legacy-by-addr-reject")) + test_attach_kprobe_legacy_by_addr_reject(); =20 if (test__start_subtest("auto")) test_attach_probe_auto(skel); --=20 2.52.0