From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15DFEECAAD1 for ; Thu, 1 Sep 2022 14:46:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234380AbiIAOq0 (ORCPT ); Thu, 1 Sep 2022 10:46:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231484AbiIAOqE (ORCPT ); Thu, 1 Sep 2022 10:46:04 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 547E875CF8; Thu, 1 Sep 2022 07:46:01 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 82A1F2015A; Thu, 1 Sep 2022 14:45:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1662043559; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=d7JBI/07yd8WyaO8RcKiT0B2kXWtniRx5v9bl5XBNpQ=; b=GS1zPTgzUE7SA44v31qD+AF4XlSoLr11tpr0vjqCs+efGkDBBFb84tSlbKYIVFvq+9Bbxg 1gChdqfyylgk0jM/3/KNCh57buu3X/Asiq54vFxcf6MyZrYILVJzzn+0uFG07K6PhaUaoX 3+RP+L1VtsfNVpeMC7kf8MDnB3x4wgU= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 629F413A79; Thu, 1 Sep 2022 14:45:59 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id h5jOFafFEGPNZQAAMHmgww (envelope-from ); Thu, 01 Sep 2022 14:45:59 +0000 Date: Thu, 1 Sep 2022 16:45:58 +0200 From: Michal Hocko To: Sebastian Andrzej Siewior Cc: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Steven Rostedt , Linus Torvalds , Matthew Wilcox , Johannes Weiner , Roman Gushchin , Shakeel Butt , Muchun Song , cgroups@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v2 5/8] mm/memcontrol: Replace the PREEMPT_RT conditionals Message-ID: References: <20220825164131.402717-1-bigeasy@linutronix.de> <20220825164131.402717-6-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220825164131.402717-6-bigeasy@linutronix.de> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu 25-08-22 18:41:28, Sebastian Andrzej Siewior wrote: > From: Thomas Gleixner > > Use VM_WARN_ON_IRQS_ENABLED() and preempt_disable/enable_nested() to > replace the CONFIG_PREEMPT_RT #ifdeffery. > > Signed-off-by: Thomas Gleixner > Cc: Johannes Weiner > Cc: Michal Hocko > Cc: Roman Gushchin > Cc: Shakeel Butt > Cc: Muchun Song > Cc: cgroups@vger.kernel.org > Cc: linux-mm@kvack.org > Signed-off-by: Sebastian Andrzej Siewior > Acked-by: Johannes Weiner > Reviewed-by: Muchun Song > Acked-by: Peter Zijlstra (Intel) Acked-by: Michal Hocko Thanks! > --- > mm/memcontrol.c | 19 ++++++------------- > 1 file changed, 6 insertions(+), 13 deletions(-) > > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index b69979c9ced5c..d35b6fa560f0a 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -597,25 +597,18 @@ static u64 flush_next_time; > */ > static void memcg_stats_lock(void) > { > -#ifdef CONFIG_PREEMPT_RT > - preempt_disable(); > -#else > - VM_BUG_ON(!irqs_disabled()); > -#endif > + preempt_disable_nested(); > + VM_WARN_ON_IRQS_ENABLED(); > } > > static void __memcg_stats_lock(void) > { > -#ifdef CONFIG_PREEMPT_RT > - preempt_disable(); > -#endif > + preempt_disable_nested(); > } > > static void memcg_stats_unlock(void) > { > -#ifdef CONFIG_PREEMPT_RT > - preempt_enable(); > -#endif > + preempt_enable_nested(); > } > > static inline void memcg_rstat_updated(struct mem_cgroup *memcg, int val) > @@ -715,7 +708,7 @@ void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, > * interrupt context while other caller need to have disabled interrupt. > */ > __memcg_stats_lock(); > - if (IS_ENABLED(CONFIG_DEBUG_VM) && !IS_ENABLED(CONFIG_PREEMPT_RT)) { > + if (IS_ENABLED(CONFIG_DEBUG_VM)) { > switch (idx) { > case NR_ANON_MAPPED: > case NR_FILE_MAPPED: > @@ -725,7 +718,7 @@ void __mod_memcg_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx, > WARN_ON_ONCE(!in_task()); > break; > default: > - WARN_ON_ONCE(!irqs_disabled()); > + VM_WARN_ON_IRQS_ENABLED(); > } > } > > -- > 2.37.2 -- Michal Hocko SUSE Labs