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=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 83FB1C282DD for ; Sat, 11 Jan 2020 00:00:44 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4451C2053B for ; Sat, 11 Jan 2020 00:00:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=shutemov-name.20150623.gappssmtp.com header.i=@shutemov-name.20150623.gappssmtp.com header.b="dEkax1Op" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4451C2053B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=shutemov.name Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id D3C1C8E0005; Fri, 10 Jan 2020 19:00:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CEC6F8E0001; Fri, 10 Jan 2020 19:00:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C29AB8E0005; Fri, 10 Jan 2020 19:00:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0165.hostedemail.com [216.40.44.165]) by kanga.kvack.org (Postfix) with ESMTP id AC5308E0001 for ; Fri, 10 Jan 2020 19:00:43 -0500 (EST) Received: from smtpin11.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with SMTP id 5242E5DD3 for ; Sat, 11 Jan 2020 00:00:43 +0000 (UTC) X-FDA: 76363397166.11.girls60_7aa0c7c7d5c4d X-HE-Tag: girls60_7aa0c7c7d5c4d X-Filterd-Recvd-Size: 4917 Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Sat, 11 Jan 2020 00:00:42 +0000 (UTC) Received: by mail-lf1-f67.google.com with SMTP id r14so2781782lfm.5 for ; Fri, 10 Jan 2020 16:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=shutemov-name.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=BiBLLkC1LMnW98qyhIHJEuSYN8J0r+A5f0b9Hlo8wk4=; b=dEkax1Op5omjH15O4yU/T3NuK2tyDPZuIJkIWoz1VJfEVy79qaXupZPihSwnqI+YQL DJEGcFL+k9lpJUtqJTrZLcy6R0J4hNjtUlhwn4x7sa8mHtNHEwoa/ghHy2zzVKbGC4r3 s0C5qnxQngMYpP2WC/86q9GtOGTyscfEc9jIsbGH24q8b/MhltWLj0CRNZcF1kTGZOfz pXiPgcBGTxL12uKvHngsukk9LpLRC1++LEWC9HomkMj4xH6x39m7WKrNfnS0B7NNbM5G ArC3UsJGZTCY90vkqkVV9PSuS/EtbmU0uclh2k8I1KOJ4YPGL4R/kXcRmBoOZtGz5Qtx kXzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=BiBLLkC1LMnW98qyhIHJEuSYN8J0r+A5f0b9Hlo8wk4=; b=sp1P1ijshk3azIOmSJsTQNBhtrxZ8pWWWFKuVLaWoSAOzg59vNIdEovrl2ofDbPUa+ YMp7562yzKj0nqS5aA2C/5aBOlT8/R+dB+H5aFvx3N+QMOLXwJ2113UV30w835geThVG VNHjkpTwwYaXkV0fq3OeTDz4ncDkizddDgAm6VkIFhg55JLadHdfb14TE3BNswdmSBeQ gA1htl32bKEkNQ+a9fagaIrIj/SzuD8DEyclVbsVcAIN2lz1GZCN7TVtD+dUYKOS9LQq yprA4aXWCjJU3e/9MYHs+VG+c73/Kxm4GwGNMrXl1VgbricCb7PrVp/xrq8qZFRLKfrc M5bw== X-Gm-Message-State: APjAAAXqEgkdRIEuS0ReWwU3pXYbCNWQp55GkUk45/0LEacYdgTpXKxF ViDJU1FMeRetPVfN3WS6gzh3kw== X-Google-Smtp-Source: APXvYqz0axwpO5nM1nJxa06A9LK57uQ2d93eGUOvumsQTgwRxl7NQF30Tu1MKCHH9kzvGns14Me1Ig== X-Received: by 2002:ac2:5e9b:: with SMTP id b27mr3933245lfq.147.1578700841300; Fri, 10 Jan 2020 16:00:41 -0800 (PST) Received: from box.localdomain ([86.57.175.117]) by smtp.gmail.com with ESMTPSA id u9sm1665630lji.49.2020.01.10.16.00.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 16:00:40 -0800 (PST) Received: by box.localdomain (Postfix, from userid 1000) id 05D1910144E; Sat, 11 Jan 2020 03:00:41 +0300 (+03) Date: Sat, 11 Jan 2020 03:00:40 +0300 From: "Kirill A. Shutemov" To: Li Xinhai Cc: linux-mm@kvack.org, "Kirill A. Shutemov" , Mike Kravetz , Michal Hocko Subject: Re: [PATCH v3] mm/page_vma_mapped.c: Explicitly compare pfn for noraml, hugetlbfs and THP page Message-ID: <20200111000040.kzbjj5kgq33qk3ta@box> References: <1578671804-8297-1-git-send-email-lixinhai.lxh@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1578671804-8297-1-git-send-email-lixinhai.lxh@gmail.com> User-Agent: NeoMutt/20180716 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, Jan 10, 2020 at 03:56:44PM +0000, Li Xinhai wrote: > When check_pte, pfn of normal, hugetlbfs and THP page need be compared. > The current implementation apply comparison as > - normal page: page_pfn <= pfn < page_pfn + 1 > - hugetlbfs page: page_pfn <= pfn < page_pfn + HPAGE_PMD_NR > - THP page: page_pfn <= pfn < page_pfn + HPAGE_PMD_NR > in pfn_in_hpage. For hugetlbfs page, it should be > page_pfn == pfn > > Now, change pfn_in_hpage to pfn_is_match to highlight that comparison > is not only for THP and explicitly compare for these cases. > > Signed-off-by: Li Xinhai > Cc: Kirill A. Shutemov > Cc: Mike Kravetz > Cc: Michal Hocko > --- > mm/page_vma_mapped.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c > index eff4b45..a286ff7 100644 > --- a/mm/page_vma_mapped.c > +++ b/mm/page_vma_mapped.c > @@ -52,12 +52,16 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw) > return true; > } > > -static inline bool pfn_in_hpage(struct page *hpage, unsigned long pfn) > +static inline bool pfn_is_match(struct page *page, unsigned long pfn) > { > - unsigned long hpage_pfn = page_to_pfn(hpage); > + unsigned long page_pfn = page_to_pfn(page); > + > + /* normal page and hugetlbfs page */ > + if (!PageCompound(page) || PageHuge(page)) !PageTransCompound() instead of !PageCompound() would be better for cases when THP is disabled compile-time. Otherwise: Acked-by: Kirill A. Shutemov -- Kirill A. Shutemov