Skip to content

vhost_task: Fix a bug where KVM wakes an exited task

Sean Christopherson kvm lkml netdev virtualization 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 16 repliesIn review
  2. v13 patches 7 repliesSuperseded

Changes in v2 from the cover letter

- Drop the "safe" postfix variant and make the "default" vhost_task_wake() safe. [Michael].
- Use vhost_task_wake() and __vhost_task_wake() for the public APIs, and vhost_task_wake_up_process() for the local helper. [Michael]
- Drag the signalas back from their Spanish holiday. [Sebastian]

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/3vhost_task: Don't wake KVM x86's recovery thread if vhost task was killeddrivers/vhost/vhost.c include/linux/sched/vhost_task.h kernel/vhost_task.c+46 -90 replies
2/3vhost_task: Allow caller to omit handle_sigkill() callbackkernel/vhost_task.c+9 -10 replies
3/3KVM: x86/mmu: Don't register a sigkill callback for NX hugepage recovery tasksarch/x86/kvm/mmu/mmu.c+1 -60 replies

Reviews trailers per patch

None of the 3 patches has a Reviewed-by or Acked-by.

PatchSebastian Andrzej SiewiorSean ChristophersonLei Yang
SeriesT-b T-b T-b
1/3Debugged-by
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 0/3] vhost_task: Fix a bug where KVM wakes an exited task

Michael,

Do you want to take this through the vhost tree? It technically fixes a KVM bug, but this obviously touches far more vhost code than KVM code, and the patch that needs to go into 6.17 doesn't touch KVM at all.

Fix a bug where KVM attempts to wake a vhost task that has already exited in response to a fatal signal, and tack on a few cleanups to harden against introducing similar bugs in the future.

The issue is firmly a KVM problem, but I opted to fix the bug by making vhost_task_wake() safe against an exited task as doing so is far simpler and cleaner than implementing the same functionality in KVM, and I suspect that if there are other users of vhost_tasks in the future, then there's a good chance they will want/expect vhost_task to handle that detail.

Note, this only started causing problems when commit 56180dd20c19 ("futex:
Use RCU-based per-CPU reference counting instead of rcuref_t") landed, so the explosions are "new" in 6.17, but the bug has existed since KVM switched to vhost_task back in 6.13.

v2:
- Drop the "safe" postfix variant and make the "default" vhost_task_wake() safe. [Michael].
- Use vhost_task_wake() and __vhost_task_wake() for the public APIs, and vhost_task_wake_up_process() for the local helper. [Michael]
- Drag the signalas back from their Spanish holiday. [Sebastian]

v1: https://lore.kernel.org/all/[email protected]

Sean Christopherson (3):
vhost_task: Don't wake KVM x86's recovery thread if vhost task was
killed
vhost_task: Allow caller to omit handle_sigkill() callback
KVM: x86/mmu: Don't register a sigkill callback for NX hugepage
recovery tasks

 arch/x86/kvm/mmu/mmu.c           |  7 +---
 drivers/vhost/vhost.c            |  2 +-
 include/linux/sched/vhost_task.h |  1 +
 kernel/vhost_task.c              | 62 +++++++++++++++++++++++++++-----
 4 files changed, 56 insertions(+), 16 deletions(-)

base-commit: 1b237f190eb3d36f52dffe07a40b5eb210280e00

Signature · 1 line
2.51.0.268.g9569e192d0-goog