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=-15.8 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL 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 A7E2EC7618F for ; Wed, 17 Jul 2019 22:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6344020651 for ; Wed, 17 Jul 2019 22:14:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="emeuTjc+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728100AbfGQWOw (ORCPT ); Wed, 17 Jul 2019 18:14:52 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:46179 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726917AbfGQWOv (ORCPT ); Wed, 17 Jul 2019 18:14:51 -0400 Received: by mail-pl1-f194.google.com with SMTP id c2so12677366plz.13 for ; Wed, 17 Jul 2019 15:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=bni+Z42fzJug5JhYQ5stiuRJiEWmfpZ/sFa5RIyPdd4=; b=emeuTjc+mXVOEbjKQSGjm9CTjjRmVL0k9KVsdgLViBbSz4c0MlMsZPuJoZ9nbSJw5L OFXue6RA4LeGHn8VRW3VPXoRi6c+e+3VnffcqtVTDq4CdOv5dyfgJtIwK6KuzBfA9bpO BkGdW7ZgeklhFzPd2RYS+RCz9i6Op8NbJhAJxNcBytHVVHBpmP1IuS0XdjNrNjEpiKYs 0oeCPZMBE9AwPF8P1AhEopgZqEvAdiQoDTKwtlZxWv/xsn/wLlVJY+ENcS1ZNx3J53D1 T1W0NS4jkJkOdBtTdDzS0fAKkplvc1e79V5oyKTtkgHmPAEWAvnKvt4l6K9xsxcnfkbA 7YjQ== 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:in-reply-to:message-id :references:user-agent:mime-version; bh=bni+Z42fzJug5JhYQ5stiuRJiEWmfpZ/sFa5RIyPdd4=; b=PmtTke7PMUkezMl8WvgeEzCZzXg302zKbWwJ5CaszWaXDf6uQ6NMr5GJHaRdlkiS7Z PaZCru2oQl6jimYmFJGzs0q0qJW48NA1nfXkcsE7VVyfjTqTQLBzsI9lAIiFUFCEw6Ke 1EX1M2Sj+72UvY/wye/4MTfbT3Z+JY3yr4csGgFr496Nw2eqBbHyOx4ZBlLBYV8TqQxs VqR5EU9Ts3oaH0ukQWt1uqZfuleQf2s23eTEkFBGo5YgQsh9dbLONxYTZiioI3Am3IGc cJhuA5Ms3WPsTmg8pTdm4wNVhXlw3zWVFBwTvtCABN8wa4vA6e7ZMM/CviHSGf13fFZK 9H7Q== X-Gm-Message-State: APjAAAUWBEdGopqQMGjooe/ghvlOstoQvxIx/nE74+hn9phVTHX3jlgN bZtvCPyLnnVAsbBJVDd0V9O5ZA== X-Google-Smtp-Source: APXvYqxqTE3Ak4PslnTEdETq6mYvLmSYVFMaDKC39P/K6Xxy0gPBa0uji6xX9ZEZ1IcX9kCFU6w1WQ== X-Received: by 2002:a17:902:e282:: with SMTP id cf2mr46538329plb.301.1563401690083; Wed, 17 Jul 2019 15:14:50 -0700 (PDT) Received: from [100.112.64.100] ([104.133.8.100]) by smtp.gmail.com with ESMTPSA id f64sm27346303pfa.115.2019.07.17.15.14.48 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Jul 2019 15:14:49 -0700 (PDT) Date: Wed, 17 Jul 2019 15:14:04 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Yang Shi cc: hughd@google.com, kirill.shutemov@linux.intel.com, mhocko@suse.com, vbabka@suse.cz, rientjes@google.com, akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [v4 PATCH 1/2] mm: thp: make transhuge_vma_suitable available for anonymous THP In-Reply-To: <1563400758-124759-2-git-send-email-yang.shi@linux.alibaba.com> Message-ID: References: <1563400758-124759-1-git-send-email-yang.shi@linux.alibaba.com> <1563400758-124759-2-git-send-email-yang.shi@linux.alibaba.com> User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 18 Jul 2019, Yang Shi wrote: > The transhuge_vma_suitable() was only available for shmem THP, but > anonymous THP has the same check except pgoff check. And, it will be > used for THP eligible check in the later patch, so make it available for > all kind of THPs. This also helps reduce code duplication slightly. > > Since anonymous THP doesn't have to check pgoff, so make pgoff check > shmem vma only. > > And regroup some functions in include/linux/mm.h to solve compile issue since > transhuge_vma_suitable() needs call vma_is_anonymous() which was defined > after huge_mm.h is included. > > Cc: Hugh Dickins Thanks! Acked-by: Hugh Dickins > Cc: Kirill A. Shutemov > Cc: Michal Hocko > Cc: Vlastimil Babka > Cc: David Rientjes > Signed-off-by: Yang Shi > --- > include/linux/huge_mm.h | 23 +++++++++++++++++++++++ > include/linux/mm.h | 34 +++++++++++++++++----------------- > mm/huge_memory.c | 2 +- > mm/memory.c | 13 ------------- > 4 files changed, 41 insertions(+), 31 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 7cd5c15..45ede62 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -121,6 +121,23 @@ static inline bool __transparent_hugepage_enabled(struct vm_area_struct *vma) > > bool transparent_hugepage_enabled(struct vm_area_struct *vma); > > +#define HPAGE_CACHE_INDEX_MASK (HPAGE_PMD_NR - 1) > + > +static inline bool transhuge_vma_suitable(struct vm_area_struct *vma, > + unsigned long haddr) > +{ > + /* Don't have to check pgoff for anonymous vma */ > + if (!vma_is_anonymous(vma)) { > + if (((vma->vm_start >> PAGE_SHIFT) & HPAGE_CACHE_INDEX_MASK) != > + (vma->vm_pgoff & HPAGE_CACHE_INDEX_MASK)) > + return false; > + } > + > + if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end) > + return false; > + return true; > +} > + > #define transparent_hugepage_use_zero_page() \ > (transparent_hugepage_flags & \ > (1< @@ -271,6 +288,12 @@ static inline bool transparent_hugepage_enabled(struct vm_area_struct *vma) > return false; > } > > +static inline bool transhuge_vma_suitable(struct vm_area_struct *vma, > + unsigned long haddr) > +{ > + return false; > +} > + > static inline void prep_transhuge_page(struct page *page) {} > > #define transparent_hugepage_flags 0UL > diff --git a/include/linux/mm.h b/include/linux/mm.h > index 0389c34..beae0ae 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -541,6 +541,23 @@ static inline void vma_set_anonymous(struct vm_area_struct *vma) > vma->vm_ops = NULL; > } > > +static inline bool vma_is_anonymous(struct vm_area_struct *vma) > +{ > + return !vma->vm_ops; > +} > + > +#ifdef CONFIG_SHMEM > +/* > + * The vma_is_shmem is not inline because it is used only by slow > + * paths in userfault. > + */ > +bool vma_is_shmem(struct vm_area_struct *vma); > +#else > +static inline bool vma_is_shmem(struct vm_area_struct *vma) { return false; } > +#endif > + > +int vma_is_stack_for_current(struct vm_area_struct *vma); > + > /* flush_tlb_range() takes a vma, not a mm, and can care about flags */ > #define TLB_FLUSH_VMA(mm,flags) { .vm_mm = (mm), .vm_flags = (flags) } > > @@ -1629,23 +1646,6 @@ static inline void cancel_dirty_page(struct page *page) > > int get_cmdline(struct task_struct *task, char *buffer, int buflen); > > -static inline bool vma_is_anonymous(struct vm_area_struct *vma) > -{ > - return !vma->vm_ops; > -} > - > -#ifdef CONFIG_SHMEM > -/* > - * The vma_is_shmem is not inline because it is used only by slow > - * paths in userfault. > - */ > -bool vma_is_shmem(struct vm_area_struct *vma); > -#else > -static inline bool vma_is_shmem(struct vm_area_struct *vma) { return false; } > -#endif > - > -int vma_is_stack_for_current(struct vm_area_struct *vma); > - > extern unsigned long move_page_tables(struct vm_area_struct *vma, > unsigned long old_addr, struct vm_area_struct *new_vma, > unsigned long new_addr, unsigned long len, > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 885642c..782dd14 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -689,7 +689,7 @@ vm_fault_t do_huge_pmd_anonymous_page(struct vm_fault *vmf) > struct page *page; > unsigned long haddr = vmf->address & HPAGE_PMD_MASK; > > - if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end) > + if (!transhuge_vma_suitable(vma, haddr)) > return VM_FAULT_FALLBACK; > if (unlikely(anon_vma_prepare(vma))) > return VM_FAULT_OOM; > diff --git a/mm/memory.c b/mm/memory.c > index 89325f9..e2bb51b 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -3162,19 +3162,6 @@ static vm_fault_t pte_alloc_one_map(struct vm_fault *vmf) > } > > #ifdef CONFIG_TRANSPARENT_HUGE_PAGECACHE > - > -#define HPAGE_CACHE_INDEX_MASK (HPAGE_PMD_NR - 1) > -static inline bool transhuge_vma_suitable(struct vm_area_struct *vma, > - unsigned long haddr) > -{ > - if (((vma->vm_start >> PAGE_SHIFT) & HPAGE_CACHE_INDEX_MASK) != > - (vma->vm_pgoff & HPAGE_CACHE_INDEX_MASK)) > - return false; > - if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end) > - return false; > - return true; > -} > - > static void deposit_prealloc_pte(struct vm_fault *vmf) > { > struct vm_area_struct *vma = vmf->vma; > -- > 1.8.3.1 > >