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

Merge tag 'for-linus-rseq' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull rseq fixes from Paolo Bonzini:
 "A fix for a bug with restartable sequences and KVM.

  KVM's handling of TIF_NOTIFY_RESUME, e.g. for task migration, clears
  the flag without informing rseq and leads to stale data in userspace's
  rseq struct"

* tag 'for-linus-rseq' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: selftests: Remove __NR_userfaultfd syscall fallback
  KVM: selftests: Add a test for KVM_RUN+rseq to detect task migration bugs
  tools: Move x86 syscall number fallbacks to .../uapi/
  entry: rseq: Call rseq_handle_notify_resume() in tracehook_notify_resume()
  KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM guest
parents 9bc62afe 2da4a235

arch/arm/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -628,7 +628,6 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall) 
				uprobe_notify_resume(regs);

			} else {

				tracehook_notify_resume(regs);

				rseq_handle_notify_resume(NULL, regs);

			}

		}

		local_irq_disable();

arch/arm64/kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -940,10 +940,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_flags) 
			if (thread_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))

				do_signal(regs);



			if (thread_flags & _TIF_NOTIFY_RESUME) {

			if (thread_flags & _TIF_NOTIFY_RESUME)

				tracehook_notify_resume(regs);

				rseq_handle_notify_resume(NULL, regs);

			}



			if (thread_flags & _TIF_FOREIGN_FPSTATE)

				fpsimd_restore_current_state();

arch/csky/kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -260,8 +260,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, 
	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))

		do_signal(regs);



	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

	if (thread_info_flags & _TIF_NOTIFY_RESUME)

		tracehook_notify_resume(regs);

		rseq_handle_notify_resume(NULL, regs);

	}

}

arch/mips/kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -906,10 +906,8 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, void *unused, 
	if (thread_info_flags & (_TIF_SIGPENDING | _TIF_NOTIFY_SIGNAL))

		do_signal(regs);



	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

	if (thread_info_flags & _TIF_NOTIFY_RESUME)

		tracehook_notify_resume(regs);

		rseq_handle_notify_resume(NULL, regs);

	}



	user_enter();

}

arch/powerpc/kernel/signal.c

+1 −3
Original line number Diff line number Diff line
@@ -293,10 +293,8 @@ void do_notify_resume(struct pt_regs *regs, unsigned long thread_info_flags) 
		do_signal(current);

	}



	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

	if (thread_info_flags & _TIF_NOTIFY_RESUME)

		tracehook_notify_resume(regs);

		rseq_handle_notify_resume(NULL, regs);

	}

}



static unsigned long get_tm_stackpointer(struct task_struct *tsk)