Received: by 2002:a05:622a:251a:b0:39a:b4a2:e86 with SMTP id cm26csp327566qtb; Wed, 19 Oct 2022 03:05:01 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77v1+7HFU0uFYmRrlbXpiEMSC8Nc13V0PRAwlNhgqBs/fnVhHsaykZWS9I4+7sPOBjV53W X-Received: by 2002:a17:90b:4a8f:b0:20d:2f93:3bb with SMTP id lp15-20020a17090b4a8f00b0020d2f9303bbmr44316523pjb.149.1666173890908; Wed, 19 Oct 2022 03:04:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666173890; cv=none; d=google.com; s=arc-20160816; b=HYdiOn6SAPWyznx8kXj1Wqhnl9lz4PJ5SDkaFUmF5vCIXRK3cggzzC1AGo1TwBiLi9 EGZ6fDmAjBpwM8xvTkvgatbSbLabnqfhRMw2RbnkcVCSJ7hAi8x0puvCEe8zpyHhjsWY 8yXcyr4zJIe3YIFGDlbWiyEtswj4ATdukn33qJHr7OkClVjU4AAXNfK1eJc0ezSAFVrc v05JK2bl8n2NKamNvV7kT6jAZVuHhKn9w1F78jjcgSiTyZWqquiBPplik/AMNo8XN0tF ETfy5bVdk3LruJbL0APIflLjp5rcQv+rmLxW93lvgmsMr+hRbibzyZLwZDSVQwfsQqfl 0P+A== 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=b6GtTzMenQBjNUoC8cgvhSLOiazsO32rYKbU2MjOOMBgNxo3EO0ZlFEuumSDUZmSXr D2pIeKwgwd37RonBbJYDMFzMm0dUhIbl5LhysX7x1ChTkkZtQ41H1RcebFtYO7yT5YPw 8q6fdGX+5tfyAwiMvD4UecuAWkGGRRa4huqonRERjZxlSn2j0eFT/zMaEgGpdiwQjAPu 1PkEiPGjyupUcR3cWl3nCKE0vgLWOaObziytTsrj1ep/abbQGOWgNv1CrnEjagsGGxep PSZZ+j2BQBJObpyfTVa+FAMp0q8LTSW5+HvU7oZjHOrye3sykWvAuzg1wYPwgF+NEkVp JZhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WlS9awD2; 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 p4-20020a17090a680400b0020adba9ec02si21197668pjj.82.2022.10.19.03.04.37; Wed, 19 Oct 2022 03:04:50 -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=WlS9awD2; 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 S233168AbiJSJZF (ORCPT + 99 others); Wed, 19 Oct 2022 05:25:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230348AbiJSJXc (ORCPT ); Wed, 19 Oct 2022 05:23:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06F2AB56F2; Wed, 19 Oct 2022 02:10:24 -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 E4C1A6185F; Wed, 19 Oct 2022 09:08:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1B48C433D7; Wed, 19 Oct 2022 09:08:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170491; bh=G2L0nwBjn5VtTyRobVNartiz1/0xuFjNYrEZ5NJlSKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WlS9awD2OpdCmAms7Qro9y4Vr8NcIvMcsX3H7rdw+Wz3+nPn8g235zoZ78XrxsAgt 0Z/gjkFMA1AUwVuS7mTGrJRr6wNEM5MMD4m1ifhnXLMCaZLd5K4f4Few9gf4Earxqd kq5h+2q17hjGArztcJHcYJluCRsWtgW9Ma6tDMPw= 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 6.0 643/862] tracing: kprobe: Fix kprobe event gen test module on exit Date: Wed, 19 Oct 2022 10:32:10 +0200 Message-Id: <20221019083318.337377248@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@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.4 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