Pull mm-hotfixes-stable dependencies into mm-stable. (1301f931) · Commits · EulixOS / Software / Kernel

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -371,6 +371,7 @@ Rémi Denis-Courmont <rdenis@simphalempin.com>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo@ribalda.com>
		Ricardo Ribalda <ribalda@kernel.org> Ricardo Ribalda Delgado <ribalda@kernel.org>
		Ricardo Ribalda <ribalda@kernel.org> <ricardo.ribalda@gmail.com>
		Robert Foss <rfoss@kernel.org> <robert.foss@linaro.org>
		Roman Gushchin <roman.gushchin@linux.dev> <guro@fb.com>
		Roman Gushchin <roman.gushchin@linux.dev> <guroan@gmail.com>
		Roman Gushchin <roman.gushchin@linux.dev> <klamm@yandex-team.ru>

Documentation/admin-guide/mm/zswap.rst

+1 −3

Original line number	Diff line number	Diff line
		@@ -70,9 +70,7 @@ e.g. ``zswap.zpool=zbud``. It can also be changed at runtime using the sysfs
		The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which
		means the compression ratio will always be 2:1 or worse (because of half-full
		zbud pages). The zsmalloc type zpool has a more complex compressed page
		storage method, and it can achieve greater storage densities. However,
		zsmalloc does not implement compressed page eviction, so once zswap fills it
		cannot evict the oldest page, it can only reject new pages.
		storage method, and it can achieve greater storage densities.

		When a swap page is passed from frontswap to zswap, zswap maintains a mapping
		of the swap entry, a combination of the swap type and swap offset, to the zpool

MAINTAINERS

+3 −3

Original line number	Diff line number	Diff line
		@@ -6948,7 +6948,7 @@ F: drivers/gpu/drm/atmel-hlcdc/
		DRM DRIVERS FOR BRIDGE CHIPS
		M: Andrzej Hajda <andrzej.hajda@intel.com>
		M: Neil Armstrong <neil.armstrong@linaro.org>
		M: Robert Foss <robert.foss@linaro.org>
		M: Robert Foss <rfoss@kernel.org>
		R: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
		R: Jonas Karlman <jonas@kwiboo.se>
		R: Jernej Skrabec <jernej.skrabec@gmail.com>
		@@ -17238,7 +17238,7 @@ F: Documentation/devicetree/bindings/net/qcom,bam-dmux.yaml
		F: drivers/net/wwan/qcom_bam_dmux.c

		QUALCOMM CAMERA SUBSYSTEM DRIVER
		M: Robert Foss <robert.foss@linaro.org>
		M: Robert Foss <rfoss@kernel.org>
		M: Todor Tomov <todor.too@gmail.com>
		L: linux-media@vger.kernel.org
		S: Maintained
		@@ -17318,7 +17318,7 @@ F: drivers/dma/qcom/hidma*

		QUALCOMM I2C CCI DRIVER
		M: Loic Poulain <loic.poulain@linaro.org>
		M: Robert Foss <robert.foss@linaro.org>
		M: Robert Foss <rfoss@kernel.org>
		L: linux-i2c@vger.kernel.org
		L: linux-arm-msm@vger.kernel.org
		S: Maintained

fs/nilfs2/btree.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -480,9 +480,18 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr,
		ret = nilfs_btnode_submit_block(btnc, ptr, 0, REQ_OP_READ, &bh,
		&submit_ptr);
		if (ret) {
		if (ret != -EEXIST)
		return ret;
		if (likely(ret == -EEXIST))
		goto out_check;
		if (ret == -ENOENT) {
		/*
		* Block address translation failed due to invalid
		* value of 'ptr'. In this case, return internal code
		* -EINVAL (broken bmap) to notify bmap layer of fatal
		* metadata corruption.
		*/
		ret = -EINVAL;
		}
		return ret;
		}

		if (ra) {

fs/userfaultfd.c

+22 −6

Original line number	Diff line number	Diff line
		@@ -108,6 +108,21 @@ static bool userfaultfd_is_initialized(struct userfaultfd_ctx *ctx)
		return ctx->features & UFFD_FEATURE_INITIALIZED;
		}

		static void userfaultfd_set_vm_flags(struct vm_area_struct *vma,
		vm_flags_t flags)
		{
		const bool uffd_wp_changed = (vma->vm_flags ^ flags) & VM_UFFD_WP;

		vma->vm_flags = flags;
		/*
		* For shared mappings, we want to enable writenotify while
		* userfaultfd-wp is enabled (see vma_wants_writenotify()). We'll simply
		* recalculate vma->vm_page_prot whenever userfaultfd-wp changes.
		*/
		if ((vma->vm_flags & VM_SHARED) && uffd_wp_changed)
		vma_set_page_prot(vma);
		}

		static int userfaultfd_wake_function(wait_queue_entry_t *wq, unsigned mode,
		int wake_flags, void *key)
		{
		@@ -618,7 +633,8 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
		for_each_vma(vmi, vma) {
		if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx) {
		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
		vma->vm_flags &= ~__VM_UFFD_FLAGS;
		userfaultfd_set_vm_flags(vma,
		vma->vm_flags & ~__VM_UFFD_FLAGS);
		}
		}
		mmap_write_unlock(mm);
		@@ -652,7 +668,7 @@ int dup_userfaultfd(struct vm_area_struct vma, struct list_head fcs)
		octx = vma->vm_userfaultfd_ctx.ctx;
		if (!octx \|\| !(octx->features & UFFD_FEATURE_EVENT_FORK)) {
		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
		vma->vm_flags &= ~__VM_UFFD_FLAGS;
		userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS);
		return 0;
		}

		@@ -733,7 +749,7 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma,
		} else {
		/* Drop uffd context if remap feature not enabled */
		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
		vma->vm_flags &= ~__VM_UFFD_FLAGS;
		userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS);
		}
		}

		@@ -895,7 +911,7 @@ static int userfaultfd_release(struct inode inode, struct file file)
		prev = vma;
		}

		vma->vm_flags = new_flags;
		userfaultfd_set_vm_flags(vma, new_flags);
		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;
		}
		mmap_write_unlock(mm);
		@@ -1463,7 +1479,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx,
		* the next vma was merged into the current one and
		* the current one has not been updated yet.
		*/
		vma->vm_flags = new_flags;
		userfaultfd_set_vm_flags(vma, new_flags);
		vma->vm_userfaultfd_ctx.ctx = ctx;

		if (is_vm_hugetlb_page(vma) && uffd_disable_huge_pmd_share(vma))
		@@ -1651,7 +1667,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx,
		* the next vma was merged into the current one and
		* the current one has not been updated yet.
		*/
		vma->vm_flags = new_flags;
		userfaultfd_set_vm_flags(vma, new_flags);
		vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX;

		skip: