From nobody Mon Feb 9 15:09:52 2026 Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) (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 1D2CB31619B for ; Fri, 23 Jan 2026 07:36:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769153763; cv=none; b=duepT7mQkIQAtBrU1hh7asJsg9FYnBPm+42Y86VyVWhksl31wtlR4ZQPukY5KHgDPcW/tiETNWOtami+HZumTKXOrr+L/PU3oY0QT/nJenu4g9M2jIW+UwC2NCHCPb6BIxrIuex14gEpD78fVILpjfAtdRvA8on84GEYyydTeW8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769153763; c=relaxed/simple; bh=Cjpi43NnpU15TBezTUhlnb5sQ72udzYmaXV8ZdEL9BI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GElZgxhE+fHSIqlwIiR3wczggjTW0vBuH5SG496WFLlrnwpl83/PYeCo7sQPBHCCPsl8HtAisJ+Bm8XQVSiG6dwwEsGvTHy1KGxM9oOxUcPSrF5TlsE7hvIWxATKnZI7MNHmK7mKXXDlxlKkE3ZF10RDXEq5roH16qZDs+rlWAA= 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=fOm++M0r; arc=none smtp.client-ip=209.85.216.65 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="fOm++M0r" Received: by mail-pj1-f65.google.com with SMTP id 98e67ed59e1d1-34ccbf37205so1041074a91.2 for ; Thu, 22 Jan 2026 23:36:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769153761; x=1769758561; 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=wLdDM59DXRWdxzrRIwUsnUpMT5a0XQ8O1OsOpKALewc=; b=fOm++M0rBYRj6TyieZeUiFyPsdmWAEWHWYYPihEFAbgyuhE+PXaNV4+KjHhXnFiIrY 58GIZXbO56K+m09PFIbZjwiWPVdJDmTC8LM66DnH5e/3DgIIB6dvNuspEOqn5lB8SQfy mlH+jdm83OT7M3k46vj18/kKg+I0VVpOelZOIopaMuFG/VqB8kzgqXHD0cp9HJ1eKE3N 0HghXW294wbzhMXFDYFFhgVNtYSF4QSW5oefz+xfC3JwZXVu5VRAOvTVDJceP867CEVW AwoJgvaINy3SBBEZcScfAIjbxE6cjoFlGnRqQVzGo3pjd3KBF5pnjS4wIcaOLUH7X0CH Kedw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769153761; x=1769758561; 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=wLdDM59DXRWdxzrRIwUsnUpMT5a0XQ8O1OsOpKALewc=; b=K9FS54m+qHVn/Ydqn/GL2IZ7vuM43NucpcC8BlOQL4D30FNuq/7qgRPq0q7qqVgRmP jegDPX8wbbQ+IJF7HN5u2k0xnuAhS+BXfXHaRbrTL+8j/LqJr/llhvM4GZW5QUR+eEfu Wncbdz4xWlHY7RGX8I4UB4H5zUMslWZv9P733xM+vMec7nCZC4bngoI/Z35PppRhNLOi PWclv8x9dW88N92EPFZu7J/TD2T2RrQ/58iYuROsAUFr7Z7vTFdcqBAc/7NQ+nDluePc Wt/0Lv1OeQzUbo1tdo2Ca/Zhu5hxRvtY9t2VxxKJNlVibrO+4Bdifl5qV0ifYKmKlAZI nMSg== X-Forwarded-Encrypted: i=1; AJvYcCW0NLr+wHTK4aQIETQAF1s0mfqlAuqM70bPEMjMFHu/4TfErD+zBYWoQfcGFdg05Wth6Z4CBOEAapy2erg=@vger.kernel.org X-Gm-Message-State: AOJu0YyAit9H2gzcy97OyLUakohb/q6psOAg2QRL7m4K++gSRzMeAoQj K6RqDKZbCjs60iVsioQY8Awuj3kY+r6RqMr8XYYz3FHz+Ekn5cu1QRDw X-Gm-Gg: AZuq6aI/VF49vq44QbSLIWwSjqCKyBAXWq/zb7eGGTCXrsPl66QZUsqKjLYKWWzPVF/ VR8RYk3u0n28XcfErB9EnnXYPRLVsJU5oGOQEW+93I3OVz08U0YyYShXjy6eLkZXZTD4sMdd6TY f7hI3M28IIh2gtIDO0vej5GZ39PkxX1hYUCskjQqFajNpw2c4xU7cFFFSfq+S7GRCBpqW1U2aaT d9ulSisfq0jTrW+ictJ7NOeZZUHuVx9Nim0R1KdXoiPfySm1gtq7sopSorNT7g00zOxtCVw6518 faw/WmCBQaS64fj9xMiUmReJf8NWiYoE4/2BZQtdjw8pj0ArKB7WRUQRl9hR7n8oI3R0kJFxfUq 3mxDk7xGwn5SjOOGxCAMLcGTXiyuHI8T553myztsyBC1l1FeEPnugZy3aHqSaRaNToluC1BlTgQ 1M6wtuZlmy X-Received: by 2002:a17:90b:3911:b0:341:2141:df76 with SMTP id 98e67ed59e1d1-35367028e9dmr1880255a91.13.1769153761295; Thu, 22 Jan 2026 23:36:01 -0800 (PST) Received: from 7940hx ([103.173.155.241]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8231876fd1fsm1334205b3a.69.2026.01.22.23.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jan 2026 23:36:00 -0800 (PST) From: Menglong Dong X-Google-Original-From: Menglong Dong To: andrii@kernel.org Cc: 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 v11 02/12] bpf: use the least significant byte for the nr_args in trampoline Date: Fri, 23 Jan 2026 15:35:22 +0800 Message-ID: <20260123073532.238985-3-dongml2@chinatelecom.cn> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260123073532.238985-1-dongml2@chinatelecom.cn> References: <20260123073532.238985-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 --- 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 | 38 ++++++++++++++++++++++---------------- kernel/trace/bpf_trace.c | 6 +++--- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 41bbed6418b5..b3f912ad18ba 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,12 +23811,15 @@ 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 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