From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.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 3869937DE8D for ; Mon, 6 Jul 2026 02:21:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783304496; cv=none; b=QImMMsBftrttKM+0tSMDcPGfZPpCH9nnYEl0QiLr7SlKiew9350PFnSVGfFkzmAEiogR6Mzu9cMDg3FUQLaXxF5ME4TD/RFG85BAfVjj+DlgPTcdI4ZRm2OkNONXSRPjG40Uuv5/P+zivcoZU9ThCWNy37dnKOsT9zdBWIeQqLg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783304496; c=relaxed/simple; bh=MKcM0tP19vCkKjZtVB0XVvUWewGHvXSskCJnk32CE+k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s0a3CnU58CHAqYGHZqsmXgEETtcFlLt/wm7jfac5tBd/+S75fGAwFhlNb8yXlUW+UTnMOwq+EKQptwovRvXfOSIt74epDe43zcTtUPqOqfEfy1IZRbB6w85BRWFtyPC1bvCl0YpmHU6MDGn+Hm2s5W8LXPb/HPVMKk9wkJ8kSuE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XjIUQMRz; arc=none smtp.client-ip=209.85.210.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XjIUQMRz" Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-847a483e344so1926563b3a.0 for ; Sun, 05 Jul 2026 19:21:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783304494; x=1783909294; 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=qWXXbXM8qG3ZuT8JFgvr3zN3NQWJY6TPhUqR1K2Hkx4=; b=XjIUQMRzxoRMgeB/j/c8fY1GAgKozmVGG5M9pkooRE6Jc6hiQuxFyWWetG3n3YXy6C d/En0qzcqYq+lDnNaTc+pRnQdA5GLA+mo5WF8eL3SS9+iHSifgAx9CNEFZ5JGO5DFU0d OYUpqc9qs6TooquK9YfSuL+CaIBCyxfDOYN5JPh2DhMguhyzYZcfOuIWNuJlsqj0czYQ bomeyYFHNJlE+77m/z1XIHDrZmM6CYIEP9RgXFtgZMcs+nw8hi+QBBBIJW1srlhyjcfP O8iSFLc0UyOAozSudg6Q1ukAAjoo5tlLY7s/av34YnBt3lzD6raPIvmZ0Oz8ZJAbRTAy Necg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783304494; x=1783909294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=qWXXbXM8qG3ZuT8JFgvr3zN3NQWJY6TPhUqR1K2Hkx4=; b=QkJVc0/yL/AOlghimmItBGw9rHT/YvazHpXvlAzKlxmpIGf35K+ZbEDEhxyqjzEyag LehBerLxXEfXJOUVPtysD1R6eBvtTcN68+iEgzSXNp1Wpj/z8wYIn2M4xoR4FYfJYPBf 8i8tiei4NZK2/MYck87XaytTm3jtRzXL8zZOdPlE7y3+p36hts5nE2zPNk1UpCvOw+vc U3r6KrAaR+VKOP1SiKT7fzR1SlPopsC+e3/8mReFMTUKNsijfzmFEAW77hyJ+9PX5Axa W0wkcyPE19ZwAG10f8Fv5ka5RT6b0yhziSJJGfgCeAIle7W1EihrRNx9H4RYg3VvzKUF 47UA== X-Forwarded-Encrypted: i=1; AHgh+RpsRgi4XlNWtenmLg/DiUP/DFyrFJVRuZjDpVhSaQLZdHTKw3IRJNW3uasDdmXNYOBL9vWJNFGtYBoThgBTPDo=@vger.kernel.org X-Gm-Message-State: AOJu0YyJXAzcU+U1qw3OBoxj45uwDOVs+pYlqMCa91AXrrTMemHXJ6NA a9OvSxg4ZZaKP5rvKGvODC+OWl7tniIzlRKis0F/MVkQh0xCy7XC05pj X-Gm-Gg: AfdE7clIIk/HDf7EqVmeKSsj2UTClGAhCD0tdDZ082ZCQvnwa/k6Vau7RjnC5uf60OI CF+xBmliPXz0ETi12bDOfSmUltVhVkD62Zl9bWi+I3HMZ3CNpuNsVs7c0BRpHMKYK3Vb04DPCAD uF6wo3ga8Waa6a5Ku6FOaDNTaYgkF1JYmz9mZFk6PmLvlUauXq8kphWqRoCxokgiBmEBQpCcB6N VDsagfp35CmMhc5ajHLcTGgXVtyJ0n1kPrsogR7PE/Ymirt4sfO3Q4nMQQdtUjUBdQJezOToo9Q BdCBsc9BgejYtAhZVNQ+dekJVZwyJ9N5KEd61iW3DllTPTqfVnpo8TLtG0RUf+P6p3ytb2sqdBj WIrEgMvWXM4hZlCs6NMl2E9VQk5Slnwa6QLWbGry3tLT0Ixo/Wnkr/1Thh7s5JHnY X-Received: by 2002:a05:6a00:440c:b0:847:888f:9b0f with SMTP id d2e1a72fcca58-847f8675f1emr6341733b3a.15.1783304494664; Sun, 05 Jul 2026 19:21:34 -0700 (PDT) Received: from localhost ([2001:da8:7001:11::cb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-847f6b96998sm2844797b3a.16.2026.07.05.19.21.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jul 2026 19:21:34 -0700 (PDT) From: Inochi Amaoto To: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Anup Patel , Atish Patra , Paolo Bonzini , Shuah Khan , Charlie Jenkins , Sergey Matyukevich , Thomas Huth , Inochi Amaoto , Deepak Gupta Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-kselftest@vger.kernel.org, Yixun Lan , Longbin Li , Quan Zhou Subject: [PATCH v5 1/8] RISC-V: KVM: Add support for Svadu FWFT features Date: Mon, 6 Jul 2026 10:20:37 +0800 Message-ID: <20260706022046.214956-2-inochiama@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260706022046.214956-1-inochiama@gmail.com> References: <20260706022046.214956-1-inochiama@gmail.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Hardware updating of PTE A/D bits is controlled through ADUE bit in henvcfg Expose the feature only if both Svadu and Svade are supported for VS-mode. Allow the VMM to enable/disable this feature by change the ISA extension state in the guest. Assisted-by: YuanSheng:claude-4.7-opus Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Signed-off-by: Inochi Amaoto --- arch/riscv/include/uapi/asm/kvm.h | 1 + arch/riscv/kvm/vcpu_sbi_fwft.c | 77 +++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/arch/riscv/include/uapi/asm/kvm.h b/arch/riscv/include/uapi/asm/kvm.h index 504e73305343..7bbea8812d92 100644 --- a/arch/riscv/include/uapi/asm/kvm.h +++ b/arch/riscv/include/uapi/asm/kvm.h @@ -240,6 +240,7 @@ struct kvm_riscv_sbi_fwft_feature { struct kvm_riscv_sbi_fwft { struct kvm_riscv_sbi_fwft_feature misaligned_deleg; struct kvm_riscv_sbi_fwft_feature pointer_masking; + struct kvm_riscv_sbi_fwft_feature pte_ad_hw_updating; }; /* If you need to interpret the index values, here is the key: */ diff --git a/arch/riscv/kvm/vcpu_sbi_fwft.c b/arch/riscv/kvm/vcpu_sbi_fwft.c index ab39ac464ffd..01db40b53295 100644 --- a/arch/riscv/kvm/vcpu_sbi_fwft.c +++ b/arch/riscv/kvm/vcpu_sbi_fwft.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,45 @@ static bool kvm_fwft_is_defined_feature(enum sbi_fwft_feature_t feature) return false; } +static void kvm_sbi_fwft_env_flag_reset_helper(struct kvm_vcpu *vcpu, + u64 flag) +{ + vcpu->arch.cfg.henvcfg &= ~flag; +} + +static long kvm_sbi_fwft_env_flag_set_helper(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, + unsigned long value, u64 flag) +{ + struct kvm_vcpu_config *cfg = &vcpu->arch.cfg; + + if (value == 0) + cfg->henvcfg &= ~flag; + else if (value == 1) + cfg->henvcfg |= flag; + else + return SBI_ERR_INVALID_PARAM; + + if (!one_reg_access) { + ncsr_write(CSR_HENVCFG, vcpu->arch.cfg.henvcfg); + if (IS_ENABLED(CONFIG_32BIT)) + ncsr_write(CSR_HENVCFGH, vcpu->arch.cfg.henvcfg >> 32); + } + + return SBI_SUCCESS; +} + +static long kvm_sbi_fwft_env_flag_get_helper(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, + unsigned long *value, u64 flag) +{ + *value = (vcpu->arch.cfg.henvcfg & flag) == flag; + + return SBI_SUCCESS; +} + static bool kvm_sbi_fwft_misaligned_delegation_supported(struct kvm_vcpu *vcpu) { return misaligned_traps_can_delegate(); @@ -137,6 +177,34 @@ static long kvm_sbi_fwft_get_misaligned_delegation(struct kvm_vcpu *vcpu, return SBI_SUCCESS; } +static bool kvm_sbi_fwft_pte_ad_hw_updating_supported(struct kvm_vcpu *vcpu) +{ + return riscv_isa_extension_available(vcpu->arch.isa, SVADU) && + riscv_isa_extension_available(vcpu->arch.isa, SVADE); +} + +static void kvm_sbi_fwft_reset_pte_ad_hw_updating(struct kvm_vcpu *vcpu) +{ + if (kvm_sbi_fwft_pte_ad_hw_updating_supported(vcpu)) + kvm_sbi_fwft_env_flag_reset_helper(vcpu, ENVCFG_ADUE); +} + +static long kvm_sbi_fwft_set_pte_ad_hw_updating(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long value) +{ + return kvm_sbi_fwft_env_flag_set_helper(vcpu, conf, one_reg_access, + value, ENVCFG_ADUE); +} + +static long kvm_sbi_fwft_get_pte_ad_hw_updating(struct kvm_vcpu *vcpu, + struct kvm_sbi_fwft_config *conf, + bool one_reg_access, unsigned long *value) +{ + return kvm_sbi_fwft_env_flag_get_helper(vcpu, conf, one_reg_access, + value, ENVCFG_ADUE); +} + #ifndef CONFIG_32BIT static bool try_to_set_pmm(unsigned long value) @@ -246,6 +314,15 @@ static const struct kvm_sbi_fwft_feature features[] = { .set = kvm_sbi_fwft_set_misaligned_delegation, .get = kvm_sbi_fwft_get_misaligned_delegation, }, + { + .id = SBI_FWFT_PTE_AD_HW_UPDATING, + .first_reg_num = offsetof(struct kvm_riscv_sbi_fwft, pte_ad_hw_updating.enable) / + sizeof(unsigned long), + .supported = kvm_sbi_fwft_pte_ad_hw_updating_supported, + .reset = kvm_sbi_fwft_reset_pte_ad_hw_updating, + .set = kvm_sbi_fwft_set_pte_ad_hw_updating, + .get = kvm_sbi_fwft_get_pte_ad_hw_updating, + }, #ifndef CONFIG_32BIT { .id = SBI_FWFT_POINTER_MASKING_PMLEN, -- 2.55.0