Commit cf6d429e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.11-1' of... 

Merge tag 'loongarch-fixes-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "Enable general EFI poweroff method to make poweroff usable on
  hardwares which lack ACPI S5, use accessors to page table entries
  instead of direct dereference to avoid potential problems, and two
  trivial kvm cleanups"

* tag 'loongarch-fixes-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: KVM: Remove undefined a6 argument comment for kvm_hypercall()
  LoongArch: KVM: Remove unnecessary definition of KVM_PRIVATE_MEM_SLOTS
  LoongArch: Use accessors to page table entries instead of direct dereference
  LoongArch: Enable general EFI poweroff method
parents 660e4b18 494b0792

arch/loongarch/include/asm/hugetlb.h

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm, 
					    unsigned long addr, pte_t *ptep)

{

	pte_t clear;

	pte_t pte = *ptep;

	pte_t pte = ptep_get(ptep);



	pte_val(clear) = (unsigned long)invalid_pte_table;

	set_pte_at(mm, addr, ptep, clear);
@@ -65,7 +65,7 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, 
					     pte_t *ptep, pte_t pte,

					     int dirty)

{

	int changed = !pte_same(*ptep, pte);

	int changed = !pte_same(ptep_get(ptep), pte);



	if (changed) {

		set_pte_at(vma->vm_mm, addr, ptep, pte);

arch/loongarch/include/asm/kfence.h

+3 −3
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ static inline bool kfence_protect_page(unsigned long addr, bool protect) 
{

	pte_t *pte = virt_to_kpte(addr);



	if (WARN_ON(!pte) || pte_none(*pte))

	if (WARN_ON(!pte) || pte_none(ptep_get(pte)))

		return false;



	if (protect)

		set_pte(pte, __pte(pte_val(*pte) & ~(_PAGE_VALID | _PAGE_PRESENT)));

		set_pte(pte, __pte(pte_val(ptep_get(pte)) & ~(_PAGE_VALID | _PAGE_PRESENT)));

	else

		set_pte(pte, __pte(pte_val(*pte) | (_PAGE_VALID | _PAGE_PRESENT)));

		set_pte(pte, __pte(pte_val(ptep_get(pte)) | (_PAGE_VALID | _PAGE_PRESENT)));



	preempt_disable();

	local_flush_tlb_one(addr);

arch/loongarch/include/asm/kvm_host.h

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 


#define KVM_MAX_VCPUS			256

#define KVM_MAX_CPUCFG_REGS		21

/* memory slots that does not exposed to userspace */

#define KVM_PRIVATE_MEM_SLOTS		0



#define KVM_HALT_POLL_NS_DEFAULT	500000

#define KVM_REQ_TLB_FLUSH_GPA		KVM_ARCH_REQ(0)

arch/loongarch/include/asm/kvm_para.h

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ struct kvm_steal_time { 
 * Hypercall interface for KVM hypervisor

 *

 * a0: function identifier

 * a1-a6: args

 * a1-a5: args

 * Return value will be placed in a0.

 * Up to 6 arguments are passed in a1, a2, a3, a4, a5, a6.

 * Up to 5 arguments are passed in a1, a2, a3, a4, a5.

 */

static __always_inline long kvm_hypercall0(u64 fid)

{

arch/loongarch/include/asm/pgtable.h

+29 −19
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
#define KFENCE_AREA_START	(VMEMMAP_END + 1)

#define KFENCE_AREA_END		(KFENCE_AREA_START + KFENCE_AREA_SIZE - 1)



#define ptep_get(ptep) READ_ONCE(*(ptep))

#define pmdp_get(pmdp) READ_ONCE(*(pmdp))



#define pte_ERROR(e) \

	pr_err("%s:%d: bad pte %016lx.\n", __FILE__, __LINE__, pte_val(e))

#ifndef __PAGETABLE_PMD_FOLDED
@@ -147,11 +150,6 @@ static inline int p4d_present(p4d_t p4d) 
	return p4d_val(p4d) != (unsigned long)invalid_pud_table;

}



static inline void p4d_clear(p4d_t *p4dp)

{

	p4d_val(*p4dp) = (unsigned long)invalid_pud_table;

}



static inline pud_t *p4d_pgtable(p4d_t p4d)

{

	return (pud_t *)p4d_val(p4d);
@@ -159,7 +157,12 @@ static inline pud_t *p4d_pgtable(p4d_t p4d) 


static inline void set_p4d(p4d_t *p4d, p4d_t p4dval)

{

	*p4d = p4dval;

	WRITE_ONCE(*p4d, p4dval);

}



static inline void p4d_clear(p4d_t *p4dp)

{

	set_p4d(p4dp, __p4d((unsigned long)invalid_pud_table));

}



#define p4d_phys(p4d)		PHYSADDR(p4d_val(p4d))
@@ -193,17 +196,20 @@ static inline int pud_present(pud_t pud) 
	return pud_val(pud) != (unsigned long)invalid_pmd_table;

}



static inline void pud_clear(pud_t *pudp)

static inline pmd_t *pud_pgtable(pud_t pud)

{

	pud_val(*pudp) = ((unsigned long)invalid_pmd_table);

	return (pmd_t *)pud_val(pud);

}



static inline pmd_t *pud_pgtable(pud_t pud)

static inline void set_pud(pud_t *pud, pud_t pudval)

{

	return (pmd_t *)pud_val(pud);

	WRITE_ONCE(*pud, pudval);

}



#define set_pud(pudptr, pudval) do { *(pudptr) = (pudval); } while (0)

static inline void pud_clear(pud_t *pudp)

{

	set_pud(pudp, __pud((unsigned long)invalid_pmd_table));

}



#define pud_phys(pud)		PHYSADDR(pud_val(pud))

#define pud_page(pud)		(pfn_to_page(pud_phys(pud) >> PAGE_SHIFT))
@@ -231,12 +237,15 @@ static inline int pmd_present(pmd_t pmd) 
	return pmd_val(pmd) != (unsigned long)invalid_pte_table;

}



static inline void pmd_clear(pmd_t *pmdp)

static inline void set_pmd(pmd_t *pmd, pmd_t pmdval)

{

	pmd_val(*pmdp) = ((unsigned long)invalid_pte_table);

	WRITE_ONCE(*pmd, pmdval);

}



#define set_pmd(pmdptr, pmdval) do { *(pmdptr) = (pmdval); } while (0)

static inline void pmd_clear(pmd_t *pmdp)

{

	set_pmd(pmdp, __pmd((unsigned long)invalid_pte_table));

}



#define pmd_phys(pmd)		PHYSADDR(pmd_val(pmd))
@@ -314,7 +323,8 @@ extern void paging_init(void); 


static inline void set_pte(pte_t *ptep, pte_t pteval)

{

	*ptep = pteval;

	WRITE_ONCE(*ptep, pteval);



	if (pte_val(pteval) & _PAGE_GLOBAL) {

		pte_t *buddy = ptep_buddy(ptep);

		/*
@@ -341,8 +351,8 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) 
		: [buddy] "+m" (buddy->pte), [tmp] "=&r" (tmp)

		: [global] "r" (page_global));

#else /* !CONFIG_SMP */

		if (pte_none(*buddy))

			pte_val(*buddy) = pte_val(*buddy) | _PAGE_GLOBAL;

		if (pte_none(ptep_get(buddy)))

			WRITE_ONCE(*buddy, __pte(pte_val(ptep_get(buddy)) | _PAGE_GLOBAL));

#endif /* CONFIG_SMP */

	}

}
@@ -350,7 +360,7 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) 
static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

{

	/* Preserve global status for the pair */

	if (pte_val(*ptep_buddy(ptep)) & _PAGE_GLOBAL)

	if (pte_val(ptep_get(ptep_buddy(ptep))) & _PAGE_GLOBAL)

		set_pte(ptep, __pte(_PAGE_GLOBAL));

	else

		set_pte(ptep, __pte(0));
@@ -603,7 +613,7 @@ static inline pmd_t pmd_mkinvalid(pmd_t pmd) 
static inline pmd_t pmdp_huge_get_and_clear(struct mm_struct *mm,

					    unsigned long address, pmd_t *pmdp)

{

	pmd_t old = *pmdp;

	pmd_t old = pmdp_get(pmdp);



	pmd_clear(pmdp);