Commit 5952886b authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar

x86/mm/cpa: Cleanup split_large_page() and its callee

So basically we're generating the pte_t * from a struct page and
we're handing it down to the __split_large_page() internal version
which then goes and gets back struct page * from it because it
needs it.

Change the caller to hand down struct page * directly and the
callee can compute the pte_t itself.

Net save is one virt_to_page() call and simpler code. While at
it, make __split_large_page() static.
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1363886217-24703-1-git-send-email-bp@alien8.deSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ec7fd344
...@@ -351,7 +351,6 @@ static inline void update_page_count(int level, unsigned long pages) { } ...@@ -351,7 +351,6 @@ static inline void update_page_count(int level, unsigned long pages) { }
* as a pte too. * as a pte too.
*/ */
extern pte_t *lookup_address(unsigned long address, unsigned int *level); extern pte_t *lookup_address(unsigned long address, unsigned int *level);
extern int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase);
extern phys_addr_t slow_virt_to_phys(void *__address); extern phys_addr_t slow_virt_to_phys(void *__address);
#endif /* !__ASSEMBLY__ */ #endif /* !__ASSEMBLY__ */
......
...@@ -542,13 +542,14 @@ try_preserve_large_page(pte_t *kpte, unsigned long address, ...@@ -542,13 +542,14 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,
return do_split; return do_split;
} }
int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase) static int
__split_large_page(pte_t *kpte, unsigned long address, struct page *base)
{ {
pte_t *pbase = (pte_t *)page_address(base);
unsigned long pfn, pfninc = 1; unsigned long pfn, pfninc = 1;
unsigned int i, level; unsigned int i, level;
pte_t *tmp; pte_t *tmp;
pgprot_t ref_prot; pgprot_t ref_prot;
struct page *base = virt_to_page(pbase);
spin_lock(&pgd_lock); spin_lock(&pgd_lock);
/* /*
...@@ -633,7 +634,6 @@ int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase) ...@@ -633,7 +634,6 @@ int __split_large_page(pte_t *kpte, unsigned long address, pte_t *pbase)
static int split_large_page(pte_t *kpte, unsigned long address) static int split_large_page(pte_t *kpte, unsigned long address)
{ {
pte_t *pbase;
struct page *base; struct page *base;
if (!debug_pagealloc) if (!debug_pagealloc)
...@@ -644,8 +644,7 @@ static int split_large_page(pte_t *kpte, unsigned long address) ...@@ -644,8 +644,7 @@ static int split_large_page(pte_t *kpte, unsigned long address)
if (!base) if (!base)
return -ENOMEM; return -ENOMEM;
pbase = (pte_t *)page_address(base); if (__split_large_page(kpte, address, base))
if (__split_large_page(kpte, address, pbase))
__free_page(base); __free_page(base);
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment