From patchwork Mon Mar 17 07:41:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Atish Patra X-Patchwork-Id: 14018758 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (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 3066621ABAA for ; Mon, 17 Mar 2025 07:41:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742197314; cv=none; b=MBKzLtTyMFGcVYF201VNRaS6mpNnE3jma2iXBx9d05jCd+8YKYiPiikfbdz3KfnpuHZ6NIuUeEQrQVAPnmXLKNKd7pj5NaloVWWtMejl8N/eOYpwoCVt3nAOIqrjRPMcTTsrytHqLH73iLxzH5oguzrXfzYeGWjCxNTDhvosP3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742197314; c=relaxed/simple; bh=RQFGRpmfHe1Gotmrdp301aRcZTQMMzE6gQFT+sG+UEE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=unTlHOY5PyiTdP8zA5ipM7mC2rgdQbFcsqo8ce/8yqw72+jZIe9IACC52jTtPBvoFN+cGti29hx/Sx/yJZMqomxWMTvgRTbV92Mt8+c3HgmOQW8H0Z6pLWZPcZZ1tEQq3td0Cm75k4PcROgtIvpS7wI3yBYAocEubxGfntUDdL4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=zlmta6fc; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="zlmta6fc" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2235189adaeso66970085ad.0 for ; Mon, 17 Mar 2025 00:41:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1742197310; x=1742802110; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=BWPfpt8VAXB3af6uH6FGAR6gVvoFFmvCHpj+nN5EIrc=; b=zlmta6fcMHUePYSA45XaE6ZD9MqfUT8Z5a84Pou6NKWwZ7cZmwDYFqdC6czUT99q4Y BhyKluvXXBe5kWggqtzp3hrwUs784nR+Ms0scXRW3QAT9wSrV93XY2AXncEsZ+kFyY0t SgAAugVcoP6UGGGHCJnkwhpQVkGePwuRgjglXgAPpJ4iM7bsI9BsTts2f/h1CRBZbp2p J7FrMNiODH6TELuunF05YoqqW71PHQ7aGxCJmYo6kTWW3fkdUU3b4EAE3M9DMUf6ILUI 44gWywqZfEY82p8XJXPlS/X40sZdOBKPHvXBx3HBnaSpCjfri2t94eEywD9LQEqoiCep 8lgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742197310; x=1742802110; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BWPfpt8VAXB3af6uH6FGAR6gVvoFFmvCHpj+nN5EIrc=; b=ix/IUL5IwKfLsGrV2b8INbvAqcq6HbZI2XF6/Ki7AT2I1dyVjsUaTvLXbW/4vwwxMO +bPoDDADjZ8Upmp2BIE3SXIbGUM7eXaeqy9PX3mAwKtSv69giY1PYByI8sakVI/HhYch CY2UYtic3N2dvWf0zw8IH7cI8plx8/KwY0N8tT0DggYIyjgolyFn6IN6wextBaWLRdtr lFLkE5qFxXE1oGH64TqTSSB32CGGXo0YhlkicitQcj5jO2fUa52SUGh6JF56wVB3Hmd9 k+ClZPrpD+nn3BYc476xRqQnnG33JpXMjNvCnAHux3762PkV8iB+3QwoBIHkX1nOoeiV wC+Q== X-Forwarded-Encrypted: i=1; AJvYcCUN04xlK4YcB7q7a78NFifUEbEgSHP5pGuU4VVX0IuiOJ/jMrgEQFcrkTQhNjtGkzCQ9k0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+HVI5o/TKwXnomC32n+XZxZZ+UFfzXJzAHiNd282dZ3gFxveC UxAtf8TcaucjGMkBO6Li7oUX55WKB/RRSa95Vu3gLQMAcGecQ7ZMdAdZHHvm6r8= X-Gm-Gg: ASbGnctVV2SGf8JrUDASg2ekgwABADssI/1bjede+SFxiZRAVnaOZwGXm1uXg0JyvjQ VuR5XabcZrKSAXM01tDjm5B1PL1AfzsM25VsnAdbCpGqGFXHtp6bvNnUVNdWojHDmIWyzSmVVYS zliyQGleVHmy1UpFWTNaHUz6Trdis5UDD8fEC6jkODYru+klxHXskGHZkck3Gf6rSuQS0iDPoo1 oZsEKlDmQscftJgTN2G7UuSktgzv38PxA+0dKnk3mq+anylXb4gYlh5KVJp03/fD4zyuSnlCK0+ 5mjA0hkNkxWDkIaor+UixNzeC3tvxfaHmeHS4dr84nKMtu/xgC24LNuBjw== X-Google-Smtp-Source: AGHT+IFs7Rf6sPUtecH+s3HQAFvCcmzDdiTgKOaVqa0qXb6f/a/R2HaloGPq4WHogQPMfmpEkOl+tA== X-Received: by 2002:a17:902:d48b:b0:215:b1e3:c051 with SMTP id d9443c01a7336-225e16b0fa3mr112060465ad.11.1742197310458; Mon, 17 Mar 2025 00:41:50 -0700 (PDT) Received: from atishp.ba.rivosinc.com ([64.71.180.162]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-225c6bd4dabsm68863435ad.233.2025.03.17.00.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Mar 2025 00:41:50 -0700 (PDT) From: Atish Patra Date: Mon, 17 Mar 2025 00:41:44 -0700 Subject: [PATCH] RISC-V: KVM: Teardown riscv specific bits after kvm_exit Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250317-kvm_exit_fix-v1-1-aa5240c5dbd2@rivosinc.com> X-B4-Tracking: v=1; b=H4sIADfS12cC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1MDY0Mz3eyy3PjUisyS+LTMCl1z8+QUAzNjoxRzEwMloJaColSgMNi46Nj aWgCyH6qWXgAAAA== X-Change-ID: 20250316-kvm_exit_fix-77cd0632d740 To: Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Alexandre Ghiti , Andrew Jones Cc: Anup Patel , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Atish Patra X-Mailer: b4 0.15-dev-42535 During a module removal, kvm_exit invokes arch specific disable call which disables AIA. However, we invoke aia_exit before kvm_exit resulting in the following warning. KVM kernel module can't be inserted afterwards due to inconsistent state of IRQ. [25469.031389] percpu IRQ 31 still enabled on CPU0! [25469.031732] WARNING: CPU: 3 PID: 943 at kernel/irq/manage.c:2476 __free_percpu_irq+0xa2/0x150 [25469.031804] Modules linked in: kvm(-) [25469.031848] CPU: 3 UID: 0 PID: 943 Comm: rmmod Not tainted 6.14.0-rc5-06947-g91c763118f47-dirty #2 [25469.031905] Hardware name: riscv-virtio,qemu (DT) [25469.031928] epc : __free_percpu_irq+0xa2/0x150 [25469.031976] ra : __free_percpu_irq+0xa2/0x150 [25469.032197] epc : ffffffff8007db1e ra : ffffffff8007db1e sp : ff2000000088bd50 [25469.032241] gp : ffffffff8131cef8 tp : ff60000080b96400 t0 : ff2000000088baf8 [25469.032285] t1 : fffffffffffffffc t2 : 5249207570637265 s0 : ff2000000088bd90 [25469.032329] s1 : ff60000098b21080 a0 : 037d527a15eb4f00 a1 : 037d527a15eb4f00 [25469.032372] a2 : 0000000000000023 a3 : 0000000000000001 a4 : ffffffff8122dbf8 [25469.032410] a5 : 0000000000000fff a6 : 0000000000000000 a7 : ffffffff8122dc10 [25469.032448] s2 : ff60000080c22eb0 s3 : 0000000200000022 s4 : 000000000000001f [25469.032488] s5 : ff60000080c22e00 s6 : ffffffff80c351c0 s7 : 0000000000000000 [25469.032582] s8 : 0000000000000003 s9 : 000055556b7fb490 s10: 00007ffff0e12fa0 [25469.032621] s11: 00007ffff0e13e9a t3 : ffffffff81354ac7 t4 : ffffffff81354ac7 [25469.032664] t5 : ffffffff81354ac8 t6 : ffffffff81354ac7 [25469.032698] status: 0000000200000100 badaddr: ffffffff8007db1e cause: 0000000000000003 [25469.032738] [] __free_percpu_irq+0xa2/0x150 [25469.032797] [] free_percpu_irq+0x30/0x5e [25469.032856] [] kvm_riscv_aia_exit+0x40/0x42 [kvm] [25469.033947] [] cleanup_module+0x10/0x32 [kvm] [25469.035300] [] __riscv_sys_delete_module+0x18e/0x1fc [25469.035374] [] syscall_handler+0x3a/0x46 [25469.035456] [] do_trap_ecall_u+0x72/0x134 [25469.035536] [] handle_exception+0x148/0x156 Invoke aia_exit and other arch specific cleanup functions after kvm_exit so that disable gets a chance to be called first before exit. Fixes: 54e43320c2ba ("RISC-V: KVM: Initial skeletal support for AIA") Signed-off-by: Atish Patra Reviewed-by: Sean Christopherson --- arch/riscv/kvm/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- base-commit: 4701f33a10702d5fc577c32434eb62adde0a1ae1 change-id: 20250316-kvm_exit_fix-77cd0632d740 -- Regards, Atish patra diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c index 1fa8be5ee509..4b24705dc63a 100644 --- a/arch/riscv/kvm/main.c +++ b/arch/riscv/kvm/main.c @@ -172,8 +172,8 @@ module_init(riscv_kvm_init); static void __exit riscv_kvm_exit(void) { - kvm_riscv_teardown(); - kvm_exit(); + + kvm_riscv_teardown(); } module_exit(riscv_kvm_exit);