From patchwork Mon Mar 10 15:12:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= X-Patchwork-Id: 14010470 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D263DC35FF3 for ; Mon, 10 Mar 2025 17:50:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vOYddS0MakKJ5bdhP3oC/Jbfb4xHitJWRosG6hvbjbs=; b=VHvbCF3JNPuGkh 5KmRVeQ1qynt9ZnRhSH2vCJ35s7RJbWlUKL2BoCgQ/jaGwKvpNKwV/eR44l+y79amsKsYesklMHtS kuvQxT1Va+jtmj5PCDbP9hSh9hUmSoOYkSQYIDKso4cahj54IKolo8ocAiO3ycTTC9vd7ByEoiH5V 2S5m5eOfskk4qxblgClPK3/YR0MqsTmSKklgEL2p5f48u5L6ncPz5Da5Rli7dSo5B0/0MlIAw28cO 4wHNlyV1veX03JT7y5soxEEGoowNby+KU4qj6LhCRGHecO48ifpyKTUZvrPUlHsmm3NCgn/dRycMp KLZId+r3QVcOcq/HzPFQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1trhGr-00000003WuG-2Cy5; Mon, 10 Mar 2025 17:50:33 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1treqW-000000038LD-3Gb4 for linux-riscv@lists.infradead.org; Mon, 10 Mar 2025 15:15:14 +0000 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-22438c356c8so47871565ad.1 for ; Mon, 10 Mar 2025 08:15:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1741619712; x=1742224512; darn=lists.infradead.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=OfJ3/5A+8eTTKYRN2eD83evjq8eHQRgBJnaNQ4fOKIc=; b=RaGZcgSuyZaRNK4dg61HdT9HjX4hr6meHTJ+jGQExnA8MoqybDS3qmzSZ9bjMWRydP dzsU9/9+xdi5pmJnkQWEP2hEIXjE1WLeMnpvNHsnd9/aXvVls74A3IioZyxnc9fWF+8u yYUYYAYhJ4xlqASg+4tgPSuhaOdvg7gNQUYZjk16yVEYGodkPCgJ+uhdBNhLlSfsnMfr 5+B8ZGDBUZcWekg2I5qHpv/8aJrnF2enrFNnwira7tIrs2F1rCHi1bQls+0KXur/7lnR 6U29yCFvnfHGZQXRO49X+XnrlA0NAuk1bsTg2ZO40TMSSa13axjbbsX6AjxmJ3Zyza3d luew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741619712; x=1742224512; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OfJ3/5A+8eTTKYRN2eD83evjq8eHQRgBJnaNQ4fOKIc=; b=RhZfKuYYEuyGyziSjOYu91rV5Bakzl11oWLzXimU4icC1mUmlH3xl9RLwWFJthL6jv gI/YD0qm5T09CBq70VFLU530ib/XbIGATf3Rt74sCBJtPbqvveo85o1H2bB+51+j/ICK 1ZeRT0clCjh2n2MG/whIdk+/y/ugbCqwM2pJblKLKM7/yW76R4IlK40vsy723wF5Vg3F xKVVVm/Rnyy0NP6T5oCybdDqZdembqf6le6ZhQkKL7Uul7V/B/ivDbTxhWvom3mufcQ/ 1I004Q6QaKsX8alpVQbweEV7AGnObjFk3sDLLFR7JHWQek1k2Rrjq0K7tG+RH9K4/N77 DTEg== X-Forwarded-Encrypted: i=1; AJvYcCXSL9nO61TNv966TV5xfV9caAWet2w3ZnjlDkiD/6np+ppfTM2VXQp5NAXTN/GS79UrC6C607DjzK6qzQ==@lists.infradead.org X-Gm-Message-State: AOJu0YxsSbjkaG9yPbCxyLMG+qRF477Oqwpfre6Mt6qQbkBN6W0iPGCV z24tGur1RaLtp9DrrKmipNR4GvOtSnepv2D+ViivZb/Nff4xWxOureOGbNauq9w= X-Gm-Gg: ASbGncuV3VmauImPdp+jnjr+hhcoDMH6RTkrIcwENWP9N7/s63RE1REgX5c6ko6MmOy kRBxCfpzDsxp10GdgnnkUag+k1VLfYqWiuXlguwdZZYaDevrRsqkIiGIpyUbHRF7xT8kac/i6iO DKj+8syIqjorm7hS8louqvzC5PXbOtRmgVC/xgV0Xo7yF8ZZfyjs7IZtSl8BzqKpqoPJ7tnZV8D DjiJonX0KpvxV5ANnUurcy986MOnHC6I2xTcP7he3UgVLzPjF6l+EPwe3hm5VnIeYhORMz5WbGq 5qCMi1uDW2WB1RrYJfmlkJ5rs1F8n/2gaTN675AshJEmKQ== X-Google-Smtp-Source: AGHT+IFwcAES82fPdZN2juakD/f3DtxEXqN8fLDByuuUWFv0PrmjGf+tQ1Z8z/EN2hDCjCyy0IsnJg== X-Received: by 2002:a17:903:2b0f:b0:21f:8453:7484 with SMTP id d9443c01a7336-22428a9d15dmr204592905ad.30.1741619710747; Mon, 10 Mar 2025 08:15:10 -0700 (PDT) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-224109e99dfsm79230515ad.91.2025.03.10.08.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Mar 2025 08:15:10 -0700 (PDT) From: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= To: Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , Shuah Khan , Jonathan Corbet , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org Cc: =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , Samuel Holland , Deepak Gupta Subject: [PATCH v3 17/17] RISC-V: KVM: add support for SBI_FWFT_MISALIGNED_DELEG Date: Mon, 10 Mar 2025 16:12:24 +0100 Message-ID: <20250310151229.2365992-18-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250310151229.2365992-1-cleger@rivosinc.com> References: <20250310151229.2365992-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250310_081512_845122_AEF7965C X-CRM114-Status: GOOD ( 13.29 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org SBI_FWFT_MISALIGNED_DELEG needs hedeleg to be modified to delegate misaligned load/store exceptions. Save and restore it during CPU load/put. Signed-off-by: Clément Léger Reviewed-by: Deepak Gupta Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu.c | 3 +++ arch/riscv/kvm/vcpu_sbi_fwft.c | 39 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index 542747e2c7f5..d98e379945c3 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -646,6 +646,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { void *nsh; struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; vcpu->cpu = -1; @@ -671,6 +672,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) csr->vstval = nacl_csr_read(nsh, CSR_VSTVAL); csr->hvip = nacl_csr_read(nsh, CSR_HVIP); csr->vsatp = nacl_csr_read(nsh, CSR_VSATP); + cfg->hedeleg = nacl_csr_read(nsh, CSR_HEDELEG); } else { csr->vsstatus = csr_read(CSR_VSSTATUS); csr->vsie = csr_read(CSR_VSIE); @@ -681,6 +683,7 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) csr->vstval = csr_read(CSR_VSTVAL); csr->hvip = csr_read(CSR_HVIP); csr->vsatp = csr_read(CSR_VSATP); + cfg->hedeleg = csr_read(CSR_HEDELEG); } } diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index cce1e41d5490..756fda1cf2e7 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -14,6 +14,8 @@ #include #include +#define MIS_DELEG (BIT_ULL(EXC_LOAD_MISALIGNED) | BIT_ULL(EXC_STORE_MISALIGNED)) + struct kvm_sbi_fwft_feature { /** * @id: Feature ID @@ -64,7 +66,44 @@ static bool kvm_fwft_is_defined_feature(enum sbi_fwft_feature_t feature) return false; } +static bool kvm_sbi_fwft_misaligned_delegation_supported(struct kvm_vcpu *vcpu) +{ + if (!misaligned_traps_can_delegate()) + return false; + + return true; +} + +static int kvm_sbi_fwft_set_misaligned_delegation(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + unsigned long value) +{ + if (value == 1) + csr_set(CSR_HEDELEG, MIS_DELEG); + else if (value == 0) + csr_clear(CSR_HEDELEG, MIS_DELEG); + else + return SBI_ERR_INVALID_PARAM; + + return SBI_SUCCESS; +} + +static int kvm_sbi_fwft_get_misaligned_delegation(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + unsigned long *value) +{ + *value = (csr_read(CSR_HEDELEG) & MIS_DELEG) != 0; + + return SBI_SUCCESS; +} + static const struct kvm_sbi_fwft_feature features[] = { + { + .id = SBI_FWFT_MISALIGNED_EXC_DELEG, + .supported = kvm_sbi_fwft_misaligned_delegation_supported, + .set = kvm_sbi_fwft_set_misaligned_delegation, + .get = kvm_sbi_fwft_get_misaligned_delegation, + }, }; static struct kvm_sbi_fwft_config *