From patchwork Thu May 18 05:26:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 95656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp258528vqo; Wed, 17 May 2023 22:41:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ68dwm/KXsqo2em6UxOIdBIeuTeqABqS/Cl90OKzW2VhK18mmCT2InLxpsdcZSTFMzNYNjx X-Received: by 2002:a05:6a20:8f05:b0:106:3b67:b5db with SMTP id b5-20020a056a208f0500b001063b67b5dbmr1067957pzk.18.1684388488432; Wed, 17 May 2023 22:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684388488; cv=none; d=google.com; s=arc-20160816; b=B/WkwLKewiXuinNZLqZ1jfmaeZjXvpH1HDsLYNFtNRWqkFcXqA1QifEzAobxZMuufG LwZ4LZyE34VUYPeZ+T0cAmrMftHsGb5plobvvCKmgM5BMXoqWeZKMOBstU3PLg+mSP/1 7fRrsq3+kvbpCaaiL6HRpP1LzmpIvg2OoGypn42Xg4qSAXkvyRk7mLzdiSPCUJzlV1jS tfFCPaHBc/dDa/qArf3g1eDEPHtNGX114PiJvR2kTj5g4eUiQdt/2LdyIUHX4k0smL3c rEh7aBUklJfD1dUaXRGp09oi2E4AW7p00x7Mlarx0Q5ZLPdtwolbRre9zRGNn9ZCETk3 hXBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=5JJprbgl/045lJXkgoojCc0iDd1OvezjENf+mx4+L3c=; b=NBnLZedscnNJQ1beR/A2IJIPC7kKisVcC6fx9leKskK/HKLPdw5ojR/ZgPo80mNdMe diZF3UbrDrjMqRt76dRDl49i3rBWVpw2VqATt9O9Q9IhuNfP6Akg0ga7GuSAvKeV0q/o vtPudsJnAqYiHDU4An7WGtxC1sO6T49/qSQkJd8nypbJRlEW33pQxwlxXad/YMYLe1/2 xztqK6qn4ZJmHU0gOf7TIxYYEhh/UmHUqpSA4Q+CdO3FxeeapxNcHhg7SkpA+0+6JOzs MBXE6jmDb77gp1srtm2ya3bjbd2183vyI5JxBwR4tLb3xhWKNwrFDM0U2EtY3nR7kFi/ gEJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="H2Pm8s/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s17-20020a639251000000b005192652814bsi580572pgn.541.2023.05.17.22.41.15; Wed, 17 May 2023 22:41:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="H2Pm8s/4"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229833AbjERF0v (ORCPT + 99 others); Thu, 18 May 2023 01:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229566AbjERF0u (ORCPT ); Thu, 18 May 2023 01:26:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E61AE3AA4; Wed, 17 May 2023 22:26:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6BDBE64D15; Thu, 18 May 2023 05:26:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 54403C4339B; Thu, 18 May 2023 05:26:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684387568; bh=EDAfjVhXNNZTfw/0M4y8FYKGdj60FWofsOqnsedq2+A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H2Pm8s/4IGPi9m1yoZy+gC+p31qMwCnhEKZ2OCd0enD1DDBzJcJtdmq0YsTUPrBK3 afiQ+gCRuup3v+ud5wKibyVEGCnfVbk+I/Kn8IZ0RcOTBOOa3Q5FcxwLzk3q9QQGMs KS3xIK31N58sJkhdRly2iHWTYTKxcxhQ/puFkGDLxSUlEcTovk0bj2d2j3w/C75x06 N7PdpYbBk4+aPEY5favUzvpv4zS1hUaMLrbd6FGDY11keVACeeiTe/DjbYBN1MYime qUzJojnw+BwszSCS7n3oQ2UbnehiN71OiZ0AiGM3nRoTe590matws4eDaBdLn8QTzr NgLlwFTNZuaXw== From: "Masami Hiramatsu (Google)" To: linux-trace-kernel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Steven Rostedt , mhiramat@kernel.org, Florent Revest , Mark Rutland , Will Deacon , Mathieu Desnoyers , Martin KaFai Lau , bpf@vger.kernel.org, Bagas Sanjaya Subject: [PATCH v12 08/11] tracing/probes: Add BTF retval type support Date: Thu, 18 May 2023 14:26:05 +0900 Message-ID: <168438756494.1517340.8589120584247312702.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.40.1.606.ga4b1b128d6-goog In-Reply-To: <168438749373.1517340.14083401972478496211.stgit@mhiramat.roam.corp.google.com> References: <168438749373.1517340.14083401972478496211.stgit@mhiramat.roam.corp.google.com> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766209343792992882?= X-GMAIL-MSGID: =?utf-8?q?1766209343792992882?= From: Masami Hiramatsu (Google) Check the target function has non-void retval type and set the correct fetch type if user doesn't specify it. If the function returns void, $retval is rejected as below; # echo 'f unregister_kprobes%return $retval' >> dynamic_events sh: write error: No such file or directory # cat error_log [ 37.488397] trace_fprobe: error: This function returns 'void' type Command: f unregister_kprobes%return $retval ^ Signed-off-by: Masami Hiramatsu (Google) --- Changes in v8: - Fix wrong indentation. Changes in v7: - Introduce this as a new patch. --- kernel/trace/trace_probe.c | 69 ++++++++++++++++++++++++++++++++++++++++---- kernel/trace/trace_probe.h | 1 + 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 1807eebefabe..8a6beb76a8de 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -371,15 +371,13 @@ static const char *type_from_btf_id(struct btf *btf, s32 id) return NULL; } -static const struct btf_param *find_btf_func_param(const char *funcname, s32 *nr, - bool tracepoint) +static const struct btf_type *find_btf_func_proto(const char *funcname) { struct btf *btf = traceprobe_get_btf(); - const struct btf_param *param; const struct btf_type *t; s32 id; - if (!btf || !funcname || !nr) + if (!btf || !funcname) return ERR_PTR(-EINVAL); id = btf_find_by_name_kind(btf, funcname, BTF_KIND_FUNC); @@ -396,6 +394,22 @@ static const struct btf_param *find_btf_func_param(const char *funcname, s32 *nr if (!btf_type_is_func_proto(t)) return ERR_PTR(-ENOENT); + return t; +} + +static const struct btf_param *find_btf_func_param(const char *funcname, s32 *nr, + bool tracepoint) +{ + const struct btf_param *param; + const struct btf_type *t; + + if (!funcname || !nr) + return ERR_PTR(-EINVAL); + + t = find_btf_func_proto(funcname); + if (IS_ERR(t)) + return (const struct btf_param *)t; + *nr = btf_type_vlen(t); param = (const struct btf_param *)(t + 1); @@ -462,6 +476,32 @@ static const struct fetch_type *parse_btf_arg_type(int arg_idx, return find_fetch_type(typestr, ctx->flags); } +static const struct fetch_type *parse_btf_retval_type( + struct traceprobe_parse_context *ctx) +{ + struct btf *btf = traceprobe_get_btf(); + const char *typestr = NULL; + const struct btf_type *t; + + if (btf && ctx->funcname) { + t = find_btf_func_proto(ctx->funcname); + if (!IS_ERR(t)) + typestr = type_from_btf_id(btf, t->type); + } + + return find_fetch_type(typestr, ctx->flags); +} + +static bool is_btf_retval_void(const char *funcname) +{ + const struct btf_type *t; + + t = find_btf_func_proto(funcname); + if (IS_ERR(t)) + return false; + + return t->type == 0; +} #else static struct btf *traceprobe_get_btf(void) { @@ -480,8 +520,15 @@ static int parse_btf_arg(const char *varname, struct fetch_insn *code, trace_probe_log_err(ctx->offset, NOSUP_BTFARG); return -EOPNOTSUPP; } + #define parse_btf_arg_type(idx, ctx) \ find_fetch_type(NULL, ctx->flags) + +#define parse_btf_retval_type(ctx) \ + find_fetch_type(NULL, ctx->flags) + +#define is_btf_retval_void(funcname) (false) + #endif #define PARAM_MAX_STACK (THREAD_SIZE / sizeof(unsigned long)) @@ -512,6 +559,11 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t, if (strcmp(arg, "retval") == 0) { if (ctx->flags & TPARG_FL_RETURN) { + if ((ctx->flags & TPARG_FL_KERNEL) && + is_btf_retval_void(ctx->funcname)) { + err = TP_ERR_NO_RETVAL; + goto inval; + } code->op = FETCH_OP_RETVAL; return 0; } @@ -917,9 +969,12 @@ static int traceprobe_parse_probe_arg_body(const char *argv, ssize_t *size, goto fail; /* Update storing type if BTF is available */ - if (IS_ENABLED(CONFIG_PROBE_EVENTS_BTF_ARGS) && - !t && code->op == FETCH_OP_ARG) - parg->type = parse_btf_arg_type(code->param, ctx); + if (IS_ENABLED(CONFIG_PROBE_EVENTS_BTF_ARGS) && !t) { + if (code->op == FETCH_OP_ARG) + parg->type = parse_btf_arg_type(code->param, ctx); + else if (code->op == FETCH_OP_RETVAL) + parg->type = parse_btf_retval_type(ctx); + } ret = -EINVAL; /* Store operation */ diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h index b5f265819503..c13690b74d51 100644 --- a/kernel/trace/trace_probe.h +++ b/kernel/trace/trace_probe.h @@ -445,6 +445,7 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call, C(BAD_EVENT_NAME, "Event name must follow the same rules as C identifiers"), \ C(EVENT_EXIST, "Given group/event name is already used by another event"), \ C(RETVAL_ON_PROBE, "$retval is not available on probe"), \ + C(NO_RETVAL, "This function returns 'void' type"), \ C(BAD_STACK_NUM, "Invalid stack number"), \ C(BAD_ARG_NUM, "Invalid argument number"), \ C(BAD_VAR, "Invalid $-valiable specified"), \