From patchwork Tue Jun 26 14:22:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 10489185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ECA996031B for ; Tue, 26 Jun 2018 14:23:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC0C41FE95 for ; Tue, 26 Jun 2018 14:23:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0F461FFE6; Tue, 26 Jun 2018 14:23:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 729B11FE95 for ; Tue, 26 Jun 2018 14:23:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A45756B027E; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 71D556B027F; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 378DF6B0284; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 9D75B6B027F for ; Tue, 26 Jun 2018 10:23:04 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id n19-v6so8778641pff.8 for ; Tue, 26 Jun 2018 07:23:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=RXLD5jH9ZF6x6upQ2gINDhovzlfARN8xFMKNyln6EuI=; b=Igj20nfABHXfVXP3jusDOzlMVnz6UU2JMqVwTnkIAHcoMyYjZfa06Y0q2VzFcf4FX2 uKag3DxAgJU5BmN7LfalJfXid3/tAP3aIapvxXiY/rla816NiAO1Xxbn1ONP7GbqMPn4 ij0RFv66NQs1nj8ddguU3ZgyBmTnVV+p/W/vmhClSSYQc4OzPlloTG4xa62W92PLmIOo eJB/NmDrmjQsaSbPaP0PmAYBBm3xKL2IeI2GvDyW4DaLPKpv88UcOAsyRc5QDv2fJn/D fAJTmy/QjzkeJrcf0GyklXF2Z4+JZwr7S6DPxezoMu/kVCQUO4lNrfcTaQWiZIIqdCqe iH6A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E2xHe8YG/U2PaE76HE7gSfNc0zHV8R8YUSgTIpbdgYolwnJ/4k3 PGv1JblZZvs3QeFjv1pth0Nko2SPV/Axet989otx/Kf/4KFH+GLDZTKRmcEvupothJ62h7Pjo+Z +iisMFAM2F0gEXMEhDJoQ2gaQTpu9l53+zZsvSLcUfGs+iNZBpCyzQIEY7r6q/VbTFw== X-Received: by 2002:a62:d09:: with SMTP id v9-v6mr1749419pfi.163.1530022984338; Tue, 26 Jun 2018 07:23:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcmGg3w8jy/btZltU/fwNcuyqoYWmtNIizvbEIYMX1KWGKQTejogcYYXMHiFdgshql/XqTf X-Received: by 2002:a62:d09:: with SMTP id v9-v6mr1748986pfi.163.1530022976826; Tue, 26 Jun 2018 07:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022976; cv=none; d=google.com; s=arc-20160816; b=iNGXXpyqtg+zrwqZWHNbLM8qehyN1oaNVPsLXBqB1tCtY5i+r+hJ3mEwWERcU970rC U4iVCq7btcPFmTuAzpAuMVAo7v7swMMG5jaEwX/++mnBypnNj25+A14GhKMUvg88LTHO Tgh6rvlRRMxcbsokWaeLLGmdVUYJEL5rRdpXS408NxMr+nI5/oyDKmYC+br9QSiDalE9 RTU6MfLU1/5Z7TgS4rOG48rj9r+eAbuP62VuqrrhqB067ZlwMOcJo257WwBAtPTQxYyU GtfuJRm4MelpZOGRUldvvZlFpP9AeAk8hO09pb2KhMXDkMCJEpQHAINiiQ3se5BEj/IG TB0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=RXLD5jH9ZF6x6upQ2gINDhovzlfARN8xFMKNyln6EuI=; b=djZ5EYsb4t2g8FqMUym4C/vf4gs/eQ+rTyCtvGTkChLdaqqHEI+DrbveZ7l4QPsmrC iOL/kn5/L9mVHqfVK0Yeyn7B2Eqkzf0hQoReqfEc7bQv9Eo0mVCfwvmcPnriBZHd1xB3 7dRAhQyl0u2G6j2Trec1DdM3jCENzalif+y154MG8SA7/kboCWFqJI/+kDDbsHxmPbyt 7Iv81wjZUNxKnH9+oyOCQ8yc9Qn0LIiU1kLAV1RObS8XsXaYZ++/esYpiAmfq4SvWtny MUS2na/hZz8DhwB0p5ybFT2pCt1Rue+gFGE9QlFhPmMUNwiA1t0199JU0AuXHN9ShNDO MPtw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id x3-v6si1202539pfj.289.2018.06.26.07.22.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 07:22:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 07:22:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,274,1526367600"; d="scan'208";a="52025495" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 26 Jun 2018 07:22:53 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 112DD7B6; Tue, 26 Jun 2018 17:22:52 +0300 (EEST) From: "Kirill A. Shutemov" To: Ingo Molnar , x86@kernel.org, Thomas Gleixner , "H. Peter Anvin" , Tom Lendacky Cc: Dave Hansen , Kai Huang , Jacob Pan , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Kirill A. Shutemov" Subject: [PATCHv4 12/18] x86/mm: Rename CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING Date: Tue, 26 Jun 2018 17:22:39 +0300 Message-Id: <20180626142245.82850-13-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180626142245.82850-1-kirill.shutemov@linux.intel.com> References: <20180626142245.82850-1-kirill.shutemov@linux.intel.com> 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: X-Virus-Scanned: ClamAV using ClamSMTP Rename the option to CONFIG_MEMORY_PHYSICAL_PADDING. It will be used not only for KASLR. Signed-off-by: Kirill A. Shutemov --- 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)