All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Ingo Molnar <mingo@redhat.com>,
	x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Tom Lendacky <thomas.lendacky@amd.com>
Cc: Dave Hansen <dave.hansen@intel.com>,
	Kai Huang <kai.huang@linux.intel.com>,
	Jacob Pan <jacob.jun.pan@linux.intel.com>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCHv4 12/18] x86/mm: Rename CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING
Date: Tue, 26 Jun 2018 17:22:39 +0300	[thread overview]
Message-ID: <20180626142245.82850-13-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20180626142245.82850-1-kirill.shutemov@linux.intel.com>

Rename the option to CONFIG_MEMORY_PHYSICAL_PADDING. It will be used
not only for KASLR.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 arch/x86/Kconfig    | 2 +-
 arch/x86/mm/kaslr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c4d64b19acff..fa5e1ec09247 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2197,7 +2197,7 @@ config RANDOMIZE_MEMORY
 
 	   If unsure, say Y.
 
-config RANDOMIZE_MEMORY_PHYSICAL_PADDING
+config MEMORY_PHYSICAL_PADDING
 	hex "Physical memory mapping padding" if EXPERT
 	depends on RANDOMIZE_MEMORY
 	default "0xa" if MEMORY_HOTPLUG
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 61db77b0eda9..4408cd9a3bef 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -102,7 +102,7 @@ void __init kernel_randomize_memory(void)
 	 */
 	BUG_ON(kaslr_regions[0].base != &page_offset_base);
 	memory_tb = DIV_ROUND_UP(max_pfn << PAGE_SHIFT, 1UL << TB_SHIFT) +
-		CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING;
+		CONFIG_MEMORY_PHYSICAL_PADDING;
 
 	/* Adapt phyiscal memory region size based on available memory */
 	if (memory_tb < kaslr_regions[0].size_tb)
-- 
2.18.0


  parent reply	other threads:[~2018-06-26 14:26 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-26 14:22 [PATCHv4 00/18] MKTME enabling Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 01/18] mm: Do no merge VMAs with different encryption KeyIDs Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 02/18] mm/ksm: Do not merge pages with different KeyIDs Kirill A. Shutemov
2018-07-09 18:03   ` Konrad Rzeszutek Wilk
2018-06-26 14:22 ` [PATCHv4 03/18] mm/page_alloc: Unify alloc_hugepage_vma() Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 04/18] mm/page_alloc: Handle allocation for encrypted memory Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 05/18] mm/khugepaged: Handle encrypted pages Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 06/18] x86/mm: Mask out KeyID bits from page table entry pfn Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 07/18] x86/mm: Introduce variables to store number, shift and mask of KeyIDs Kirill A. Shutemov
2018-07-09 18:09   ` Konrad Rzeszutek Wilk
2018-07-10 10:48     ` Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 08/18] x86/mm: Preserve KeyID on pte_modify() and pgprot_modify() Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 09/18] x86/mm: Implement page_keyid() using page_ext Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 10/18] x86/mm: Implement vma_keyid() Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 11/18] x86/mm: Implement prep_encrypted_page() and arch_free_page() Kirill A. Shutemov
2018-06-26 14:22 ` Kirill A. Shutemov [this message]
2018-06-26 14:22 ` [PATCHv4 13/18] x86/mm: Allow to disable MKTME after enumeration Kirill A. Shutemov
2018-07-09 18:20   ` Konrad Rzeszutek Wilk
2018-07-10 10:49     ` Kirill A. Shutemov
2018-07-10 11:21       ` Konrad Rzeszutek Wilk
2018-06-26 14:22 ` [PATCHv4 14/18] x86/mm: Detect MKTME early Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 15/18] x86/mm: Calculate direct mapping size Kirill A. Shutemov
2018-07-09 18:32   ` Konrad Rzeszutek Wilk
2018-06-26 14:22 ` [PATCHv4 16/18] x86/mm: Implement sync_direct_mapping() Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 17/18] x86/mm: Handle encrypted memory in page_to_virt() and __pa() Kirill A. Shutemov
2018-06-26 16:38   ` Dave Hansen
2018-06-27 21:56     ` Kirill A. Shutemov
2018-06-26 14:22 ` [PATCHv4 18/18] x86: Introduce CONFIG_X86_INTEL_MKTME Kirill A. Shutemov
2018-06-26 17:30   ` Randy Dunlap
2018-06-27 21:57     ` Kirill A. Shutemov
2018-06-27 23:48       ` Randy Dunlap
2018-07-09 18:36   ` Konrad Rzeszutek Wilk
2018-07-09 18:44     ` Dave Hansen
2018-07-09 18:52       ` Konrad Rzeszutek Wilk
2018-07-09 18:59         ` Dave Hansen
2018-07-09 20:29           ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180626142245.82850-13-kirill.shutemov@linux.intel.com \
    --to=kirill.shutemov@linux.intel.com \
    --cc=dave.hansen@intel.com \
    --cc=hpa@zytor.com \
    --cc=jacob.jun.pan@linux.intel.com \
    --cc=kai.huang@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.com \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.