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

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "The main changes are relating to our handling of access/dirty bits,
  where our low-level page-table helpers could lead to stale young
  mappings and loss of the dirty bit in some cases (the latter has not
  been observed in practice, but could happen when clearing "soft-dirty"
  if we enabled that). These were posted as part of a larger series, but
  the rest of that is less urgent and needs a v2 which I'll get to
  shortly.

  In other news, we've now got a set of fixes to resolve the
  lockdep/tracing problems that have been plaguing us for a while, but
  they're still a bit "fresh" and I plan to send them to you next week
  after we've got some more confidence in them (although initial CI
  results look good).

  Summary:

   - Fix kerneldoc warnings generated by ACPI IORT code

   - Fix pte_accessible() so that access flag is ignored

   - Fix missing header #include

   - Fix loss of software dirty bit across pte_wrprotect() when HW DBM
     is enabled"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: pgtable: Ensure dirty bit is preserved across pte_wrprotect()
  arm64: pgtable: Fix pte_accessible()
  ACPI/IORT: Fix doc warnings in iort.c
  arm64/fpsimd: add <asm/insn.h> to <asm/kprobes.h> to fix fpsimd build
parents 6adf33a5 ff1712f9

arch/arm64/include/asm/pgtable.h

+18 −16
Original line number Diff line number Diff line
@@ -115,8 +115,6 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
#define pte_valid(pte)		(!!(pte_val(pte) & PTE_VALID))

#define pte_valid_not_user(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_USER)) == PTE_VALID)

#define pte_valid_young(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_AF)) == (PTE_VALID | PTE_AF))

#define pte_valid_user(pte) \

	((pte_val(pte) & (PTE_VALID | PTE_USER)) == (PTE_VALID | PTE_USER))
@@ -124,9 +122,12 @@ extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; 
 * Could the pte be present in the TLB? We must check mm_tlb_flush_pending

 * so that we don't erroneously return false for pages that have been

 * remapped as PROT_NONE but are yet to be flushed from the TLB.

 * Note that we can't make any assumptions based on the state of the access

 * flag, since ptep_clear_flush_young() elides a DSB when invalidating the

 * TLB.

 */

#define pte_accessible(mm, pte)	\

	(mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid_young(pte))

	(mm_tlb_flush_pending(mm) ? pte_present(pte) : pte_valid(pte))



/*

 * p??_access_permitted() is true for valid user mappings (subject to the
@@ -164,13 +165,6 @@ static inline pmd_t set_pmd_bit(pmd_t pmd, pgprot_t prot) 
	return pmd;

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	pte = clear_pte_bit(pte, __pgprot(PTE_WRITE));

	pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	pte = set_pte_bit(pte, __pgprot(PTE_WRITE));
@@ -196,6 +190,20 @@ static inline pte_t pte_mkdirty(pte_t pte) 
	return pte;

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	/*

	 * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY

	 * clear), set the PTE_DIRTY bit.

	 */

	if (pte_hw_dirty(pte))

		pte = pte_mkdirty(pte);



	pte = clear_pte_bit(pte, __pgprot(PTE_WRITE));

	pte = set_pte_bit(pte, __pgprot(PTE_RDONLY));

	return pte;

}



static inline pte_t pte_mkold(pte_t pte)

{

	return clear_pte_bit(pte, __pgprot(PTE_AF));
@@ -845,12 +853,6 @@ static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addres 
	pte = READ_ONCE(*ptep);

	do {

		old_pte = pte;

		/*

		 * If hardware-dirty (PTE_WRITE/DBM bit set and PTE_RDONLY

		 * clear), set the PTE_DIRTY bit.

		 */

		if (pte_hw_dirty(pte))

			pte = pte_mkdirty(pte);

		pte = pte_wrprotect(pte);

		pte_val(pte) = cmpxchg_relaxed(&pte_val(*ptep),

					       pte_val(old_pte), pte_val(pte));

arch/arm64/include/asm/probes.h

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#ifndef _ARM_PROBES_H

#define _ARM_PROBES_H



#include <asm/insn.h>



typedef u32 probe_opcode_t;

typedef void (probes_handler_t) (u32 opcode, long addr, struct pt_regs *);

drivers/acpi/arm64/iort.c

+5 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static DEFINE_SPINLOCK(iort_fwnode_lock); 
 * iort_set_fwnode() - Create iort_fwnode and use it to register

 *		       iommu data in the iort_fwnode_list

 *

 * @node: IORT table node associated with the IOMMU

 * @iort_node: IORT table node associated with the IOMMU

 * @fwnode: fwnode associated with the IORT node

 *

 * Returns: 0 on success
@@ -673,7 +673,8 @@ static int iort_dev_find_its_id(struct device *dev, u32 id, 
/**

 * iort_get_device_domain() - Find MSI domain related to a device

 * @dev: The device.

 * @req_id: Requester ID for the device.

 * @id: Requester ID for the device.

 * @bus_token: irq domain bus token.

 *

 * Returns: the MSI domain for this device, NULL otherwise

 */
@@ -1136,7 +1137,7 @@ static int rc_dma_get_range(struct device *dev, u64 *size) 
 *

 * @dev: device to configure

 * @dma_addr: device DMA address result pointer

 * @size: DMA range size result pointer

 * @dma_size: DMA range size result pointer

 */

void iort_dma_setup(struct device *dev, u64 *dma_addr, u64 *dma_size)

{
@@ -1526,6 +1527,7 @@ static __init const struct iort_dev_config *iort_get_dev_cfg( 
/**

 * iort_add_platform_device() - Allocate a platform device for IORT node

 * @node: Pointer to device ACPI IORT node

 * @ops: Pointer to IORT device config struct

 *

 * Returns: 0 on success, <0 failure

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE