Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fe3ccae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "26 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits)
  userfaultfd: remove wrong comment from userfaultfd_ctx_get()
  fat: fix using uninitialized fields of fat_inode/fsinfo_inode
  sh: cayman: IDE support fix
  kasan: fix races in quarantine_remove_cache()
  kasan: resched in quarantine_remove_cache()
  mm: do not call mem_cgroup_free() from within mem_cgroup_alloc()
  thp: fix another corner case of munlock() vs. THPs
  rmap: fix NULL-pointer dereference on THP munlocking
  mm/memblock.c: fix memblock_next_valid_pfn()
  userfaultfd: selftest: vm: allow to build in vm/ directory
  userfaultfd: non-cooperative: userfaultfd_remove revalidate vma in MADV_DONTNEED
  userfaultfd: non-cooperative: fix fork fctx->new memleak
  mm/cgroup: avoid panic when init with low memory
  drivers/md/bcache/util.h: remove duplicate inclusion of blkdev.h
  mm/vmstats: add thp_split_pud event for clarity
  include/linux/fs.h: fix unsigned enum warning with gcc-4.2
  userfaultfd: non-cooperative: release all ctx in dup_userfaultfd_complete
  userfaultfd: non-cooperative: robustness check
  userfaultfd: non-cooperative: rollback userfaultfd_exit
  x86, mm: unify exit paths in gup_pte_range()
  ...
parents 9db61d6f 2378cd61

Documentation/dev-tools/kcov.rst

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Note that kcov does not aim to collect as much coverage as possible. It aims 
to collect more or less stable coverage that is function of syscall inputs.

To achieve this goal it does not collect coverage in soft/hard interrupts

and instrumentation of some inherently non-deterministic parts of kernel is

disbled (e.g. scheduler, locking).

disabled (e.g. scheduler, locking).



Usage

-----

Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ Required Properties: 
Optional Properties:

- reg-names: In addition to the required properties, the following are optional

  - "efuse-address"	- Contains efuse base address used to pick up ABB info.

  - "ldo-address"	- Contains address of ABB LDO overide register address.

  - "ldo-address"	- Contains address of ABB LDO override register.

	"efuse-address" is required for this.

- ti,ldovbb-vset-mask	- Required if ldo-address is set, mask for LDO override

	register to provide override vset value.

Documentation/vm/userfaultfd.txt

+0 −4
Original line number Diff line number Diff line
@@ -172,10 +172,6 @@ the same read(2) protocol as for the page fault notifications. The 
manager has to explicitly enable these events by setting appropriate

bits in uffdio_api.features passed to UFFDIO_API ioctl:



UFFD_FEATURE_EVENT_EXIT - enable notification about exit() of the

non-cooperative process. When the monitored process exits, the uffd

manager will get UFFD_EVENT_EXIT.



UFFD_FEATURE_EVENT_FORK - enable userfaultfd hooks for fork(). When

this feature is enabled, the userfaultfd context of the parent process

is duplicated into the newly created process. The manager receives

arch/cris/arch-v32/drivers/cryptocop.c

+1 −1
Original line number Diff line number Diff line
@@ -2086,7 +2086,7 @@ static void cryptocop_job_queue_close(void) 
		dma_in_cfg.en = regk_dma_no;

		REG_WR(dma, IN_DMA_INST, rw_cfg, dma_in_cfg);



		/* Disble the cryptocop. */

		/* Disable the cryptocop. */

		rw_cfg = REG_RD(strcop, regi_strcop, rw_cfg);

		rw_cfg.en = 0;

		REG_WR(strcop, regi_strcop, rw_cfg, rw_cfg);

arch/powerpc/include/asm/book3s/64/pgtable.h

+55 −30
Original line number Diff line number Diff line
@@ -347,23 +347,58 @@ static inline int __ptep_test_and_clear_young(struct mm_struct *mm, 
	__r;							\

})



static inline int __pte_write(pte_t pte)

{

	return !!(pte_raw(pte) & cpu_to_be64(_PAGE_WRITE));

}



#ifdef CONFIG_NUMA_BALANCING

#define pte_savedwrite pte_savedwrite

static inline bool pte_savedwrite(pte_t pte)

{

	/*

	 * Saved write ptes are prot none ptes that doesn't have

	 * privileged bit sit. We mark prot none as one which has

	 * present and pviliged bit set and RWX cleared. To mark

	 * protnone which used to have _PAGE_WRITE set we clear

	 * the privileged bit.

	 */

	return !(pte_raw(pte) & cpu_to_be64(_PAGE_RWX | _PAGE_PRIVILEGED));

}

#else

#define pte_savedwrite pte_savedwrite

static inline bool pte_savedwrite(pte_t pte)

{

	return false;

}

#endif



static inline int pte_write(pte_t pte)

{

	return __pte_write(pte) || pte_savedwrite(pte);

}



#define __HAVE_ARCH_PTEP_SET_WRPROTECT

static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr,

				      pte_t *ptep)

{

	if ((pte_raw(*ptep) & cpu_to_be64(_PAGE_WRITE)) == 0)

		return;



	if (__pte_write(*ptep))

		pte_update(mm, addr, ptep, _PAGE_WRITE, 0, 0);

	else if (unlikely(pte_savedwrite(*ptep)))

		pte_update(mm, addr, ptep, 0, _PAGE_PRIVILEGED, 0);

}



static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,

					   unsigned long addr, pte_t *ptep)

{

	if ((pte_raw(*ptep) & cpu_to_be64(_PAGE_WRITE)) == 0)

		return;



	/*

	 * We should not find protnone for hugetlb, but this complete the

	 * interface.

	 */

	if (__pte_write(*ptep))

		pte_update(mm, addr, ptep, _PAGE_WRITE, 0, 1);

	else if (unlikely(pte_savedwrite(*ptep)))

		pte_update(mm, addr, ptep, 0, _PAGE_PRIVILEGED, 1);

}



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
@@ -397,11 +432,6 @@ static inline void pte_clear(struct mm_struct *mm, unsigned long addr, 
	pte_update(mm, addr, ptep, ~0UL, 0, 0);

}



static inline int pte_write(pte_t pte)

{

	return !!(pte_raw(pte) & cpu_to_be64(_PAGE_WRITE));

}



static inline int pte_dirty(pte_t pte)

{

	return !!(pte_raw(pte) & cpu_to_be64(_PAGE_DIRTY));
@@ -465,19 +495,12 @@ static inline pte_t pte_clear_savedwrite(pte_t pte) 
	VM_BUG_ON(!pte_protnone(pte));

	return __pte(pte_val(pte) | _PAGE_PRIVILEGED);

}



#define pte_savedwrite pte_savedwrite

static inline bool pte_savedwrite(pte_t pte)

#else

#define pte_clear_savedwrite pte_clear_savedwrite

static inline pte_t pte_clear_savedwrite(pte_t pte)

{

	/*

	 * Saved write ptes are prot none ptes that doesn't have

	 * privileged bit sit. We mark prot none as one which has

	 * present and pviliged bit set and RWX cleared. To mark

	 * protnone which used to have _PAGE_WRITE set we clear

	 * the privileged bit.

	 */

	VM_BUG_ON(!pte_protnone(pte));

	return !(pte_raw(pte) & cpu_to_be64(_PAGE_RWX | _PAGE_PRIVILEGED));

	VM_WARN_ON(1);

	return __pte(pte_val(pte) & ~_PAGE_WRITE);

}

#endif /* CONFIG_NUMA_BALANCING */
@@ -506,6 +529,8 @@ static inline unsigned long pte_pfn(pte_t pte) 
/* Generic modifiers for PTE bits */

static inline pte_t pte_wrprotect(pte_t pte)

{

	if (unlikely(pte_savedwrite(pte)))

		return pte_clear_savedwrite(pte);

	return __pte(pte_val(pte) & ~_PAGE_WRITE);

}
@@ -926,6 +951,7 @@ static inline int pmd_protnone(pmd_t pmd) 


#define __HAVE_ARCH_PMD_WRITE

#define pmd_write(pmd)		pte_write(pmd_pte(pmd))

#define __pmd_write(pmd)	__pte_write(pmd_pte(pmd))

#define pmd_savedwrite(pmd)	pte_savedwrite(pmd_pte(pmd))



#ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -982,11 +1008,10 @@ static inline int __pmdp_test_and_clear_young(struct mm_struct *mm, 
static inline void pmdp_set_wrprotect(struct mm_struct *mm, unsigned long addr,

				      pmd_t *pmdp)

{



	if ((pmd_raw(*pmdp) & cpu_to_be64(_PAGE_WRITE)) == 0)

		return;



	if (__pmd_write((*pmdp)))

		pmd_hugepage_update(mm, addr, pmdp, _PAGE_WRITE, 0);

	else if (unlikely(pmd_savedwrite(*pmdp)))

		pmd_hugepage_update(mm, addr, pmdp, 0, _PAGE_PRIVILEGED);

}



static inline int pmd_trans_huge(pmd_t pmd)