From mboxrd@z Thu Jan 1 00:00:00 1970 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 7730FCA0FE8 for ; Sat, 23 Aug 2025 16:38:04 +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=rxE6lv8LO3qcfbV4GWjuj3dBF3JCiJ1OwJ/QZ30tykw=; b=XXntqx1Yt+C91F DqKzS/ehY4O/nqNFRm3h03Con9uoh1bZbOwnfgt2Gl0QkclrnG8Dd87HgcadgzG2xEUB4QhQwQwox s6eYiXhzq69CwyVj1Abq5VNBsO9U7bMm4nMabZYiQz6qb9bs3Mm+DFwMWMdNJp5mXUeRFS7McsDM2 VYWXTpC0pQi/V6D9Eh08G8D87ornotiECaEqQHH1O+JXiS3tJPylfYqMVDqthRqVbx6rJVBSdRXd8 IguUCktgJkExhVOu9sxSsKqtyVDINmXN9dRwFgc0itWW83CThZIgTi77ZrPXRCGGvojX9G46niiS2 WZdu+kmCQFkk63hBEq4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uprFc-000000052vp-1BU9; Sat, 23 Aug 2025 16:37:56 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1upqf7-00000004xSJ-2Wk2 for linux-riscv@lists.infradead.org; Sat, 23 Aug 2025 16:00:14 +0000 Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-76e2ea6ccb7so2411690b3a.2 for ; Sat, 23 Aug 2025 09:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755964813; x=1756569613; 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=Chrrw+dyIJSlBaNuFfzfLJBXunJM56lFjN13/1zM0cU=; b=U/rrESb/lccyxSAqNXrUKruf4cytxEHQXn6MRIzfQOB7R8h7UKk3+OTAy+C4bFC70O bd+acd3Fwg99ZwJsYDUUpE8uwh+BB6WEikJKRAWSwGj2hJy40jEWbNuS9cP3r4zm0PVo 6NymjhJTKgK02Kx5OwftX7HZNcrNyZZAWyxrgixBhjaVb/uMt/UeA8prKDxtLdwIm2r0 U6KpUOtng+UXtbCuZa0RaL3lfURJSwzlZYLKKqo0wZkSyWwkG0UZWTNbcFdHRiH14o9K T0To93OwAxhPtKpi12ujG1KpgiIVocsZWuF0rfObCt3IhkH+3fs0pMSPpS1nlHmcmNFu fpUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755964813; x=1756569613; 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=Chrrw+dyIJSlBaNuFfzfLJBXunJM56lFjN13/1zM0cU=; b=ND2OiDfXT5LrDQQJLMhupBlJYb45dep/ZY7pXSf/ePGBoCl8j34/t972iwJJHfjess wSJ95N3ASJxsG+NLwlxaoF5cdZt7siRHskgoAR3ySvziv6xMyz8Ch8Vsi0gWUGLJ8dCE 6Adi+NsCenTbma6GMXCdDEYZ0nW9N9YyrU79L0ruo6B+Cf7BFnyuaodXSwRdiiKjDBC+ P1I0xZZaUT9r8eL0/yKxjS7wLH7lrjzL5R/wVYy8QnjmxZL+/hwJK65x45yeKfA5sapH aPHd/2QnpJZAoOE9XZTB/aH/SyJ/lO4dvtcSnoVChBQ4kELizJSW9I0VesOseh5LyGNy vuwQ== X-Forwarded-Encrypted: i=1; AJvYcCWo0mdIjJm5V4HnfniMkl4lprv6leDaCyoXwmwQKm3O0ZlHchU3YWlIPTtQuiE+gvtgdBp+Kd2KGjPtvA==@lists.infradead.org X-Gm-Message-State: AOJu0YxSA/mOzVNTZZARcd8w/GNVNsFjtT26kDyV4Xj1kgnscJpdHYWQ Fib9eFp47BrNeNYjwrLZJcnXTeGYkJ844oNQFIF12H2UFNNvGj0A1ZIMv18U17w3TZc= X-Gm-Gg: ASbGnctH6L42Shk/M+CP1V2E55XAPt+7zIubTfqM9QqUyBzU10M9+o0ETee4ocHRFUo +RU7iKXPBn3IomGS6dPjePBVneBM6RbK9a/cQuGFne3qfVxI0XhT/0CzOQ9r+zbFe4KVfZ3LC1U C5Jlt5u+CxmgkNWx5VxY1GiR2e46naDQrNlbjMnxotOB+TZdWaZghagOf1KGu33KQV5l2X1oAM5 PFdWkwbvpl1uB4cxpBX40IldHHgTisGaSV/WkNLKedIFySuQE6Bfr+JNeYtLyBmtIHHbLFQ1Eww rPxpnW5NsvNa1kVcyycjTzRKZnXJmFxmwYl9leFchP9LNb4K5vmktrp1Hb/FkongUFJmjvgLxpH 5scolKHjQCehS0LWgZo/aeGQfHIJAfM3WGVSWfocB89NdmEQWXCxIXxHD6jNN0A== X-Google-Smtp-Source: AGHT+IESNcTGvVN4k0EYaaXCdIDdf4qv1awjmTqd/O8lynLE/hwFMmWAV0QVQZM1K89/KGK7Pb4KXg== X-Received: by 2002:a05:6a00:2e96:b0:76e:885a:c33c with SMTP id d2e1a72fcca58-7702fad486emr8086610b3a.26.1755964812754; Sat, 23 Aug 2025 09:00:12 -0700 (PDT) Received: from anup-ubuntu-vm.localdomain ([103.97.166.196]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77040214b81sm2804464b3a.93.2025.08.23.09.00.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 23 Aug 2025 09:00:12 -0700 (PDT) From: Anup Patel To: Atish Patra Cc: Palmer Dabbelt , Paul Walmsley , Alexandre Ghiti , Andrew Jones , Anup Patel , Paolo Bonzini , Shuah Khan , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Anup Patel Subject: [PATCH v3 2/6] RISC-V: KVM: Introduce feature specific reset for SBI FWFT Date: Sat, 23 Aug 2025 21:29:43 +0530 Message-ID: <20250823155947.1354229-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250823155947.1354229-1-apatel@ventanamicro.com> References: <20250823155947.1354229-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250823_090013_642009_31D242A5 X-CRM114-Status: GOOD ( 13.91 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The SBI FWFT feature values must be reset upon VCPU reset so introduce feature specific reset callback for this purpose. Signed-off-by: Anup Patel Reviewed-by: Andrew Jones --- arch/riscv/kvm/vcpu_sbi_fwft.c | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index 164a01288b0a..5a3bad0f9330 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -30,6 +30,13 @@ struct kvm_sbi_fwft_feature { */ bool (*supported)(struct kvm_vcpu *vcpu); + /** + * @reset: Reset the feature value irrespective whether feature is supported or not + * + * This callback is mandatory + */ + void (*reset)(struct kvm_vcpu *vcpu); + /** * @set: Set the feature value * @@ -75,6 +82,13 @@ static bool kvm_sbi_fwft_misaligned_delegation_supported(struct kvm_vcpu *vcpu) return misaligned_traps_can_delegate(); } +static void kvm_sbi_fwft_reset_misaligned_delegation(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; + + cfg->hedeleg &= ~MIS_DELEG; +} + static long kvm_sbi_fwft_set_misaligned_delegation(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long value) @@ -124,6 +138,11 @@ static bool kvm_sbi_fwft_pointer_masking_pmlen_supported(struct kvm_vcpu *vcpu) return fwft->have_vs_pmlen_7 || fwft->have_vs_pmlen_16; } +static void kvm_sbi_fwft_reset_pointer_masking_pmlen(struct kvm_vcpu *vcpu) +{ + vcpu->arch.cfg.henvcfg &= ~ENVCFG_PMM; +} + static long kvm_sbi_fwft_set_pointer_masking_pmlen(struct kvm_vcpu *vcpu, struct kvm_sbi_fwft_config *conf, unsigned long value) @@ -180,6 +199,7 @@ static const struct kvm_sbi_fwft_feature features[] = { { .id = SBI_FWFT_MISALIGNED_EXC_DELEG, .supported = kvm_sbi_fwft_misaligned_delegation_supported, + .reset = kvm_sbi_fwft_reset_misaligned_delegation, .set = kvm_sbi_fwft_set_misaligned_delegation, .get = kvm_sbi_fwft_get_misaligned_delegation, }, @@ -187,6 +207,7 @@ static const struct kvm_sbi_fwft_feature features[] = { { .id = SBI_FWFT_POINTER_MASKING_PMLEN, .supported = kvm_sbi_fwft_pointer_masking_pmlen_supported, + .reset = kvm_sbi_fwft_reset_pointer_masking_pmlen, .set = kvm_sbi_fwft_set_pointer_masking_pmlen, .get = kvm_sbi_fwft_get_pointer_masking_pmlen, }, @@ -321,11 +342,16 @@ static void kvm_sbi_ext_fwft_deinit(struct kvm_vcpu *vcpu) static void kvm_sbi_ext_fwft_reset(struct kvm_vcpu *vcpu) { - int i; struct kvm_sbi_fwft *fwft = vcpu_to_fwft(vcpu); + const struct kvm_sbi_fwft_feature *feature; + int i; - for (i = 0; i < ARRAY_SIZE(features); i++) + for (i = 0; i < ARRAY_SIZE(features); i++) { fwft->configs[i].flags = 0; + feature = &features[i]; + if (feature->reset) + feature->reset(vcpu); + } } const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft = { -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv