From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 478911D0E28 for ; Fri, 25 Oct 2024 22:12:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729894346; cv=none; b=NUYq7IIFuN/16CWOBhWdcZUsXp0e9jUmgIgy3/uz0G8dQ538rY1KQZWwgFbs0AskZMT7R37XHqearq5k+yd3iWVtZRcvCmVnJ4JCZr4Q+G+OB4kT4R6TSXYsCl/5AmWA0Tg+GvR1EjNJmltNOabNKywtDK3osWN5b8uCDQcajrs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729894346; c=relaxed/simple; bh=NK5OZSsxHrxv1wlh6RU3G8N57LyHfd3rgn7LtmDFZgs=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=UwzmSTMFHekVYK4EazI+YZxkU1PNugLXeKP0nYV8X73eL0g2yHOoP8kf0IOsbd+iLLii7URYv5UjougH3boyg3W7eYRFMZgb/VUMDik2jYjvV/btgJTiCQKLpth3oAMEMbHzXN1soOiqx0k1+d31vNz+xmzP13xEW7nwL4gyqxA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--rananta.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dV5SaGez; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--rananta.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dV5SaGez" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e2e3321aae0so4503053276.1 for ; Fri, 25 Oct 2024 15:12:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729894343; x=1730499143; darn=lists.linux.dev; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=kAitD5UlZ526DH4CXulhVwZM1+TjXuj2ZSzY1GKH9CI=; b=dV5SaGezvZzq7op+eiUEQ1RP8JT/AAThZ1h1knF6kzmvCvF9MnJhVQ9P3hFeoZnGyp klET525YOASd9dI+sW4Z99oME/zjX8WHYkCGtaWXlO9XuPcw1gOhWDDdoztg+jxszG9f F15NvYyIqMIWuYpp7fzQYdDafBvf2xtWpYdIfO86eo5Xr6MIe6SEQai52cd8ofqCGtlV YQkiQ7rCRvNw/1H1JuyqdNozoqrtZ9xQeLhMcmOX+z9O1oFU/T6PMkOkO8ZdvFIJIosQ 7QcgllKZerdup2voeFfPRv1FPaWYICpRwMWd2pACmL+hAz4Uv+k9E8SQWi5m/Y4ZdXVO ilzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729894343; x=1730499143; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=kAitD5UlZ526DH4CXulhVwZM1+TjXuj2ZSzY1GKH9CI=; b=LelfrHc2mba9mFTjlIr1gtgUMNqVA+/jqSti5S4Lrc3zuF8ctS5C9MVEVAoIy5rD9k K3zm+Gm9vcR0Z3zUVc0ayEADgWTZ1hiuiRaR3O6CRRnsSAun19cCzsD56Yqn2uZ4J1MK ELdejiR7F9NlElTPfIuPoPj5TxHtURAeRTnd64lQ+bAeUk1x8Ty7Uut+euSH0jEWFVy0 PV0VDTIKOjtKbCnnGtlkxUhx3lGi8Tpe+tAb+gg2Y5VxoXPv2Ahon3qcMDnmB3+0HfS2 3+pmdLznMqRmbaXplcxRedj5nOtMCdoeAM+MGambPc1xYmirISOzZlvVefh0MShZqOiN hvaA== X-Forwarded-Encrypted: i=1; AJvYcCXa5LuYTQ159VZHJ0F6z7YCOIc4sZbdSqq1bQkoEf/nqcZS/5afYGh6zAlqKX6i1111yTL0w9w=@lists.linux.dev X-Gm-Message-State: AOJu0YyVS4/nm+PQiSv3ftzDcSSgmncyB3/4fAkg39D/knQVCZdT5mn8 AngfCIVpmKjJGLS9CU1u3OXIevf2sL1mWrcMiSC8cJU6Mb8mWzi+D5ZCua1+l8LuKYXV+w0Z+fU VqXY8pQ== X-Google-Smtp-Source: AGHT+IG+6UAmoj1XD96N3OA7Nf/oOruad1eDYvy56vmbEa612keZSXmPriH5DCYyGrnCxORY2rVIPeM7z/tx X-Received: from rananta-linux.c.googlers.com ([fda3:e722:ac3:cc00:11b:3898:ac11:fac1]) (user=rananta job=sendgmr) by 2002:a25:ec0c:0:b0:e2b:d389:b35c with SMTP id 3f1490d57ef6-e3087bfc151mr497276.8.1729894343080; Fri, 25 Oct 2024 15:12:23 -0700 (PDT) Date: Fri, 25 Oct 2024 22:12:20 +0000 Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Message-ID: <20241025221220.2985227-1-rananta@google.com> Subject: [PATCH] KVM: arm64: Mark the VM as dead for failed initializations From: Raghavendra Rao Ananta To: Oliver Upton , Marc Zyngier Cc: Raghavendra Rao Anata , linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, stable@vger.kernel.org, syzbot Content-Type: text/plain; charset="UTF-8" Syzbot hit the following WARN_ON() in kvm_timer_update_irq(): WARNING: CPU: 0 PID: 3281 at arch/arm64/kvm/arch_timer.c:459 kvm_timer_update_irq+0x21c/0x394 Call trace: kvm_timer_update_irq+0x21c/0x394 arch/arm64/kvm/arch_timer.c:459 kvm_timer_vcpu_reset+0x158/0x684 arch/arm64/kvm/arch_timer.c:968 kvm_reset_vcpu+0x3b4/0x560 arch/arm64/kvm/reset.c:264 kvm_vcpu_set_target arch/arm64/kvm/arm.c:1553 [inline] kvm_arch_vcpu_ioctl_vcpu_init arch/arm64/kvm/arm.c:1573 [inline] kvm_arch_vcpu_ioctl+0x112c/0x1b3c arch/arm64/kvm/arm.c:1695 kvm_vcpu_ioctl+0x4ec/0xf74 virt/kvm/kvm_main.c:4658 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __arm64_sys_ioctl+0x108/0x184 fs/ioctl.c:893 __invoke_syscall arch/arm64/kernel/syscall.c:35 [inline] invoke_syscall+0x78/0x1b8 arch/arm64/kernel/syscall.c:49 el0_svc_common+0xe8/0x1b0 arch/arm64/kernel/syscall.c:132 do_el0_svc+0x40/0x50 arch/arm64/kernel/syscall.c:151 el0_svc+0x54/0x14c arch/arm64/kernel/entry-common.c:712 el0t_64_sync_handler+0x84/0xfc arch/arm64/kernel/entry-common.c:730 el0t_64_sync+0x190/0x194 arch/arm64/kernel/entry.S:598 The sequence that led to the report is when KVM_ARM_VCPU_INIT ioctl is invoked after a failed first KVM_RUN. In a general sense though, since kvm_arch_vcpu_run_pid_change() doesn't tear down any of the past initiatializations, it's possible that the VM's state could be left half-baked. Any upcoming ioctls could behave erroneously because of this. Since these late vCPU initializations is past the point of attributing the failures to any ioctl, instead of tearing down each of the previous setups, simply mark the VM as dead, gving an opportunity for the userspace to close and try again. Cc: Reported-by: syzbot Suggested-by: Oliver Upton Signed-off-by: Raghavendra Rao Ananta --- arch/arm64/kvm/arm.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index a0d01c46e4084..ae3551bc98aeb 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -821,12 +821,12 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) */ ret = kvm_vgic_map_resources(kvm); if (ret) - return ret; + goto out_err; } ret = kvm_finalize_sys_regs(vcpu); if (ret) - return ret; + goto out_err; /* * This needs to happen after any restriction has been applied @@ -836,16 +836,16 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) ret = kvm_timer_enable(vcpu); if (ret) - return ret; + goto out_err; ret = kvm_arm_pmu_v3_enable(vcpu); if (ret) - return ret; + goto out_err; if (is_protected_kvm_enabled()) { ret = pkvm_create_hyp_vm(kvm); if (ret) - return ret; + goto out_err; } if (!irqchip_in_kernel(kvm)) { @@ -869,6 +869,10 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) mutex_unlock(&kvm->arch.config_lock); return ret; + +out_err: + kvm_vm_dead(kvm); + return ret; } bool kvm_arch_intc_initialized(struct kvm *kvm) -- 2.47.0.163.g1226f6d8fa-goog