Unverified Commit db97293d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12779 riscv: Sync efi page table's kernel mappings before switching 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2KRDC72IX6OJEHKCTZ66XL5ANPJX26BJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRII 
 
Link:https://gitee.com/openeuler/kernel/pulls/12779

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 13b77a24 378ee00f

arch/riscv/include/asm/efi.h

+5 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <asm/mmu_context.h>

#include <asm/ptrace.h>

#include <asm/tlbflush.h>

#include <asm/pgalloc.h>



#ifdef CONFIG_EFI

extern void efi_init(void);
@@ -20,7 +21,10 @@ extern void efi_init(void); 
int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md);

int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md);



#define arch_efi_call_virt_setup()      efi_virtmap_load()

#define arch_efi_call_virt_setup()      ({		\

		sync_kernel_mappings(efi_mm.pgd);	\

		efi_virtmap_load();			\

	})

#define arch_efi_call_virt_teardown()   efi_virtmap_unload()



#define ARCH_EFI_IRQ_FLAGS_MASK (SR_IE | SR_SPIE)

arch/riscv/include/asm/pgalloc.h

+8 −3
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) 


#define pmd_pgtable(pmd)	pmd_page(pmd)



static inline void sync_kernel_mappings(pgd_t *pgd)

{

	memcpy(pgd + USER_PTRS_PER_PGD,

	       init_mm.pgd + USER_PTRS_PER_PGD,

	       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

}



static inline pgd_t *pgd_alloc(struct mm_struct *mm)

{

	pgd_t *pgd;
@@ -48,9 +55,7 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm) 
	if (likely(pgd != NULL)) {

		memset(pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));

		/* Copy kernel mappings */

		memcpy(pgd + USER_PTRS_PER_PGD,

			init_mm.pgd + USER_PTRS_PER_PGD,

			(PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));

		sync_kernel_mappings(pgd);

	}

	return pgd;

}