From patchwork Mon Feb 10 21:35:48 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: 13969388 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 E3571C021A3 for ; Tue, 11 Feb 2025 00:10:56 +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=6xA6De1R0WSoUSiNpfGLOtw2QdJPjwel4uEX3ihQlyA=; b=X9ZpIdhGuBHW8S 9RbVZOlj2l9kTIUR45ipSq6TNWvTnnA02olhLMkNbHq7kUJ0lGBak4ESjAJ+djXMLGLMj1ZHAuFb4 6C6yqZX1W4ehzGjf8+hZV6MsL72Bwm+dKf3fJXYurDhsmOXdkbfcjr4vv2NVGjTPRD8qh1q1JB3D8 +rAALareNIw8lgmNr/OtCYUqrryxqRdOGa6IsSuqsCpYtqDk8lzC0qyktu3J+vLxd9CmDF4B46arD 3F5tEGqwocxiChUHwhpjs6CgNmMqBuLH/WF6MjpOWWaM3zAm96gevmz96o5e/8Dp9NKgoVFJMidAJ eKFWk/YGgResPDXOTDtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1thdrY-00000001w25-2oPS; Tue, 11 Feb 2025 00:10:52 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thbS9-00000001VWS-0Hmi for linux-riscv@bombadil.infradead.org; Mon, 10 Feb 2025 21:36:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender :Reply-To:Content-ID:Content-Description; bh=YLemH8ynfgSfPvc/FNbZdwEa9OOsaEqx6lRijihbbR8=; b=oaGHdhdEyOKEfEHPOXSyvVkuNP YFXNlyD1zYWpm78+V2c42gVqqWga/UhN/HyEPLnwfqRgqiClUbhlA9Dsp77E9jr/pfHSJzhnX8LIj QQ+g1DPYNUPI0twji7oBpY5pmBUlWkTl1slC266zWwfDJBMMh0LdW/GFQTye39EvBDSNVlwbRF1P3 xSMds/vpznavVnuTP+3VehdT38yrIcAazxmym97H+vecNmzzO7p2BddlRWiKiOfgorfYUBUXgJLdx 2tz18HVoBu20H4/Kk4nvC0lM9ubxig2iP7ypNzRnHwXcF9CFpCIt3v66g9tuHMJk/klNOJFAfn1Ac 7bWFYl6w==; Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by casper.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1thbS5-0000000GoSS-3Z4R for linux-riscv@lists.infradead.org; Mon, 10 Feb 2025 21:36:27 +0000 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-38dcc6bfbccso1956251f8f.0 for ; Mon, 10 Feb 2025 13:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1739223383; x=1739828183; 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=YLemH8ynfgSfPvc/FNbZdwEa9OOsaEqx6lRijihbbR8=; b=WTp7hm6BtoF38h/0Q1noY5l4R8Ysa/DEmJixoqjO8sQxPyOQlkjAD9vV3Cm4cd++CQ EKZDNSQfA7hhSOTHYbTQHmMpZ9sTcBEX2LmyzcpIx9DxCt16uo0Dw0lYzOLGe9qMBT/B MzCgx5FVwXPGtAkDZQiz8FqRdIwA8DIBUsnpNorib6I9TOiZ9ST28I/FYnNmTI6n4oqp QFlhNfX1pSSX1NyHlPi2Qw3RTWA+KjU3ZY5uB8LVeAt7G9qOCghOMNnX7q8BI0Uh0nR9 JnqIsKfI81sDS8Ocp2ZT0EAplUjLP9kUxkFLa/BkHrobj+pZofVFqw6NszshvodcJsnB rwDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739223383; x=1739828183; 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=YLemH8ynfgSfPvc/FNbZdwEa9OOsaEqx6lRijihbbR8=; b=iyldymkWZ1Z0xPR4cEmmBfvlBtUYSwxomjHpuwhmEd3YWhOmUqYszrJvOfrZh0VofP z5t9SBDArfmRWI+Sbcfond+Ve8/TOsPxE2tD5UrwcUe6onBCEqTi1cb5tYWX9CtgkVhZ Nurjv6/I56SFXF0VSrqG0ruLSqrWqhWitbTzXoBe/5YTbG+CRCKlI2VB4FtFUAOHqWNZ 9yX3wtOTvIVcdwuYbI2QjmYm5wDTUEbQSeKjE8jdbug4g7z4XVjeWjNIumn9I01AcWth Q8YR1aUIewKLCORqNsP1IhEeGxTCzcQW8u7IkOtrswmD70hF0R1kg+w/2O2o2jXQxrkY jhQw== X-Forwarded-Encrypted: i=1; AJvYcCXuAmUxIx++Qdaeevjq9hLimAJlpLSY/e81UwmB5jTtKAdCGI0jitXYJ6Gb9necTM6stDGoa5OTDqhVmg==@lists.infradead.org X-Gm-Message-State: AOJu0YxX4L/sjLYDxYydeF/eFW1Qw6Pu20WGDA6a4ZkSXNPMfUPeZFxZ Mr4E0F3kN0Dbs/zv+G92QK3d97wV0+nFNgsVNH/Jqbv5UB3f52H2sDJcUGgXMfw= X-Gm-Gg: ASbGncuQ8z+19sBSe6gWjXm+WDV/lN35QdjrrVFKXeTARLqzlPTBzRXd/rdyswLduIK Bthhp7xM/ZkRcP3TuGUfPb4DG88oD14B8u8/Nh3zdAFUNmhLYvP9BlpAV4IBgmnvkJ9nFPTmFkw d0GnIxE/TJxEgDrJThZuBgvX/uImImGyGUu/EeHQE7OT9GHnSSccToNoYGpl9lcuR0FQWC596GP bb2QpobVsR67gEL7YgI+wBtv9dZlUXhvH1QxWif/FZLG1Bt7jHIsYFOtAxyCDUswKn3viX9OUY4 gmU7FGDPVLhJWwKZ X-Google-Smtp-Source: AGHT+IH2dlYi1O5kUCZJxtYlgHXa+ws9BLhvD6mC+8NX+JeSXuC2kr9vlNuO+zXUNjOhcWWHcNo08w== X-Received: by 2002:adf:efc4:0:b0:38a:4b8b:c57a with SMTP id ffacd0b85a97d-38dc93509damr12435434f8f.44.1739223383507; Mon, 10 Feb 2025 13:36:23 -0800 (PST) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4394376118esm47541515e9.40.2025.02.10.13.36.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Feb 2025 13:36:22 -0800 (PST) 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 Subject: [PATCH v2 15/15] RISC-V: KVM: add support for SBI_FWFT_MISALIGNED_DELEG Date: Mon, 10 Feb 2025 22:35:48 +0100 Message-ID: <20250210213549.1867704-16-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250210213549.1867704-1-cleger@rivosinc.com> References: <20250210213549.1867704-1-cleger@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250210_213626_118808_B8971120 X-CRM114-Status: GOOD ( 13.25 ) 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 --- 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 fe608bf16558..235a46d553d4 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 (1UL << EXC_LOAD_MISALIGNED | 1UL << EXC_STORE_MISALIGNED) + static const enum sbi_fwft_feature_t kvm_fwft_defined_features[] = { SBI_FWFT_MISALIGNED_EXC_DELEG, SBI_FWFT_LANDING_PAD, @@ -35,7 +37,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 *