Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AD11516150 for ; Tue, 29 Sep 2026 11:40:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790682022; cv=none; b=H0R/q48bnGT6rOkqZew46huMJMh5wfsF2x9U+7pa/Y3WwPifRPJuM4iYvnTUeQG+KSgt4Kd4ibifI8LcoWbWKTVd9Idc+RX3eCbgMTDwrfKYSYAF4iPRzjhg6bqnXgvc0ePNc/Hga8xuAce3QEGXUcfAIGqS0bYdqVUw+yyxT14= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790682022; c=relaxed/simple; bh=7plrRveb5YLse633ihtqUv6BRK0mHEuZZzPdaNglhbU=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=H+Ih1JVzLxRRcE8WSbooY2lGutzQuIb1TEHoDXgzwX3lwvRtsDNxxj7Cli8oENPlE7k+iwqpHZzpg4w1ym1ZGetswvY+ivaI4sZVt8bDAGY/I3qB40h/2TNyffGtXIk00jrh7OkRgdtsxFa7QgXL45AKBQ2LKS1pWLvyynOo/Ow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uwRxvYJs; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uwRxvYJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5491D1F000FF; Tue, 29 Sep 2026 11:40:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790682019; bh=STi40NXHZaYRI2P1I+89w/DwHWxITwVI/Y7nRQ9D3aY=; h=Subject:To:Cc:From:Date; b=uwRxvYJs+K1PlxOBZCd0DosM+rH4P4qoaSF1m+aPvov3EAhjyGaNreI9v+1ARK6lQ VkJeUVnLx4uL5dIHw22tgVwtH2Fq73BaOkwaH7b0TwvvSn7mQ2bz+obVE5RnaUcCAU j57UmGOSXUloCKMm6Xs7YBORMVb3ZzK793UZ1HT0= Subject: FAILED: patch "[PATCH] RISC-V: KVM: Serialize IMSIC attributes with vCPU migration" failed to apply to 6.18-stable tree To: xb@ultrarisc.com,anup@brainfault.org Cc: From: Date: Tue, 29 Sep 2026 13:40:14 +0200 Message-ID: <2026092914-nifty-tackling-3b69@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 8ae12ccaec6ec74945d8c1ef39f2c1b8df779abc # git commit -s git send-email --to '' --in-reply-to '2026092914-nifty-tackling-3b69@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 8ae12ccaec6ec74945d8c1ef39f2c1b8df779abc Mon Sep 17 00:00:00 2001 From: Xie Bo Date: Mon, 10 Aug 2026 09:21:15 +0800 Subject: [PATCH] RISC-V: KVM: Serialize IMSIC attributes with vCPU migration KVM device ioctls are not serialized against KVM_RUN. As a result, kvm_riscv_aia_imsic_rw_attr() can snapshot the physical CPU and HGEI of an IMSIC VS-file before a concurrent vCPU migration releases it. The HGEI can then be allocated to another vCPU before imsic_vsfile_rw() uses the stale tuple. A GET or SET attribute may consequently access the new owner's interrupt file. Serialize the entire IMSIC attribute operation with the target vCPU mutex. This prevents the VS-file from being migrated and recycled until the attribute access completes. Acquire the mutex killably so that the device ioctl remains interruptible while waiting for KVM_RUN to finish. Fixes: db8b7e97d613 ("RISC-V: KVM: Add in-kernel virtualization of AIA IMSIC") Cc: stable@vger.kernel.org Signed-off-by: Xie Bo Reviewed-by: Anup Patel Link: https://lore.kernel.org/r/20260810-imsic-attr-race-v2-1-00ed95ad321e@ultrarisc.com Signed-off-by: Anup Patel diff --git a/arch/riscv/kvm/aia_imsic.c b/arch/riscv/kvm/aia_imsic.c index c1af23e79ae0..f17dc559a709 100644 --- a/arch/riscv/kvm/aia_imsic.c +++ b/arch/riscv/kvm/aia_imsic.c @@ -965,9 +965,14 @@ int kvm_riscv_aia_imsic_rw_attr(struct kvm *kvm, unsigned long type, if (!vcpu) return -ENODEV; + if (mutex_lock_killable(&vcpu->mutex)) + return -EINTR; + imsic = vcpu->arch.aia_context.imsic_state; - if (!imsic) - return -ENODEV; + if (!imsic) { + rc = -ENODEV; + goto out_unlock; + } isel = KVM_DEV_RISCV_AIA_IMSIC_GET_ISEL(type); read_lock_irqsave(&imsic->vsfile_lock, flags); @@ -991,6 +996,8 @@ int kvm_riscv_aia_imsic_rw_attr(struct kvm *kvm, unsigned long type, rc = imsic_vsfile_rw(vsfile_hgei, vsfile_cpu, imsic->nr_eix, isel, write, val); +out_unlock: + mutex_unlock(&vcpu->mutex); return rc; }