From patchwork Mon Dec 12 15:37:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2311371wrr; Mon, 12 Dec 2022 07:38:54 -0800 (PST) X-Google-Smtp-Source: AA0mqf6/j3XKMukF6Cxvs7gndJVpj0PKNGLR88h8WPbB+ETExrkV9cEgCL5Qfss23qeuMbmhbQ9b X-Received: by 2002:a17:906:2a92:b0:7a4:bc2a:b98e with SMTP id l18-20020a1709062a9200b007a4bc2ab98emr13607765eje.24.1670859534304; Mon, 12 Dec 2022 07:38:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670859534; cv=none; d=google.com; s=arc-20160816; b=LkzCYoLCr7WFlGxz6v3FswV5th9d57Zy/8dYTxlytP5QlpZAH8wq2VIsm8U2iNbYKq isPcLMSVlkteno5ZLsPBzWMe6nwc4sdINBkiTzL8w7nedVEoX0iucfE4jODoM+e0Mzav Eb5RuNmbbSO2jQVNmmtr8CDQ6Kd8TlrCcm2rg1tYJOETOx/q9lnMmQ0i5eybwrwKAjin 8qygZuN1fIOJFsWhO3jBBhxWDVzZCOotaGYU32bcwTs0PthWi0BXSFomgtWMOKTmKAzF taFpLuZKdUm7NFmQH4Nd9kuJ87iL02eIZlKqrSRQx4ohR5vEShaRIG82PrYdgQARzDMB Xr1w== 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 :message-id:subject:cc:to:from:date; bh=AO7YLB8iwU5oZW8MnbywY0IltT7KiEq6iAya8QAlzA4=; b=WzWYsCx57pRYPU8QrgAaHWZteImyf3YG2ZR7B8EuU3TxurK3U8p92pKwK0PbluhZhD imFAIiNxXEwV9LNtVnNWj9Y5y996VUfq2RcimV51pcQAsvx/Yv3n2dt2zx1QjRtAYjVO WNCNGULltVxSdDXTj0YkF64+25vmRJlMOACkpPUYuh8Mq9Yca6z+MSogh4iLF++zzwrb jOXKxtpwm5TF/h0Kwdj8qqHOklSDikXLIyMmXDgf8lwa4iikZZz8/HmoX0wFRGdUnZA6 XFwiL8U2sctDxnhoR0JKtRZtF2i/AZ3Pwol5wueHpv72JWF6HQ6zVzxEG+MTE90N8oNj r19w== 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 du13-20020a17090772cd00b007c16344082dsi4505316ejc.799.2022.12.12.07.38.30; Mon, 12 Dec 2022 07:38:54 -0800 (PST) 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 S232505AbiLLPhO (ORCPT + 99 others); Mon, 12 Dec 2022 10:37:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232128AbiLLPhI (ORCPT ); Mon, 12 Dec 2022 10:37:08 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07251B4BD for ; Mon, 12 Dec 2022 07:37:08 -0800 (PST) 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 971A961122 for ; Mon, 12 Dec 2022 15:37:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5E1DC433EF; Mon, 12 Dec 2022 15:37:05 +0000 (UTC) Date: Mon, 12 Dec 2022 10:37:03 -0500 From: Steven Rostedt To: LKML Cc: Masami Hiramatsu , Thomas Gleixner , Peter Zijlstra , Borislav Petkov , "x86@kernel.org" , Karol Herbst , Pekka Paalanen , Dave Hansen , Andy Lutomirski , Ingo Molnar Subject: [PATCH] x86/mm/kmmio: Remove redundant preempt_disable() Message-ID: <20221212103703.7129cc5d@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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 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?1752023206565568554?= X-GMAIL-MSGID: =?utf-8?q?1752023206565568554?= From: "Steven Rostedt (Google)" Now that kmmio uses rcu_read_lock_sched_notrace() there's no reason to call preempt_disable() as the read_lock_sched_notrace() already does that and is redundant. This also removes the preempt_enable_no_resched() as the "no_resched()" portion was bogus as there's no reason to do that. Signed-off-by: Steven Rostedt (Google) --- arch/x86/mm/kmmio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 853c49877c16..9f82019179e1 100644 --- a/arch/x86/mm/kmmio.c +++ b/arch/x86/mm/kmmio.c @@ -246,14 +246,13 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr) page_base &= page_level_mask(l); /* - * Preemption is now disabled to prevent process switch during - * single stepping. We can only handle one active kmmio trace + * Hold the RCU read lock over single stepping to avoid looking + * up the probe and kmmio_fault_page again. The rcu_read_lock_sched() + * also disables preemption and prevents process switch during + * the single stepping. We can only handle one active kmmio trace * per cpu, so ensure that we finish it before something else - * gets to run. We also hold the RCU read lock over single - * stepping to avoid looking up the probe and kmmio_fault_page - * again. + * gets to run. */ - preempt_disable(); rcu_read_lock_sched_notrace(); faultpage = get_kmmio_fault_page(page_base); @@ -324,7 +323,6 @@ int kmmio_handler(struct pt_regs *regs, unsigned long addr) no_kmmio: rcu_read_unlock_sched_notrace(); - preempt_enable_no_resched(); return ret; } @@ -364,7 +362,6 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs) ctx->active--; BUG_ON(ctx->active); rcu_read_unlock_sched_notrace(); - preempt_enable_no_resched(); /* * if somebody else is singlestepping across a probe point, flags