linux-kernel - [PATCH 4.19 88/92] mm/hotplug: kill is_dev_zone() usage in __remove

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 28 Jan 2020 15:08:56 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        Dan Williams <dan.j.williams@...el.com>,
        David Hildenbrand <david@...hat.com>,
        Oscar Salvador <osalvador@...e.de>,
        Michal Hocko <mhocko@...e.com>,
        Logan Gunthorpe <logang@...tatee.com>,
        Pavel Tatashin <pasha.tatashin@...een.com>,
        Jane Chu <jane.chu@...cle.com>, Jeff Moyer <jmoyer@...hat.com>,
        Jérôme Glisse <jglisse@...hat.com>,
        Jonathan Corbet <corbet@....net>,
        Mike Rapoport <rppt@...ux.ibm.com>,
        Toshi Kani <toshi.kani@....com>,
        Vlastimil Babka <vbabka@...e.cz>,
        Wei Yang <richardw.yang@...ux.intel.com>,
        Jason Gunthorpe <jgg@...lanox.com>,
        Christoph Hellwig <hch@....de>,
        Andrew Morton <akpm@...ux-foundation.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        "Aneesh Kumar K . V" <aneesh.kumar@...ux.ibm.com>
Subject: [PATCH 4.19 88/92] mm/hotplug: kill is_dev_zone() usage in __remove_pages()

From: Dan Williams <dan.j.williams@...el.com>

commit 96da4350000973ef9310a10d077d65bbc017f093 upstream.

-- snip --

Minor conflict, keep the altmap check.

-- snip --

The zone type check was a leftover from the cleanup that plumbed altmap
through the memory hotplug path, i.e.  commit da024512a1fa "mm: pass the
vmem_altmap to arch_remove_memory and __remove_pages".

Link: http://lkml.kernel.org/r/156092352642.979959.6664333788149363039.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@...el.com>
Reviewed-by: David Hildenbrand <david@...hat.com>
Reviewed-by: Oscar Salvador <osalvador@...e.de>
Tested-by: Aneesh Kumar K.V <aneesh.kumar@...ux.ibm.com>	[ppc64]
Cc: Michal Hocko <mhocko@...e.com>
Cc: Logan Gunthorpe <logang@...tatee.com>
Cc: Pavel Tatashin <pasha.tatashin@...een.com>
Cc: Jane Chu <jane.chu@...cle.com>
Cc: Jeff Moyer <jmoyer@...hat.com>
Cc: Jérôme Glisse <jglisse@...hat.com>
Cc: Jonathan Corbet <corbet@....net>
Cc: Mike Rapoport <rppt@...ux.ibm.com>
Cc: Toshi Kani <toshi.kani@....com>
Cc: Vlastimil Babka <vbabka@...e.cz>
Cc: Wei Yang <richardw.yang@...ux.intel.com>
Cc: Jason Gunthorpe <jgg@...lanox.com>
Cc: Christoph Hellwig <hch@....de>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: David Hildenbrand <david@...hat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
---
 mm/memory_hotplug.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -507,11 +507,8 @@ void __remove_pages(struct zone *zone, u
 	unsigned long map_offset = 0;
 	int sections_to_remove;
 
-	/* In the ZONE_DEVICE case device driver owns the memory region */
-	if (is_dev_zone(zone)) {
-		if (altmap)
-			map_offset = vmem_altmap_offset(altmap);
-	}
+	if (altmap)
+		map_offset = vmem_altmap_offset(altmap);
 
 	clear_zone_contiguous(zone);