evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kaiser: drop is_atomic arg to kaiser_pagetable_walk()

Browse source 
I have not observed a might_sleep() warning from setup_fixmap_gdt()'s
use of kaiser_add_mapping() in our tree (why not?), but like upstream
we have not provided a way for that to pass is_atomic true down to
kaiser_pagetable_walk(), and at startup it's far from a likely source
of trouble: so just delete the walk's is_atomic arg and might_sleep().

Signed-off-by: Hugh Dickins <hughd@google.com>
Acked-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hugh Dickins 2017-10-29 11:36:19 -07:00 • committed by Greg Kroah-Hartman
parent 2dff99eb03
commit 28c6de5441
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/mm/kaiser.c
View file

@ -108,19 +108,13 @@ static inline unsigned long get_pa_from_mapping(unsigned long vaddr)
* *
* Returns a pointer to a PTE on success, or NULL on failure. * Returns a pointer to a PTE on success, or NULL on failure.
*/ */
static pte_t *kaiser_pagetable_walk(unsigned long address, bool is_atomic) static pte_t *kaiser_pagetable_walk(unsigned long address)
{ {
pmd_t *pmd; pmd_t *pmd;
pud_t *pud; pud_t *pud;
pgd_t *pgd = native_get_shadow_pgd(pgd_offset_k(address)); pgd_t *pgd = native_get_shadow_pgd(pgd_offset_k(address));
gfp_t gfp = (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO); gfp_t gfp = (GFP_KERNEL | __GFP_NOTRACK | __GFP_ZERO);
if (is_atomic) {
gfp &= ~GFP_KERNEL;
gfp |= __GFP_HIGH | __GFP_ATOMIC;
} else
might_sleep();
if (pgd_none(*pgd)) { if (pgd_none(*pgd)) {
WARN_ONCE(1, "All shadow pgds should have been populated"); WARN_ONCE(1, "All shadow pgds should have been populated");
return NULL; return NULL;
@ -195,7 +189,7 @@ static int kaiser_add_user_map(const void *__start_addr, unsigned long size,
ret = -EIO; ret = -EIO;
break; break;
} }
pte = kaiser_pagetable_walk(address, false); pte = kaiser_pagetable_walk(address);
if (!pte) { if (!pte) {
ret = -ENOMEM; ret = -ENOMEM;
break; break;