From nobody Mon Feb 9 23:43:08 2026 Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) (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 EC7FC142E83 for ; Sat, 24 Jan 2026 03:31:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.193 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769225512; cv=none; b=SYGcJ82Vrf58LNNql4oBDkC6v86cWHyZSmZuUwNaHwQEQNHBdkOb3VMVgQj6i0yNOlr+cAWF8xisfbl9yT4UV8y/MHWAsmg5nPJlPAsVTEG9Up94TaQXCfL6w8EbAMhV6xbuQUsdwtm256CNxqgjkSAEU/+nRleFUOcidaN0aiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769225512; c=relaxed/simple; bh=ov0wUqV6kuTWTFBkzZscv2aYec7op/sl0bS8tbqxj1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BcsiQFE7REYIrm+dva7Gau1nm80U9dCtkp9uzJ0tO778rEB1xhRKn2IgaWQln8Z2SSnjo0z7zz8y1kkgOgAaSuMxdY/IsewB+tzSbVkWe5af9oE7EK16DtA1dK8r917MnlbiNWQdvOQQZuGpaY/s/99IGPNDIVfkYLZh4roP5J0= 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=GBXG9QMG; arc=none smtp.client-ip=209.85.214.193 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="GBXG9QMG" Received: by mail-pl1-f193.google.com with SMTP id d9443c01a7336-2a0c09bb78cso20139855ad.0 for ; Fri, 23 Jan 2026 19:31:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769225510; x=1769830310; 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=0MyGznuXGAu60e1tz5lHjO5zn/zhV1nMJNWbpCAy+Ik=; b=GBXG9QMGhVsF7DpzxaLxURSje+hnx5S+fHSqdDcm28PxROnbj6XzRnDMdXFXjdb+zZ KVa/4UsbbDbMpxnKtuz0s26YFDMTywEC2s+zYvkavE0GbxAWjjqfkUI6UmTXLcFj/XZA TQnUfhH8i7Es3f8yDF9nNlIDNJkdaMy+zGm+1ZcHvLuW7ND18qRipymeE61BBdCE408s ZAXF9P5OYtGr4x7vs5Fff/BQsRP5bot3hdUbXNASorQLIQD1BEVjbVlp9VDTM93inTb1 i0GNo4GfEy+ZsfPSZHqEY8+z0Cvm9PcEQvnkNDWJZsoSJpH37nGxykQUH24huGs4dZg0 pKbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769225510; x=1769830310; 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=0MyGznuXGAu60e1tz5lHjO5zn/zhV1nMJNWbpCAy+Ik=; b=Uyh3kpLvo/z7fXbmJ7Lzh49Zbk3C4V8zxhBKtkwUDT3mHdYVkKZPXU7oK5lGmlOj1L d4qBhsEk/yJ9FmNlABtiiF8KSFI7CbL03X+CuTthADa6cXQUOoiG93yklg01ntF1QtGQ W4DcBpCm+pF/auWktVq2EY30hEN/kADWGyKUyTqz7Pv69ZxHUBe/9v+0F7v3eLR6UEnh OGol3pbd14i3PLhXlxp1byqrRFdj/B4V/wm8SLmg2K0FoPLQEgmqthcYoU4RQi34z+9+ SQO3PCi/2ahe1keWUoE/lFJg+V+54iqqouAh+cwiL3C7geGHT6WaVgU2TfVuSDIUZicw C1hw== X-Forwarded-Encrypted: i=1; AJvYcCW7BmAZ6IKLicTReX9YZhEElk85A9M3qZyoR5e/wzwGC4yzKIIgakLoh/Q/RSWmPX3dLKAn8Pomy6B5jV8=@vger.kernel.org X-Gm-Message-State: AOJu0YwsirsHRrewLrdXv1VzkCRd5TjoeHo1WS89CEF6cdqZmacOfTKl bLsPzX27gJAQFB8haZlQiTMuvZPIyVbhXvZ3Wee9qkG53T26B9YT1Ibp X-Gm-Gg: AZuq6aLWLUPakDxnYjF7ynB1WnUsh6BaZNzfXEenu6j1FBaNViN147NsboNHmMI/jmJ rG7XZ3y7EZZGJ/T0SHzHQofmeDsP1Du6bHZ6doZ/ipTjpzFxUR1pwSX1i296Jto8F6cTI08WyDw O6aEuFXuO0o0k/q9b+q0MlCg3aNjr6oVz2dEk7l14q+zJHr43tiM9CEFmBgu1kU62LUJOxJSRk5 Ten0t0AlLbVSxT23K2FEsg2hqZ93pvR3qlE/2+UK+JXeeWl31kT0YUNPnFdDdlaZRNqBb2GXhxX 2lIzrGl0Z9XPYHrnASIMG1KYJxrE8CHgSYJeWJZ0m97HYTFe1ZOFissfaKqiy8Eoq7F1LXgjDFl jwDOCC3CXna+VmEMCKUbgvJVavKySMej783EVRQYeBcVIgrvCRZO62PMR0q2U9KzUGxIPylQ2IJ 3/THAUZeAP X-Received: by 2002:a17:903:2442:b0:2a0:f0e5:74eb with SMTP id d9443c01a7336-2a7fe835facmr43215035ad.28.1769225510260; Fri, 23 Jan 2026 19:31:50 -0800 (PST) Received: from 7950hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2a802dcddb0sm32539805ad.38.2026.01.23.19.31.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 19:31:49 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: andrii@kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, 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, davem@davemloft.net, dsahern@kernel.org, tglx@linutronix.de, mingo@redhat.com, jiang.biao@linux.dev, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v12 02/13] bpf: use the least significant byte for the nr_args in trampoline Date: Sat, 24 Jan 2026 11:31:08 +0800 Message-ID: <20260124033119.28682-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260124033119.28682-1-dongml2@chinatelecom.cn> References: <20260124033119.28682-1-dongml2@chinatelecom.cn> 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" For now, ((u64 *)ctx)[-1] is used to store the nr_args in the trampoline. However, 1 byte is enough to store such information. Therefore, we use only the least significant byte of ((u64 *)ctx)[-1] to store the nr_args, and reserve the rest for other usages. Signed-off-by: Menglong Dong --- v12: - compute the "delta" for the BPF_FUNC_get_func_arg_cnt case v11: - fix the rebase conflict v10: - some adjustment to the subject and commit log to make the description more precise. v8: - fix the missed get_func_arg_cnt --- kernel/bpf/verifier.c | 39 +++++++++++++++++++++++---------------- kernel/trace/bpf_trace.c | 6 +++--- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 41bbed6418b5..2081343a848d 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -23747,19 +23747,21 @@ static int do_misc_fixups(struct bpf_verifier_env= *env) =20 /* skip 'void *__data' in btf_trace_##name() and save to reg0 */ insn_buf[0] =3D BPF_MOV64_IMM(BPF_REG_0, nr_args - 1); + cnt =3D 1; } else { /* Load nr_args from ctx - 8 */ insn_buf[0] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8); + insn_buf[1] =3D BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xFF); + cnt =3D 2; } - insn_buf[1] =3D BPF_JMP32_REG(BPF_JGE, BPF_REG_2, BPF_REG_0, 6); - insn_buf[2] =3D BPF_ALU64_IMM(BPF_LSH, BPF_REG_2, 3); - insn_buf[3] =3D BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1); - insn_buf[4] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, 0); - insn_buf[5] =3D BPF_STX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0); - insn_buf[6] =3D BPF_MOV64_IMM(BPF_REG_0, 0); - insn_buf[7] =3D BPF_JMP_A(1); - insn_buf[8] =3D BPF_MOV64_IMM(BPF_REG_0, -EINVAL); - cnt =3D 9; + insn_buf[cnt++] =3D BPF_JMP32_REG(BPF_JGE, BPF_REG_2, BPF_REG_0, 6); + insn_buf[cnt++] =3D BPF_ALU64_IMM(BPF_LSH, BPF_REG_2, 3); + insn_buf[cnt++] =3D BPF_ALU64_REG(BPF_ADD, BPF_REG_2, BPF_REG_1); + insn_buf[cnt++] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_2, 0); + insn_buf[cnt++] =3D BPF_STX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0); + insn_buf[cnt++] =3D BPF_MOV64_IMM(BPF_REG_0, 0); + insn_buf[cnt++] =3D BPF_JMP_A(1); + insn_buf[cnt++] =3D BPF_MOV64_IMM(BPF_REG_0, -EINVAL); =20 new_prog =3D bpf_patch_insn_data(env, i + delta, insn_buf, cnt); if (!new_prog) @@ -23779,12 +23781,13 @@ static int do_misc_fixups(struct bpf_verifier_env= *env) eatype =3D=3D BPF_MODIFY_RETURN) { /* Load nr_args from ctx - 8 */ insn_buf[0] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8); - insn_buf[1] =3D BPF_ALU64_IMM(BPF_LSH, BPF_REG_0, 3); - insn_buf[2] =3D BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1); - insn_buf[3] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0); - insn_buf[4] =3D BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_3, 0); - insn_buf[5] =3D BPF_MOV64_IMM(BPF_REG_0, 0); - cnt =3D 6; + insn_buf[1] =3D BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xFF); + insn_buf[2] =3D BPF_ALU64_IMM(BPF_LSH, BPF_REG_0, 3); + insn_buf[3] =3D BPF_ALU64_REG(BPF_ADD, BPF_REG_0, BPF_REG_1); + insn_buf[4] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_3, BPF_REG_0, 0); + insn_buf[5] =3D BPF_STX_MEM(BPF_DW, BPF_REG_2, BPF_REG_3, 0); + insn_buf[6] =3D BPF_MOV64_IMM(BPF_REG_0, 0); + cnt =3D 7; } else { insn_buf[0] =3D BPF_MOV64_IMM(BPF_REG_0, -EOPNOTSUPP); cnt =3D 1; @@ -23808,15 +23811,19 @@ static int do_misc_fixups(struct bpf_verifier_env= *env) =20 /* skip 'void *__data' in btf_trace_##name() and save to reg0 */ insn_buf[0] =3D BPF_MOV64_IMM(BPF_REG_0, nr_args - 1); + cnt =3D 1; } else { /* Load nr_args from ctx - 8 */ insn_buf[0] =3D BPF_LDX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, -8); + insn_buf[1] =3D BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 0xFF); + cnt =3D 2; } =20 - new_prog =3D bpf_patch_insn_data(env, i + delta, insn_buf, 1); + new_prog =3D bpf_patch_insn_data(env, i + delta, insn_buf, cnt); if (!new_prog) return -ENOMEM; =20 + delta +=3D cnt - 1; env->prog =3D prog =3D new_prog; insn =3D new_prog->insnsi + i + delta; goto next_insn; diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 0e9635bcd783..d466a1503da3 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -1194,7 +1194,7 @@ const struct bpf_func_proto bpf_get_branch_snapshot_p= roto =3D { BPF_CALL_3(get_func_arg, void *, ctx, u32, n, u64 *, value) { /* This helper call is inlined by verifier. */ - u64 nr_args =3D ((u64 *)ctx)[-1]; + u64 nr_args =3D ((u64 *)ctx)[-1] & 0xFF; =20 if ((u64) n >=3D nr_args) return -EINVAL; @@ -1214,7 +1214,7 @@ static const struct bpf_func_proto bpf_get_func_arg_p= roto =3D { BPF_CALL_2(get_func_ret, void *, ctx, u64 *, value) { /* This helper call is inlined by verifier. */ - u64 nr_args =3D ((u64 *)ctx)[-1]; + u64 nr_args =3D ((u64 *)ctx)[-1] & 0xFF; =20 *value =3D ((u64 *)ctx)[nr_args]; return 0; @@ -1231,7 +1231,7 @@ static const struct bpf_func_proto bpf_get_func_ret_p= roto =3D { BPF_CALL_1(get_func_arg_cnt, void *, ctx) { /* This helper call is inlined by verifier. */ - return ((u64 *)ctx)[-1]; + return ((u64 *)ctx)[-1] & 0xFF; } =20 static const struct bpf_func_proto bpf_get_func_arg_cnt_proto =3D { --=20 2.52.0