From nobody Mon Feb 9 01:16:49 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 E0A9916A930 for ; Mon, 6 Jan 2025 15:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736178568; cv=none; b=ql7G2lkMvsvUx2q/tC1TyOxUbARNmPxmWHYPsR6gJXTuJHr7IEFIpbLCLRfcHPI5z8BRS0Zz5YkmddUG520gH9g1tTnm0kLA+W27qHbWLmWldts9rzHz4hy3z0pmPxBSkwQAKfjfY38h2agLb/X221xWIGVrMdk4b1Nq7upY9Wc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736178568; c=relaxed/simple; bh=uuAHTstZa1Zpk6rx2ds/OHmd2ADhPuNSZeEnxaM5EGk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=h6amxX5kcQNKeithLmVpaIwDepOBtdliR9eSdh7Eeg8VUNd3y7YkFySY0Exa8SBZRRvgBhpOmmkAwU+Qxc4yKJAr3mAvuSVBb7KYn7Ut6uwfiv6aYf7uBx500te0pbvXqklatvYZaw+uOAnPLThXvhSOHrM4Fl72haUv5JF+rNU= 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=15pRzSOo; arc=none smtp.client-ip=209.85.214.173 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="15pRzSOo" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21670dce0a7so27176495ad.1 for ; Mon, 06 Jan 2025 07:49:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1736178566; x=1736783366; 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=mxBjx4Pwy3s9wNFrCu0QzGcTxzWHmeeGktVNtPbGFVU=; b=15pRzSOocDahB4E5LOkq53HyqOWAhjQVm/Hbhxl0GMhX9BQeclZOyK62doxPzduZey ET4TxGQXL6NhavzSqSQvs8ptSlt8llCu3qaV8Gku+HKrBU5AS5fdXjcEXtf1XTIitfNV LpRLTSQ3J3wT1SGxVzBFeHrqbXH8TnWZg91ldeiJuYW7RI4GUyFTTRqDAaa16lOu7mx4 Br6D75cA5CK/95wB2XkE937AVnVx1X+FTsFIIyz7YTwN5sd5W63xZ2ll/pJemx/1Xs7P ApzpEkSQqxm75r/vSQj1ra6Cxm9iiicS4ANy8lIWx3tzpw0PtpyvoJyOG5zHlVBglI2S /QoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736178566; x=1736783366; 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=mxBjx4Pwy3s9wNFrCu0QzGcTxzWHmeeGktVNtPbGFVU=; b=UCcSzVPv8AHXjRtGzWOYtPKd7/037OII5XsgNddh6afeRBUescR1S8U4T98W0qVNoS Cd8+WvDQfvQP2dN/e8kL8i/tMyfZ4yIfzyql6fp6DamRruSeDzYqwhYLSV3UmKTjuY9y jE/IY5/wKRYgqwKhLAygHgyZKqBOGS5aFiNNrt8mrSaKaB/LYnwf7rWSJFnoXGBW4BGl ApI0Y4C3UKk6zxBB8v8ICdW33bjhesde+wFuDTzZCkksbJ0Jquu3KUAyYn7jZXtpTiUU 25a+TnrOtrUzQoyzlT/P6h8n2Bn0c9/dA+t0rloDvcoK8LESMPGW2BoSR7FcGBWwkSw6 AfYg== X-Forwarded-Encrypted: i=1; AJvYcCVQdUpgLo/0hgHipDyeA0zXcIo585+aww67zTsgWG3zVy5gY+H89u+8B33vBwcYC2pcgXURIvN6j8fuKgQ=@vger.kernel.org X-Gm-Message-State: AOJu0Yyyc/Z9wcC8GE42VameigvtmXiiAHw8Iy1inVAo3E9+J/P3gBxq Mzecc80uW9FsjzycpQldDy8YzgL7YI3Nw2N3P7rFXHTPYaBpd6QaDZlSPOvBpjY= X-Gm-Gg: ASbGnct01UM79VOz0nOCV2w2O0CWu1iNKclupSnBbLXzorzJLqjV1OX6nfAKPTthiFx n3ezHqVSkDWu9EhBY6/vp/aBZJBc/rc64SGHeySDoWpAqyUhj43JyICV99NiwXN+B4DX7+3qhzX N1F5ItZMRdfsf7K0sTLhXM0jTZpZkh3o9vfpiM8cFHeKIWwN6duktCOBW9dp2iVfrYGHKrh+zIA HdhjaRWJmMxT7HmOcBCLwZ36PWMQ9J/v4v6k4DJM4IsPjb9O4+Y/nnfLA== X-Google-Smtp-Source: AGHT+IFBFcio9MaUGZCTb/Jg2857ywT0hQvVtOg6GlbEZCyc6I2hLialdck8Jevr/BDDD1XTJo/mLA== X-Received: by 2002:a17:902:c406:b0:216:2bd7:1c4a with SMTP id d9443c01a7336-219e6ebb716mr872299045ad.26.1736178564924; Mon, 06 Jan 2025 07:49:24 -0800 (PST) Received: from carbon-x1.. ([2a01:e0a:e17:9700:16d2:7456:6634:9626]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc9f6967sm292479535ad.214.2025.01.06.07.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Jan 2025 07:49:24 -0800 (PST) From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= To: Paul Walmsley , Palmer Dabbelt , Anup Patel , Atish Patra , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Cc: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH 3/6] RISC-V: KVM: add SBI extension init()/deinit() functions Date: Mon, 6 Jan 2025 16:48:40 +0100 Message-ID: <20250106154847.1100344-4-cleger@rivosinc.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250106154847.1100344-1-cleger@rivosinc.com> References: <20250106154847.1100344-1-cleger@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The FWFT SBI extension will need to dynamically allocate memory and do init time specific initialization. Add an init/deinit callbacks that allows to do so. Signed-off-by: Cl=C3=A9ment L=C3=A9ger --- arch/riscv/include/asm/kvm_vcpu_sbi.h | 9 ++++++++ arch/riscv/kvm/vcpu.c | 2 ++ arch/riscv/kvm/vcpu_sbi.c | 31 ++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/kvm_vcpu_sbi.h b/arch/riscv/include/asm= /kvm_vcpu_sbi.h index b96705258cf9..8c465ce90e73 100644 --- a/arch/riscv/include/asm/kvm_vcpu_sbi.h +++ b/arch/riscv/include/asm/kvm_vcpu_sbi.h @@ -49,6 +49,14 @@ struct kvm_vcpu_sbi_extension { =20 /* Extension specific probe function */ unsigned long (*probe)(struct kvm_vcpu *vcpu); + + /* + * Init/deinit function called once during VCPU init/destroy. These + * might be use if the SBI extensions need to allocate or do specific + * init time only configuration. + */ + int (*init)(struct kvm_vcpu *vcpu); + void (*deinit)(struct kvm_vcpu *vcpu); }; =20 void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run= ); @@ -69,6 +77,7 @@ const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ex= t( bool riscv_vcpu_supports_sbi_ext(struct kvm_vcpu *vcpu, int idx); int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run); void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu); +void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu); =20 int kvm_riscv_vcpu_get_reg_sbi_sta(struct kvm_vcpu *vcpu, unsigned long re= g_num, unsigned long *reg_val); diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index e048dcc6e65e..3420a4a62c94 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -180,6 +180,8 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu) =20 void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) { + kvm_riscv_vcpu_sbi_deinit(vcpu); + /* Cleanup VCPU AIA context */ kvm_riscv_vcpu_aia_deinit(vcpu); =20 diff --git a/arch/riscv/kvm/vcpu_sbi.c b/arch/riscv/kvm/vcpu_sbi.c index 6e704ed86a83..d2dbb0762072 100644 --- a/arch/riscv/kvm/vcpu_sbi.c +++ b/arch/riscv/kvm/vcpu_sbi.c @@ -486,7 +486,7 @@ void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu) struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; const struct kvm_riscv_sbi_extension_entry *entry; const struct kvm_vcpu_sbi_extension *ext; - int idx, i; + int idx, i, ret; =20 for (i =3D 0; i < ARRAY_SIZE(sbi_ext); i++) { entry =3D &sbi_ext[i]; @@ -501,8 +501,37 @@ void kvm_riscv_vcpu_sbi_init(struct kvm_vcpu *vcpu) continue; } =20 + if (ext->init) { + ret =3D ext->init(vcpu); + if (ret) + scontext->ext_status[idx] =3D + KVM_RISCV_SBI_EXT_STATUS_UNAVAILABLE; + } + scontext->ext_status[idx] =3D ext->default_disabled ? KVM_RISCV_SBI_EXT_STATUS_DISABLED : KVM_RISCV_SBI_EXT_STATUS_ENABLED; } } + +void kvm_riscv_vcpu_sbi_deinit(struct kvm_vcpu *vcpu) +{ + struct kvm_vcpu_sbi_context *scontext =3D &vcpu->arch.sbi_context; + const struct kvm_riscv_sbi_extension_entry *entry; + const struct kvm_vcpu_sbi_extension *ext; + int idx, i; + + for (i =3D 0; i < ARRAY_SIZE(sbi_ext); i++) { + entry =3D &sbi_ext[i]; + ext =3D entry->ext_ptr; + idx =3D entry->ext_idx; + + if (idx < 0 || idx >=3D ARRAY_SIZE(scontext->ext_status)) + continue; + + if (scontext->ext_status[idx] !=3D KVM_RISCV_SBI_EXT_STATUS_ENABLED || != ext->deinit) + continue; + + ext->deinit(vcpu); + } +} --=20 2.47.1