From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752095AbdFOBqY (ORCPT ); Wed, 14 Jun 2017 21:46:24 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:35705 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752036AbdFOBqX (ORCPT ); Wed, 14 Jun 2017 21:46:23 -0400 Date: Thu, 15 Jun 2017 11:46:11 +1000 From: Balbir Singh 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 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> X-Mailer: Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v5F1p8Ij027872 On Wed, 14 Jun 2017 16:11:44 -0400 Jérôme 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). > > Signed-off-by: Jérôme 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(-) > > 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) */ > > > -#if IS_ENABLED(CONFIG_HMM_DEVMEM) > +#if IS_ENABLED(CONFIG_DEVICE_PRIVATE) || IS_ENABLED(CONFIG_DEVICE_PUBLIC) > struct hmm_devmem; > > 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 */ > > > /* 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 > > 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 from > the resulting potential page faults. > > -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 > > @@ -720,11 +711,8 @@ config ZONE_DEVICE > > 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 > > help > Allows creation of struct pages to represent unaddressable device > @@ -733,11 +721,8 @@ config DEVICE_PRIVATE > > 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 > Balbir Singh.