Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes. (5ef8f1b2) · Commits · git / linux-net

.mailmap

+4 −2

Original line number	Diff line number	Diff line
		@@ -87,6 +87,7 @@ Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
		Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
		Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
		Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
		Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
		Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
		Ben Gardner <bgardner@wabtec.com>
		@@ -449,9 +450,10 @@ Oleksandr Natalenko <oleksandr@natalenko.name> <oleksandr@redhat.com>
		Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
		Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
		Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
		Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
		Oleksij Rempel <o.rempel@pengutronix.de>
		Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
		Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
		Ondřej Jirman <megi@xff.cz> <megous@megous.com>
		Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
		Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -6748,7 +6748,7 @@ F: drivers/gpu/drm/panel/panel-sitronix-st7701.c
		DRM DRIVER FOR SITRONIX ST7703 PANELS
		M: Guido Günther <agx@sigxcpu.org>
		R: Purism Kernel Team <kernel@puri.sm>
		R: Ondrej Jirman <megous@megous.com>
		R: Ondrej Jirman <megi@xff.cz>
		S: Maintained
		F: Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
		F: drivers/gpu/drm/panel/panel-sitronix-st7703.c

arch/riscv/mm/fault.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_f
		}
		pagefault_out_of_memory();
		return;
		} else if (fault & VM_FAULT_SIGBUS) {
		} else if (fault & (VM_FAULT_SIGBUS \| VM_FAULT_HWPOISON \| VM_FAULT_HWPOISON_LARGE)) {
		/* Kernel mode? Handle exceptions or die */
		if (!user_mode(regs)) {
		no_context(regs, addr);

arch/riscv/mm/hugetlbpage.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -183,15 +183,22 @@ void set_huge_pte_at(struct mm_struct *mm,
		pte_t pte,
		unsigned long sz)
		{
		unsigned long hugepage_shift;
		int i, pte_num;

		if (!pte_napot(pte)) {
		set_pte_at(mm, addr, ptep, pte);
		return;
		}
		if (sz >= PGDIR_SIZE)
		hugepage_shift = PGDIR_SHIFT;
		else if (sz >= P4D_SIZE)
		hugepage_shift = P4D_SHIFT;
		else if (sz >= PUD_SIZE)
		hugepage_shift = PUD_SHIFT;
		else if (sz >= PMD_SIZE)
		hugepage_shift = PMD_SHIFT;
		else
		hugepage_shift = PAGE_SHIFT;

		pte_num = napot_pte_num(napot_cont_order(pte));
		for (i = 0; i < pte_num; i++, ptep++, addr += PAGE_SIZE)
		pte_num = sz >> hugepage_shift;
		for (i = 0; i < pte_num; i++, ptep++, addr += (1 << hugepage_shift))
		set_pte_at(mm, addr, ptep, pte);
		}

include/linux/hugetlb.h

+39 −2

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ struct resv_map {
		long adds_in_progress;
		struct list_head region_cache;
		long region_cache_count;
		struct rw_semaphore rw_sema;
		#ifdef CONFIG_CGROUP_HUGETLB
		/*
		* On private mappings, the counter to uncharge reservations is stored
		@@ -138,7 +139,7 @@ struct page hugetlb_follow_page_mask(struct vm_area_struct vma,
		void unmap_hugepage_range(struct vm_area_struct *,
		unsigned long, unsigned long, struct page *,
		zap_flags_t);
		void __unmap_hugepage_range_final(struct mmu_gather *tlb,
		void __unmap_hugepage_range(struct mmu_gather *tlb,
		struct vm_area_struct *vma,
		unsigned long start, unsigned long end,
		struct page *ref_page, zap_flags_t zap_flags);
		@@ -245,6 +246,25 @@ int huge_pmd_unshare(struct mm_struct mm, struct vm_area_struct vma,
		void adjust_range_if_pmd_sharing_possible(struct vm_area_struct *vma,
		unsigned long start, unsigned long end);

		extern void __hugetlb_zap_begin(struct vm_area_struct *vma,
		unsigned long begin, unsigned long end);
		extern void __hugetlb_zap_end(struct vm_area_struct *vma,
		struct zap_details *details);

		static inline void hugetlb_zap_begin(struct vm_area_struct *vma,
		unsigned long start, unsigned long end)
		{
		if (is_vm_hugetlb_page(vma))
		__hugetlb_zap_begin(vma, start, end);
		}

		static inline void hugetlb_zap_end(struct vm_area_struct *vma,
		struct zap_details *details)
		{
		if (is_vm_hugetlb_page(vma))
		__hugetlb_zap_end(vma, details);
		}

		void hugetlb_vma_lock_read(struct vm_area_struct *vma);
		void hugetlb_vma_unlock_read(struct vm_area_struct *vma);
		void hugetlb_vma_lock_write(struct vm_area_struct *vma);
		@@ -296,6 +316,18 @@ static inline void adjust_range_if_pmd_sharing_possible(
		{
		}

		static inline void hugetlb_zap_begin(
		struct vm_area_struct *vma,
		unsigned long start, unsigned long end)
		{
		}

		static inline void hugetlb_zap_end(
		struct vm_area_struct *vma,
		struct zap_details *details)
		{
		}

		static inline struct page *hugetlb_follow_page_mask(
		struct vm_area_struct *vma, unsigned long address, unsigned int flags,
		unsigned int *page_mask)
		@@ -441,7 +473,7 @@ static inline long hugetlb_change_protection(
		return 0;
		}

		static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb,
		static inline void __unmap_hugepage_range(struct mmu_gather *tlb,
		struct vm_area_struct *vma, unsigned long start,
		unsigned long end, struct page *ref_page,
		zap_flags_t zap_flags)
		@@ -1245,6 +1277,11 @@ static inline bool __vma_shareable_lock(struct vm_area_struct *vma)
		return (vma->vm_flags & VM_MAYSHARE) && vma->vm_private_data;
		}

		static inline bool __vma_private_lock(struct vm_area_struct *vma)
		{
		return (!(vma->vm_flags & VM_MAYSHARE)) && vma->vm_private_data;
		}

		/*
		* Safe version of huge_pte_offset() to check the locks. See comments
		* above huge_pte_offset().