From nobody Sat Oct 4 12:49:04 2025 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 99D044C79 for ; Sun, 17 Aug 2025 12:33:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755434033; cv=none; b=qH10ziSm8QWHdLTInqt1wFuwOTYxeKA4JSyhPUUBJ3pXHUO8tQJqRwUm7+JOX4mgNEVtV17M//GmgGYFzN4WLkmaCpXUetRAQk8cCijQ4JzD7ZAjeVZazL8QyGYd4R7dYJDaWEDTOqVjx522VOxS6PqvJZg3/CGSt/COAOcMA/A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755434033; c=relaxed/simple; bh=5HKxK+Boc/7ZdYflehjWFkppD0SyD2LOi7Sgi2n9lB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nfCbm956gp1Ar3RrAHl2f2htVKSKaKy3nc7403kbQyPxZFVtfeDqeCU7yLlhgHBw4305v5tnI9q2CKVCqxZaP+ic/2CKtAkXokxUikAtAVxak+TSxN7OyA8gfIzQp/nhtrFVxPVXXydZwEBtwdI3GYc0S/NJkEn4ZboEyPk0H5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=M4MCmvi1; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="M4MCmvi1" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-32326e202e0so2548032a91.2 for ; Sun, 17 Aug 2025 05:33:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1755434031; x=1756038831; 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=Chrrw+dyIJSlBaNuFfzfLJBXunJM56lFjN13/1zM0cU=; b=M4MCmvi1nRUGO4AFRDArDaj2DmaTqlS4hp9RmR7dZRaCHJYi+EHO0F2W9ZJKPMl8PO buyIsKEq/Tk7wyT9kjIfnHCHpprVSdj5mO+VRDaklOBgZxJ8TF4ukH4bGDOTQS6BxgiO DGOAy9rHTpkcS+gFhU1zpvCDErLTqw3s0ea9cn9YqH64vOQS2yVMVU9xAOFwu4QIw1xj ij5K5qoqHjoEIo/o0jCL0ZtfrWa+tL/LNalwKd0QfpfyUMtklQfmDGnOrGpDpNTwCg7D H8dyjuFeS4xbmrbnlPV3ADTIzAOPdGU7uHTUc/gh6KgcjszpTuc3WRN1qLIWd4Cdvnhb 0VPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755434031; x=1756038831; 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=BVpH9lVke3687pIqe/V8dyzQx3ywp5abJCjLlvtZrOP4vJBAAXlwiJSVtXX3/W7eDO XQeIyCdC+db0S+G+tftbjVZUjdiK1hMTamH//J2qyY0G0I3Lv56a/Cau4zE4LU39aR1T 4zZSYyypZd6ZRlHfxQszEN1BgkPsUxUoxrIP7WLI92mYV3MT3JFPlXLfDQKxT3x+59Xz OmUOcZ79JQILQD5hVBT66jZWqvH1iILCQtwoz4NrgLGdnezWGGA4OIsZdak78bz+U+P3 vkqN5MCN1zV+dGkDJPtnAB5JeohqYJbaI1JcTyjy+n9H8jd1NItAfnLnxEkTMuu3WpUx Rq9g== X-Forwarded-Encrypted: i=1; AJvYcCXlTArVjUOdD8v5i3v85g7MVi3fKlgVdno8lqUB9uILdHVDzMhiByqN/Qf0jzBiugwde0WPUV2QwdTWxvE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw7onKM/RpWIyvIMBwWIS9A3lZ3KoN6y0VanXxSPQfP2zHHceJk N4Xff97hpacTj+rtlDS4B9cqpg/YXu/jQa9dpz/MntvQ1o5T1N2hdPtUzrJ+84OPUf0= X-Gm-Gg: ASbGncuXjU6dOegWH+CZ4m8Mo/VUFv7fsSzSHpf4eRmLVxo5xPt/R1yoD3SUGt90eNv awNP3tjzPiU+MPRnMh9oRxH+JY/eM9QbF6Qf/3bXX7UruqXze1lOmzHaz0humexFIYnP9gIXEsy frs8w7hxFGOZ9mY93rPeShGSfJrcc9nCRikCTVvYLKUerPmHIuE5yYuLGB7/wXSm0hG3Vykak7S xYXcG4EXqDBNtJsOowtXAuutZzP8lASJgUFavsG5S6F5CLdgyjZONTnMtjz6PucnJZw9n1Lst+a W5oHJqQS29x526FIb5AaFTFqzBvFgR6CPt9DfzmioA9uEQ7ZjKJ/0JWPkbRsrQLBF+n9wgm12Bn WaRqncSqqfvNl+y8A6jQetse1YpDu/etaKypAga0u7o8kHgJ8bBJrgY0= X-Google-Smtp-Source: AGHT+IETV30d+U1cTWNm+PcAX8EyUCyQ87TNGD5UPWd2IWqoSPinHs4gpy114d5b7XZmASQs/fhxjw== X-Received: by 2002:a17:90b:1f8f:b0:312:959:dc4f with SMTP id 98e67ed59e1d1-3234db7148cmr7188813a91.5.1755434030859; Sun, 17 Aug 2025 05:33:50 -0700 (PDT) Received: from localhost.localdomain ([122.171.23.202]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3232b291449sm4480912a91.0.2025.08.17.05.33.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Aug 2025 05:33:50 -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 v2 2/6] RISC-V: KVM: Introduce feature specific reset for SBI FWFT Date: Sun, 17 Aug 2025 18:03:20 +0530 Message-ID: <20250817123324.239423-3-apatel@ventanamicro.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250817123324.239423-1-apatel@ventanamicro.com> References: <20250817123324.239423-1-apatel@ventanamicro.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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); =20 + /** + * @reset: Reset the feature value irrespective whether feature is suppor= ted 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(); } =20 +static void kvm_sbi_fwft_reset_misaligned_delegation(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_config *cfg =3D &vcpu->arch.cfg; + + cfg->hedeleg &=3D ~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_support= ed(struct kvm_vcpu *vcpu) return fwft->have_vs_pmlen_7 || fwft->have_vs_pmlen_16; } =20 +static void kvm_sbi_fwft_reset_pointer_masking_pmlen(struct kvm_vcpu *vcpu) +{ + vcpu->arch.cfg.henvcfg &=3D ~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[] =3D= { { .id =3D SBI_FWFT_MISALIGNED_EXC_DELEG, .supported =3D kvm_sbi_fwft_misaligned_delegation_supported, + .reset =3D kvm_sbi_fwft_reset_misaligned_delegation, .set =3D kvm_sbi_fwft_set_misaligned_delegation, .get =3D kvm_sbi_fwft_get_misaligned_delegation, }, @@ -187,6 +207,7 @@ static const struct kvm_sbi_fwft_feature features[] =3D= { { .id =3D SBI_FWFT_POINTER_MASKING_PMLEN, .supported =3D kvm_sbi_fwft_pointer_masking_pmlen_supported, + .reset =3D kvm_sbi_fwft_reset_pointer_masking_pmlen, .set =3D kvm_sbi_fwft_set_pointer_masking_pmlen, .get =3D kvm_sbi_fwft_get_pointer_masking_pmlen, }, @@ -321,11 +342,16 @@ static void kvm_sbi_ext_fwft_deinit(struct kvm_vcpu *= vcpu) =20 static void kvm_sbi_ext_fwft_reset(struct kvm_vcpu *vcpu) { - int i; struct kvm_sbi_fwft *fwft =3D vcpu_to_fwft(vcpu); + const struct kvm_sbi_fwft_feature *feature; + int i; =20 - for (i =3D 0; i < ARRAY_SIZE(features); i++) + for (i =3D 0; i < ARRAY_SIZE(features); i++) { fwft->configs[i].flags =3D 0; + feature =3D &features[i]; + if (feature->reset) + feature->reset(vcpu); + } } =20 const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft =3D { --=20 2.43.0