From patchwork Sun Jul 2 14:47:35 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: 115098 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d684:0:b0:3ea:7c49:e304 with SMTP id dd4csp2908965vqb; Sun, 2 Jul 2023 07:50:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlGb0Qrw3pzzkvkNso02de+GmxrI0L99NDDz1Zv744k60MPVNvbxm0pZMXJ+ky9kTPyoczh9 X-Received: by 2002:a17:902:b711:b0:1b7:edcd:8dcd with SMTP id d17-20020a170902b71100b001b7edcd8dcdmr5726574pls.21.1688309446882; Sun, 02 Jul 2023 07:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688309446; cv=none; d=google.com; s=arc-20160816; b=kZod66BaDpOi3PqFDicFEpjNlulF4BkfDSMsCIj53K1W3H9xpEYRlPzXs3OjAQr/cv iIefSjdbNvKAsyJtTk7Vd+01KZZHAwChf0xEKuTYNNQhAnGqk4VOGMIX3X7Hu0TCZlo4 TlHd58CZ7FU2mrQhZtmeSo4xzAjODWIuzVaNKTbs7Dqj4HclMiEZVaFQA8vxgDL/bgkw CjyQpaNXZpB+tGYFtXLbBbi+1xwoZ+cqRWnCChT10q7MVgFQO+zsMtNeZeVtLjJDMMhB FwHf0sRruVaBe7Zwwof58q1bZ65yBTrTUXIf9PKJB2m/A5VVkdUVbB0Jn5zPMTNAhVwz 3iEw== 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=6j0A8NYar/ua2yzCxC5KF28SmvAcCu1qv3LpH9ikHvE=; fh=IqesEL0r+gt71nXDuYNYX+jwby0flLUfnEwj7ADHyoI=; b=hLse1Vo8sJB/YgBX+9eFFv1VWtZburqVTZbJCVRwtAotLFSOYbyTBAvXxinpQP6+FK uno2oanSbq3+ATiSSvldPH9AuhG6wrFDSzECb7X3QKbAquH2Ckkrj0/UJPYLt/+uMgRP B/U4buGNjQKcMThqhQoeXoq1MypKxvzOTPJa2VqzgjGne/XNZ28sj73sU0jmb5tinNUT k5DSQChwcs65lxXEryoXLOrUv39PoG0UQLljWlCUnXh9tG2gz7ZEWjxcZq0gqMN7XdbY Z5erB1WpFGFY6QDuxSxBOwspHu8Rlbl9BOkg9Magb2YEzhv6UM7qfyzlaLyjWFYAGKG9 /fdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZAJv7+bS; 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 jb22-20020a170903259600b001b51313b1c7si9095938plb.19.2023.07.02.07.50.31; Sun, 02 Jul 2023 07:50:46 -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=ZAJv7+bS; 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 S229698AbjGBOrw (ORCPT + 99 others); Sun, 2 Jul 2023 10:47:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229754AbjGBOru (ORCPT ); Sun, 2 Jul 2023 10:47:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50945E5E; Sun, 2 Jul 2023 07:47:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E0E2260C2C; Sun, 2 Jul 2023 14:47:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 577A6C433CB; Sun, 2 Jul 2023 14:47:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688309258; bh=YM6t77hkrmL0BQ4fCrPPMAXrOgv5IQjPa1agd03fP70=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZAJv7+bSjNkfj3L2nXyNjhcy/BxEBu9FTQlSatczbFtOg2/U4+IOT0Q5G+jZ7Gwp0 8br1UiPmexAvFkKepIeq+BHXRm34QM7uAcbDZLAXQzMPIUxXpVd3yz+FEDUP2D31uT ifZRTotfXmdnv/oG8/vN3yht+H+v8cu+KY1afvHB7GjtCfZ1oLraoNvrmuNwACqveh NcLqFAIQV7UWGD45KskndizDCZ007dQ+0Of/TvnX21oWBw95EimjBbDyghdPqgSy70 bEut4WLCgQG/xWwDWxv0xE0eipXo0txH/jUnc/A7T1rDZSR8BBPmaGUkpulMWAn0h8 1EqLwGQhISZjQ== From: "Masami Hiramatsu (Google)" To: Steven Rostedt Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML , Masami Hiramatsu Subject: [PATCH 3/3] tracing/probes: Fix return value when "(fault)" is injected Date: Sun, 2 Jul 2023 23:47:35 +0900 Message-ID: <168830925534.2278819.7237772177111801959.stgit@mhiramat.roam.corp.google.com> X-Mailer: git-send-email 2.41.0.255.g8b1d071c50-goog In-Reply-To: <168830922841.2278819.9165254236027770818.stgit@mhiramat.roam.corp.google.com> References: <168830922841.2278819.9165254236027770818.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?1770320766654299773?= X-GMAIL-MSGID: =?utf-8?q?1770320766654299773?= From: Masami Hiramatsu (Google) When the "(fault)" is injected, the return value of fetch_store_string*() should be the length of the "(fault)", but an error code is returned. Fix it to return the correct length and update the data_loc according the updated length. This needs to update a ftracetest test case, which expects trace output to appear as '(fault)' instead of '"(fault)"'. Fixes: 2e9906f84fc7 ("tracing: Add "(fault)" name injection to kernel probes") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) --- kernel/trace/trace_probe_kernel.h | 17 +++++++---------- .../ftrace/test.d/kprobe/kprobe_args_user.tc | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/kernel/trace/trace_probe_kernel.h b/kernel/trace/trace_probe_kernel.h index c4e1d4c03a85..63d90fe4eb87 100644 --- a/kernel/trace/trace_probe_kernel.h +++ b/kernel/trace/trace_probe_kernel.h @@ -48,14 +48,15 @@ fetch_store_strlen(unsigned long addr) return (ret < 0) ? strlen(FAULT_STRING) + 1 : len; } -static nokprobe_inline void set_data_loc(int ret, void *dest, void *__dest, void *base, int len) +static nokprobe_inline int set_data_loc(int ret, void *dest, void *__dest, void *base, int len) { - if (ret >= 0) { - *(u32 *)dest = make_data_loc(ret, __dest - base); - } else { + if (ret < 0) { strscpy(__dest, FAULT_STRING, len); ret = strlen(__dest) + 1; } + + *(u32 *)dest = make_data_loc(ret, __dest - base); + return ret; } /* @@ -76,9 +77,7 @@ fetch_store_string_user(unsigned long addr, void *dest, void *base) __dest = get_loc_data(dest, base); ret = strncpy_from_user_nofault(__dest, uaddr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); - - return ret; + return set_data_loc(ret, dest, __dest, base, maxlen); } /* @@ -107,9 +106,7 @@ fetch_store_string(unsigned long addr, void *dest, void *base) * probing. */ ret = strncpy_from_kernel_nofault(__dest, (void *)addr, maxlen); - set_data_loc(ret, dest, __dest, base, maxlen); - - return ret; + return set_data_loc(ret, dest, __dest, base, maxlen); } static nokprobe_inline int diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc index d25d01a19778..8dcc0b29bd36 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc @@ -29,6 +29,6 @@ echo 1 > events/kprobes/myevent/enable ln -s foo $TMPDIR/bar echo 0 > events/kprobes/myevent/enable -grep myevent trace | grep -q 'path=(fault) path2=(fault)' +grep myevent trace | grep -q 'path="*(fault)"* path2="*(fault)"*' exit 0