From: Andrew Jones <andrew.jones@linux.dev>
To: kvm-riscv@lists.infradead.org
Cc: atishp@rivosinc.com, cleger@rivosinc.com, jamestiotio@gmail.com
Subject: [kvm-unit-tests PATCH v2 02/11] riscv: sbi: Add fwft pte_hw_ad_updating test
Date: Thu, 27 Feb 2025 15:19:26 +0100 [thread overview]
Message-ID: <20250227141946.91604-15-andrew.jones@linux.dev> (raw)
In-Reply-To: <20250227141946.91604-13-andrew.jones@linux.dev>
Add SBI FWFT tests for the PTE_HW_AD_UPDATING feature.
Signed-off-by: Andrew Jones <andrew.jones@linux.dev>
---
riscv/sbi-fwft.c | 170 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 170 insertions(+)
diff --git a/riscv/sbi-fwft.c b/riscv/sbi-fwft.c
index f3408d8de081..ca4d49b5db85 100644
--- a/riscv/sbi-fwft.c
+++ b/riscv/sbi-fwft.c
@@ -5,9 +5,12 @@
* Copyright (C) 2024, Rivos Inc., Clément Léger <cleger@rivosinc.com>
*/
#include <libcflat.h>
+#include <alloc.h>
#include <stdlib.h>
#include <asm/csr.h>
+#include <asm/io.h>
+#include <asm/mmu.h>
#include <asm/processor.h>
#include <asm/ptrace.h>
#include <asm/sbi.h>
@@ -37,6 +40,21 @@ static struct sbiret fwft_get(uint32_t feature)
return fwft_get_raw(feature);
}
+static struct sbiret fwft_set_and_check_raw(const char *str, unsigned long feature,
+ unsigned long value, unsigned long flags)
+{
+ struct sbiret ret;
+
+ ret = fwft_set_raw(feature, value, flags);
+ if (!sbiret_report_error(&ret, SBI_SUCCESS, "set to %ld%s", value, str))
+ return ret;
+
+ ret = fwft_get_raw(feature);
+ sbiret_report(&ret, SBI_SUCCESS, value, "get %ld after set%s", value, str);
+
+ return ret;
+}
+
static void fwft_check_reserved(unsigned long id)
{
struct sbiret ret;
@@ -160,6 +178,157 @@ static void fwft_check_misaligned_exc_deleg(void)
report_prefix_pop();
}
+static bool adue_triggered_read, adue_triggered_write;
+
+static void adue_set_ad(unsigned long addr, pteval_t prot)
+{
+ pte_t *ptep = get_pte(current_pgtable(), addr);
+ *ptep = __pte(pte_val(*ptep) | prot);
+ local_flush_tlb_page(addr);
+}
+
+static void adue_read_handler(struct pt_regs *regs)
+{
+ adue_triggered_read = true;
+ adue_set_ad(regs->badaddr, _PAGE_ACCESSED);
+}
+
+static void adue_write_handler(struct pt_regs *regs)
+{
+ adue_triggered_write = true;
+ adue_set_ad(regs->badaddr, _PAGE_ACCESSED | _PAGE_DIRTY);
+}
+
+static bool adue_check_pte(pteval_t pte, bool write)
+{
+ return (pte & (_PAGE_ACCESSED | _PAGE_DIRTY)) == (_PAGE_ACCESSED | (write ? _PAGE_DIRTY : 0));
+}
+
+static void adue_check(bool hw_updating_enabled, bool write)
+{
+ unsigned long *ptr = malloc(sizeof(unsigned long));
+ pte_t *ptep = get_pte(current_pgtable(), (uintptr_t)ptr);
+ bool *triggered;
+ const char *op;
+
+ WRITE_ONCE(adue_triggered_read, false);
+ WRITE_ONCE(adue_triggered_write, false);
+
+ *ptep = __pte(pte_val(*ptep) & ~(_PAGE_ACCESSED | _PAGE_DIRTY));
+ local_flush_tlb_page((uintptr_t)ptr);
+
+ if (write) {
+ op = "write";
+ triggered = &adue_triggered_write;
+ writel(0xdeadbeef, ptr);
+ } else {
+ op = "read";
+ triggered = &adue_triggered_read;
+ readl(ptr);
+ }
+
+ report(hw_updating_enabled != *triggered &&
+ adue_check_pte(pte_val(*ptep), write), "hw updating %s %s",
+ hw_updating_enabled ? "enabled" : "disabled", op);
+
+ free(ptr);
+}
+
+static bool adue_toggle_and_check_raw(const char *str, unsigned long feature, unsigned long value,
+ unsigned long flags)
+{
+ struct sbiret ret = fwft_set_and_check_raw(str, feature, value, flags);
+
+ if (!ret.error) {
+ adue_check(value, false);
+ adue_check(value, true);
+ return true;
+ }
+
+ return false;
+}
+
+static bool adue_toggle_and_check(const char *str, unsigned long value, unsigned long flags)
+{
+ return adue_toggle_and_check_raw(str, SBI_FWFT_PTE_AD_HW_UPDATING, value, flags);
+}
+
+static void fwft_check_pte_ad_hw_updating(void)
+{
+ struct sbiret ret;
+ bool enabled;
+
+ report_prefix_push("pte_ad_hw_updating");
+
+ ret = fwft_get(SBI_FWFT_PTE_AD_HW_UPDATING);
+ if (ret.error == SBI_ERR_NOT_SUPPORTED) {
+ report_skip("not supported by platform");
+ return;
+ } else if (!sbiret_report_error(&ret, SBI_SUCCESS, "get")) {
+ /* Not much we can do without a working get... */
+ return;
+ }
+
+ report(ret.value == 0 || ret.value == 1, "first get value is 0/1");
+
+ enabled = ret.value;
+ report_kfail(true, !enabled, "resets to 0");
+
+ install_exception_handler(EXC_LOAD_PAGE_FAULT, adue_read_handler);
+ install_exception_handler(EXC_STORE_PAGE_FAULT, adue_write_handler);
+
+ adue_check(enabled, false);
+ adue_check(enabled, true);
+
+ if (!adue_toggle_and_check("", !enabled, 0))
+ goto adue_inval_tests;
+ else
+ enabled = !enabled;
+
+ if (!adue_toggle_and_check(" again", !enabled, 0))
+ goto adue_inval_tests;
+ else
+ enabled = !enabled;
+
+#if __riscv_xlen > 32
+ if (!adue_toggle_and_check_raw(" with high feature bits set",
+ BIT(32) | SBI_FWFT_PTE_AD_HW_UPDATING, !enabled, 0))
+ goto adue_inval_tests;
+ else
+ enabled = !enabled;
+#endif
+
+adue_inval_tests:
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, 2, 0);
+ sbiret_report_error(&ret, SBI_ERR_INVALID_PARAM, "set to 2");
+
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, !enabled, 2);
+ sbiret_report_error(&ret, SBI_ERR_INVALID_PARAM, "set to %d with flags=2", !enabled);
+
+ if (!adue_toggle_and_check(" with lock", !enabled, 1))
+ goto adue_done;
+ else
+ enabled = !enabled;
+
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, !enabled, 0);
+ sbiret_report_error(&ret, SBI_ERR_DENIED_LOCKED, "set locked to %d without lock", !enabled);
+
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, !enabled, 1);
+ sbiret_report_error(&ret, SBI_ERR_DENIED_LOCKED, "set locked to %d with lock", !enabled);
+
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, enabled, 0);
+ sbiret_report_error(&ret, SBI_ERR_DENIED_LOCKED, "set locked to %d without lock", enabled);
+
+ ret = fwft_set(SBI_FWFT_PTE_AD_HW_UPDATING, enabled, 1);
+ sbiret_report_error(&ret, SBI_ERR_DENIED_LOCKED, "set locked to %d with lock", enabled);
+
+adue_done:
+ install_exception_handler(EXC_LOAD_PAGE_FAULT, NULL);
+ install_exception_handler(EXC_STORE_PAGE_FAULT, NULL);
+
+ report_prefix_pop();
+}
+
void check_fwft(void)
{
report_prefix_push("fwft");
@@ -172,6 +341,7 @@ void check_fwft(void)
fwft_check_base();
fwft_check_misaligned_exc_deleg();
+ fwft_check_pte_ad_hw_updating();
report_prefix_pop();
}
--
2.48.1
--
kvm-riscv mailing list
kvm-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kvm-riscv
next prev parent reply other threads:[~2025-02-27 14:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-27 14:19 [kvm-unit-tests PATCH v2 00/11] riscv: sbi: Test improvements and a couple new Andrew Jones
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 01/11] riscv: sbi: Drop fwft upper bits test Andrew Jones
2025-02-27 14:21 ` Clément Léger
2025-02-27 14:19 ` Andrew Jones [this message]
2025-02-27 14:30 ` [kvm-unit-tests PATCH v2 02/11] riscv: sbi: Add fwft pte_hw_ad_updating test Clément Léger
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 03/11] riscv: sbi: Ensure we have IPIs enabled for HSM suspend tests Andrew Jones
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 04/11] riscv: sbi: Ensure SUSP test gets an interrupt Andrew Jones
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 05/11] riscv: sbi: Improve susp expected error output Andrew Jones
2025-02-27 14:38 ` Clément Léger
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 06/11] riscv: sbi: Improve interrupt handling cleanup Andrew Jones
2025-02-27 14:19 ` [kvm-unit-tests PATCH v2 07/11] lib/cpumask: Add some operators Andrew Jones
2025-02-27 14:22 ` [kvm-unit-tests PATCH v2 08/11] riscv: sbi: HSM suspend may not be supported Andrew Jones
2025-02-27 14:22 ` [kvm-unit-tests PATCH v2 09/11] riscv: sbi: Probe/skip SUSP Andrew Jones
2025-02-27 14:22 ` [kvm-unit-tests PATCH v2 10/11] riscv: sbi: susp: Check upper bits of sleep_type are ignored Andrew Jones
2025-02-27 14:22 ` [kvm-unit-tests PATCH v2 11/11] riscv: sbi: Add bad fid tests Andrew Jones
2025-02-27 14:33 ` Clément Léger
2025-03-04 9:31 ` [kvm-unit-tests PATCH v2 00/11] riscv: sbi: Test improvements and a couple new Andrew Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250227141946.91604-15-andrew.jones@linux.dev \
--to=andrew.jones@linux.dev \
--cc=atishp@rivosinc.com \
--cc=cleger@rivosinc.com \
--cc=jamestiotio@gmail.com \
--cc=kvm-riscv@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).