From patchwork Mon Oct 24 11:32:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp478880wru; Mon, 24 Oct 2022 07:18:09 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5rsq/fZBH8yye1Ml6/tA5P9kKVgzqBhqpkkequLParvSShrsLPQekMNQcMHMaj4Pyfw3RY X-Received: by 2002:a17:906:ef8b:b0:791:9980:b7b9 with SMTP id ze11-20020a170906ef8b00b007919980b7b9mr27917585ejb.636.1666621078404; Mon, 24 Oct 2022 07:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666621078; cv=none; d=google.com; s=arc-20160816; b=tRNigo8Go1WVztwxsmymw2J2HBaZQmbktqezOkmLKP9OLoZGksU2Gs2SY8x0cRbHol QEfl5HrC7VDoIrHMe1PPWTGD+6Wllu09voVZCb97NMr/FY8XlOFR/BaMnkbXrzLv3yiK pgx4l69iIJJxOc1SYTZ4drNwGllE7bt48tA+a74P/SGmTH1aEv2qHwGrLYv29BvrFQw8 +31HIU2wt2CvQQAxMYc/oD3D6VcQmZU+sljoRLBd8u2juynDvFlT7foaDHJryP9VJ3ed 44pqSBDra8ntYdidq6JYnvQpTy+GU1svMDE8szYJFbyGXS2hhHyMDYMErjFE5XRcz48c NOqQ== 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=hhhUBlZq+rzhgtbHUX6KSi6lB3Jl+DlMyaeyZXHGQHEoQM5rVxiDb7t3bQSVE2R++i FxQi6UZCGaEI+aUU2WVz0AChOpMA1YwlJSlD+VQKKcUB3YoyXV5EsxVF5j6rghedj/Hw LwX9WAaHEi+cp4CpMK6gld2H4qtVcT0NI2CV6tpH+hFmbqCVI6DW3+zB/1qd0fGcn139 gslUKG68Qbzc8tXRxjfeycUzBuSp+K6JWShBPfdgMKUQyGs4yg9csKgVXwYOLUSwJcgz 3yx+WjhqB+bIFvijSeqp1eooIC6u7ez4spGUIcrTqdpVubQFlXr+NYaNIhfRtNVSsMaK trjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=AfqR38GZ; 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 q2-20020a056402040200b004571a669230si23084831edv.469.2022.10.24.07.17.31; Mon, 24 Oct 2022 07:17:58 -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=AfqR38GZ; 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 S231186AbiJXOLR (ORCPT + 99 others); Mon, 24 Oct 2022 10:11:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233996AbiJXOHL (ORCPT ); Mon, 24 Oct 2022 10:07:11 -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 36D553DBD2; Mon, 24 Oct 2022 05:50:04 -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 9B5B9612C9; Mon, 24 Oct 2022 12:50:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8655DC433D6; Mon, 24 Oct 2022 12:50:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615804; bh=G2L0nwBjn5VtTyRobVNartiz1/0xuFjNYrEZ5NJlSKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AfqR38GZVrSvARtWr/dChJ4pHrNH6hDEhO8aGa2hBuFIIpVw+xJ0xsQgsPVSJnx3F DcPYtFUaiYOv/AqCJbsbaCMhGuO8WccZ0rDfmuDCvV5z9Frjt1A4NeMlyO5tJl3018 uii5+/H8e0RlyjNAwT8PqX++sLnEv84hX2/R+0EY= 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.15 388/530] tracing: kprobe: Fix kprobe event gen test module on exit Date: Mon, 24 Oct 2022 13:32:12 +0200 Message-Id: <20221024113102.627762726@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@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?1747578863879782205?= X-GMAIL-MSGID: =?utf-8?q?1747578863879782205?= 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));