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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2/dlm: fix deadlock when dispatch assert master
  membarrier: clean up selftest
  vmscan: fix sane_reclaim helper for legacy memcg
  lib/iommu-common.c: do not try to deref a null iommu->lazy_flush() pointer when n < pool->hint
  x86, efi, kasan: #undef memset/memcpy/memmove per arch
  mm: migrate: hugetlb: putback destination hugepage to active list
  mm, dax: VMA with vm_ops->pfn_mkwrite wants to be write-notified
  userfaultfd: register uapi generic syscall (aarch64)
  userfaultfd: selftest: don't error out if pthread_mutex_t isn't identical
  userfaultfd: selftest: return an error if BOUNCE_VERIFY fails
  userfaultfd: selftest: avoid my_bcmp false positives with powerpc
  userfaultfd: selftest: only warn if __NR_userfaultfd is undefined
  userfaultfd: selftest: headers fixup
  userfaultfd: selftests: vm: pick up sanitized kernel headers
  userfaultfd: revert "userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key"
parents d5fc4f55 012572d4

arch/x86/include/asm/efi.h

+10 −0
Original line number Diff line number Diff line
@@ -86,6 +86,16 @@ extern u64 asmlinkage efi_call(void *fp, ...); 
extern void __iomem *__init efi_ioremap(unsigned long addr, unsigned long size,

					u32 type, u64 attribute);



/*

 * CONFIG_KASAN may redefine memset to __memset.  __memset function is present

 * only in kernel binary.  Since the EFI stub linked into a separate binary it

 * doesn't have __memset().  So we should use standard memset from

 * arch/x86/boot/compressed/string.c.  The same applies to memcpy and memmove.

 */

#undef memcpy

#undef memset

#undef memmove



#endif /* CONFIG_X86_32 */



extern struct efi_scratch efi_scratch;

drivers/firmware/efi/libstub/efistub.h

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ 
/* error code which can't be mistaken for valid address */

#define EFI_ERROR	(~0UL)



#undef memcpy

#undef memset

#undef memmove



void efi_char16_printk(efi_system_table_t *, efi_char16_t *);



efi_status_t efi_open_volume(efi_system_table_t *sys_table_arg, void *__image,

fs/ocfs2/dlm/dlmmaster.c

+6 −3
Original line number Diff line number Diff line
@@ -1439,6 +1439,7 @@ int dlm_master_request_handler(struct o2net_msg *msg, u32 len, void *data, 
	int found, ret;

	int set_maybe;

	int dispatch_assert = 0;

	int dispatched = 0;



	if (!dlm_grab(dlm))

		return DLM_MASTER_RESP_NO;
@@ -1658,14 +1659,17 @@ send_response: 
			mlog(ML_ERROR, "failed to dispatch assert master work\n");

			response = DLM_MASTER_RESP_ERROR;

			dlm_lockres_put(res);

		} else

		} else {

			dispatched = 1;

			__dlm_lockres_grab_inflight_worker(dlm, res);

		}

		spin_unlock(&res->spinlock);

	} else {

		if (res)

			dlm_lockres_put(res);

	}



	if (!dispatched)

		dlm_put(dlm);

	return response;

}
@@ -2090,7 +2094,6 @@ int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, 




	/* queue up work for dlm_assert_master_worker */

	dlm_grab(dlm);  /* get an extra ref for the work item */

	dlm_init_work_item(dlm, item, dlm_assert_master_worker, NULL);

	item->u.am.lockres = res; /* already have a ref */

	/* can optionally ignore node numbers higher than this node */

fs/ocfs2/dlm/dlmrecovery.c

+6 −2
Original line number Diff line number Diff line
@@ -1694,6 +1694,7 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data, 
	unsigned int hash;

	int master = DLM_LOCK_RES_OWNER_UNKNOWN;

	u32 flags = DLM_ASSERT_MASTER_REQUERY;

	int dispatched = 0;



	if (!dlm_grab(dlm)) {

		/* since the domain has gone away on this
@@ -1719,8 +1720,10 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data, 
				dlm_put(dlm);

				/* sender will take care of this and retry */

				return ret;

			} else

			} else {

				dispatched = 1;

				__dlm_lockres_grab_inflight_worker(dlm, res);

			}

			spin_unlock(&res->spinlock);

		} else {

			/* put.. incase we are not the master */
@@ -1730,6 +1733,7 @@ int dlm_master_requery_handler(struct o2net_msg *msg, u32 len, void *data, 
	}

	spin_unlock(&dlm->spinlock);



	if (!dispatched)

		dlm_put(dlm);

	return master;

}

fs/userfaultfd.c

+4 −4
Original line number Diff line number Diff line
@@ -467,8 +467,8 @@ static int userfaultfd_release(struct inode *inode, struct file *file) 
	 * the fault_*wqh.

	 */

	spin_lock(&ctx->fault_pending_wqh.lock);

	__wake_up_locked_key(&ctx->fault_pending_wqh, TASK_NORMAL, 0, &range);

	__wake_up_locked_key(&ctx->fault_wqh, TASK_NORMAL, 0, &range);

	__wake_up_locked_key(&ctx->fault_pending_wqh, TASK_NORMAL, &range);

	__wake_up_locked_key(&ctx->fault_wqh, TASK_NORMAL, &range);

	spin_unlock(&ctx->fault_pending_wqh.lock);



	wake_up_poll(&ctx->fd_wqh, POLLHUP);
@@ -650,10 +650,10 @@ static void __wake_userfault(struct userfaultfd_ctx *ctx, 
	spin_lock(&ctx->fault_pending_wqh.lock);

	/* wake all in the range and autoremove */

	if (waitqueue_active(&ctx->fault_pending_wqh))

		__wake_up_locked_key(&ctx->fault_pending_wqh, TASK_NORMAL, 0,

		__wake_up_locked_key(&ctx->fault_pending_wqh, TASK_NORMAL,

				     range);

	if (waitqueue_active(&ctx->fault_wqh))

		__wake_up_locked_key(&ctx->fault_wqh, TASK_NORMAL, 0, range);

		__wake_up_locked_key(&ctx->fault_wqh, TASK_NORMAL, range);

	spin_unlock(&ctx->fault_pending_wqh.lock);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE