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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 19B9DC433EF for ; Sat, 18 Dec 2021 14:31:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7777D6B0072; Sat, 18 Dec 2021 09:31:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7005D6B0073; Sat, 18 Dec 2021 09:31:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 552F06B0074; Sat, 18 Dec 2021 09:31:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 3E0796B0072 for ; Sat, 18 Dec 2021 09:31:45 -0500 (EST) Received: from smtpin01.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id F2D18884A2 for ; Sat, 18 Dec 2021 14:31:34 +0000 (UTC) X-FDA: 78931153350.01.EDA55C5 Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) by imf22.hostedemail.com (Postfix) with ESMTP id F1B9EC003A for ; Sat, 18 Dec 2021 14:31:28 +0000 (UTC) Received: by mail-lj1-f172.google.com with SMTP id p8so7973415ljo.5 for ; Sat, 18 Dec 2021 06:31:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=kc9+R56+8MDwRjsvf8i5sUSf8w2i6c6JQNVbPSuHRX8=; b=xR2uhj8UbddcxmP5jfJS/z074f0OYTuCQDGeyGFnIfWf9E8gTNi0IDJz/fI0Z/OAvc 7fOm8mlCykK9BjpbCWzINJIR4sDD0LhvX0Z6ozTAVnEn7pFpCNe0vlaa7Pm1HymSWCGC C4lmPUmgydMmZdMZ19+fa3tpD8J7FSl6lEjNBPIA4SddyGzHR1fsDEAz5JxAcfDetypJ FI2LHJVemJJ/MpPe37oF483qw+8gPRxAkyUZV8FnQ89POjT0HdkGsm0Yf79ay9+a8M8W 3VApEdP40S71I3ORpuPSDR2D33NRa/0ChyTexY2NEKJzRDHP6JwtzNPwPc7yrAfU9YzV 2cAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=kc9+R56+8MDwRjsvf8i5sUSf8w2i6c6JQNVbPSuHRX8=; b=clulamCpjCzYgfpnTNir6OpCjBwePsFtUdXwQPE9oxLGK2sA0gsTDX0sh/D9ZwiQ06 gFr7Y7YFhiPwk0sx/HAYRIuxnsVU/phuLnlhHsuVz6WspjIwizBwmOvJbp2vSeY2tqY7 pWL7OFQLP7bruTGW7hRoSznWQ/PrrVrRcKjTUYv03zHCzijAfSYrUxXLh1QCFS3Zajgt /QVMPcdLqikBKZO8gen9O+zsq9o0ueDq5AvKyVkjR2G4sP4AbOwkfaqH0NoJbh6yViYB eDrxst0Ypg87r6MZavmQDO5lWsGwcazU0V9RR1OgTYCXuh0sGZXCI8AwMK5SrWGRx/mr At5Q== X-Gm-Message-State: AOAM532EATxceIi6vEJv0nq6He3i9+n5X9rtlkrVkqU1fF6n9Y+9hf5K mDSylEP8WhOYz32fe30/LALSuQ== X-Google-Smtp-Source: ABdhPJzmI9OTT/xCA71zNk9+24raVNhyR/s+xVQncJY5pMt407MtgvqvPevD3vS+f21s18SmfZttYg== X-Received: by 2002:a2e:8702:: with SMTP id m2mr6625821lji.55.1639837887862; Sat, 18 Dec 2021 06:31:27 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id h18sm2037126ljh.133.2021.12.18.06.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Dec 2021 06:31:27 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id 6662C103A58; Sat, 18 Dec 2021 17:31:34 +0300 (+03) Date: Sat, 18 Dec 2021 17:31:34 +0300 From: "Kirill A. Shutemov" To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, Andrew Morton , Hugh Dickins , Linus Torvalds , David Rientjes , Shakeel Butt , John Hubbard , Jason Gunthorpe , Mike Kravetz , Mike Rapoport , Yang Shi , "Kirill A . Shutemov" , Matthew Wilcox , Vlastimil Babka , Jann Horn , Michal Hocko , Nadav Amit , Rik van Riel , Roman Gushchin , Andrea Arcangeli , Peter Xu , Donald Dutile , Christoph Hellwig , Oleg Nesterov , Jan Kara , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org Subject: Re: [PATCH v1 03/11] mm: simplify hugetlb and file-THP handling in __page_mapcount() Message-ID: <20211218143134.rdnyw6zarkysckrw@box.shutemov.name> References: <20211217113049.23850-1-david@redhat.com> <20211217113049.23850-4-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211217113049.23850-4-david@redhat.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: F1B9EC003A X-Stat-Signature: gn94b9rn3nhxseb4o3bqciw68pzo6dkf Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=shutemov-name.20210112.gappssmtp.com header.s=20210112 header.b=xR2uhj8U; spf=none (imf22.hostedemail.com: domain of kirill@shutemov.name has no SPF policy when checking 209.85.208.172) smtp.mailfrom=kirill@shutemov.name; dmarc=none X-HE-Tag: 1639837888-914928 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 Fri, Dec 17, 2021 at 12:30:41PM +0100, David Hildenbrand wrote: > Let's return early for hugetlb, which really only relies on the compound > mapcount so far and does not support PageDoubleMap() yet. Use the chance > to cleanup the file-THP case to make it easier to grasp. While at it, use > head_compound_mapcount(). > > This is a preparation for further changes. > > Reviewed-by: Peter Xu > Signed-off-by: David Hildenbrand > --- > mm/util.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/mm/util.c b/mm/util.c > index 741ba32a43ac..3239e75c148d 100644 > --- a/mm/util.c > +++ b/mm/util.c > @@ -732,15 +732,18 @@ int __page_mapcount(struct page *page) > { > int ret; > > - ret = atomic_read(&page->_mapcount) + 1; > + if (PageHuge(page)) > + return compound_mapcount(page); It would be nice to make PageHuge() inlinable first. It's a shame the we need to have to do a function call for PageHuge() check. Otherwise, looks good: Acked-by: Kirill A. Shutemov -- Kirill A. Shutemov