From patchwork Tue Jan 23 15:03:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 190996 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp396353dyi; Tue, 23 Jan 2024 07:07:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkh0J7wfFk9Mjd08/wQrc5l4zVvUDRZ7NgOpsJzFtdTvidpfpWM8CF3pvknePX7BaNWzIN X-Received: by 2002:a17:903:228b:b0:1d7:4c27:8c09 with SMTP id b11-20020a170903228b00b001d74c278c09mr2756408plh.127.1706022463619; Tue, 23 Jan 2024 07:07:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706022463; cv=pass; d=google.com; s=arc-20160816; b=0LTWPidd5Ylldj07YvanCGDwXuTHRh8MdEI70Zx/jwxg0TmNsmpajTmitFpRYWVYy0 vYY1Kmecx+awnwfdsC/kznXb0ePKe8kUzjsHs05SHmYSeo7/1ZxBal95VQnsqc2rj9B7 iVSfZs91mDdx2vzkYqLbzLtkV+rALjcwCiEEibTHK0SQSdi9SjmcMhMJ9nu5ER5H8iIr bm2JyiA2CX6cjbFkDyfNMD/j2l0+sJWkhcItTsRmM5WVSiWSqyzhO2d0DP/FPkXlSj+m xLLeAyDIzZcHvERYL3WefYdounTN6MZFUm88J0+PsT3nIxc1EAg+6oaJI2FaunenAWCY d16w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:user-agent:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Lx92Plo1fDxFp6mOe4BmAYC2z1sYcgBI6uW2nCOBopc=; fh=LBIueuLWJJWHxyU4hm5JIqvIjL/4JP6mHBzM9UMkE+w=; b=hAfQj0AfIup19ZY0TB2nRGJjTgoMzEBAKgJCyuis3FZBuBHiqiqlMX9swiGTeVUUbm sQfQ5jAzbqbAYgDQz4ZkpAjs6hQqMpjAIBUCcV+HwkEGDw9FK9ML6VEEH011EKzfWSg6 CqSlz+oETF+MpD6pji2stcZ0qj0yXpOZnKS6eIfys1PQ3bIoQHNLxNs+jkPva8OvKCng nv4YTlh+Tg8gjhe16n96XVg2CfFOsuwNxezyZT0nAk8uKg3Ugz+lVm1j0lbmPkE9vryz dLkZD7KQqCal4j8m1LAJ8sPsWnSjGU/8caM8TQdQBR/88Ct3aXIL+/Ne9cgJIbviLYrg Ov7g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MNjIOkfD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-35495-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35495-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id j8-20020a170903024800b001d6f7879b34si10210005plh.383.2024.01.23.07.07.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Jan 2024 07:07:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-35495-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MNjIOkfD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-35495-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-35495-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E0148290A82 for ; Tue, 23 Jan 2024 15:04:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A8DE2604B1; Tue, 23 Jan 2024 15:03:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MNjIOkfD" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 103CA6025A; Tue, 23 Jan 2024 15:03:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706022186; cv=none; b=k1JMIe8X33pn2NRv2DWNncVdF8ndRj7MHD15fPM/iSSWXv1JOYmnKv97EYBdKkelyd1B439DFZ0S6b047fnztxpTNaT4KmkoBLEuhgF5dADmj57yxR2NGATDpUVK8e/wuazBqrPlKyC6eQjE1+SNN5k+JKUp3JFMT0LLZHX0W70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706022186; c=relaxed/simple; bh=DpFRKAv848BeIsEakfLzG1UGGofnWebodFFq+ZPLFzc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=I3xt35VktEDTD1sT9biavm2dw2O15vv/FZUZKI2qfNs03JUIE/C7Cl09OVMzWbnKOn2cKTtV18RSaSxTzoF5ujA6NGJ8ihdExvMiezgiSKnHUQjvQG0wvO3INPR/HitIYqMQHFlmFjd6sxp/rgEhLTQ1huW3Bvjrg3QuTcXO8i0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MNjIOkfD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94777C433B2; Tue, 23 Jan 2024 15:03:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1706022185; bh=DpFRKAv848BeIsEakfLzG1UGGofnWebodFFq+ZPLFzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MNjIOkfDtBPT8jY8NxQen69zTiSHDSrOVlENvRZEsyBxDj/tqwpecSTTDlPGvwiqj CaEmyHGdx4QSwezjaYOSd2J7TrovAkX+KIwwVZ8YtH51JGB3jlT7zG2AB0O69y0itU 1F9jk7tbibrLFv2f9Q0eWt2Ymq16yKwws2VuTLBDEZRqjoWUbu/kzjI3Q6YpN5sbDU MZT/yiiJ67R92QjBF1Ru+BRtxKk0gtWyteKgcS8MNJR2AEaiLDBMjcz+pLSHWVzuKq IwVYlhRKQlu7B7QU698fY66kJNumSkY3PnDNgrJX4pS+qdEFUCkqdBEnAam2771XhQ JsuVUz2gljaNA== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: linux-trace-kernel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] tracing/probes: Fix to set arg size and fmt after setting type from BTF Date: Wed, 24 Jan 2024 00:03:02 +0900 Message-Id: <170602218196.215583.6417859469540955777.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170602214309.215583.16731124846112910621.stgit@devnote2> References: <170602214309.215583.16731124846112910621.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788894210890206859 X-GMAIL-MSGID: 1788894210890206859 From: Masami Hiramatsu (Google) Since the BTF type setting updates probe_arg::type, the type size calculation and setting print-fmt should be done after that. Without this fix, the argument size and print-fmt can be wrong. Fixes: b576e09701c7 ("tracing/probes: Support function parameters if BTF is available") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) --- kernel/trace/trace_probe.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index c6da5923e5b9..34289f9c6707 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -1172,18 +1172,6 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, trace_probe_log_err(ctx->offset + (t ? (t - arg) : 0), BAD_TYPE); goto out; } - parg->offset = *size; - *size += parg->type->size * (parg->count ?: 1); - - ret = -ENOMEM; - if (parg->count) { - len = strlen(parg->type->fmttype) + 6; - parg->fmt = kmalloc(len, GFP_KERNEL); - if (!parg->fmt) - goto out; - snprintf(parg->fmt, len, "%s[%d]", parg->type->fmttype, - parg->count); - } code = tmp = kcalloc(FETCH_INSN_MAX, sizeof(*code), GFP_KERNEL); if (!code) @@ -1207,6 +1195,19 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, goto fail; } } + parg->offset = *size; + *size += parg->type->size * (parg->count ?: 1); + + if (parg->count) { + len = strlen(parg->type->fmttype) + 6; + parg->fmt = kmalloc(len, GFP_KERNEL); + if (!parg->fmt) { + ret = -ENOMEM; + goto out; + } + snprintf(parg->fmt, len, "%s[%d]", parg->type->fmttype, + parg->count); + } ret = -EINVAL; /* Store operation */