From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.alien8.de (mail.alien8.de [65.109.113.108]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1980232D0E1 for ; Fri, 9 Jan 2026 20:12:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=65.109.113.108 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767989526; cv=none; b=gLBTaD6i8LASaXk2vY4ONhdCgHW2UhBazCwE97jiiY4JypcXwo4lFvcas5Dv6hFQqrNLLVogQ3IUZO+VniAGQabX5174iO5CAh9sb997Lsq3r9XP4EbyF0b4jMMBIDgn9ZLwdFhvP73/izyfa+I7jozlw0YJ/VMQVc8Cyr2p0K4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767989526; c=relaxed/simple; bh=r99gVSaavD/rqCKNn9WGw9uOH4p2YohgdpXj2Heidag=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Cgu2BUdqgsuqDtNoj6W0DfG20aFQlsbxhnbIuKq93agyZWEzGooLF9T4WyDiDf6dhMSjjFAcjYN5aIFfM/JL2yOHeKmmT3GMQMQ+ZASVA7Suv5nrzoYp7NKSWoTOA1MkQmCitV5mPbawhEKk8bYaHC5dh1S5PI7g/eLPsk6j8xw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=alien8.de; spf=pass smtp.mailfrom=alien8.de; dkim=pass (4096-bit key) header.d=alien8.de header.i=@alien8.de header.b=gb3fzT4a; arc=none smtp.client-ip=65.109.113.108 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=alien8.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=alien8.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (4096-bit key) header.d=alien8.de header.i=@alien8.de header.b="gb3fzT4a" Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with ESMTP id F314940E01BB; Fri, 9 Jan 2026 20:12:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at mail.alien8.de Authentication-Results: mail.alien8.de (amavisd-new); dkim=pass (4096-bit key) header.d=alien8.de Received: from mail.alien8.de ([127.0.0.1]) by localhost (mail.alien8.de [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id sFMh_cNHjU4m; Fri, 9 Jan 2026 20:11:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=alien8; t=1767989518; bh=0G8ZpIB7PKKPCBS89cczhj+k44r6aydNZxzyLOosVqg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=gb3fzT4aZM5zZSMwbEz68Zyw0yL2bQlGuuPwKItPLS0g/MFwGrI/Gn0XzAHwUO9GE lMJNi3VNSXhKyiFFkc1KHKnSZcksZjMmlaTqMLHF/OqasKFe8nHRZv9kOodWnsYZ73 3Tm5JLFRxF7LC5BFeIAqGx0tiPqnkvF8jY1IwxCmw0cO3niVew2Fx80kSIgSlgQfeY 5xtzUnwqRJomnUWcWEe1mml5UicBqgHR0kKm0SKLYX5ffbR0CZuH91woWn+mMlB+Dy vVd3SsuJfUIBctY7xAo8GyumrkzsR4Lp8vBbIFoB1oM7+RcnsJymIVgwACqC95jEZV X51yPT3K6cN8KLJAgXFo4Z9IN9e+66xkG7slGj0HMwDms/V8XFvWXacv7hgF34nA8K Q+VkZWUSLuCaq+5nPgLmoR3vqC4bGFfNgc58Zzl2JXBM/GoZetJ8kzIg93SHftycW+ 6toBKtyQ3o3UQuL5k4odPb9TnRUZzh3yEWEWC6qv9DUGdE/QK1YOKEKEmOELaZddms f27cRoGYEyEPOmuJjaOpoTqksQJS2CYcCs3kO6k4HLlq7CtB01D/BpiJlwSxaoa9RR Pr1CBm7ZqujCUSsJ7GPCrDEf0hnYPp6O+3pOiTysySKw7dLZQbT32swoaOb/bV56LC ZaydLiXYTJutzNBP80SCLNgA= Received: from zn.tnic (pd953023b.dip0.t-ipconnect.de [217.83.2.59]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature ECDSA (P-256) server-digest SHA256) (No client certificate requested) by mail.alien8.de (SuperMail on ZX Spectrum 128k) with UTF8SMTPSA id 2F82F40E0028; Fri, 9 Jan 2026 20:11:49 +0000 (UTC) Date: Fri, 9 Jan 2026 21:11:42 +0100 From: Borislav Petkov To: Coiby Xu Cc: kexec@lists.infradead.org, x86@kernel.org, Andrew Morton , Thomas Gleixner , Ingo Molnar , Dave Hansen , "H. Peter Anvin" , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" Subject: Re: [PATCH 1/2] x86/crash: Use set_memory_p instead of __set_memory_prot Message-ID: <20260109201142.GFaWFg_kR8eW48CpUp@fat_crate.local> References: <20260106095100.656292-1-coxu@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20260106095100.656292-1-coxu@redhat.com> On Tue, Jan 06, 2026 at 05:50:58PM +0800, Coiby Xu wrote: > set_memory_p has been introduced since commit 030ad7af9437 ("x86/mm: > Regularize set_memory_p() parameters and make non-static"). There is no > need to use __set_memory_prot. > > Signed-off-by: Coiby Xu > --- > arch/x86/kernel/machine_kexec_64.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Why aren't those a single patch? --- From: Coiby Xu Date: Tue, 6 Jan 2026 17:50:58 +0800 Subject: [PATCH] x86/crash: Use set_memory_p() instead of __set_memory_prot() set_memory_p() is available to use outside of its compilation unit since: 030ad7af9437 ("x86/mm: Regularize set_memory_p() parameters and make non-static"). There is no use for __set_memory_prot() anymore so drop it too. [ bp: Massage commit message. ] Signed-off-by: Coiby Xu Signed-off-by: Borislav Petkov (AMD) Link: https://patch.msgid.link/20260106095100.656292-1-coxu@redhat.com --- arch/x86/include/asm/set_memory.h | 1 - arch/x86/kernel/machine_kexec_64.c | 5 +---- arch/x86/mm/pat/set_memory.c | 13 ------------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/x86/include/asm/set_memory.h b/arch/x86/include/asm/set_memory.h index 61f56cdaccb5..4362c26aa992 100644 --- a/arch/x86/include/asm/set_memory.h +++ b/arch/x86/include/asm/set_memory.h @@ -38,7 +38,6 @@ int set_memory_rox(unsigned long addr, int numpages); * The caller is required to take care of these. */ -int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot); int _set_memory_uc(unsigned long addr, int numpages); int _set_memory_wc(unsigned long addr, int numpages); int _set_memory_wt(unsigned long addr, int numpages); diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index 201137b98fb8..0590d399d4f1 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -673,10 +673,7 @@ static void kexec_mark_dm_crypt_keys(bool protect) if (protect) set_memory_np((unsigned long)phys_to_virt(start_paddr), nr_pages); else - __set_memory_prot( - (unsigned long)phys_to_virt(start_paddr), - nr_pages, - __pgprot(_PAGE_PRESENT | _PAGE_NX | _PAGE_RW)); + set_memory_p((unsigned long)phys_to_virt(start_paddr), nr_pages); } } diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index 6c6eb486f7a6..40581a720fe8 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -2145,19 +2145,6 @@ static inline int cpa_clear_pages_array(struct page **pages, int numpages, CPA_PAGES_ARRAY, pages); } -/* - * __set_memory_prot is an internal helper for callers that have been passed - * a pgprot_t value from upper layers and a reservation has already been taken. - * If you want to set the pgprot to a specific page protocol, use the - * set_memory_xx() functions. - */ -int __set_memory_prot(unsigned long addr, int numpages, pgprot_t prot) -{ - return change_page_attr_set_clr(&addr, numpages, prot, - __pgprot(~pgprot_val(prot)), 0, 0, - NULL); -} - int _set_memory_uc(unsigned long addr, int numpages) { /* -- 2.51.0 -- Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette