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 X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D83CC4741F for ; Thu, 29 Oct 2020 20:57:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2A9220738 for ; Thu, 29 Oct 2020 20:57:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kamngtTU" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2A9220738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 26CFD6B005D; Thu, 29 Oct 2020 16:57:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21C6D6B006C; Thu, 29 Oct 2020 16:57:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0E4E76B0070; Thu, 29 Oct 2020 16:57:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0073.hostedemail.com [216.40.44.73]) by kanga.kvack.org (Postfix) with ESMTP id D40166B005D for ; Thu, 29 Oct 2020 16:57:23 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7BCCB8249980 for ; Thu, 29 Oct 2020 20:57:23 +0000 (UTC) X-FDA: 77426173566.13.pen39_3604e3427290 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id 3206D18140B67 for ; Thu, 29 Oct 2020 20:57:23 +0000 (UTC) X-HE-Tag: pen39_3604e3427290 X-Filterd-Recvd-Size: 5946 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Thu, 29 Oct 2020 20:57:22 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id 184so5093602lfd.6 for ; Thu, 29 Oct 2020 13:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:date:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=tgYhSKMAAApq0oCw/G6+KM7ZmeNwhy01uUadN4Msmr8=; b=kamngtTUhEHe6EopfY7xDBXcaztAd12laOvNxT/Pfc5rHqUZsolkVu/ydHV+vBjRe6 5LNoIdx2UDaj6TpXRuo6saeKCao+Bbs++hJfYzYUTshWOjTO0/Z7E7MqVgWlyyNjIG3u zNlzaFu5S3rEwZmukjVLxqZrKe85jp6yqJHbVIPIaMYp4Nef8IP7hNTGmos+prMP9YI5 Gbaul1fEgVTdiqADoht6gzLJiukJBrE7fCY4opA/qw0TiGOMuPADmRt9+VLKgSkDC3Nu /5HXHli6Lk7KAPduNzxqjkP6apKtYAncHK4ggzD93AM3xjGo6a/pJ4riMfZTlE7JBOgm Jmzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=tgYhSKMAAApq0oCw/G6+KM7ZmeNwhy01uUadN4Msmr8=; b=TqiiCHYubolMv82eJvyRWCbr+ve7SoiNod2RN+giasW/PGbQB1g84qfgVczbKk44Db jxmO4H5QWf1W7uMep0psXhQ7RKhPyzrvywF0J1tH9XUbcG+1Seo5zlfoPcmmSup5vw6m DgohtFLmJbQ+tE/lPs7OPf16hQ1BUKq/fGoosjvDk5vNOk5pwAHc1wkBjWP3Q1saoz5A C7t118ArAF1i7j7zA+fkbhx+keB9ERlm2i5cYiuo167mYRp63LXKdsNAVqPYn8vmBpVb 2OjVtP4fGeloLeUK3SvOVDInWiv9THEeLtmkMygvH+N6sWGMsZRIqydR9vJKPp8D5Rj2 J8lQ== X-Gm-Message-State: AOAM5321F8Q/Jy/WqS2ISsYNpSrr1LDh4TTu/jk7eYYB1tpjpSwBr0WT hjn1bExNVZq0D09Qja/RZqw= X-Google-Smtp-Source: ABdhPJz1HePsbMnzrXaTW5LlatGbQe5A1udz2beATHkR5LAg7o9Xlqff/m0/1Fo4gornOtOrIIvPCQ== X-Received: by 2002:ac2:4d96:: with SMTP id g22mr479731lfe.335.1604005041061; Thu, 29 Oct 2020 13:57:21 -0700 (PDT) Received: from pc636 (h5ef52e31.seluork.dyn.perspektivbredband.net. [94.245.46.49]) by smtp.gmail.com with ESMTPSA id j18sm392987lfh.283.2020.10.29.13.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Oct 2020 13:57:19 -0700 (PDT) From: Uladzislau Rezki X-Google-Original-From: Uladzislau Rezki Date: Thu, 29 Oct 2020 21:57:17 +0100 To: "Paul E . McKenney" Cc: LKML , RCU , "Paul E . McKenney" , Andrew Morton , Peter Zijlstra , Michal Hocko , Thomas Gleixner , "Theodore Y . Ts'o" , Joel Fernandes , Sebastian Andrzej Siewior , Oleksiy Avramchenko , linux-mm@kvack.org, urezki@gmail.com Subject: Re: [PATCH 06/16] mm/pagemap: Cleanup PREEMPT_COUNT leftovers Message-ID: <20201029205717.GA24578@pc636> References: <20201029165019.14218-1-urezki@gmail.com> <20201029165019.14218-6-urezki@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201029165019.14218-6-urezki@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Thu, Oct 29, 2020 at 05:50:09PM +0100, Uladzislau Rezki (Sony) wrote: > From: Thomas Gleixner > > CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be > removed. Cleanup the leftovers before doing so. > > Signed-off-by: Thomas Gleixner > Cc: Andrew Morton > Cc: linux-mm@kvack.org > Signed-off-by: Uladzislau Rezki (Sony) > --- > include/linux/pagemap.h | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h > index c77b7c31b2e4..cbfbe2bcca75 100644 > --- a/include/linux/pagemap.h > +++ b/include/linux/pagemap.h > @@ -204,9 +204,7 @@ void release_pages(struct page **pages, int nr); > static inline int __page_cache_add_speculative(struct page *page, int count) > { > #ifdef CONFIG_TINY_RCU > -# ifdef CONFIG_PREEMPT_COUNT > - VM_BUG_ON(!in_atomic() && !irqs_disabled()); > -# endif > + VM_BUG_ON(preemptible()) > /* > * Preempt must be disabled here - we rely on rcu_read_lock doing > * this for us. > -- > 2.20.1 > Hello, Paul. Sorry for a small mistake, it was fixed by you before, whereas i took an old version of the patch that is question. Please use below one instead of posted one: Author: Thomas Gleixner Date: Mon Sep 14 19:25:00 2020 +0200 mm/pagemap: Cleanup PREEMPT_COUNT leftovers CONFIG_PREEMPT_COUNT is now unconditionally enabled and will be removed. Cleanup the leftovers before doing so. Signed-off-by: Thomas Gleixner Cc: Andrew Morton Cc: linux-mm@kvack.org [ paulmck: Fix !SMP build error per kernel test robot feedback. ] Signed-off-by: Paul E. McKenney diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 7de11dcd534d..b3d9d9217ea0 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -168,9 +168,7 @@ void release_pages(struct page **pages, int nr); static inline int __page_cache_add_speculative(struct page *page, int count) { #ifdef CONFIG_TINY_RCU -# ifdef CONFIG_PREEMPT_COUNT - VM_BUG_ON(!in_atomic() && !irqs_disabled()); -# endif + VM_BUG_ON(preemptible()); /* * Preempt must be disabled here - we rely on rcu_read_lock doing * this for us. -- Vlad Rezki