From nobody Sat Feb 7 05:57:31 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 8B5501991CF; Sat, 26 Apr 2025 16:00:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683252; cv=none; b=QwuHJutmTiJCabh74CBDkdcbiUs1+sZN61a7bHKNRwohH5WbkElrMOpZpByUkiSNBXdWTDcmvUiM7RFowxQwwP+HTcNY/AwmkVx/QrRPFnnQMS8M3aTM8KkC40fEeDn8lflt6rsqSd+WD4InPh2mk2tUneYf2U2Ng75N2qX1K8g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683252; c=relaxed/simple; bh=6wtlZ3cVz3h8HN3xXJXOFuW6FUMXN4oKtvQE5SotFwA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Amf18ar87A3sVBWCb8P9nn4OyGiR7+YPm7RRF9z8HSPMqqt4PSLU4zNv32Nd4mfncKjqNnEOtLHCtuSbgSBfwNUDlqFDFPMtuomSbRXSiL9Kf4voscqgtIA1BUhWn9YFv0IKltgnVWtuXt3laG/JAqaGLh4b3L3IJhh4BcfBWrI= 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=V4Itz2zH; arc=none smtp.client-ip=209.85.210.177 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="V4Itz2zH" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-72d3b48d2ffso3188813b3a.2; Sat, 26 Apr 2025 09:00:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745683250; x=1746288050; 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=R/detW5q78fUeVymgHMz6DHf9alatBjaEk8q4ObEsdg=; b=V4Itz2zH88qMv5KkTnbYjQjrUT36jr7NOp0xDpWTZusPZpNz19qGGtegt4+94o4w8O nDnBGg6wCD+bcPQ0xykw790VZKI92ux1IKLFmUMwA1OXAhy2P7pWG/f9LbnYgzxnhFr7 bXwYUsGS96lBe8FQ+DewVXvgxAcpT5uuHlwHwBGRQJvJ1WFzAV2VBx48B1d6OR7iUewo AIG1fpIxnjiQiz9kYAKLQCy88R+1nZpiUYCm59p7Ymq9vmyMWL7E9rEWUhxgNkVOprSH 89z9THIyf/7WhSeW/PmAz0GUICFtPx2DyvI87F+08L8wrFLbSHcLVoOax0w7fF9quWgA gIgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745683250; x=1746288050; 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=R/detW5q78fUeVymgHMz6DHf9alatBjaEk8q4ObEsdg=; b=vclpWBK/5S221NBYrE/3P035Iq0noGlXQAE29G+98gtjUGbGulN9d7NZruY9Rc2REF 9hkLXc7UuPhNA7/uxgX99K5T1EgjlCGYsUn100NoGc5OtuVxYgy5rKgBNS7tgNWbbtOo ekA1ps6wNKoSO7Hi/57TIFc/zOa99cBSVqRS+81k8vKACL9zGvwL6xZA0czAgBCjL2Li p6IESLzU+zbGc0YkRIjGwaVBJIkLGtQ3k/eV0OdrefOWYhrJjcj41WZVNKcH4SBZAW+j k7dLoe3fVxNtTXhfzXOU5uCz3XhNva5VKnk3YTpnEGdyuMSh+wzRM1ahx6F9D9h4wf1l FehQ== X-Forwarded-Encrypted: i=1; AJvYcCVecIfy6mrKIOGrvORsIKXhpLGmHCoxywrfG1g5GEpTGliCntCVQfoUchon7HuTaVWwLEI=@vger.kernel.org, AJvYcCWczK482uOlxeEk6J6pSKMIsVyAWwCP+yTsrrytzj26cqVej4cJqzo06Dp7UXtksGol/Bwwcc5U@vger.kernel.org, AJvYcCWjPWXSXjpoB0i7ekaMzGBFtcxWF8z3/eqJe4ks3gniMj46RFdXkYmi2Kla7etYpVB6HhCv/VygXn/VIAi2uxBoCooN@vger.kernel.org, AJvYcCX/U/CnqDBBsnH6+E7gRZFIu4pOWqo67qe7S82t+Ld45LH+ernRUTY9df65C97tkr3Ol+UDx+hYDgeCMxjALrfx@vger.kernel.org X-Gm-Message-State: AOJu0YyXaChIX2/vTT7EaaIVq/fMrJVsMW0BKRVal1AcRTPUrQJ387xx f1tHXF8iDHXDRDMKqkGMboI3pIEZfg4i0T8QIHkBJwv1UNjl95j3 X-Gm-Gg: ASbGncvxLC9vGpmRb+Vnk0ZbpMPCvp6xxDvnUU7JNjEcpI1i0zPsk2oUXehXxrvnYB9 M6ST2UAuUHs8TYgavE+Rk2t6LHdPKKnpf2YxirYbG92cYg4ymyH/McNciVhzZ31XQa5YIOCrDQp zoFbDs+Xre6OpjgT5tRSPibjkV+1BkwT/2GbA4IPsIZ4HjRIKCq+pByQz8vjPxtKjJFEbj42NhA VXp7xlhWvlt7dLM6sh9shtjogBRyymDhyXhWo2YIx4dgDpyDYWqEoGtvfPaw1U8meS5Ib/2Vbls iT5KnTxP67NvaI3uUxqe8dtCY84J6VD+QE7X5H9biLA= X-Google-Smtp-Source: AGHT+IFsBkXoaPfJogYRS6DLJQLaIJ0SeexlKs+HGVduqWYpjSAZjFAgxsW3BQmfCzS1QUqe8Ims2A== X-Received: by 2002:a05:6a00:2445:b0:73e:1566:5960 with SMTP id d2e1a72fcca58-73ff7377393mr4741493b3a.19.1745683249690; Sat, 26 Apr 2025 09:00:49 -0700 (PDT) Received: from ubuntu2404.. ([122.231.145.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25941cc1sm5174760b3a.60.2025.04.26.09.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 09:00:49 -0700 (PDT) From: KaFai Wan To: song@kernel.org, jolsa@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, mattbobrowski@google.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, mykolal@fb.com, shuah@kernel.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev, mannkafai@gmail.com Subject: [PATCH bpf-next 1/4] bpf: Allow get_func_[arg|arg_cnt] helpers in raw tracepoint programs Date: Sun, 27 Apr 2025 00:00:24 +0800 Message-ID: <20250426160027.177173-2-mannkafai@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426160027.177173-1-mannkafai@gmail.com> References: <20250426160027.177173-1-mannkafai@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" Adding support to use get_func_[arg|arg_cnt] helpers in raw_tp/tp_btf programs. We can use get_func_[arg|ret|arg_cnt] helpers in fentry/fexit/fmod_ret programs currently. If we try to use get_func_[arg|arg_cnt] helpers in raw_tp/tp_btf programs, verifier will fail to load the program with: ; __u64 cnt =3D bpf_get_func_arg_cnt(ctx); 3: (85) call bpf_get_func_arg_cnt#185 unknown func bpf_get_func_arg_cnt#185 Adding get_func_[arg|arg_cnt] helpers in raw_tp_prog_func_proto and tracing_prog_func_proto for raw tracepoint. Adding 1 arg on ctx of raw tracepoint program and make it stores number of arguments on ctx-8, so it's easy to verify argument index and find argument's position. Signed-off-by: KaFai Wan --- kernel/trace/bpf_trace.c | 17 ++++++++++++++--- net/bpf/test_run.c | 13 +++++-------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 52c432a44aeb..eb4c56013493 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1892,6 +1892,10 @@ raw_tp_prog_func_proto(enum bpf_func_id func_id, con= st struct bpf_prog *prog) return &bpf_get_stackid_proto_raw_tp; case BPF_FUNC_get_stack: return &bpf_get_stack_proto_raw_tp; + case BPF_FUNC_get_func_arg: + return &bpf_get_func_arg_proto; + case BPF_FUNC_get_func_arg_cnt: + return &bpf_get_func_arg_cnt_proto; case BPF_FUNC_get_attach_cookie: return &bpf_get_attach_cookie_proto_tracing; default: @@ -1950,10 +1954,16 @@ tracing_prog_func_proto(enum bpf_func_id func_id, c= onst struct bpf_prog *prog) case BPF_FUNC_d_path: return &bpf_d_path_proto; case BPF_FUNC_get_func_arg: + if (prog->type =3D=3D BPF_PROG_TYPE_TRACING && + prog->expected_attach_type =3D=3D BPF_TRACE_RAW_TP) + return &bpf_get_func_arg_proto; return bpf_prog_has_trampoline(prog) ? &bpf_get_func_arg_proto : NULL; case BPF_FUNC_get_func_ret: return bpf_prog_has_trampoline(prog) ? &bpf_get_func_ret_proto : NULL; case BPF_FUNC_get_func_arg_cnt: + if (prog->type =3D=3D BPF_PROG_TYPE_TRACING && + prog->expected_attach_type =3D=3D BPF_TRACE_RAW_TP) + return &bpf_get_func_arg_cnt_proto; return bpf_prog_has_trampoline(prog) ? &bpf_get_func_arg_cnt_proto : NUL= L; case BPF_FUNC_get_attach_cookie: if (prog->type =3D=3D BPF_PROG_TYPE_TRACING && @@ -2312,7 +2322,7 @@ void __bpf_trace_run(struct bpf_raw_tp_link *link, u6= 4 *args) #define REPEAT(X, FN, DL, ...) REPEAT_##X(FN, DL, __VA_ARGS__) =20 #define SARG(X) u64 arg##X -#define COPY(X) args[X] =3D arg##X +#define COPY(X) args[X + 1] =3D arg##X =20 #define __DL_COM (,) #define __DL_SEM (;) @@ -2323,9 +2333,10 @@ void __bpf_trace_run(struct bpf_raw_tp_link *link, u= 64 *args) void bpf_trace_run##x(struct bpf_raw_tp_link *link, \ REPEAT(x, SARG, __DL_COM, __SEQ_0_11)) \ { \ - u64 args[x]; \ + u64 args[x + 1]; \ + args[0] =3D x; \ REPEAT(x, COPY, __DL_SEM, __SEQ_0_11); \ - __bpf_trace_run(link, args); \ + __bpf_trace_run(link, args + 1); \ } \ EXPORT_SYMBOL_GPL(bpf_trace_run##x) BPF_TRACE_DEFN_x(1); diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index aaf13a7d58ed..8cb285187270 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -760,6 +760,7 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, void __user *ctx_in =3D u64_to_user_ptr(kattr->test.ctx_in); __u32 ctx_size_in =3D kattr->test.ctx_size_in; struct bpf_raw_tp_test_run_info info; + u64 args[MAX_BPF_FUNC_ARGS + 1] =3D {}; int cpu =3D kattr->test.cpu, err =3D 0; int current_cpu; =20 @@ -776,14 +777,11 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, if ((kattr->test.flags & BPF_F_TEST_RUN_ON_CPU) =3D=3D 0 && cpu !=3D 0) return -EINVAL; =20 - if (ctx_size_in) { - info.ctx =3D memdup_user(ctx_in, ctx_size_in); - if (IS_ERR(info.ctx)) - return PTR_ERR(info.ctx); - } else { - info.ctx =3D NULL; - } + if (ctx_size_in && copy_from_user(args + 1, ctx_in, ctx_size_in)) + return -EFAULT; =20 + args[0] =3D ctx_size_in / sizeof(u64); + info.ctx =3D args + 1; info.prog =3D prog; =20 current_cpu =3D get_cpu(); @@ -807,7 +805,6 @@ int bpf_prog_test_run_raw_tp(struct bpf_prog *prog, copy_to_user(&uattr->test.retval, &info.retval, sizeof(u32))) err =3D -EFAULT; =20 - kfree(info.ctx); return err; } =20 --=20 2.43.0 From nobody Sat Feb 7 05:57:31 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 99F4A253F24; Sat, 26 Apr 2025 16:01:00 +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=1745683262; cv=none; b=NQ10LiLbPwdBU9++8NrEMrjB040gGwfEhzveIMJPnS3OekIU6McgfoiA3ndMq27kLdzrong3PXPWrWWskfageapB0nKgbnCEHPO4x6iKuW9qQcsAyBeUpalBo5EloWDJcDtK9G/TtLZu3DnRmRocmVHSDTkdFea+W/kvWFgwOtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683262; c=relaxed/simple; bh=7EA6hhpeHbVYqXYkZALdzPQEkiddr5+VhaiimhyaAJQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kb51lrWP4JRzK3ynU6LU8ULAR34eW1Jyw8eOP0khZlz55Kjc6LXu1rHpAb17tfh7wxYpx36N5X1btlw9sIAru1Z5oDI70kUGMXY7EjAgqrpi5f9HUeJRmt4Iy4Bs5U+KHdlIfZo0HW3qLEDm+e7FcGuSk6mcwvtBG/VGxZGc6To= 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/XbNTC4; 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="S/XbNTC4" Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-736c062b1f5so2858737b3a.0; Sat, 26 Apr 2025 09:01:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745683260; x=1746288060; 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=mx9tLjJ69ao0Ttn6mcN/Ke4GGkgbccuSZK0yZYt++zk=; b=S/XbNTC406YiZu62DqDcrrqMZMErQsmPsQSRwbV0301J51L1V3kqGN4zaq4RQcyb/Z VPWULcTnKMiDlfsUcPIf5bSQ0NuxY9hcvKG8LcGknCKfMc6/I/YGtFYsl0Nfl4fZItLX tU3fcyd+FXX4hQyUpgCUFocTfg/VCVX+8/Bao0uJyoiD9WIrof64V0X7pjdarqNH0aUF BZuV7RCDcASwt+HfczIYR66lAkYN85mVkQ/exealn9aY1mGyurSGERzC7X60iFdLygBv KyILFnwf+rVKZxmjxvMfBvEfhpdfIngB4ru1L6QheO3ATXSH0KDgr/90amS5hBg2nVhE tVxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745683260; x=1746288060; 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=mx9tLjJ69ao0Ttn6mcN/Ke4GGkgbccuSZK0yZYt++zk=; b=OBuY6lGQutdEPGuppIWycKp8OOIni78doM7SUIWADGQ5b5aAANRPcZ+03V1KXFv2n1 3I3v0jhYDkdqgqg99G21IDD/hTQtZP7/TnRIDlQfcdpFMscX0/hpRV6MmhZG8qm1kwdW FF/eDTgg9LeN0XofGIueTROhDcRHfefvZaWZ3bZUfxV26PWq3W4/IPNg6GsoeA5CqfQ7 zCYGGFIamDnzNit5IXZ9d82Q1qovBjGDmC1MqGj9a8K8vVklLR78AAwQJK+mCS3BH5LX 8uZPYTjwOOXC5jpXrFJNBMvyWAACnm/C8j6VXUVOifXGwTT0bUQw6WI5t5ptjBsJXEwa m5AA== X-Forwarded-Encrypted: i=1; AJvYcCV+9Cqzz6RtZqATCnoOhZxi/HFlLeZa8ubmyIjYth8B5QL3eyF0cA+nme1yFGcDtbsa6Hs=@vger.kernel.org, AJvYcCX+M58ontdwzN7Gul4DXjrPoIjj4P61atfWYNbuUsfs3GZ0wpL8V1SEhyCQeBQgmgghRN0v97eovLEqSUVnOJPkhst3@vger.kernel.org, AJvYcCXTkcnzohVz9pZptziIMIvyMV4HQhc4QTQrJgxqk1WSWlTFo7euV8PMt7P6bvodISXBy9DTjyHqfeWh93NnhXae@vger.kernel.org, AJvYcCXij7j/VcKAqrpttFT81NmTRDnS1tHyT1/Mit02ziLoOVuODeCmZDZjxLjieF+gN3TMt/+cSgSm@vger.kernel.org X-Gm-Message-State: AOJu0YziBffLDQ8pY220cnz19Z2XyeY8lCxz3BLrky8xYZDaJaZ1Fn3Q vg4EMmIc1pR0NOzL5xAQyG9rZT9ljnuCGKqbLSsQDiW7XgRvhUsz X-Gm-Gg: ASbGnctC0mfK3Pt/XpMav3V71OZkWn/7VJEgLgGBzuxDGMB8WpQs+Drmu2VuTMk+FIm rdSG8rQU1s9SGKfaHIxL63jymFC2MkK21x9u6DoFPA2YfxQYmhDHUzFZv52jHA3wjJeSKXRMeNT NeFT68M3Yp0b1AdfcJWoE2Ts4NauYbjCJOn/mD/kCHTPMIVxkDNxH5MIhoQSt3c5/ME9cry+EVG lUR19B49oVgEs/yUNMTurwiOEcP/aQ2/C89zRyAC5P2uxF1WFLZDcXPdwU4qjy56FJSN8z7yDke B1NPynktA6Hn5dWcATit8bF8otZkXBwLy2gYNPU6Kso= X-Google-Smtp-Source: AGHT+IEDyzhR7wng6IWBJ4bIfZ/KPJ2uEby6DK0Yi2omYF4qz4F3oJwL2SznPWd7fMBKEjoTCxS84A== X-Received: by 2002:a05:6a00:cce:b0:739:4723:c4d7 with SMTP id d2e1a72fcca58-73fd8e53d55mr7469160b3a.22.1745683259731; Sat, 26 Apr 2025 09:00:59 -0700 (PDT) Received: from ubuntu2404.. ([122.231.145.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25941cc1sm5174760b3a.60.2025.04.26.09.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 09:00:59 -0700 (PDT) From: KaFai Wan To: song@kernel.org, jolsa@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, mattbobrowski@google.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, mykolal@fb.com, shuah@kernel.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev, mannkafai@gmail.com Subject: [PATCH bpf-next 2/4] bpf: Enable BPF_PROG_TEST_RUN for tp_btf Date: Sun, 27 Apr 2025 00:00:25 +0800 Message-ID: <20250426160027.177173-3-mannkafai@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426160027.177173-1-mannkafai@gmail.com> References: <20250426160027.177173-1-mannkafai@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 .test_run for tp_btf. Use the .test_run for raw_tp. Signed-off-by: KaFai Wan --- net/bpf/test_run.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 8cb285187270..8c901ec92341 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -690,6 +690,9 @@ int bpf_prog_test_run_tracing(struct bpf_prog *prog, int b =3D 2, err =3D -EFAULT; u32 retval =3D 0; =20 + if (prog->expected_attach_type =3D=3D BPF_TRACE_RAW_TP) + return bpf_prog_test_run_raw_tp(prog, kattr, uattr); + if (kattr->test.flags || kattr->test.cpu || kattr->test.batch_size) return -EINVAL; =20 --=20 2.43.0 From nobody Sat Feb 7 05:57:31 2026 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.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 C6D151F7580; Sat, 26 Apr 2025 16:01:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683273; cv=none; b=ZN0AVIf43yG9gXUyM77XhZUngdQ1J8uWLvjZSrHw4LUHoaMsJSxXKfZZZtIjNO9RWZa9K5LBZMC8dD8IAsQM8fzExFDkeMlr8vkiY1l1v//dkWSqUcB9/fwG82sS3ZOh0lv+ZgV3YfU1LZA38isrC63Ncoade9TYJVSMEjTSUOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683273; c=relaxed/simple; bh=sYrYwmNXEWJvhSrFZ7do9MRllwHp0cTWhXCq5TJG9ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pvFm5XZtxRM33IvFxgtQsi+or7vfzYj5qbxxZgazOdPhTwu2DNIxOuzqUPOuSCLNUqE2ldkY1gFzw1GEmuuwzMCl547wYxrAsAocnUNfGPx3tbzv4FsxwjUrnBCmrFaMsa257lpC4s6QYbs6nt6HxcRrtykKQVCHZUbDSWJVTxM= 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=mqV4E8Hm; arc=none smtp.client-ip=209.85.210.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="mqV4E8Hm" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-736bfa487c3so2787608b3a.1; Sat, 26 Apr 2025 09:01:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745683270; x=1746288070; 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=EfrHPL8SYej58F/66Eqqubx6STs/vpsTKaIaiNl+Q5w=; b=mqV4E8HmV030JWD+fsnbSR4bsJOn+idzgnWewmGPDfzaFvicZB+ie6wSkPtgGFtnfp nWt2CE13+lDzY9whWFd663VX/FxJSSroxPZjEkARJMloTKqj771R/rv4Ilp1j3EhanSG j1QEe2DKMKIb2HJ7krdlr0s04hjq38rzl9E0v65XvrT65bqbWJDgeLqgg5GY4HjHeq8T jIV7wq8i+MBf6DU0QtrTnQoHhLMekrGzoimukFwKQPQVPWKn81nGkgZsX9XSegYwFlrW YhxTUawIWg+bg844Yi6vAlaa1tL2Vm+Vkceynw9IIAgzp/RVBNxIPhNSiA8SmwYBWyQ+ JcIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745683270; x=1746288070; 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=EfrHPL8SYej58F/66Eqqubx6STs/vpsTKaIaiNl+Q5w=; b=LWiIEtqnrPSq2GjeBV1CtWRGnbVyzkXiSPqVwrJcbiU/me3Yz+SrAIuo77TLA2lkuY tyBavKuHbqlBESDx1y0q/UI9+VtrMSql9/aqzUQFBWFKDQ2nryzBLU5puQBVM3TLtnB3 k0ZMr7XChhhRj8Pvx31HdDD09YQ06FjUXW0w0HrPg/WJ4Zmtflt66BozdGQ+Hmo4JVP+ 9HWe2EhDFx0khdPhq3MK4md8nYQhZVLijjIOwCRmzQtk9/hIHBXpg3OO2y5db/EtIhQl t/RqTq8EBC9r34sxMTCGgaHkS6+fOi8H5dXayZYDdu0Og28IM/TWmYoR6FXGkufLwIRh vJPA== X-Forwarded-Encrypted: i=1; AJvYcCUeX71H2ZFpNZTldRwhg82IjYJFClviHVvwAYpVJxV+qkBonkJsj4v7yKrykvgsfA7T+KQkDom/TeuIflPZKxbCmrRy@vger.kernel.org, AJvYcCV9Qr17eGmd+4Kte8TkUiChX2zGbD1LNw86AN9w2KX/CxFGSngBfSYD4Qn8+eNiuauAY+0=@vger.kernel.org, AJvYcCVuiCkbv1gQ9QWLnTfF02wukpqSE14+TBzxkYJ5zuKajAuAgR2PgRmE0YGQZWHOgUP5OK7lOHWxQ3vfdwH+8HmT@vger.kernel.org, AJvYcCXiUS7WTirqWpN23iiITO8ARE91ScMZ6CtXoAfeF01iXYM2tPHXOtRd5/rPv3PlrVLsUPjKd8c4@vger.kernel.org X-Gm-Message-State: AOJu0YytXKP7SaA8Ll7vrbJxu3lrabqaCxtDIVbtz9aWMmLT70bvxjPS r/2/VuOQv+kO+1+UJeE8JBzP/3Palc8FkrVUO6Y8+1mj0uI1zmKG X-Gm-Gg: ASbGncv/5TzcKeehAn1PzwY/RIaNdJ2StvdO5VngVeRZJkZTG4ORPYJQ8ztZjWzbCbM hzpEG+CNtDBDTyguh94/Gfzc1AqhKr5Xa0GjhYDoHXSFSBaWBGNsSZ7kcr4yne051fsud6G7Lr1 2q+Gz/Egk+H2RJsCxso4BZR905QUY2ARXCImEY0+wYYsJPeizrWjDETZ2GuGR4XuS0HiPpwiZQP reGnUineo0U4ow+D5frZ2K787z/hYsOlHS1o99ciOy4Zx4g8J7Oit8tgHJyVKU690DZeGWC+zFt HQkNuT/MC0SdBj1P+7tBnL3g79RWHg4HF59vkvM19PQ= X-Google-Smtp-Source: AGHT+IHH8JmPF6Bo5KLrR6mlou2ajWs07pw1O7Jy5rpnCnPvYOD74bRAZa77Qqju+OGMCRCnUbkf+g== X-Received: by 2002:a05:6a20:12d1:b0:1f5:769a:a4be with SMTP id adf61e73a8af0-2046a6f41d4mr5051483637.36.1745683269931; Sat, 26 Apr 2025 09:01:09 -0700 (PDT) Received: from ubuntu2404.. ([122.231.145.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25941cc1sm5174760b3a.60.2025.04.26.09.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 09:01:09 -0700 (PDT) From: KaFai Wan To: song@kernel.org, jolsa@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, mattbobrowski@google.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, mykolal@fb.com, shuah@kernel.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev, mannkafai@gmail.com Subject: [PATCH bpf-next 3/4] selftests/bpf: Add raw_tp_test_run for tp_btf Date: Sun, 27 Apr 2025 00:00:26 +0800 Message-ID: <20250426160027.177173-4-mannkafai@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426160027.177173-1-mannkafai@gmail.com> References: <20250426160027.177173-1-mannkafai@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 test runs test_run for tp_btf base on raw_tp. Changing test_raw_tp_test_run to test both raw_tp and tp_btf. Signed-off-by: KaFai Wan --- .../selftests/bpf/prog_tests/raw_tp_test_run.c | 18 ++++++++++++++++-- .../selftests/bpf/progs/test_raw_tp_test_run.c | 16 +++++++++++++--- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/raw_tp_test_run.c b/too= ls/testing/selftests/bpf/prog_tests/raw_tp_test_run.c index fe5b8fae2c36..e2968a1e73bf 100644 --- a/tools/testing/selftests/bpf/prog_tests/raw_tp_test_run.c +++ b/tools/testing/selftests/bpf/prog_tests/raw_tp_test_run.c @@ -5,7 +5,7 @@ #include "bpf/libbpf_internal.h" #include "test_raw_tp_test_run.skel.h" =20 -void test_raw_tp_test_run(void) +static void test_raw_tp(bool is_tp_btf) { int comm_fd =3D -1, err, nr_online, i, prog_fd; __u64 args[2] =3D {0x1234ULL, 0x5678ULL}; @@ -28,6 +28,9 @@ void test_raw_tp_test_run(void) if (!ASSERT_OK_PTR(skel, "skel_open")) goto cleanup; =20 + bpf_program__set_autoattach(skel->progs.rename_tp_btf, is_tp_btf); + bpf_program__set_autoattach(skel->progs.rename_raw_tp, !is_tp_btf); + err =3D test_raw_tp_test_run__attach(skel); if (!ASSERT_OK(err, "skel_attach")) goto cleanup; @@ -42,7 +45,10 @@ void test_raw_tp_test_run(void) ASSERT_NEQ(skel->bss->count, 0, "check_count"); ASSERT_EQ(skel->data->on_cpu, 0xffffffff, "check_on_cpu"); =20 - prog_fd =3D bpf_program__fd(skel->progs.rename); + if (is_tp_btf) + prog_fd =3D bpf_program__fd(skel->progs.rename_tp_btf); + else + prog_fd =3D bpf_program__fd(skel->progs.rename_raw_tp); opts.ctx_in =3D args; opts.ctx_size_in =3D sizeof(__u64); =20 @@ -84,3 +90,11 @@ void test_raw_tp_test_run(void) test_raw_tp_test_run__destroy(skel); free(online); } + +void test_raw_tp_test_run(void) +{ + if (test__start_subtest("raw_tp")) + test_raw_tp(false); + if (test__start_subtest("tp_btf")) + test_raw_tp(true); +} diff --git a/tools/testing/selftests/bpf/progs/test_raw_tp_test_run.c b/too= ls/testing/selftests/bpf/progs/test_raw_tp_test_run.c index 4c63cc87b9d0..ddc22e6cfdd9 100644 --- a/tools/testing/selftests/bpf/progs/test_raw_tp_test_run.c +++ b/tools/testing/selftests/bpf/progs/test_raw_tp_test_run.c @@ -8,10 +8,8 @@ __u32 count =3D 0; __u32 on_cpu =3D 0xffffffff; =20 -SEC("raw_tp/task_rename") -int BPF_PROG(rename, struct task_struct *task, char *comm) +static __always_inline int check_test_run(struct task_struct *task, char *= comm) { - count++; if ((__u64) task =3D=3D 0x1234ULL && (__u64) comm =3D=3D 0x5678ULL) { on_cpu =3D bpf_get_smp_processor_id(); @@ -21,4 +19,16 @@ int BPF_PROG(rename, struct task_struct *task, char *com= m) return 0; } =20 +SEC("raw_tp/task_rename") +int BPF_PROG(rename_raw_tp, struct task_struct *task, char *comm) +{ + return check_test_run(task, comm); +} + +SEC("tp_btf/task_rename") +int BPF_PROG(rename_tp_btf, struct task_struct *task, char *comm) +{ + return check_test_run(task, comm); +} + char _license[] SEC("license") =3D "GPL"; --=20 2.43.0 From nobody Sat Feb 7 05:57:31 2026 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 5AE1425D21D; Sat, 26 Apr 2025 16:01:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683282; cv=none; b=VVMoqBxj47BmG3C7XQv8uE2J+z1OpRRxtJWdygUMHjww4BgtRd9zwmfP0CJrbnY8tpB6nD2cVG0wQY0k6bWFAsbZKGb8euMYZYPHEDbUbGyR4ytxjygPV9hg6ltYmakB6N3A1WqtTOs3udWC7g0QmvGqK10K6ilKW0TxJLnbTeM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745683282; c=relaxed/simple; bh=j1ZwpePxHf17oaNy4C817iuNGsFMNMA27KCXp3StqC4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AmlJ20lUoWbeO0HZvg/9xVDcl1l51zdT4EWaolaf5KlbF8cj7FW39tOdugDPSjAiDRU0SIauineAmUI2CdSi/PFslf7JUEefxj2IkgymMirk1GoGzODEau2JQguFMYAz9ebWpGT45jcAwrVw+3Y+iB+6I6KKc/+bxQc+eQiO9IM= 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=QBHgvRBS; arc=none smtp.client-ip=209.85.210.170 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="QBHgvRBS" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7376e311086so4556845b3a.3; Sat, 26 Apr 2025 09:01:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745683280; x=1746288080; 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=Pni2FZRTPtb8qRjCx0Q87tyTFJ+GCQIncwnprr7wWgE=; b=QBHgvRBSLbVc/Sx08gPXKGClsKwiUguwzNKatGdXcQtOn1XfEciPuNWVpqqvjCET18 /c+tSvT4TnF7f6TLM/tRySp0b3V7EkWMwHerYr4ApcAHI+YOAYjczK/JmjvNf/UULNHf 04XygGsuxZZi1Wp9RiGxMZv9vviIjtouAUQ9gKaidlF8LH1GSc0OglWQfb5LXTfIf28B 1TeuZo7XHGwwIh+pqpyDm0svCBBHdIfH2YOvmoCezlHOmTgayonjlOdVy+iwTAZomKaL te9TjO3e9FlW/iiRwk9bC2vKIz76uReWvS6HLlelLE69/QQNdYxnQSHktwUMvDTqiZbs jZUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745683280; x=1746288080; 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=Pni2FZRTPtb8qRjCx0Q87tyTFJ+GCQIncwnprr7wWgE=; b=S1O4/W5I3m467tLVPD24LPbCCMWg75fzEnvXWcxb5/Ea9fV9YEQuNW/xu7bQX+ytoO jk1Ez4qJoV4PxDeHWvQ0ocwadgfX2ozT83fK3LCJQMZrWRNurDsaRap2VTJ0sMJGtcaE SGHWhpPKT/Y7r4fu62xjkZBvz3CB6sV1lAg8zGEWGKwizfYPlqIk3DDX71E5Z1h4noDt l+MFrsRA2LmPySsdtiraMJUJFRPTLaIPDKzknA65ScXDdH9nqW1An7f2+qAx+uLnABIq AlFVeat1+43TYI81ET/yhbvdgPQCJYX0SO45C5Xp/kUDLKjcbABEMCB8F6hLVtnNbIHF +hrw== X-Forwarded-Encrypted: i=1; AJvYcCV8RFjMHN2EDFF9PX3+lonodys4l/Zkqc8wPyNrGsEcJ4/w+A9Jp0tcuvwx9ervDhibVkPImT+3jpNt8hXChJOq@vger.kernel.org, AJvYcCVXjBApDXqnsZIZsAdEa3wWvcjCZRDGzeegBty/fCQ777Txy1vzC0hT2DTjdVLQ3D+eNphkeCBT@vger.kernel.org, AJvYcCWLXcPyq86GVZRPSBGPXzbXZvbVHisRRhZ8Ed5oUM/TYYCalmnImkbCFaES6R3E73APqv8=@vger.kernel.org, AJvYcCXr8geTaygwN8QLkRKTsLz7U9JVCh8OO1W0rgPinLButL4I1Wmt/riCyMS3IiEF649Lpyfnp2sKzM/nXM4nx6JYlL8e@vger.kernel.org X-Gm-Message-State: AOJu0YyBAPmdqDfAKZLwlt4igQZ5xTLkry7wGM0DdGOAVuPA+R1O7Rj9 fnSZGe/TC693VvkdOOdw+J0dTyUZF2ObezRkJsxMxnLLr7xwZVj0 X-Gm-Gg: ASbGncuvNfVCIB2ufQTmYZ8LyQqIUsCXeNnw5M7y5RUM9NLCjoi2cfchyW85rSJJG2w UuA82BIN25/wUrksvGmyfznU1qVyHMBwhfo9f58tRfnlXvuDX65cWPm+mb0JS5EAGN+DzKy8BZf ONR2VhIt9NEg4rPQVwm53SH4AjcnyzUK1gg9UgUOSWHhMyDWQNuYimjxeKMOGNijc9WyLXGd+ha 5aaHzNpPzpavsqFjk9AjkGdmaCbLQf7D5CPnYutQCpRl+0cMZHLarmNRB+DY4KmvlJ79w9hAVt9 C+wCSOWDf0m0hL2jvk6L5UkkiMY9CfQTizHZF7VMpdg= X-Google-Smtp-Source: AGHT+IFr3Hq2i69IJFF1tw0S+2vvtpcd7Ijsa0JxUv/8phzlJOtKXrwfW+IUvTV1XqCfbuHcuHWW0Q== X-Received: by 2002:a05:6a00:2410:b0:736:4b85:ee05 with SMTP id d2e1a72fcca58-73fd74c1cc4mr7970090b3a.11.1745683280597; Sat, 26 Apr 2025 09:01:20 -0700 (PDT) Received: from ubuntu2404.. ([122.231.145.226]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25941cc1sm5174760b3a.60.2025.04.26.09.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Apr 2025 09:01:20 -0700 (PDT) From: KaFai Wan To: song@kernel.org, jolsa@kernel.org, ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, mattbobrowski@google.com, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, mykolal@fb.com, shuah@kernel.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-trace-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, leon.hwang@linux.dev, mannkafai@gmail.com Subject: [PATCH bpf-next 4/4] selftests/bpf: Add tests for get_func_[arg|arg_cnt] helpers in raw tracepoint programs Date: Sun, 27 Apr 2025 00:00:27 +0800 Message-ID: <20250426160027.177173-5-mannkafai@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250426160027.177173-1-mannkafai@gmail.com> References: <20250426160027.177173-1-mannkafai@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" Adding tests for get_func_[arg|arg_cnt] helpers in raw tracepoint programs. Using these helpers in raw_tp/tp_btf programs. Signed-off-by: KaFai Wan --- .../bpf/prog_tests/raw_tp_get_func_args.c | 48 +++++++++++++++++++ .../bpf/progs/test_raw_tp_get_func_args.c | 47 ++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_get_func_= args.c create mode 100644 tools/testing/selftests/bpf/progs/test_raw_tp_get_func_= args.c diff --git a/tools/testing/selftests/bpf/prog_tests/raw_tp_get_func_args.c = b/tools/testing/selftests/bpf/prog_tests/raw_tp_get_func_args.c new file mode 100644 index 000000000000..cbe9b441d8d9 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/raw_tp_get_func_args.c @@ -0,0 +1,48 @@ +// SPDX-License-Identifier: GPL-2.0 +#include +#include +#include "bpf/libbpf_internal.h" +#include "test_raw_tp_get_func_args.skel.h" + +static void test_raw_tp_args(bool is_tp_btf) +{ + __u64 args[2] =3D {0x1234ULL, 0x5678ULL}; + int expected_retval =3D 0x1234 + 0x5678; + struct test_raw_tp_get_func_args *skel; + LIBBPF_OPTS(bpf_test_run_opts, opts, + .ctx_in =3D args, + .ctx_size_in =3D sizeof(args), + ); + int err, prog_fd; + + skel =3D test_raw_tp_get_func_args__open_and_load(); + if (!ASSERT_OK_PTR(skel, "skel_open")) + goto cleanup; + + bpf_program__set_autoattach(skel->progs.tp_btf_test, is_tp_btf); + bpf_program__set_autoattach(skel->progs.raw_tp_test, !is_tp_btf); + + err =3D test_raw_tp_get_func_args__attach(skel); + if (!ASSERT_OK(err, "skel_attach")) + goto cleanup; + + if (is_tp_btf) + prog_fd =3D bpf_program__fd(skel->progs.tp_btf_test); + else + prog_fd =3D bpf_program__fd(skel->progs.raw_tp_test); + err =3D bpf_prog_test_run_opts(prog_fd, &opts); + ASSERT_OK(err, "test_run"); + ASSERT_EQ(opts.retval, expected_retval, "check_retval"); + ASSERT_EQ(skel->bss->test_result, 1, "test_result"); + +cleanup: + test_raw_tp_get_func_args__destroy(skel); +} + +void test_raw_tp_get_func_args(void) +{ + if (test__start_subtest("raw_tp")) + test_raw_tp_args(false); + if (test__start_subtest("tp_btf")) + test_raw_tp_args(true); +} diff --git a/tools/testing/selftests/bpf/progs/test_raw_tp_get_func_args.c = b/tools/testing/selftests/bpf/progs/test_raw_tp_get_func_args.c new file mode 100644 index 000000000000..5069bbd15283 --- /dev/null +++ b/tools/testing/selftests/bpf/progs/test_raw_tp_get_func_args.c @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "vmlinux.h" +#include +#include +#include + +__u64 test_result =3D 0; + +static __always_inline int check_args(void *ctx, struct task_struct *task, + char *comm) +{ + __u64 cnt =3D bpf_get_func_arg_cnt(ctx); + __u64 a =3D 0, b =3D 0, z =3D 0; + __s64 err; + + if ((__u64)task !=3D 0x1234ULL || (__u64)comm !=3D 0x5678ULL) + return 0; + + test_result =3D cnt =3D=3D 2; + + /* valid arguments */ + err =3D bpf_get_func_arg(ctx, 0, &a); + test_result &=3D err =3D=3D 0 && a =3D=3D 0x1234ULL; + + err =3D bpf_get_func_arg(ctx, 1, &b); + test_result &=3D err =3D=3D 0 && b =3D=3D 0x5678ULL; + + /* not valid argument */ + err =3D bpf_get_func_arg(ctx, 2, &z); + test_result &=3D err =3D=3D -EINVAL; + + return a + b; +} + +SEC("raw_tp/task_rename") +int BPF_PROG(raw_tp_test, struct task_struct *task, char *comm) +{ + return check_args(ctx, task, comm); +} + +SEC("tp_btf/task_rename") +int BPF_PROG(tp_btf_test, struct task_struct *task, char *comm) +{ + return check_args(ctx, task, comm); +} + +char _license[] SEC("license") =3D "GPL"; --=20 2.43.0