From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 562A56B0279 for ; Wed, 14 Jun 2017 21:46:23 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id o74so661196pfi.6 for ; Wed, 14 Jun 2017 18:46:23 -0700 (PDT) Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com. [2607:f8b0:400e:c05::242]) by mx.google.com with ESMTPS id x8si1235037plm.39.2017.06.14.18.46.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 18:46:22 -0700 (PDT) Received: by mail-pg0-x242.google.com with SMTP id a70so111930pge.0 for ; Wed, 14 Jun 2017 18:46:22 -0700 (PDT) Date: Thu, 15 Jun 2017 11:46:11 +1000 From: Balbir Singh Subject: Re: [HMM-CDM 5/5] mm/hmm: simplify kconfig and enable HMM and DEVICE_PUBLIC for ppc64 Message-ID: <20170615114611.34e8f2a7@firefly.ozlabs.ibm.com> In-Reply-To: <20170614201144.9306-6-jglisse@redhat.com> References: <20170614201144.9306-1-jglisse@redhat.com> <20170614201144.9306-6-jglisse@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org List-ID: To: =?UTF-8?B?SsOpcsO0bWU=?= Glisse Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, John Hubbard , David Nellans , Balbir Singh , Aneesh Kumar , "Paul E . McKenney" , Benjamin Herrenschmidt On Wed, 14 Jun 2017 16:11:44 -0400 J=C3=A9r=C3=B4me Glisse wrote: > This just simplify kconfig and allow HMM and DEVICE_PUBLIC to be > selected for ppc64 once ZONE_DEVICE is allowed on ppc64 (different > patchset). >=20 > Signed-off-by: J=C3=A9r=C3=B4me Glisse > Signed-off-by: John Hubbard > Cc: Balbir Singh > Cc: Aneesh Kumar > Cc: Paul E. McKenney > Cc: Benjamin Herrenschmidt > --- > include/linux/hmm.h | 4 ++-- > mm/Kconfig | 27 ++++++--------------------- > mm/hmm.c | 4 ++-- > 3 files changed, 10 insertions(+), 25 deletions(-) >=20 > diff --git a/include/linux/hmm.h b/include/linux/hmm.h > index f6713b2..720d18c 100644 > --- a/include/linux/hmm.h > +++ b/include/linux/hmm.h > @@ -327,7 +327,7 @@ int hmm_vma_fault(struct vm_area_struct *vma, > #endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */ > =20 > =20 > -#if IS_ENABLED(CONFIG_HMM_DEVMEM) > +#if IS_ENABLED(CONFIG_DEVICE_PRIVATE) || IS_ENABLED(CONFIG_DEVICE_PUBLIC) > struct hmm_devmem; > =20 > struct page *hmm_vma_alloc_locked_page(struct vm_area_struct *vma, > @@ -456,7 +456,7 @@ struct hmm_device { > */ > struct hmm_device *hmm_device_new(void *drvdata); > void hmm_device_put(struct hmm_device *hmm_device); > -#endif /* IS_ENABLED(CONFIG_HMM_DEVMEM) */ > +#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */ > =20 > =20 > /* Below are for HMM internal use only! Not to be used by device driver!= */ > diff --git a/mm/Kconfig b/mm/Kconfig > index ad082b9..7de939a 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -265,7 +265,7 @@ config ARCH_ENABLE_HUGEPAGE_MIGRATION > config ARCH_HAS_HMM > bool > default y > - depends on X86_64 > + depends on X86_64 || PPC64 Ideally we want to make this (PPC64 && PPC_BOOK3S) > depends on ZONE_DEVICE > depends on MMU && 64BIT > depends on MEMORY_HOTPLUG > @@ -277,7 +277,7 @@ config HMM > =20 > config HMM_MIRROR > bool "HMM mirror CPU page table into a device page table" > - depends on ARCH_HAS_HMM > + depends on ARCH_HAS_HMM && X86_64 We would need HMM_MIRROR for the generation of hardware that does not have CDM > select MMU_NOTIFIER > select HMM > help > @@ -287,15 +287,6 @@ config HMM_MIRROR > page tables (at PAGE_SIZE granularity), and must be able to recover f= rom > the resulting potential page faults. > =20 > -config HMM_DEVMEM > - bool "HMM device memory helpers (to leverage ZONE_DEVICE)" > - depends on ARCH_HAS_HMM > - select HMM > - help > - HMM devmem is a set of helper routines to leverage the ZONE_DEVICE > - feature. This is just to avoid having device drivers to replicating a= lot > - of boiler plate code. See Documentation/vm/hmm.txt. > - > config PHYS_ADDR_T_64BIT > def_bool 64BIT || ARCH_PHYS_ADDR_T_64BIT > =20 > @@ -720,11 +711,8 @@ config ZONE_DEVICE > =20 > config DEVICE_PRIVATE > bool "Unaddressable device memory (GPU memory, ...)" > - depends on X86_64 > - depends on ZONE_DEVICE > - depends on MEMORY_HOTPLUG > - depends on MEMORY_HOTREMOVE > - depends on SPARSEMEM_VMEMMAP > + depends on ARCH_HAS_HMM && X86_64 Same as above > + select HMM > =20 > help > Allows creation of struct pages to represent unaddressable device > @@ -733,11 +721,8 @@ config DEVICE_PRIVATE > =20 > config DEVICE_PUBLIC > bool "Unaddressable device memory (GPU memory, ...)" The unaddressable is a typo from above. > - depends on X86_64 > - depends on ZONE_DEVICE > - depends on MEMORY_HOTPLUG > - depends on MEMORY_HOTREMOVE > - depends on SPARSEMEM_VMEMMAP > + depends on ARCH_HAS_HMM > + select HMM > =20 Balbir Singh. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org