| Message ID | 155552634586.2015392.2662168839054356692.stgit@dwillia2-desk3.amr.corp.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mm: Sub-section memory hotplug support | expand |
On Wed, Apr 17, 2019 at 2:52 PM Dan Williams <dan.j.williams@intel.com> wrote: > > Up-level the local section size and mask from kernel/memremap.c to > global definitions. These will be used by the new sub-section hotplug > support. > > Cc: Michal Hocko <mhocko@suse.com> > Cc: Vlastimil Babka <vbabka@suse.cz> > Cc: Jérôme Glisse <jglisse@redhat.com> > Cc: Logan Gunthorpe <logang@deltatee.com> > Signed-off-by: Dan Williams <dan.j.williams@intel.com> Should be dropped from this series as it has been replaced by a very similar patch in the mainline: 7c697d7fb5cb14ef60e2b687333ba3efb74f73da mm/memremap: Rename and consolidate SECTION_SIZE
On Thu, May 2, 2019 at 7:53 AM Pavel Tatashin <pasha.tatashin@soleen.com> wrote: > > On Wed, Apr 17, 2019 at 2:52 PM Dan Williams <dan.j.williams@intel.com> wrote: > > > > Up-level the local section size and mask from kernel/memremap.c to > > global definitions. These will be used by the new sub-section hotplug > > support. > > > > Cc: Michal Hocko <mhocko@suse.com> > > Cc: Vlastimil Babka <vbabka@suse.cz> > > Cc: Jérôme Glisse <jglisse@redhat.com> > > Cc: Logan Gunthorpe <logang@deltatee.com> > > Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > Should be dropped from this series as it has been replaced by a very > similar patch in the mainline: > > 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > mm/memremap: Rename and consolidate SECTION_SIZE I saw that patch fly by and acked it, but I have not seen it picked up anywhere. I grabbed latest -linus and -next, but don't see that commit. $ git show 7c697d7fb5cb14ef60e2b687333ba3efb74f73da fatal: bad object 7c697d7fb5cb14ef60e2b687333ba3efb74f73da
On 03/05/2019 01:41, Dan Williams wrote: > On Thu, May 2, 2019 at 7:53 AM Pavel Tatashin <pasha.tatashin@soleen.com> wrote: >> >> On Wed, Apr 17, 2019 at 2:52 PM Dan Williams <dan.j.williams@intel.com> wrote: >>> >>> Up-level the local section size and mask from kernel/memremap.c to >>> global definitions. These will be used by the new sub-section hotplug >>> support. >>> >>> Cc: Michal Hocko <mhocko@suse.com> >>> Cc: Vlastimil Babka <vbabka@suse.cz> >>> Cc: Jérôme Glisse <jglisse@redhat.com> >>> Cc: Logan Gunthorpe <logang@deltatee.com> >>> Signed-off-by: Dan Williams <dan.j.williams@intel.com> >> >> Should be dropped from this series as it has been replaced by a very >> similar patch in the mainline: >> >> 7c697d7fb5cb14ef60e2b687333ba3efb74f73da >> mm/memremap: Rename and consolidate SECTION_SIZE > > I saw that patch fly by and acked it, but I have not seen it picked up > anywhere. I grabbed latest -linus and -next, but don't see that > commit. > > $ git show 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > fatal: bad object 7c697d7fb5cb14ef60e2b687333ba3efb74f73da Yeah, I don't recognise that ID either, nor have I had any notifications that Andrew's picked up anything of mine yet :/ Robin.
On Fri, May 3, 2019 at 6:35 AM Robin Murphy <robin.murphy@arm.com> wrote: > > On 03/05/2019 01:41, Dan Williams wrote: > > On Thu, May 2, 2019 at 7:53 AM Pavel Tatashin <pasha.tatashin@soleen.com> wrote: > >> > >> On Wed, Apr 17, 2019 at 2:52 PM Dan Williams <dan.j.williams@intel.com> wrote: > >>> > >>> Up-level the local section size and mask from kernel/memremap.c to > >>> global definitions. These will be used by the new sub-section hotplug > >>> support. > >>> > >>> Cc: Michal Hocko <mhocko@suse.com> > >>> Cc: Vlastimil Babka <vbabka@suse.cz> > >>> Cc: Jérôme Glisse <jglisse@redhat.com> > >>> Cc: Logan Gunthorpe <logang@deltatee.com> > >>> Signed-off-by: Dan Williams <dan.j.williams@intel.com> > >> > >> Should be dropped from this series as it has been replaced by a very > >> similar patch in the mainline: > >> > >> 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > >> mm/memremap: Rename and consolidate SECTION_SIZE > > > > I saw that patch fly by and acked it, but I have not seen it picked up > > anywhere. I grabbed latest -linus and -next, but don't see that > > commit. > > > > $ git show 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > > fatal: bad object 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > > Yeah, I don't recognise that ID either, nor have I had any notifications > that Andrew's picked up anything of mine yet :/ Sorry for the confusion. I thought I checked in a master branch, but turns out I checked in a branch where I applied arm hotremove patches and Robin's patch as well. These two patches are essentially the same, so which one goes first the other should be dropped. Reviewed-by: Pavel Tatashin <pasha.tatashin@soleen.com> Thank you, Pasha > > Robin.
On Fri, May 03, 2019 at 08:57:09AM -0400, Pavel Tatashin wrote: > On Fri, May 3, 2019 at 6:35 AM Robin Murphy <robin.murphy@arm.com> wrote: > > > > On 03/05/2019 01:41, Dan Williams wrote: > > > On Thu, May 2, 2019 at 7:53 AM Pavel Tatashin <pasha.tatashin@soleen.com> wrote: > > >> > > >> On Wed, Apr 17, 2019 at 2:52 PM Dan Williams <dan.j.williams@intel.com> wrote: > > >>> > > >>> Up-level the local section size and mask from kernel/memremap.c to > > >>> global definitions. These will be used by the new sub-section hotplug > > >>> support. > > >>> > > >>> Cc: Michal Hocko <mhocko@suse.com> > > >>> Cc: Vlastimil Babka <vbabka@suse.cz> > > >>> Cc: Jérôme Glisse <jglisse@redhat.com> > > >>> Cc: Logan Gunthorpe <logang@deltatee.com> > > >>> Signed-off-by: Dan Williams <dan.j.williams@intel.com> > > >> > > >> Should be dropped from this series as it has been replaced by a very > > >> similar patch in the mainline: > > >> > > >> 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > > >> mm/memremap: Rename and consolidate SECTION_SIZE > > > > > > I saw that patch fly by and acked it, but I have not seen it picked up > > > anywhere. I grabbed latest -linus and -next, but don't see that > > > commit. > > > > > > $ git show 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > > > fatal: bad object 7c697d7fb5cb14ef60e2b687333ba3efb74f73da > > > > Yeah, I don't recognise that ID either, nor have I had any notifications > > that Andrew's picked up anything of mine yet :/ > > Sorry for the confusion. I thought I checked in a master branch, but > turns out I checked in a branch where I applied arm hotremove patches > and Robin's patch as well. These two patches are essentially the same, > so which one goes first the other should be dropped. > > Reviewed-by: Pavel Tatashin <pasha.tatashin@soleen.com> Hey Pavel, just a friendly note :-) : you are reviewing v6, I think you might want to review v7 [1] instead ;-)? [1] https://patchwork.kernel.org/cover/10926035/
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index f0bbd85dc19a..6726fc175b51 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1134,6 +1134,8 @@ static inline unsigned long early_pfn_to_nid(unsigned long pfn) * PFN_SECTION_SHIFT pfn to/from section number */ #define PA_SECTION_SHIFT (SECTION_SIZE_BITS) +#define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT) +#define PA_SECTION_MASK (~(PA_SECTION_SIZE-1)) #define PFN_SECTION_SHIFT (SECTION_SIZE_BITS - PAGE_SHIFT) #define NR_MEM_SECTIONS (1UL << SECTIONS_SHIFT) diff --git a/kernel/memremap.c b/kernel/memremap.c index 4e59d29245f4..f355586ea54a 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -14,8 +14,6 @@ #include <linux/hmm.h> static DEFINE_XARRAY(pgmap_array); -#define SECTION_MASK ~((1UL << PA_SECTION_SHIFT) - 1) -#define SECTION_SIZE (1UL << PA_SECTION_SHIFT) #if IS_ENABLED(CONFIG_DEVICE_PRIVATE) vm_fault_t device_private_entry_fault(struct vm_area_struct *vma, @@ -98,8 +96,8 @@ static void devm_memremap_pages_release(void *data) put_page(pfn_to_page(pfn)); /* pages are dead and unused, undo the arch mapping */ - align_start = res->start & ~(SECTION_SIZE - 1); - align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE) + align_start = res->start & ~(PA_SECTION_SIZE - 1); + align_size = ALIGN(res->start + resource_size(res), PA_SECTION_SIZE) - align_start; nid = page_to_nid(pfn_to_page(align_start >> PAGE_SHIFT)); @@ -160,8 +158,8 @@ void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap) if (!pgmap->ref || !pgmap->kill) return ERR_PTR(-EINVAL); - align_start = res->start & ~(SECTION_SIZE - 1); - align_size = ALIGN(res->start + resource_size(res), SECTION_SIZE) + align_start = res->start & ~(PA_SECTION_SIZE - 1); + align_size = ALIGN(res->start + resource_size(res), PA_SECTION_SIZE) - align_start; align_end = align_start + align_size - 1; diff --git a/mm/hmm.c b/mm/hmm.c index ecd16718285e..def451a56c3e 100644 --- a/mm/hmm.c +++ b/mm/hmm.c @@ -34,8 +34,6 @@ #include <linux/mmu_notifier.h> #include <linux/memory_hotplug.h> -#define PA_SECTION_SIZE (1UL << PA_SECTION_SHIFT) - #if IS_ENABLED(CONFIG_HMM_MIRROR) static const struct mmu_notifier_ops hmm_mmu_notifier_ops;
Up-level the local section size and mask from kernel/memremap.c to global definitions. These will be used by the new sub-section hotplug support. Cc: Michal Hocko <mhocko@suse.com> Cc: Vlastimil Babka <vbabka@suse.cz> Cc: Jérôme Glisse <jglisse@redhat.com> Cc: Logan Gunthorpe <logang@deltatee.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- include/linux/mmzone.h | 2 ++ kernel/memremap.c | 10 ++++------ mm/hmm.c | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-)