From mboxrd@z Thu Jan 1 00:00:00 1970 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 5CF52238159 for ; Mon, 13 Jul 2026 01:04:03 +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=1783904646; cv=none; b=Zj9BQ6tCwXMgCWTLfX9yXWyOK57uGHiQIn7gMTBP9GPu8b1Liw5F/Cjy6eutmzqeFs26TaKdVohy5rAtWvb0dm8BBZpa76KTD3PYyFSHIpgKsBQli5QKGOVGKt3HWdaLxKemDklAUcNhyyRwbSTs80zzsNjUQFm953TY5SAyiNc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783904646; c=relaxed/simple; bh=8W95h9pioucOk6mrrNHL0UllepTkkotEJTZXjD/sveQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UQfWz+FTS9WiGVNMVBk7bEqnrqiD+CGMnXDvF28n356gKpFvAV0fW7qDDyBbLGsGz84kyjpGAHGIt/s5sLpxDVLs4ia2cYypEWlltZnHHLQDxSUtqAFv2uZgsk1dF6gBFQllaEgxAnG/0iwXi+Fjh2w2s+ocpDNxFO3S8fGtbU4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kD5I4P3r; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kD5I4P3r" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-2ca64c3ce5fso29552025ad.3 for ; Sun, 12 Jul 2026 18:04:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783904642; x=1784509442; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=rpV1zK6+w2gomPz2kgJsMZZImbuU17m/e3kCCv0XAXs=; b=kD5I4P3rh4PO2aZvQoKIa3PHRjDzWCA0wAJpLokbdZjmWpB8V3gOmYV17tNeMq2bpL mLxQSRArAKNeWPxygg4AvotBdRAM5iNwvpjho0krWmwc8oJHl46LbzzcYvspVS/hK8vf YaPbnvoU1iBCyc3XuZO/Z+MkZxj4QSYeo8H4k4RSU0urpvfF89EcbSCT8RA+uxn0J6JN ZmxX7zQgn/pH2787W1JqbRHdofeFrxvvIyK1amc8OMqCe2Hl4j2QD0ockYhYosXKGf9P 1ZBiEO0De/evJdxNtL1p2TfGQQXFbcQ0H5ZrTqj7Diy1xSMis4EhAVdnp34R2FH3XDS+ 2xjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783904642; x=1784509442; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=rpV1zK6+w2gomPz2kgJsMZZImbuU17m/e3kCCv0XAXs=; b=rLHiUIIFXTcOc5aqz6x+H87wI6kcYXIX8qEe8dnoyaVhBczwv9WizCoC798ZeWq8Wa tLFfNQWIILsf++24xslc4jd2f5veXcV6JjBLsSw4CgtlzSL7LiMzUCCxycyPGQQ0RXzt 9k35OaOQFEMSrU4hnH5O1hqrtwmP85Wn3aAYpLUV5KVSTtNlC58cjegDUvzu0oK2VfTe hTdWaEicMSM9Fz3Qucq/iYNWPKpx0NMljvpl0RU//8wbRriw3C0KKIUYl/mImiWm0Srj 2PAoKa8Hna/OryAgcMQI5BFKBGQ9aFmm8+2HObG6DfJWYd/Bc5PbIzhUDgidVNKhV7Ax eR9w== X-Forwarded-Encrypted: i=1; AHgh+Rrk02Y0r1qOoBQs5PYa/bk34s38FpvzrbwQ1cJ7uCVHkwfma2kEUtHPfgAig6R9lopHm0G5H+XjUoch7CY=@vger.kernel.org X-Gm-Message-State: AOJu0YwETRe+N/UxRSL2Y7B2+GdQDNGmdqcqEQfHVX2EwKJN+Hd1CMml uGxWStjsZNhxCgLfD97GvJcwZEoH1idFlYltcZP+idztW8NWTXwwVAMg X-Gm-Gg: AfdE7ckYDvj38FdDWv73Fj7ywCnfCMyeQQKvVUq/C/8T0s7bdJBCFdvqk6rYCLGH46b U1htAzrvTUjvxvIZb04saQkP0WWofqHojUA+xfcv1XtZUK0Nh2Q/GHp/nduSiVblMd3Ge++ir5G MqvPllDbKAFeJCZ5kCm1mP083q2+tr6AsXNKiGmUTiTcCix95JXDJYRq3i78Ho60l9kHt9KHyjO T3i9X8E6pkHIbP3bMNAdCQpLybzc2QetQtA2orkNpf5t24alydTaHLx7rz9j8hpjoCKrL48Bf39 oLK8fWn4+nel4s5vNQQU2AtzdRKfYg07Ayz6ze/Xxeh3q/4/cuQ1lQokalth7uwVG4HIljizmmk T3KqFSwGa0fri/7NtZJLT8IFb+t/t90Pbi8uNQ2JFx9rsg8cYI3gfJKL1VjGlCo+rlUhsrzfZxd uolwfrobJ0ucw= X-Received: by 2002:a17:902:e806:b0:2ca:619f:9733 with SMTP id d9443c01a7336-2ce9eac58f9mr71900625ad.17.1783904642652; Sun, 12 Jul 2026 18:04:02 -0700 (PDT) Received: from localhost ([121.250.214.124]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9bdb746sm89165375ad.7.2026.07.12.18.04.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 18:04:02 -0700 (PDT) From: Inochi Amaoto To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Anup Patel , Atish Patra , Paolo Bonzini , Shuah Khan , Andy Chiu , Charlie Jenkins , Deepak Gupta , Thomas Huth , Inochi Amaoto , Sergey Matyukevich Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Yixun Lan , Longbin Li , Quan Zhou Subject: [PATCH v6 5/8] RISC-V: KVM: Handle software-check exits for VCPU Date: Mon, 13 Jul 2026 09:02:58 +0800 Message-ID: <20260713010302.303278-6-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260713010302.303278-1-inochiama@gmail.com> References: <20260713010302.303278-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The extension Zicfiss/Zicfilp introduces a software-check exception to the privilege architecture. Delegate this exception to VS mode when vCPU enable Zicfiss/Zicfilp so the CFI violations in VU/VS could be reported. Assisted-by: YuanSheng:claude-4.7-opus Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Inochi Amaoto --- arch/riscv/include/asm/csr.h | 1 + arch/riscv/kvm/vcpu_exit.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 31b8988f4488..224af9facf1f 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -117,6 +117,7 @@ #define EXC_INST_PAGE_FAULT 12 #define EXC_LOAD_PAGE_FAULT 13 #define EXC_STORE_PAGE_FAULT 15 +#define EXC_SOFTWARE_CHECK 18 #define EXC_INST_GUEST_PAGE_FAULT 20 #define EXC_LOAD_GUEST_PAGE_FAULT 21 #define EXC_VIRTUAL_INST_FAULT 22 diff --git a/arch/riscv/kvm/vcpu_exit.c b/arch/riscv/kvm/vcpu_exit.c index 0bb0c51e3c89..12eebeabdf14 100644 --- a/arch/riscv/kvm/vcpu_exit.c +++ b/arch/riscv/kvm/vcpu_exit.c @@ -243,6 +243,10 @@ int kvm_riscv_vcpu_exit(struct kvm_vcpu *vcpu, struct kvm_run *run, run->exit_reason = KVM_EXIT_DEBUG; ret = 0; break; + case EXC_SOFTWARE_CHECK: + if (vcpu->arch.cfg.henvcfg & (ENVCFG_LPE | ENVCFG_SSE)) + ret = vcpu_redirect(vcpu, trap); + break; default: break; } -- 2.55.0