Commit 995d03ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

[ This does not merge the "fortify: use WARN instead of BUG for now"
  patch, which needs a bit of extra work to build cleanly with all
  configurations. Arnd is on it.   - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: don't clear SGID when inheriting ACLs
  mm: allow page_cache_get_speculative in interrupt context
  userfaultfd: non-cooperative: flush event_wqh at release time
  ipc: add missing container_of()s for randstruct
  cpuset: fix a deadlock due to incomplete patching of cpusets_enabled()
  userfaultfd_zeropage: return -ENOSPC in case mm has gone
  mm: take memory hotplug lock within numa_zonelist_order_handler()
  mm/page_io.c: fix oops during block io poll in swapin path
  zram: do not free pool->size_class
  kthread: fix documentation build warning
  kasan: avoid -Wmaybe-uninitialized warning
  userfaultfd: non-cooperative: notify about unmap of destination during mremap
  mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries
  pid: kill pidhash_size in pidhash_init()
  mm/hugetlb.c: __get_user_pages ignores certain follow_hugetlb_page errors
parents 8d3fe85f 19ec8e48

fs/ocfs2/acl.c

+12 −12
Original line number Diff line number Diff line
@@ -240,18 +240,6 @@ int ocfs2_set_acl(handle_t *handle, 
	switch (type) {

	case ACL_TYPE_ACCESS:

		name_index = OCFS2_XATTR_INDEX_POSIX_ACL_ACCESS;

		if (acl) {

			umode_t mode;



			ret = posix_acl_update_mode(inode, &mode, &acl);

			if (ret)

				return ret;



			ret = ocfs2_acl_set_mode(inode, di_bh,

						 handle, mode);

			if (ret)

				return ret;

		}

		break;

	case ACL_TYPE_DEFAULT:

		name_index = OCFS2_XATTR_INDEX_POSIX_ACL_DEFAULT;
@@ -289,7 +277,19 @@ int ocfs2_iop_set_acl(struct inode *inode, struct posix_acl *acl, int type) 
	had_lock = ocfs2_inode_lock_tracker(inode, &bh, 1, &oh);

	if (had_lock < 0)

		return had_lock;

	if (type == ACL_TYPE_ACCESS && acl) {

		umode_t mode;



		status = posix_acl_update_mode(inode, &mode, &acl);

		if (status)

			goto unlock;



		status = ocfs2_acl_set_mode(inode, bh, NULL, mode);

		if (status)

			goto unlock;

	}

	status = ocfs2_set_acl(NULL, inode, bh, type, acl, NULL, NULL);

unlock:

	ocfs2_inode_unlock_tracker(inode, 1, &oh, had_lock);

	brelse(bh);

	return status;

fs/userfaultfd.c

+5 −0
Original line number Diff line number Diff line
@@ -854,6 +854,9 @@ wakeup: 
	__wake_up_locked_key(&ctx->fault_wqh, TASK_NORMAL, &range);

	spin_unlock(&ctx->fault_pending_wqh.lock);



	/* Flush pending events that may still wait on event_wqh */

	wake_up_all(&ctx->event_wqh);



	wake_up_poll(&ctx->fd_wqh, POLLHUP);

	userfaultfd_ctx_put(ctx);

	return 0;
@@ -1643,6 +1646,8 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx, 
		ret = mfill_zeropage(ctx->mm, uffdio_zeropage.range.start,

				     uffdio_zeropage.range.len);

		mmput(ctx->mm);

	} else {

		return -ENOSPC;

	}

	if (unlikely(put_user(ret, &user_uffdio_zeropage->zeropage)))

		return -EFAULT;

include/linux/cpuset.h

+17 −2
Original line number Diff line number Diff line
@@ -18,6 +18,19 @@ 


#ifdef CONFIG_CPUSETS



/*

 * Static branch rewrites can happen in an arbitrary order for a given

 * key. In code paths where we need to loop with read_mems_allowed_begin() and

 * read_mems_allowed_retry() to get a consistent view of mems_allowed, we need

 * to ensure that begin() always gets rewritten before retry() in the

 * disabled -> enabled transition. If not, then if local irqs are disabled

 * around the loop, we can deadlock since retry() would always be

 * comparing the latest value of the mems_allowed seqcount against 0 as

 * begin() still would see cpusets_enabled() as false. The enabled -> disabled

 * transition should happen in reverse order for the same reasons (want to stop

 * looking at real value of mems_allowed.sequence in retry() first).

 */

extern struct static_key_false cpusets_pre_enable_key;

extern struct static_key_false cpusets_enabled_key;

static inline bool cpusets_enabled(void)

{
@@ -32,12 +45,14 @@ static inline int nr_cpusets(void) 


static inline void cpuset_inc(void)

{

	static_branch_inc(&cpusets_pre_enable_key);

	static_branch_inc(&cpusets_enabled_key);

}



static inline void cpuset_dec(void)

{

	static_branch_dec(&cpusets_enabled_key);

	static_branch_dec(&cpusets_pre_enable_key);

}



extern int cpuset_init(void);
@@ -115,7 +130,7 @@ extern void cpuset_print_current_mems_allowed(void); 
 */

static inline unsigned int read_mems_allowed_begin(void)

{

	if (!cpusets_enabled())

	if (!static_branch_unlikely(&cpusets_pre_enable_key))

		return 0;



	return read_seqcount_begin(&current->mems_allowed_seq);
@@ -129,7 +144,7 @@ static inline unsigned int read_mems_allowed_begin(void) 
 */

static inline bool read_mems_allowed_retry(unsigned int seq)

{

	if (!cpusets_enabled())

	if (!static_branch_unlikely(&cpusets_enabled_key))

		return false;



	return read_seqcount_retry(&current->mems_allowed_seq, seq);

include/linux/kthread.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ struct task_struct *kthread_create_on_node(int (*threadfn)(void *data), 
 * @threadfn: the function to run in the thread

 * @data: data pointer for @threadfn()

 * @namefmt: printf-style format string for the thread name

 * @...: arguments for @namefmt.

 * @arg...: arguments for @namefmt.

 *

 * This macro will create a kthread on the current node, leaving it in

 * the stopped state.  This is just a helper for kthread_create_on_node();

include/linux/mm_types.h

+4 −0
Original line number Diff line number Diff line
@@ -494,6 +494,10 @@ struct mm_struct { 
	 * PROT_NONE or PROT_NUMA mapped page.

	 */

	bool tlb_flush_pending;

#endif

#ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH

	/* See flush_tlb_batched_pending() */

	bool tlb_flush_batched;

#endif

	struct uprobes_state uprobes_state;

#ifdef CONFIG_HUGETLB_PAGE

CRA Git | Maintained and supported by SUSTech CRA and CCSE