From patchwork Mon Oct 24 11:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9596 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp529197wru; Mon, 24 Oct 2022 09:03:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7H40kTE1BPOyCiHQBXH7B2ie9+gvJBTSyoTQlisvrmsbffriaI5MakwEe9yegQ+EZSbk6v X-Received: by 2002:a17:902:9690:b0:17a:4cf:edeb with SMTP id n16-20020a170902969000b0017a04cfedebmr34333197plp.129.1666627397634; Mon, 24 Oct 2022 09:03:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627397; cv=none; d=google.com; s=arc-20160816; b=kxWZwwcIdvsB/McUOl8PUtrA2jpxEht/Odm7GKSCkmLlpF1CMzAIG7geKwmVC8EoJd EARqby6k8Y5iUjX0ffenBRLrFsiV2DOoRmYUpLD1bDpi+X3sWt6+Bfqh22D299W23bpT 7VomEeUeJKIypg3USaVt73+dUQvPuOzJPv7LlZzoUIicWYIm5AMj5g5W31eXIO+nHrOI ysI47gvbSF3mZTU8bTuiiydpeaIBEm6/QTT2lndMcnmVkA7iClQdhgQAumg3Nroagb5y sFqOUpdvdO8YAhqzIDA1jsgTokW+gvbu0WGA1bkz7NfkE07BBefFkGSin2qk1WktGPg/ G3nA== 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=KCkiCwAeM0DC4G4M8RXTYA9/YX5WvLBhBfIsZNV29lU=; b=DFzTaXXdOFf4eeCVjYB1uZ9RVZD0Y8qi4g6TlV1BpmXkFfdNKBiDBrnG/pIPRkM/VP axqpQfa3auJMmJMW/QMZzQ97EM1aWJX8060+qEDyCsHyasfHeafxuPh0tnlWADG7stkA YALfzIsvhwWasdp4cKFy4EBM2vc2sts2QJVPy9Z0Vwxs1V68SwCRHPj5lUkS8CFon/oo aLZeiWGqDEL44bhwCkcguDwtqtZbGAd3YaP3rkIGq/Pdjeb1oF3JqIOCIxnt3Fhf7GNr 80FQ2YYj7ECn4lQVIXdLmnU3ZYZTc3KSkyjai9imzR6FrkDx+fshkqEHT7pUj+Kvh+aJ QKLQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xIL7Kig0; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r9-20020a1709028bc900b001768a29b9dfsi9344416plo.68.2022.10.24.09.02.56; Mon, 24 Oct 2022 09:03:17 -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=@linuxfoundation.org header.s=korg header.b=xIL7Kig0; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230456AbiJXQBl (ORCPT + 99 others); Mon, 24 Oct 2022 12:01:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232377AbiJXP7C (ORCPT ); Mon, 24 Oct 2022 11:59:02 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0531C9D52A; Mon, 24 Oct 2022 07:54:05 -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 ams.source.kernel.org (Postfix) with ESMTPS id E2D91B8169A; Mon, 24 Oct 2022 12:28:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 218F9C433D6; Mon, 24 Oct 2022 12:28:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614515; bh=G2L0nwBjn5VtTyRobVNartiz1/0xuFjNYrEZ5NJlSKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xIL7Kig0irVv/2KyxsITbg/4FxxHGkofIkh9tkgm2nfpYBeM9FAnPrTX8Fb9axMVn chPP0AyBphu3DO8MmKXWNp3GIZbPZGalipX9CvYb8tdHco6IKjXZ73GCPZ3uJVrK/+ PCxXGJFbEM80/UkSmwhqnJ7YlCezo+HC07VkxJJc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, linux-riscv@lists.infradead.org, mingo@redhat.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, zanussi@kernel.org, liaochang1@huawei.com, chris.zjh@huawei.com, Yipeng Zou , "Masami Hiramatsu (Google)" , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.10 283/390] tracing: kprobe: Fix kprobe event gen test module on exit Date: Mon, 24 Oct 2022 13:31:20 +0200 Message-Id: <20221024113034.994789643@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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 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?1747585489944667658?= X-GMAIL-MSGID: =?utf-8?q?1747585489944667658?= From: Yipeng Zou [ Upstream commit ac48e189527fae87253ef2bf58892e782fb36874 ] Correct gen_kretprobe_test clr event para on module exit. This will make it can't to delete. Link: https://lkml.kernel.org/r/20220919125629.238242-2-zouyipeng@huawei.com Cc: Cc: Cc: Cc: Cc: Cc: Cc: Cc: Fixes: 64836248dda2 ("tracing: Add kprobe event command generation test module") Signed-off-by: Yipeng Zou Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/kprobe_event_gen_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/trace/kprobe_event_gen_test.c b/kernel/trace/kprobe_event_gen_test.c index 18b0f1cbb947..e023154be0f8 100644 --- a/kernel/trace/kprobe_event_gen_test.c +++ b/kernel/trace/kprobe_event_gen_test.c @@ -206,7 +206,7 @@ static void __exit kprobe_event_gen_test_exit(void) WARN_ON(kprobe_event_delete("gen_kprobe_test")); /* Disable the event or you can't remove it */ - WARN_ON(trace_array_set_clr_event(gen_kprobe_test->tr, + WARN_ON(trace_array_set_clr_event(gen_kretprobe_test->tr, "kprobes", "gen_kretprobe_test", false));