Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp3928454rwi; Sat, 22 Oct 2022 02:22:40 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6t94faSkk2lNcGTpk5LD9R0u5XUCu9wJC4duWmAT1GfGW07RFD7b3aclLYYSXUpPOuCTwu X-Received: by 2002:a63:4e66:0:b0:456:b3a7:7a80 with SMTP id o38-20020a634e66000000b00456b3a77a80mr19309661pgl.467.1666430560185; Sat, 22 Oct 2022 02:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666430560; cv=none; d=google.com; s=arc-20160816; b=vCIN/DBP5szILYN/NtqvyZqF4yzH/MAQWMHnamfHr56/+bwwNmlGI99199tUpA0fEI C8NW0bIJKXeDB75XdyopzeJUQIacOdKH8bhyzjmzDw5Drh40q1s6Vl4QEeLrb2eVPtnX S2g1l9ML1fP/ufiBc1L14PG+Df1RCcjkE5XOhSaNa3DkEJrXFUOAQ2KXNx8gHMsLEpM0 RvXjUMX+llJww+8YnCDU1YNZolWfQtRoMaekum9fjkfSjTtuzpyuj7yiMDmoBoDUDu1o 2ZC34s+d+os5RjyEkA2P1yCEV+k9pfFTwgD4MlitCiGIUcJ6Tixfb97tMlm9qQj6vxYD YtRg== 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=ZNoMqDQDR/f+9SqriZBn0Ku27lDbi3Qhj+L6N7eqhWInRjd7ZmKFfqa50CNjKNf/2g aH/JDxqseqFerTv7DaxXGffc9q1c49K4bao4rP6qlJJkodUV0vxdFCTSyj82ckXRrtvR t4b4ghv/J1PAsAkGovH3uLLID/w+lIKomLRWmSRYm7ft9tywyukRp5p+u/AVjAS/OftK jiSUWCJCJhx+DoSEFpGwfHJafLSJvr+Rt/IdxLzTB0k3Q/7EOSW9QKqzybgGmTbZulu+ eQ42g5ncPtuQYyOTF/lE4iS8OanNglu8SLe4OBmGH3vF6Pb0rQGMfEU45T8MSgg7erWo vxAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oDRZ1KYU; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ls15-20020a17090b350f00b001eccaceca72si10977986pjb.1.2022.10.22.02.22.28; Sat, 22 Oct 2022 02:22:40 -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=oDRZ1KYU; 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 S234995AbiJVIvO (ORCPT + 99 others); Sat, 22 Oct 2022 04:51:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235219AbiJVIuB (ORCPT ); Sat, 22 Oct 2022 04:50:01 -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 E092D2ED993; Sat, 22 Oct 2022 01:11:30 -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 3859BB82E2D; Sat, 22 Oct 2022 08:00:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33292C433C1; Sat, 22 Oct 2022 08:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666425604; bh=G2L0nwBjn5VtTyRobVNartiz1/0xuFjNYrEZ5NJlSKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oDRZ1KYUy5xDGt2FQnuCeCcx9fj4wv5GIF9HXC+tVhsOPOQmqLA+5uEISjXPMdRbS 0bPVrndXQkwwX5kqhFGluLch6JZQdPOjKnVcZhjOCz8C3hK0T80OgENFqyyH8OAx/w xCpBpjv3nMMD7q6c7e4Do6AGiK9UXrLMM6z/lhNY= 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.19 525/717] tracing: kprobe: Fix kprobe event gen test module on exit Date: Sat, 22 Oct 2022 09:26:44 +0200 Message-Id: <20221022072521.543885453@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.3 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 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)); -- 2.35.1