From patchwork Thu Jun 15 13:05:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 108545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp673209vqr; Thu, 15 Jun 2023 07:21:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4T/N0akQ26v3FCdulmhTGWtHTFdHWCQzptkBfWUe63hitinWs9jqS/GeXUcBtGJq7opCh5 X-Received: by 2002:a05:6808:b0c:b0:39c:71fc:4cb4 with SMTP id s12-20020a0568080b0c00b0039c71fc4cb4mr11512392oij.58.1686838890044; Thu, 15 Jun 2023 07:21:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686838889; cv=none; d=google.com; s=arc-20160816; b=GkFV07E3iwXMyoVHgL1Nc7smUnF9uak5qNiL28GclK+dQghYbkl5eNuVo2+yxxsEEr S1kJIbDdZp3vi4MOXYaEv4v8YGB/v4l9g+4i7FS30qKq090Ucm8byh2+F5NNeUlaV7rf fpkaZ8nTIjK3LRu2yr0ojclglyE5ZoOujX0UeALMqBY1Wf0Anx7EJnkLpOoMIrEfRaM6 Mrvuf0dXilA2YPbS66QqKYqTF1ZGumr4FlDqFO9aSQXpmWiYarq5Uwbk5dX3rUtfxCod Rl1TiZmWAzftrMj3o1Snmlgxu+/IQipUaIpox+CS8UdBgOcEX2sKctD35oMtqlS27NU0 7pGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=//RRdv1TqMsGMlCJ28rAc5ADUb/9JWY+wnjFREEE/Q0=; b=cvHUc/0LYf67q4k0Ty18gd1ZwD7jkImmV/nslH2N779u1nAzy7Ho5+gulj+KvwddzL BY9gt5ybx5aZlLVfY2rGp1t0GdzIPbxPJR1gq5NEvD8/V+UvW2qgFUfv4F+rDwdkwjV5 Ayv4X6ITjUcOt5jZu5ijbp5Q2sAcE2iG9QXslt8Ahlu2JdZj2b6QK76G1ZKSMshPrqWq /4RjPxLn1HBnWYP17fAey6cPAvr90AEAduZ/QiYrC/achtAO5vVBrMOM4gB1Mbv9SpLZ FWkhiFv2dJHLetSA4rf52Xp2WqSORn63Q/ysl7AD227JEOPWQ5bBRCf04a9JaRtn4HLS /+kw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p9-20020a639509000000b0053f24deef0dsi12794683pgd.312.2023.06.15.07.21.13; Thu, 15 Jun 2023 07:21:29 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343593AbjFONg1 (ORCPT + 99 others); Thu, 15 Jun 2023 09:36:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344753AbjFONfY (ORCPT ); Thu, 15 Jun 2023 09:35:24 -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 E36CD30F8 for ; Thu, 15 Jun 2023 06:34:47 -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 B75636371C for ; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 32EC1C433C9; Thu, 15 Jun 2023 13:34:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1q9n7A-000Tob-0r; Thu, 15 Jun 2023 09:34:16 -0400 Message-ID: <20230615133416.089967064@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 15 Jun 2023 09:05:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Beau Belgrave , sunliming Subject: [for-linus][PATCH 07/15] selftests/user_events: Clear the events after perf self-test References: <20230615130531.200384328@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,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?1768778776161755663?= X-GMAIL-MSGID: =?utf-8?q?1768778776161755663?= From: sunliming When the self test is completed, perf self-test left the user events not to be cleared. Clear the events by unregister and delete the event. Link: https://lkml.kernel.org/r/20230606062027.1008398-4-sunliming@kylinos.cn Acked-by: Beau Belgrave Acked-by: Masami Hiramatsu (Google) Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) --- .../testing/selftests/user_events/perf_test.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/testing/selftests/user_events/perf_test.c b/tools/testing/selftests/user_events/perf_test.c index a070258d4449..e97f24ab6e2f 100644 --- a/tools/testing/selftests/user_events/perf_test.c +++ b/tools/testing/selftests/user_events/perf_test.c @@ -81,6 +81,32 @@ static int get_offset(void) return offset; } +static int clear(int *check) +{ + struct user_unreg unreg = {0}; + + unreg.size = sizeof(unreg); + unreg.disable_bit = 31; + unreg.disable_addr = (__u64)check; + + int fd = open(data_file, O_RDWR); + + if (fd == -1) + return -1; + + if (ioctl(fd, DIAG_IOCSUNREG, &unreg) == -1) + if (errno != ENOENT) + return -1; + + if (ioctl(fd, DIAG_IOCSDEL, "__test_event") == -1) + if (errno != ENOENT) + return -1; + + close(fd); + + return 0; +} + FIXTURE(user) { int data_fd; int check; @@ -93,6 +119,9 @@ FIXTURE_SETUP(user) { FIXTURE_TEARDOWN(user) { close(self->data_fd); + + if (clear(&self->check) != 0) + printf("WARNING: Clear didn't work!\n"); } TEST_F(user, perf_write) {