Commit 8dcdfb70 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

Merge branches 'doc.2019.10.29a', 'fixes.2019.10.30a', 'nohz.2019.10.28a',... 

Merge branches 'doc.2019.10.29a', 'fixes.2019.10.30a', 'nohz.2019.10.28a', 'replace.2019.10.30a', 'torture.2019.10.05a' and 'lkmm.2019.10.05a' into HEAD

doc.2019.10.29a: RCU documentation updates.
fixes.2019.10.30a: RCU miscellaneous fixes.
nohz.2019.10.28a: RCU NO_HZ and NO_HZ_FULL updates.
replace.2019.10.30a: Replace rcu_swap_protected() with rcu_replace().
torture.2019.10.05a: RCU torture-test updates.

lkmm.2019.10.05a: Linux kernel memory model updates.
parents b1ec18ea 36b5dae6 dd7dafd1 a60a5746 67d64918 c58a8017

arch/x86/kvm/pmu.c

+2 −2
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ int kvm_vm_ioctl_set_pmu_event_filter(struct kvm *kvm, void __user *argp) 
	*filter = tmp;



	mutex_lock(&kvm->lock);

	rcu_swap_protected(kvm->arch.pmu_event_filter, filter,

	filter = rcu_replace_pointer(kvm->arch.pmu_event_filter, filter,

				     mutex_is_locked(&kvm->lock));

	mutex_unlock(&kvm->lock);

drivers/gpu/drm/i915/gem/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -1629,7 +1629,7 @@ replace: 
		i915_gem_context_set_user_engines(ctx);

	else

		i915_gem_context_clear_user_engines(ctx);

	rcu_swap_protected(ctx->engines, set.engines, 1);

	set.engines = rcu_replace_pointer(ctx->engines, set.engines, 1);

	mutex_unlock(&ctx->engines_mutex);



	call_rcu(&set.engines->rcu, free_engines_rcu);

drivers/scsi/scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void scsi_update_vpd_page(struct scsi_device *sdev, u8 page, 
		return;



	mutex_lock(&sdev->inquiry_mutex);

	rcu_swap_protected(*sdev_vpd_buf, vpd_buf,

	vpd_buf = rcu_replace_pointer(*sdev_vpd_buf, vpd_buf,

				      lockdep_is_held(&sdev->inquiry_mutex));

	mutex_unlock(&sdev->inquiry_mutex);

drivers/scsi/scsi_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -466,9 +466,9 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work) 
	sdev->request_queue = NULL;



	mutex_lock(&sdev->inquiry_mutex);

	rcu_swap_protected(sdev->vpd_pg80, vpd_pg80,

	vpd_pg80 = rcu_replace_pointer(sdev->vpd_pg80, vpd_pg80,

				       lockdep_is_held(&sdev->inquiry_mutex));

	rcu_swap_protected(sdev->vpd_pg83, vpd_pg83,

	vpd_pg83 = rcu_replace_pointer(sdev->vpd_pg83, vpd_pg83,

				       lockdep_is_held(&sdev->inquiry_mutex));

	mutex_unlock(&sdev->inquiry_mutex);

fs/afs/vl_list.c

+2 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ struct afs_vlserver_list *afs_extract_vlserver_list(struct afs_cell *cell, 
			struct afs_addr_list *old = addrs;



			write_lock(&server->lock);

			rcu_swap_protected(server->addresses, old,

			old = rcu_replace_pointer(server->addresses, old,

						  lockdep_is_held(&server->lock));

			write_unlock(&server->lock);

			afs_put_addrlist(old);

CRA Git | Maintained and supported by SUSTech CRA and CCSE