From: Baoquan He <bhe@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, keescook@chromium.org, kirill@shutemov.name,
yamada.masahiro@socionext.com, tglx@linutronix.de, bp@alien8.de,
hpa@zytor.com, dave.hansen@linux.intel.com, luto@kernel.org,
peterz@infradead.org, x86@kernel.org, thgarnie@google.com,
Baoquan He <bhe@redhat.com>
Subject: [PATCH v4 2/6] x86/mm/KASLR: Open code unnecessary function get_padding
Date: Thu, 14 Mar 2019 17:46:41 +0800 [thread overview]
Message-ID: <20190314094645.4883-3-bhe@redhat.com> (raw)
In-Reply-To: <20190314094645.4883-1-bhe@redhat.com>
It's used only twice and we do bit shifts in the parent function
anyway so it's not like it's hiding some uninteresting detail.
Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Kees Cook <keescook@chromium.org>
---
arch/x86/mm/kaslr.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c
index 5debf82ab06a..d7ea6b252594 100644
--- a/arch/x86/mm/kaslr.c
+++ b/arch/x86/mm/kaslr.c
@@ -92,12 +92,6 @@ static __initdata struct kaslr_memory_region {
{ &vmemmap_base, 1 },
};
-/* Get size in bytes used by the memory region */
-static inline unsigned long get_padding(struct kaslr_memory_region *region)
-{
- return (region->size_tb << TB_SHIFT);
-}
-
/*
* Apply no randomization if KASLR was disabled at boot or if KASAN
* is enabled. KASAN shadow mappings rely on regions being PGD aligned.
@@ -155,7 +149,7 @@ void __init kernel_randomize_memory(void)
/* Calculate entropy available between regions */
remain_entropy = vaddr_end - vaddr_start;
for (i = 0; i < ARRAY_SIZE(kaslr_regions); i++)
- remain_entropy -= get_padding(&kaslr_regions[i]);
+ remain_entropy -= kaslr_regions[i].size_tb << TB_SHIFT;
prandom_seed_state(&rand_state, kaslr_get_random_long("Memory"));
@@ -176,7 +170,7 @@ void __init kernel_randomize_memory(void)
* Jump the region and add a minimum padding based on
* randomization alignment.
*/
- vaddr += get_padding(&kaslr_regions[i]);
+ vaddr += kaslr_regions[i].size_tb << TB_SHIFT;
vaddr = round_up(vaddr + 1, PUD_SIZE);
remain_entropy -= entropy;
}
--
2.17.2
next prev parent reply other threads:[~2019-03-14 9:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-14 9:46 [PATCH v4 0/6] Several patches to fix code bugs, improve documents and clean up Baoquan He
2019-03-14 9:46 ` [PATCH v4 1/6] x86/mm/KASLR: Improve code comments about struct kaslr_memory_region Baoquan He
2019-03-14 9:46 ` Baoquan He [this message]
2019-03-14 9:46 ` [PATCH v4 3/6] mm: Add build time sanity check for struct page size Baoquan He
2019-03-14 9:50 ` Baoquan He
2019-03-14 9:57 ` Baoquan He
2019-03-14 9:46 ` [PATCH v4 4/6] x86/mm/KASLR: Fix the wrong calculation of memory region initial size Baoquan He
2019-03-24 20:58 ` Thomas Gleixner
2019-03-25 3:46 ` Baoquan He
2019-03-14 9:46 ` [PATCH v4 5/6] x86/mm/KASLR: Calculate the actual size of vmemmap region Baoquan He
2019-03-14 9:46 ` [PATCH v4 6/6] x86/mm/KASLR: Do not adapt the size of the direct mapping region for SGI UV system Baoquan He
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=20190314094645.4883-3-bhe@redhat.com \
--to=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=thgarnie@google.com \
--cc=x86@kernel.org \
--cc=yamada.masahiro@socionext.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).