From nobody Mon Feb 9 16:51:38 2026 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 1AA7C334C26 for ; Thu, 18 Dec 2025 13:07:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766063245; cv=none; b=JHTsS+au0XPEet2eZor2I22h3i2ivP+uHuZ9S79O8etloQIGO4j5X45gpP9fJ51C9vyxX9ALmM7SWsYmqseWO33GYGuFdrTVnfBtCQblM2PnlOEnGW6muwc2TkzBO1QMkLCoSC99b+hQ6v1R96fvE3vY2Z3uj4k0rVgUICnaVNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766063245; c=relaxed/simple; bh=zbKUAm5oIbrYUr4Pq0Qw8fCPvshez5LuSrD/UJz2biw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZuzONdBUcWIx5DNV7JK4ycEmOdsqIX8xKGBwghIK2kmGN68kdbkc7IRRrgBrE9EzekfCy+brWIme941q15hGcJFJeSyDpvSV6BJ9Tl/Ie0xK57BlLX60J2Bd6YznEK46iSkloCW6JLW3w+VTABisIYKPVzyxbFKzCJ1+Pis2bZU= 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=joh7WqP5; arc=none smtp.client-ip=209.85.214.169 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="joh7WqP5" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2a102494058so8848505ad.0 for ; Thu, 18 Dec 2025 05:07:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766063241; x=1766668041; 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=xfWGrzFwQxVXKLSf8bK35Njw60Z0UXLSaG1EWbBTvoM=; b=joh7WqP5+e0bTINEg1VVmEsk5qcgnr/knqedVyFaR1w8zUYQkGUOcSWEiToU0S+F9Q Cn0UXcvFiZYfBR4q0PX5kqURxbWjLTxZtRX+eupKzm+BnP5no0+o1lFhhF/lQ8at2BQ3 Ap98lWv0QSYAKSvLi8VXIKN3obLOlQrIOUg629vBgt54Sq8B8uusGtfGeuUrmYqkfMcM 2BM7Jt4mQcx8S0A7UQVIFhn/vbnLcTR16ff5/EaoTdOViNjNW1zC/vdmPktiwaMJXbFw nARbCmklIBasTWFaxXVTK5o/0Qckp8NGkbsRyZGn/mhcbrqEynh81AabOMq0vU47QEn9 L0Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766063241; x=1766668041; 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=xfWGrzFwQxVXKLSf8bK35Njw60Z0UXLSaG1EWbBTvoM=; b=HY3e2G3kUMtqA/Hj9Y8QNv1qoCSgyueOQEqwKlYK4LeOSIv1ha/EdHlOQyTisUvDRK 7yJEKjYOs1eNQ3szRWbuq7fE0DYKtNTF/9sIJLMufSpNTY8EHPhv/O+Vty0uo67RCfbg FX44LFehwg6eKI6m8o4r4T4vwkvkqf6TxZN5I+xmEtvD3GlCi6Nsmmmcb1FEG4H5lxuX D5eWaFCkD1ZXInCCN0YupmNuOBE+/jnktIv+31W/GgJJj1fijpURuJmEi+kmZUGGhjw0 iC6eusKAMttjXnseosVkC0exuJBQs5Gbi4f/I2xcSAE/gv9lEk+QoJM5rbU7a11J9uMY z/nA== X-Forwarded-Encrypted: i=1; AJvYcCUDwAW1CLHjn5u9bGr3uagSg+/8YLjRQzai36RMTGZwrJGa0ECjsk93IoewUrN5oT9AKopas9LRD4pWa1k=@vger.kernel.org X-Gm-Message-State: AOJu0YxGbPJ7nOI74gY1bkEQcaoNj7mtahF726dHoqQdAF6u9Pg7kMYm i5SjSYM99M2v7vefrrC2YkxBkUROLziIjYRgaGrOX3uLI+VZFAqfBFd4 X-Gm-Gg: AY/fxX70Oid5OmqTTEISlQ+sWkaPmAVtdHl8vAqpDo6LvMPXhpog5v37C0MxOunEuF+ DPwr5ixLFpFs/ZvCoEtmxhZbUk1KhhIHkzOJky2HSQzgBz9XhyLKnDvyQTh4UMZ/hkn3SXobDHj k27TguI/IGfmOvmuV6hhsxVTa1cTrraW8U1KKxoKpOyPuSHW5YrTBrDGcOzKBl0je3wyomCPfXG wXqBoUIIfjHhBQXSCnQDV3IxDrxrIRqkMfygSITCfedMsoIeQwQArf79HqUxBrjIVA8MXa44ShS /gN971QMxkwR8xcLdPXp4gRwWkVb4emmbIZ1oll2kFE+bZiVbUXYioZgW3dSomstyN2lcBGVv7G cBW5oenV3ReLmet5c/F9AWl3Vr0ltpbn0c2Jhcp2goeZiCeUJwSvefTTO1AdPEmIMvmMZTRlO5R 4isZADY5XR7Ge/HR9ugUiX2rD8qkecRhj2PqA= X-Google-Smtp-Source: AGHT+IE2dPr6IKueNkbs60vHXI/kEmriix+hjdpYj9PL6qm8QcZvc/lPn2FJdvkRkQDLRAi3HNJglg== X-Received: by 2002:a17:903:2452:b0:2a0:acb8:9e80 with SMTP id d9443c01a7336-2a2cac7e29cmr28263405ad.29.1766063241197; Thu, 18 Dec 2025 05:07:21 -0800 (PST) Received: from mi-ThinkStation-K.mioffice.cn ([43.224.245.232]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a2d1926cd2sm25539905ad.77.2025.12.18.05.07.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 05:07:20 -0800 (PST) From: liujing40 X-Google-Original-From: liujing40 To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, mhiramat@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, liujing40@xiaomi.com Subject: [PATCH 1/2] bpf: Prepare for kprobe multi link fallback patch Date: Thu, 18 Dec 2025 21:06:28 +0800 Message-Id: <20251218130629.365398-2-liujing40@xiaomi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20251218130629.365398-1-liujing40@xiaomi.com> References: <20251218130629.365398-1-liujing40@xiaomi.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" This moves some functions and structs around to make the following patch easier to read. Signed-off-by: Jing Liu --- kernel/trace/bpf_trace.c | 304 +++++++++++++++++++-------------------- 1 file changed, 152 insertions(+), 152 deletions(-) diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index fe28d86f7c35..1fd07c10378f 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -2291,67 +2291,6 @@ struct bpf_kprobe_multi_run_ctx { unsigned long entry_ip; }; =20 -struct user_syms { - const char **syms; - char *buf; -}; - -#ifndef CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS -static DEFINE_PER_CPU(struct pt_regs, bpf_kprobe_multi_pt_regs); -#define bpf_kprobe_multi_pt_regs_ptr() this_cpu_ptr(&bpf_kprobe_multi_pt_r= egs) -#else -#define bpf_kprobe_multi_pt_regs_ptr() (NULL) -#endif - -static unsigned long ftrace_get_entry_ip(unsigned long fentry_ip) -{ - unsigned long ip =3D ftrace_get_symaddr(fentry_ip); - - return ip ? : fentry_ip; -} - -static int copy_user_syms(struct user_syms *us, unsigned long __user *usym= s, u32 cnt) -{ - unsigned long __user usymbol; - const char **syms =3D NULL; - char *buf =3D NULL, *p; - int err =3D -ENOMEM; - unsigned int i; - - syms =3D kvmalloc_array(cnt, sizeof(*syms), GFP_KERNEL); - if (!syms) - goto error; - - buf =3D kvmalloc_array(cnt, KSYM_NAME_LEN, GFP_KERNEL); - if (!buf) - goto error; - - for (p =3D buf, i =3D 0; i < cnt; i++) { - if (__get_user(usymbol, usyms + i)) { - err =3D -EFAULT; - goto error; - } - err =3D strncpy_from_user(p, (const char __user *) usymbol, KSYM_NAME_LE= N); - if (err =3D=3D KSYM_NAME_LEN) - err =3D -E2BIG; - if (err < 0) - goto error; - syms[i] =3D p; - p +=3D err + 1; - } - - us->syms =3D syms; - us->buf =3D buf; - return 0; - -error: - if (err) { - kvfree(syms); - kvfree(buf); - } - return err; -} - static void kprobe_multi_put_modules(struct module **mods, u32 cnt) { u32 i; @@ -2360,12 +2299,6 @@ static void kprobe_multi_put_modules(struct module *= *mods, u32 cnt) module_put(mods[i]); } =20 -static void free_user_syms(struct user_syms *us) -{ - kvfree(us->syms); - kvfree(us->buf); -} - static void bpf_kprobe_multi_link_release(struct bpf_link *link) { struct bpf_kprobe_multi_link *kmulti_link; @@ -2469,6 +2402,152 @@ static const struct bpf_link_ops bpf_kprobe_multi_l= ink_lops =3D { #endif }; =20 +static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx) +{ + struct bpf_kprobe_multi_run_ctx *run_ctx; + + run_ctx =3D container_of(current->bpf_ctx, struct bpf_kprobe_multi_run_ct= x, + session_ctx.run_ctx); + return run_ctx->entry_ip; +} + +struct modules_array { + struct module **mods; + int mods_cnt; + int mods_cap; +}; + +static int add_module(struct modules_array *arr, struct module *mod) +{ + struct module **mods; + + if (arr->mods_cnt =3D=3D arr->mods_cap) { + arr->mods_cap =3D max(16, arr->mods_cap * 3 / 2); + mods =3D krealloc_array(arr->mods, arr->mods_cap, sizeof(*mods), GFP_KER= NEL); + if (!mods) + return -ENOMEM; + arr->mods =3D mods; + } + + arr->mods[arr->mods_cnt] =3D mod; + arr->mods_cnt++; + return 0; +} + +static bool has_module(struct modules_array *arr, struct module *mod) +{ + int i; + + for (i =3D arr->mods_cnt - 1; i >=3D 0; i--) { + if (arr->mods[i] =3D=3D mod) + return true; + } + return false; +} + +static int get_modules_for_addrs(struct module ***mods, unsigned long *add= rs, u32 addrs_cnt) +{ + struct modules_array arr =3D {}; + u32 i, err =3D 0; + + for (i =3D 0; i < addrs_cnt; i++) { + bool skip_add =3D false; + struct module *mod; + + scoped_guard(rcu) { + mod =3D __module_address(addrs[i]); + /* Either no module or it's already stored */ + if (!mod || has_module(&arr, mod)) { + skip_add =3D true; + break; /* scoped_guard */ + } + if (!try_module_get(mod)) + err =3D -EINVAL; + } + if (skip_add) + continue; + if (err) + break; + err =3D add_module(&arr, mod); + if (err) { + module_put(mod); + break; + } + } + + /* We return either err < 0 in case of error, ... */ + if (err) { + kprobe_multi_put_modules(arr.mods, arr.mods_cnt); + kfree(arr.mods); + return err; + } + + /* or number of modules found if everything is ok. */ + *mods =3D arr.mods; + return arr.mods_cnt; +} + +struct user_syms { + const char **syms; + char *buf; +}; + +#ifndef CONFIG_HAVE_FTRACE_REGS_HAVING_PT_REGS +static DEFINE_PER_CPU(struct pt_regs, bpf_kprobe_multi_pt_regs); +#define bpf_kprobe_multi_pt_regs_ptr() this_cpu_ptr(&bpf_kprobe_multi_pt_r= egs) +#else +#define bpf_kprobe_multi_pt_regs_ptr() (NULL) +#endif + +static unsigned long ftrace_get_entry_ip(unsigned long fentry_ip) +{ + unsigned long ip =3D ftrace_get_symaddr(fentry_ip); + + return ip ? : fentry_ip; +} + +static int copy_user_syms(struct user_syms *us, unsigned long __user *usym= s, u32 cnt) +{ + unsigned long __user usymbol; + const char **syms =3D NULL; + char *buf =3D NULL, *p; + int err =3D -ENOMEM; + unsigned int i; + + syms =3D kvmalloc_array(cnt, sizeof(*syms), GFP_KERNEL); + if (!syms) + goto error; + + buf =3D kvmalloc_array(cnt, KSYM_NAME_LEN, GFP_KERNEL); + if (!buf) + goto error; + + for (p =3D buf, i =3D 0; i < cnt; i++) { + if (__get_user(usymbol, usyms + i)) { + err =3D -EFAULT; + goto error; + } + err =3D strncpy_from_user(p, (const char __user *) usymbol, KSYM_NAME_LE= N); + if (err =3D=3D KSYM_NAME_LEN) + err =3D -E2BIG; + if (err < 0) + goto error; + syms[i] =3D p; + p +=3D err + 1; + } + + us->syms =3D syms; + us->buf =3D buf; + return 0; + +error: + if (err) { + kvfree(syms); + kvfree(buf); + } + return err; +} + static void bpf_kprobe_multi_cookie_swap(void *a, void *b, int size, const= void *priv) { const struct bpf_kprobe_multi_link *link =3D priv; @@ -2520,15 +2599,6 @@ static u64 bpf_kprobe_multi_cookie(struct bpf_run_ct= x *ctx) return *cookie; } =20 -static u64 bpf_kprobe_multi_entry_ip(struct bpf_run_ctx *ctx) -{ - struct bpf_kprobe_multi_run_ctx *run_ctx; - - run_ctx =3D container_of(current->bpf_ctx, struct bpf_kprobe_multi_run_ct= x, - session_ctx.run_ctx); - return run_ctx->entry_ip; -} - static __always_inline int kprobe_multi_link_prog_run(struct bpf_kprobe_multi_link *link, unsigned long entry_ip, struct ftrace_regs *fregs, @@ -2597,6 +2667,12 @@ kprobe_multi_link_exit_handler(struct fprobe *fp, un= signed long fentry_ip, fregs, true, data); } =20 +static void free_user_syms(struct user_syms *us) +{ + kvfree(us->syms); + kvfree(us->buf); +} + static int symbols_cmp_r(const void *a, const void *b, const void *priv) { const char **str_a =3D (const char **) a; @@ -2627,82 +2703,6 @@ static void symbols_swap_r(void *a, void *b, int siz= e, const void *priv) } } =20 -struct modules_array { - struct module **mods; - int mods_cnt; - int mods_cap; -}; - -static int add_module(struct modules_array *arr, struct module *mod) -{ - struct module **mods; - - if (arr->mods_cnt =3D=3D arr->mods_cap) { - arr->mods_cap =3D max(16, arr->mods_cap * 3 / 2); - mods =3D krealloc_array(arr->mods, arr->mods_cap, sizeof(*mods), GFP_KER= NEL); - if (!mods) - return -ENOMEM; - arr->mods =3D mods; - } - - arr->mods[arr->mods_cnt] =3D mod; - arr->mods_cnt++; - return 0; -} - -static bool has_module(struct modules_array *arr, struct module *mod) -{ - int i; - - for (i =3D arr->mods_cnt - 1; i >=3D 0; i--) { - if (arr->mods[i] =3D=3D mod) - return true; - } - return false; -} - -static int get_modules_for_addrs(struct module ***mods, unsigned long *add= rs, u32 addrs_cnt) -{ - struct modules_array arr =3D {}; - u32 i, err =3D 0; - - for (i =3D 0; i < addrs_cnt; i++) { - bool skip_add =3D false; - struct module *mod; - - scoped_guard(rcu) { - mod =3D __module_address(addrs[i]); - /* Either no module or it's already stored */ - if (!mod || has_module(&arr, mod)) { - skip_add =3D true; - break; /* scoped_guard */ - } - if (!try_module_get(mod)) - err =3D -EINVAL; - } - if (skip_add) - continue; - if (err) - break; - err =3D add_module(&arr, mod); - if (err) { - module_put(mod); - break; - } - } - - /* We return either err < 0 in case of error, ... */ - if (err) { - kprobe_multi_put_modules(arr.mods, arr.mods_cnt); - kfree(arr.mods); - return err; - } - - /* or number of modules found if everything is ok. */ - *mods =3D arr.mods; - return arr.mods_cnt; -} - static int addrs_check_error_injection_list(unsigned long *addrs, u32 cnt) { u32 i; --=20 2.25.1