From nobody Tue Feb 10 04:33:02 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.4]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 20CB1302758; Wed, 27 Aug 2025 05:32:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.4 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756272726; cv=none; b=F1IhCRGKsp7gRxISaX8lLM5dWZrhz8rjgTev/oCC0f9IDMpCGZjRixl2AXv/TERU/TP7XiVX4jq+orIpou8T6q/mjDTM6+HlMfAv79zNVVCqe5bru0ontwBmNGeGj0khkmfOsxAiQ5ngUtmNybcszJ/YZzw5FfBQZvFaKXvEsqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756272726; c=relaxed/simple; bh=oOEeYhNtImoYRgERbX2qVP2Km2nGoj6xX3jfiUFanzE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lyNw9pWDDxl+hb12+RepVBaelWRmxpY0bZRAdK+Z2CdA/3B/6EKYTg+jkYLYl9C/gnjjcXzSLN9pWmMLvOT9BsKCUT+cZkoQETML/OOJK7yNoPg4G1jZs16RY4rvE/Pay2PK9Bvt90qKSANIBLy2f0Mjo5/jofKXudtBLJLiLuQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=WuuVcrIr; arc=none smtp.client-ip=117.135.210.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="WuuVcrIr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=rS PIv8s8kcS3i1Xd7PtvfP8EhgkdT5NmuXgjHpwvZA4=; b=WuuVcrIrXs+PSA7+7M bXWvIDGByCEDvnocnaOGLgWxuO+2klw82gCaioa709IU1/OCnUQL0XSpER95JwbM 72LAdW3XdoUMcY7fBzYfVy3N+EmFrL5JL9guyWnfChQhYdfzcL6P3DToD7/3LVop aDagYbO4mJqpHzzDoqEj9Ogv4= Received: from phoenix.. (unknown []) by gzga-smtp-mtada-g0-1 (Coremail) with SMTP id _____wDXH3YxmK5oLPk1Ew--.15805S3; Wed, 27 Aug 2025 13:31:32 +0800 (CST) From: Jiawei Zhao To: ast@kernel.org Cc: daniel@iogearbox.net, andrii@kernel.org, yonghong.song@linux.dev, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next v16 1/2] libbpf: fix USDT SIB argument handling causing unrecognized register error Date: Wed, 27 Aug 2025 05:31:27 +0000 Message-ID: <20250827053128.1301287-2-phoenix500526@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250827053128.1301287-1-phoenix500526@163.com> References: <20250827053128.1301287-1-phoenix500526@163.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 X-CM-TRANSID: _____wDXH3YxmK5oLPk1Ew--.15805S3 X-Coremail-Antispam: 1Uf129KBjvJXoWxtryfArWkXF4kJrWUJFykuFg_yoWxWw1Dpa y0gr9YyryrJw4SvF4fXF40y343Crs7GrWrAr4kta4UZFWxWr45XrWSkryYyrn8GrW7Ar43 XF4YvrWxGa43Ar7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jzlksUUUUU= X-CM-SenderInfo: pskrv0dl0viiqvswqiywtou0bp/1tbiFBm2iGiuiyngxgAAsx Content-Type: text/plain; charset="utf-8" On x86-64, USDT arguments can be specified using Scale-Index-Base (SIB) addressing, e.g. "1@-96(%rbp,%rax,8)". The current USDT implementation in libbpf cannot parse this format, causing `bpf_program__attach_usdt()` to fail with -ENOENT (unrecognized register). This patch fixes this by implementing the necessary changes: - add correct handling for SIB-addressed arguments in `bpf_usdt_arg`. - add adaptive support to `__bpf_usdt_arg_type` and `__bpf_usdt_arg_spec` to represent SIB addressing parameters. Signed-off-by: Jiawei Zhao --- tools/lib/bpf/usdt.bpf.h | 44 +++++++++++++++++++++++-- tools/lib/bpf/usdt.c | 69 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/tools/lib/bpf/usdt.bpf.h b/tools/lib/bpf/usdt.bpf.h index 2a7865c8e3fe..43deb05a5197 100644 --- a/tools/lib/bpf/usdt.bpf.h +++ b/tools/lib/bpf/usdt.bpf.h @@ -34,13 +34,32 @@ enum __bpf_usdt_arg_type { BPF_USDT_ARG_CONST, BPF_USDT_ARG_REG, BPF_USDT_ARG_REG_DEREF, + BPF_USDT_ARG_SIB, }; =20 +/* + * This struct layout is designed specifically to be backwards/forward + * compatible between libbpf versions for ARG_CONST, ARG_REG, and + * ARG_REG_DEREF modes. ARG_SIB requires libbpf v1.7+. + */ struct __bpf_usdt_arg_spec { /* u64 scalar interpreted depending on arg_type, see below */ __u64 val_off; +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ /* arg location case, see bpf_usdt_arg() for details */ - enum __bpf_usdt_arg_type arg_type; + enum __bpf_usdt_arg_type arg_type: 8; + /* index register offset within struct pt_regs */ + __u16 idx_reg_off: 12; + /* scale factor for index register (1, 2, 4, or 8) */ + __u16 scale_bitshift: 4; + /* reserved for future use, keeps reg_off offset stable */ + __u8 __reserved: 8; +#else + __u8 __reserved: 8; + __u16 idx_reg_off: 12; + __u16 scale_bitshift: 4; + enum __bpf_usdt_arg_type arg_type: 8; +#endif /* offset of referenced register within struct pt_regs */ short reg_off; /* whether arg should be interpreted as signed value */ @@ -149,7 +168,7 @@ int bpf_usdt_arg(struct pt_regs *ctx, __u64 arg_num, lo= ng *res) { struct __bpf_usdt_spec *spec; struct __bpf_usdt_arg_spec *arg_spec; - unsigned long val; + unsigned long val, idx; int err, spec_id; =20 *res =3D 0; @@ -202,6 +221,27 @@ int bpf_usdt_arg(struct pt_regs *ctx, __u64 arg_num, l= ong *res) return err; #if __BYTE_ORDER__ =3D=3D __ORDER_BIG_ENDIAN__ val >>=3D arg_spec->arg_bitshift; +#endif + break; + case BPF_USDT_ARG_SIB: + /* Arg is in memory addressed by SIB (Scale-Index-Base) mode + * (e.g., "-1@-96(%rbp,%rax,8)" in USDT arg spec). We first + * fetch the base register contents and the index register + * contents from pt_regs. Then we calculate the final address + * as base + (index * scale) + offset, and do a user-space + * probe read to fetch the argument value. + */ + err =3D bpf_probe_read_kernel(&val, sizeof(val), (void *)ctx + arg_spec-= >reg_off); + if (err) + return err; + err =3D bpf_probe_read_kernel(&idx, sizeof(idx), (void *)ctx + arg_spec-= >idx_reg_off); + if (err) + return err; + err =3D bpf_probe_read_user(&val, sizeof(val), (void *)(val + (idx << ar= g_spec->scale_bitshift) + arg_spec->val_off)); + if (err) + return err; +#if __BYTE_ORDER__ =3D=3D __ORDER_BIG_ENDIAN__ + val >>=3D arg_spec->arg_bitshift; #endif break; default: diff --git a/tools/lib/bpf/usdt.c b/tools/lib/bpf/usdt.c index 3373b9d45ac4..e5eeac0b0fa4 100644 --- a/tools/lib/bpf/usdt.c +++ b/tools/lib/bpf/usdt.c @@ -200,12 +200,23 @@ enum usdt_arg_type { USDT_ARG_CONST, USDT_ARG_REG, USDT_ARG_REG_DEREF, + USDT_ARG_SIB, }; =20 /* should match exactly struct __bpf_usdt_arg_spec from usdt.bpf.h */ struct usdt_arg_spec { __u64 val_off; - enum usdt_arg_type arg_type; +#if __BYTE_ORDER__ =3D=3D __ORDER_LITTLE_ENDIAN__ + enum usdt_arg_type arg_type: 8; + __u16 idx_reg_off: 12; + __u16 scale_bitshift: 4; + __u8 __reserved: 8; /* keep reg_off offset stable */ +#else + __u8 __reserved: 8; /* keep reg_off offset stable */ + __u16 idx_reg_off: 12; + __u16 scale_bitshift: 4; + enum usdt_arg_type arg_type: 8; +#endif short reg_off; bool arg_signed; char arg_bitshift; @@ -1283,11 +1294,58 @@ static int calc_pt_regs_off(const char *reg_name) =20 static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_ar= g_spec *arg, int *arg_sz) { - char reg_name[16]; - int len, reg_off; - long off; + char reg_name[16] =3D {0}, idx_reg_name[16] =3D {0}; + int len, reg_off, idx_reg_off, scale =3D 1; + long off =3D 0; + + if (sscanf(arg_str, " %d @ %ld ( %%%15[^,] , %%%15[^,] , %d ) %n", + arg_sz, &off, reg_name, idx_reg_name, &scale, &len) =3D=3D 5 || + sscanf(arg_str, " %d @ ( %%%15[^,] , %%%15[^,] , %d ) %n", + arg_sz, reg_name, idx_reg_name, &scale, &len) =3D=3D 4 || + sscanf(arg_str, " %d @ %ld ( %%%15[^,] , %%%15[^)] ) %n", + arg_sz, &off, reg_name, idx_reg_name, &len) =3D=3D 4 || + sscanf(arg_str, " %d @ ( %%%15[^,] , %%%15[^)] ) %n", + arg_sz, reg_name, idx_reg_name, &len) =3D=3D 3 + ) { + /* + * Scale Index Base case: + * 1@-96(%rbp,%rax,8) + * 1@(%rbp,%rax,8) + * 1@-96(%rbp,%rax) + * 1@(%rbp,%rax) + */ + arg->arg_type =3D USDT_ARG_SIB; + arg->val_off =3D off; + + reg_off =3D calc_pt_regs_off(reg_name); + if (reg_off < 0) + return reg_off; + arg->reg_off =3D reg_off; =20 - if (sscanf(arg_str, " %d @ %ld ( %%%15[^)] ) %n", arg_sz, &off, reg_name,= &len) =3D=3D 3) { + idx_reg_off =3D calc_pt_regs_off(idx_reg_name); + if (idx_reg_off < 0) + return idx_reg_off; + /* validate scale factor and set fields directly */ + switch (scale) { + case 1: + arg->scale_bitshift =3D 0; + break; + case 2: + arg->scale_bitshift =3D 1; + break; + case 4: + arg->scale_bitshift =3D 2; + break; + case 8: + arg->scale_bitshift =3D 3; + break; + default: + pr_warn("usdt: invalid SIB scale %d, expected 1, 2, 4, 8\n", scale); + return -EINVAL; + } + arg->idx_reg_off =3D idx_reg_off; + } else if (sscanf(arg_str, " %d @ %ld ( %%%15[^)] ) %n", + arg_sz, &off, reg_name, &len) =3D=3D 3) { /* Memory dereference case, e.g., -4@-20(%rbp) */ arg->arg_type =3D USDT_ARG_REG_DEREF; arg->val_off =3D off; @@ -1306,6 +1364,7 @@ static int parse_usdt_arg(const char *arg_str, int ar= g_num, struct usdt_arg_spec } else if (sscanf(arg_str, " %d @ %%%15s %n", arg_sz, reg_name, &len) =3D= =3D 2) { /* Register read case, e.g., -4@%eax */ arg->arg_type =3D USDT_ARG_REG; + /* register read has no memory offset */ arg->val_off =3D 0; =20 reg_off =3D calc_pt_regs_off(reg_name); --=20 2.43.0