From patchwork Wed Apr 26 17:17:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 87913 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp398831vqo; Wed, 26 Apr 2023 10:21:41 -0700 (PDT) X-Google-Smtp-Source: AKy350Zmt/H1lPq9KRMhKwX/BrV5sXLHjE1WbWQqZPgVPF/EatyyeRKsikrQK5bUW9B+KKvqVfg3 X-Received: by 2002:a17:903:294c:b0:1a2:23f7:20f with SMTP id li12-20020a170903294c00b001a223f7020fmr18341955plb.28.1682529700828; Wed, 26 Apr 2023 10:21:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682529700; cv=none; d=google.com; s=arc-20160816; b=fKuwQizjOFD3qUMjKU57VM7VxNPgSVO8K+b98nrymP1U22iYFwCWL5yj51cttKO+++ 8iJKZ59uqRIRZ/rcJifOSw0qgLxAZ4MN3YFZ10B1JwUMqN79JB5iAcRtc3+kMcUiqz8O /iAe16u5HzQEPtQLbH7yYbq4RhnMv71KXd/kBl4eWt13IPPF0nVLkrCWojA/FPe/t94H APmsa/x9s33ktUYx6oaL+mx6E8ZHg+SUCoCYb8N0uDMluDZzSyfivQUD/S2w/FdCBGv2 FSSovtTCGXAGz5vn89ndE1Ypb1bu8yqrbi+kFbTB9WmmHw55uV56oQMk8PXj2HnaFAl5 CwgA== 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=lWnb4R9naH/p7fwoi1cohkC7ysD3Trv1o3hqkU6N3ko=; b=tflghLJNmnRmAOKfBjILWQ4TOBb+bICs8Bcji6mwCfafNCTAs1d/iuKlSDp5nNqj4n SC5AdCNUeI+wX6X9e61PofCBk1iOzl/AX5w4haP79lc/8VEPnAj8whawSn1Q/8pdbrBF bX39Qh8ddwDNfVrywlwYqHQynqQlo4iyS+VRtqOl2g5uOz3te7Cup7QkgfGw3BrspW+i naKqr/2BGP5KK8M6eHvbZ40vSpn1+qdRYNaLkxQMOHhKe83sxeBSL1viVLfSCX6QcOiD umsad2w7b8UFYfqTVeckhFEOt0lbpOy9X7vySYdoHpPN3ooUVMBc8XK9pj5BqO2OAM/0 d0rQ== 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 f11-20020a170902ce8b00b001a6e5be610esi14106812plg.297.2023.04.26.10.21.25; Wed, 26 Apr 2023 10:21: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; 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 S235036AbjDZRSR (ORCPT + 99 others); Wed, 26 Apr 2023 13:18:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234751AbjDZRRx (ORCPT ); Wed, 26 Apr 2023 13:17:53 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9AD92701 for ; Wed, 26 Apr 2023 10:17:52 -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 EAD4E62FEA for ; Wed, 26 Apr 2023 17:17:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C5E9C433D2; Wed, 26 Apr 2023 17:17:51 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1prim6-005KaP-1K; Wed, 26 Apr 2023 13:17:50 -0400 Message-ID: <20230426171750.231148604@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 26 Apr 2023 13:17:09 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Doug Cook , Beau Belgrave Subject: [for-next][PATCH 06/11] tracing/user_events: Ensure bit is cleared on unregister References: <20230426171703.202523909@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,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?1764260263358123768?= X-GMAIL-MSGID: =?utf-8?q?1764260263358123768?= From: Beau Belgrave If an event is enabled and a user process unregisters user_events, the bit is left set. Fix this by always clearing the bit in the user process if unregister is successful. Update abi self-test to ensure this occurs properly. Link: https://lkml.kernel.org/r/20230425225107.8525-3-beaub@linux.microsoft.com Suggested-by: Doug Cook Signed-off-by: Beau Belgrave Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_user.c | 34 +++++++++++++++++++ .../testing/selftests/user_events/abi_test.c | 9 +++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/kernel/trace/trace_events_user.c b/kernel/trace/trace_events_user.c index 546d47a57520..4f9ae63dfc5d 100644 --- a/kernel/trace/trace_events_user.c +++ b/kernel/trace/trace_events_user.c @@ -2149,6 +2149,35 @@ static long user_unreg_get(struct user_unreg __user *ureg, return ret; } +static int user_event_mm_clear_bit(struct user_event_mm *user_mm, + unsigned long uaddr, unsigned char bit) +{ + struct user_event_enabler enabler; + int result; + + memset(&enabler, 0, sizeof(enabler)); + enabler.addr = uaddr; + enabler.values = bit; +retry: + /* Prevents state changes from racing with new enablers */ + mutex_lock(&event_mutex); + + /* Force the bit to be cleared, since no event is attached */ + mmap_read_lock(user_mm->mm); + result = user_event_enabler_write(user_mm, &enabler, false); + mmap_read_unlock(user_mm->mm); + + mutex_unlock(&event_mutex); + + if (result) { + /* Attempt to fault-in and retry if it worked */ + if (!user_event_mm_fault_in(user_mm, uaddr)) + goto retry; + } + + return result; +} + /* * Unregisters an enablement address/bit within a task/user mm. */ @@ -2193,6 +2222,11 @@ static long user_events_ioctl_unreg(unsigned long uarg) mutex_unlock(&event_mutex); + /* Ensure bit is now cleared for user, regardless of event status */ + if (!ret) + ret = user_event_mm_clear_bit(mm, reg.disable_addr, + reg.disable_bit); + return ret; } diff --git a/tools/testing/selftests/user_events/abi_test.c b/tools/testing/selftests/user_events/abi_test.c index e0323d3777a7..5125c42efe65 100644 --- a/tools/testing/selftests/user_events/abi_test.c +++ b/tools/testing/selftests/user_events/abi_test.c @@ -109,13 +109,16 @@ TEST_F(user, enablement) { ASSERT_EQ(0, change_event(false)); ASSERT_EQ(0, self->check); - /* Should not change after disable */ + /* Ensure kernel clears bit after disable */ ASSERT_EQ(0, change_event(true)); ASSERT_EQ(1, self->check); ASSERT_EQ(0, reg_disable(&self->check, 0)); + ASSERT_EQ(0, self->check); + + /* Ensure doesn't change after unreg */ + ASSERT_EQ(0, change_event(true)); + ASSERT_EQ(0, self->check); ASSERT_EQ(0, change_event(false)); - ASSERT_EQ(1, self->check); - self->check = 0; } TEST_F(user, bit_sizes) {