From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 DBAE4368263 for ; Wed, 1 Jul 2026 02:08:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782871710; cv=none; b=t9pAY2Q6LkpBTBqKczIWcARuXE3pBV9yzBAzAibVk6EOhuC9ZXCKSxSVCZDg+uPGXaOsDz/fBEOlsQH3vkXxB+VxLgQ8wroe90K4vw3yE8oLcMl8iuEKZRzNUuSK1H3X+IwOA/QvpAMT+UwYc3jw7YT3A61JUmr8sI4GhTTTYa4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782871710; c=relaxed/simple; bh=8W95h9pioucOk6mrrNHL0UllepTkkotEJTZXjD/sveQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r4ZMa/Bm8CXT3MicHH6UAkkk8+1rdWS6sVhD9t2EX4vxw8NIkwCBEephCrUvViUtkfH2By9bYUiOdrGQg7w7D/UUbpzDuUWMhPHNpIjOQ9bmouFuZcX2Y00VESP8XNMXZjAFzN/54epx4vrSPSfhlcg++fpbc+XQDfAH7oRVFSk= 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=Czgex0fM; arc=none smtp.client-ip=209.85.210.181 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="Czgex0fM" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-84536ecfc5bso125617b3a.2 for ; Tue, 30 Jun 2026 19:08:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782871708; x=1783476508; 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; bh=rpV1zK6+w2gomPz2kgJsMZZImbuU17m/e3kCCv0XAXs=; b=Czgex0fMMDOEe63je5QsPqiTlirekc244s5o1A7kCN5kdpMKziA1qS2KNdUAjMKpkJ 2ZXhR1BMLcC/GBn2Ci7J56xPADKnvw1a41vrlyW95zg9QZQUzEUA7+VW0huPZjYeCh8M Zbc5x0Ui3iiR9dzVZ/sTlaX/w3JYspse90ZWxLHDAgmKFSW8RmP/yDhC8s7vtaE2/kOJ P64x8ZsOXZWIWVLplNtkwtI+UNL2sAB/v7tT8TZferM0Ysxo7hMOeyEw2dBqcRRa29eS rNaQcvHfuH3yHswvJyXic7YdFs12apG2RjpJvvYUvMq6UMvtg4fd87y3TkIc/MVvtb/T RfNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782871708; x=1783476508; 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; bh=rpV1zK6+w2gomPz2kgJsMZZImbuU17m/e3kCCv0XAXs=; b=VtkJCM7ey1QWwiYLtU4zbh48TxQ5ZcCapCMk7FGGNAdK1DdOh3j/nupf82kYE1LrC7 SPP8cirr8PPfv/eVG8Jsk+hylXJl1x18GQfALOIQZjdJAn8FJw+NsgGYkGItcCh1Z8LA xxdKKG7Pth838nhitVFFwJ+7HYX0UIn1B39op9TeiLIfG7CQHwJPRpzMVsqpDn3AXFUE AsC1X8okuf4cPNhT9mNjBx/L+HhdQuqmvYSmHtXvNnY7Si/SwWlPK0NzyrkewUHqpjP7 fvOID4fnMKxxqctXFCByVJGRIF7y0ns+WGvmQHCRZB+j3OoqR0x6rNpziLAsVAbXo0BY P5vQ== X-Forwarded-Encrypted: i=1; AHgh+RqWFv5fwn11Ot/n97OE3Qr8y3lCGSu1G9ihWa364bg3602JMGokstMR2pmzB1jYh3hNwwIBtcoppfKnq0w=@vger.kernel.org X-Gm-Message-State: AOJu0YzoJbyLiAYK5oOnuihvtSbBTRB6RvNdBux+xxFHJGHfD4f1MHxP SlcKXlfmaKmw8WEFkIsBJvM7brWfO44DxkNt7rDBzutakblDBnyWWubE X-Gm-Gg: AfdE7clJyhIVWn/1x5hrEidtJQxahjnsNXm6WW4+Oo3jUbRIUVCBL+NHpynl553c7Em 21bsb6PTZ7olaMTF/mLh40dWkRWg2ic8L/02WX1Ui6PglRx7XWNjRGcCHI0zmd6n8MEXKi+8PVp NZeCMRpwuU0kyh+yRucXfC7G5rGB9lUFAhgWtw+/6o/dqEElsJa3IQslSZAkdHs9XmZKVB3YVw+ wzc8G0LalJi48UbYS7SlB+vzyh24brT44YPAlf5A1myKEAs0C6IqFe6l/ON1rRBrI1AvlH+/66N aQdGfXjYUqriqkIsm7IWGFZp2Qc3yMCZk/Ol2ACEXCydEyjPi2wpWlzgSQo/QWMIKwvYxjoYQiU NMsXOdVXM0KYeZpTtLDnOvUCnno8T4y/L01u6168x3HB9LQa1jngu6yQimL7fj439LdzKRIg2XV x+JRdsRarozkY= X-Received: by 2002:a05:6a00:988:b0:845:e44c:2e5 with SMTP id d2e1a72fcca58-847addb218amr2835089b3a.22.1782871708161; Tue, 30 Jun 2026 19:08:28 -0700 (PDT) Received: from localhost ([2001:19f0:8000:3e6e:5400:6ff:fe38:3d01]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847a02d41c0sm2957918b3a.33.2026.06.30.19.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 19:08:27 -0700 (PDT) From: Inochi Amaoto To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Anup Patel , Atish Patra , Paolo Bonzini , Shuah Khan , Thomas Huth , Sergey Matyukevich , Inochi Amaoto , Andy Chiu , Deepak Gupta 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 v4 5/8] RISC-V: KVM: Handle software-check exits for VCPU Date: Wed, 1 Jul 2026 10:07:42 +0800 Message-ID: <20260701020746.170157-6-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260701020746.170157-1-inochiama@gmail.com> References: <20260701020746.170157-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