From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 CC1B21DEFC8 for ; Thu, 24 Apr 2025 12:37:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745498235; cv=none; b=J2Ns0Q+pFoZ9SwvDS/zOaiYENsQebDjiP/C7Cs1dMi3Xl52XegYpQs2G5erd5L7HPAj2Huq1Oyg3yq7Y4dUXNZS0GxS+yW9BLw3iiSQTEdpN+FEmATPZwOk/CYV8eLfkLRfVWKk/ES7h9UjmvL0m59ZEbH53yI18A6p3SX9GmTQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745498235; c=relaxed/simple; bh=RtF0Ii7968sqtIEiSOoOHmfF6UJG7nfCpDcEL14f2h0=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=m2qoZvbAzFgBNTZldB+WqrUMHAoWXMt0JfHDqKda0/WL0q+zc7PmHlDoWuVnS3N9osFaA/e4xKMn28Laif6YWQmkOp4HLt61Qfdcvxu7nKJf5iaPMYbWvi4f29j6QE3idnK+aN18Q6Q3LVu4VbvpTLJ5mwbihVyrgSQv0EPSSCs= 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=O7BVL9J0; arc=none smtp.client-ip=209.85.221.51 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="O7BVL9J0" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-39129fc51f8so784038f8f.0 for ; Thu, 24 Apr 2025 05:37:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1745498232; x=1746103032; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=mXBQ/2qXvZB57eFvN07u42A0vH9tPCFMfppvAtJvXGM=; b=O7BVL9J0y6luUTGtyNRrQ+tsxebF2HkhxkgKSpGAY7xQoaVwcq9Pl2s3BKJt3W3P7A wrJ3W7zkl2iFLH74pOv6watRy0SsK1b2hLGVQ09DL5mf6HP/3DYmgiuEta3WP87Lh6PX O45YZcjhvX0JMiFJJCYlKz0afof5jBVQp1rpdkIokeQ+q04Hv9VtsEIpsntNlNsaDSIG tLwup6sV5AR3xtOAEckVeW479kbfQteBQSAArAnxrmpMt89rR+Gr9ofNdSb4dJ/7+7Ec H25LlR8BJAEnmL5hmw18OD0qUicNhf54+438iE5w/CtZ0dj/0QoPlF3A2vbpO7sqp+Mq U6WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745498232; x=1746103032; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=mXBQ/2qXvZB57eFvN07u42A0vH9tPCFMfppvAtJvXGM=; b=D8Ql+k8oKtUgzFXxLuAPApvP+b5eVYxY2MwTWDcRd3ZN+y4cBukDJgRDSvmpUqUUYq c6VevS46XbWN1aNw2j9aVdqFr2T7nRGiOM35n08F1MwVJ4GzoMvUSaHhiESHnu3dq7EW P3tKGYGaeKHwCfSSxuoK+65X+zetnZw9xwc8aBC0+nvigfGARbLosWtgSw6Le2fF3sRZ thUbXFFWo84AsROzLovjATj7w/pvd6iaQeUBaNCtDtFQ8LPIlGZsa5hRe1bh/+Or5Bvi rr+Ogl5mZxN5tiN9jhHvkPjjxWQBjLdP4usmo7IaucZN+Zl/7c1k+FSS2v3q8iS+gvjX +pgw== X-Forwarded-Encrypted: i=1; AJvYcCUp1Y65AgD0e/M8FFKIRUnoi2WmW+AiTpj2KDTyfGDMWYkgPqnKXDdI/gbr97PO6mVR/joz/XZZN7hTf30=@vger.kernel.org X-Gm-Message-State: AOJu0Yy+vjSKHWPh2pFVzE+DS9RVs8b4WjkeUorS/4v/MBYqSNuV6Beo HdzU6OsuvJ4q3yd6LOwT3i8a43G19MN19RYfgfct/FyE6ti4B02A5WIB5CO7EiU= X-Gm-Gg: ASbGncugKH4PkYZZTx9zuc2fgSLvEzJgKS5TsjbHo+HFexjx7CA/A1XidO10I+3064n T6PP9j3iiho0hQ8dI22UA9rrA5azG4he8dvNFjlNbNqT8gKcHixwaLpNwbtUyOsI/U2v5UwHDMa V5Otubc3TKdNhwPHBBXLkYyu25y44Z9XrL9IhuAzb963TCKfgfWnWhYhnc3Anej6qBioebcHbr4 U3JTLAyjfVYYKM2f8bbZXR0UAvPe8meHR9kDvsEP3ZdlUaHIobnQvIrdVMbZGH0YzOP9kWz8P5T Xoq373DyH2HXTThF4zX1aGQJlJ0Gc/Eaj6ZTM2WNCJGSuRg0SyKE4BzUf0Frl9xX4sSOocn7JE2 6RutH/qNEOA== X-Google-Smtp-Source: AGHT+IFQHcJdwFRaXmEWb0g3t5DToUnDgaUuyc1wuadZLcOAY6FK4EOtEA/saYPalIta+MsOsrAKYA== X-Received: by 2002:a05:6000:18a8:b0:391:241d:a13e with SMTP id ffacd0b85a97d-3a06cfab52fmr1726627f8f.48.1745498232082; Thu, 24 Apr 2025 05:37:12 -0700 (PDT) Received: from ?IPV6:2a01:e0a:e17:9700:16d2:7456:6634:9626? ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a06d532551sm2004598f8f.65.2025.04.24.05.37.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 24 Apr 2025 05:37:11 -0700 (PDT) Message-ID: Date: Thu, 24 Apr 2025 14:37:11 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 13/13] RISC-V: KVM: add support for SBI_FWFT_MISALIGNED_DELEG To: Andrew Jones Cc: 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, Samuel Holland , Deepak Gupta References: <20250417122337.547969-1-cleger@rivosinc.com> <20250417122337.547969-14-cleger@rivosinc.com> <20250424-ae24464169f7143c509cbab5@orel> Content-Language: en-US From: =?UTF-8?B?Q2zDqW1lbnQgTMOpZ2Vy?= In-Reply-To: <20250424-ae24464169f7143c509cbab5@orel> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 24/04/2025 13:34, Andrew Jones wrote: > On Thu, Apr 17, 2025 at 02:20:00PM +0200, Clément Léger wrote: >> 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 | 36 ++++++++++++++++++++++++++++++++++ >> 2 files changed, 39 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 b0f66c7bf010..237edaefa267 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 >> @@ -68,7 +70,41 @@ 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) >> +{ >> + return misaligned_traps_can_delegate(); >> +} >> + >> +static long 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 long 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; > > This should be > > (csr_read(CSR_HEDELEG) & MIS_DELEG) == MIS_DELEG; Hum yeah indeed, I didn't thought that someone would ony delegate load or stores. I'll fix that, Thanks, Clément > >> + >> + 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 * >> -- >> 2.49.0 >> > > Thanks, > drew