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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9701EC433F5 for ; Thu, 7 Oct 2021 09:16:04 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 40F9161130 for ; Thu, 7 Oct 2021 09:16:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 40F9161130 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id DC5CD6B0074; Thu, 7 Oct 2021 05:16:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9B8C6B0073; Thu, 7 Oct 2021 05:16:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C62C86B0074; Thu, 7 Oct 2021 05:16:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0034.hostedemail.com [216.40.44.34]) by kanga.kvack.org (Postfix) with ESMTP id BB7886B0071 for ; Thu, 7 Oct 2021 05:16:03 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6316F2BFAC for ; Thu, 7 Oct 2021 09:16:03 +0000 (UTC) X-FDA: 78669084606.32.EF29E9B Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf22.hostedemail.com (Postfix) with ESMTP id ED5642359 for ; Thu, 7 Oct 2021 09:16:02 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id C5D96203F6; Thu, 7 Oct 2021 09:16:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1633598161; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CxQ0ZV9cOOlrG2jRElhDboOH1/ncgOGYv8QD9De0aOg=; b=Lw7uvG7zBKms7sqR9dWZKsIPebzq3igxLuZw//KJ82jkCbX/WVCIt+ohnaMwcuCzgj/X1o 5LlB2SJRb5Ft6RYdOCD+LQrhcspETJZ1NLEHzDutE/2DBaNkPZs15JDb3Rep0F/TldZLNc Z2meDzCll9YQpTWNJgF3nkYIoYernHw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1633598161; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=CxQ0ZV9cOOlrG2jRElhDboOH1/ncgOGYv8QD9De0aOg=; b=8xCq5EgoVY5xRbt7QHo29GOnRCfknfEkb/GRje1CC6D7omn0OivrSNXVnP7veEnFhiakWa e7XgNEG+K5LURCDg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5941613A98; Thu, 7 Oct 2021 09:16:00 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dPciE9C6XmHkLgAAMHmgww (envelope-from ); Thu, 07 Oct 2021 09:16:00 +0000 Date: Thu, 7 Oct 2021 11:15:58 +0200 From: Oscar Salvador To: David Hildenbrand Cc: linux-kernel@vger.kernel.org, Andrew Morton , Jonathan Corbet , Alex Shi , Michael Ellerman , Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , Dave Hansen , Andy Lutomirski , Peter Zijlstra , Greg Kroah-Hartman , "Rafael J. Wysocki" , "Michael S. Tsirkin" , Jason Wang , Shuah Khan , Michal Hocko , Mike Rapoport , x86@kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v1 6/6] x86: remove memory hotplug support on X86_32 Message-ID: References: <20210929143600.49379-1-david@redhat.com> <20210929143600.49379-7-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210929143600.49379-7-david@redhat.com> X-Rspamd-Queue-Id: ED5642359 X-Stat-Signature: nc3635o36b5oydr3m9u6dxr3eao9ezb7 Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Lw7uvG7z; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=8xCq5Ego; spf=pass (imf22.hostedemail.com: domain of osalvador@suse.de designates 195.135.220.29 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de X-Rspamd-Server: rspam06 X-HE-Tag: 1633598162-386442 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Sep 29, 2021 at 04:36:00PM +0200, David Hildenbrand wrote: > CONFIG_MEMORY_HOTPLUG was marked BROKEN over one year and we just > restricted it to 64 bit. Let's remove the unused x86 32bit implementation > and simplify the Kconfig. > > Signed-off-by: David Hildenbrand Reviewed-by: Oscar Salvador > --- > arch/x86/Kconfig | 6 +++--- > arch/x86/mm/init_32.c | 31 ------------------------------- > 2 files changed, 3 insertions(+), 34 deletions(-) > > diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig > index ab83c22d274e..85f4762429f1 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -62,7 +62,7 @@ config X86 > select ARCH_32BIT_OFF_T if X86_32 > select ARCH_CLOCKSOURCE_INIT > select ARCH_ENABLE_HUGEPAGE_MIGRATION if X86_64 && HUGETLB_PAGE && MIGRATION > - select ARCH_ENABLE_MEMORY_HOTPLUG if X86_64 || (X86_32 && HIGHMEM) > + select ARCH_ENABLE_MEMORY_HOTPLUG if X86_64 > select ARCH_ENABLE_MEMORY_HOTREMOVE if MEMORY_HOTPLUG > select ARCH_ENABLE_SPLIT_PMD_PTLOCK if (PGTABLE_LEVELS > 2) && (X86_64 || X86_PAE) > select ARCH_ENABLE_THP_MIGRATION if X86_64 && TRANSPARENT_HUGEPAGE > @@ -1615,7 +1615,7 @@ config ARCH_SELECT_MEMORY_MODEL > > config ARCH_MEMORY_PROBE > bool "Enable sysfs memory/probe interface" > - depends on X86_64 && MEMORY_HOTPLUG > + depends on MEMORY_HOTPLUG > help > This option enables a sysfs memory/probe interface for testing. > See Documentation/admin-guide/mm/memory-hotplug.rst for more information. > @@ -2395,7 +2395,7 @@ endmenu > > config ARCH_HAS_ADD_PAGES > def_bool y > - depends on X86_64 && ARCH_ENABLE_MEMORY_HOTPLUG > + depends on ARCH_ENABLE_MEMORY_HOTPLUG > > config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE > def_bool y > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index bd90b8fe81e4..5cd7ea6d645c 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -779,37 +779,6 @@ void __init mem_init(void) > test_wp_bit(); > } > > -#ifdef CONFIG_MEMORY_HOTPLUG > -int arch_add_memory(int nid, u64 start, u64 size, > - struct mhp_params *params) > -{ > - unsigned long start_pfn = start >> PAGE_SHIFT; > - unsigned long nr_pages = size >> PAGE_SHIFT; > - int ret; > - > - /* > - * The page tables were already mapped at boot so if the caller > - * requests a different mapping type then we must change all the > - * pages with __set_memory_prot(). > - */ > - if (params->pgprot.pgprot != PAGE_KERNEL.pgprot) { > - ret = __set_memory_prot(start, nr_pages, params->pgprot); > - if (ret) > - return ret; > - } > - > - return __add_pages(nid, start_pfn, nr_pages, params); > -} > - > -void arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap) > -{ > - unsigned long start_pfn = start >> PAGE_SHIFT; > - unsigned long nr_pages = size >> PAGE_SHIFT; > - > - __remove_pages(start_pfn, nr_pages, altmap); > -} > -#endif > - > int kernel_set_to_readonly __read_mostly; > > static void mark_nxdata_nx(void) > -- > 2.31.1 > > -- Oscar Salvador SUSE Labs