From patchwork Thu Oct 24 12:28:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13848858 Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0275418784C for ; Thu, 24 Oct 2024 12:28:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729772938; cv=none; b=is3FzPkD0p2nbrfWOoxLm6X3xVKlvTete2mMV3/twQ/kRhj8KEVo25zKOTqKkRTZQM+NpL5C47E5ZNf/cxq6h7lJWd7q+spOGrKDwgUwuYHBL7r7JEAmMzsR5GkpFSGaNT6ehAUVGyG8Xh7R0gJCKLHnpmrd/uMIotp6T6AUQ1M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729772938; c=relaxed/simple; bh=+3N3tPmq9Enxzcre2jV43GQ8dmZ+Ady39InNYSJ5PNg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mCawYtNq1dOJwebsColZa1da26uMVygbIoXY4IFUSoB/6LjU4Rqh4UFgljwL3Q2SqLF87RtJpCu0gGAm4bzKqL3Klkn+jS0SvWdbM7RC7vM5eQI+Toj42ZJE8wdVmXClbdLRH14VZXKhR134ooDV9Dbn5nArHWDfUXQ95gz6olk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=Ekd1+zEK; arc=none smtp.client-ip=91.218.175.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="Ekd1+zEK" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1729772932; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vrJKQYsqPwfe+UgIDxmj85EUMOBw0DGpaZVWjzi1Ymg=; b=Ekd1+zEKQDJLHGukcW5X+Va3WoHLQu4VX98H9BK4ukiC1n2JeRaXb3pgtRnrN8Ww0x32lN CHzACX2HJ6KyLui+rATAalHJ8tDcI7NNQXv3L8ODilKsxMpud9VgVOzWvpzxO1FV5RzXki JKeEQ01l7PThEB35FSxRA/ZdKcLaKFA= From: Andrew Jones To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Cc: cade.richard@gmail.com, atishp@rivosinc.com, jamestiotio@gmail.com Subject: [kvm-unit-tests PATCH 1/2] riscv: Add sbi_send_ipi_broadcast Date: Thu, 24 Oct 2024 14:28:41 +0200 Message-ID: <20241024122839.71753-5-andrew.jones@linux.dev> In-Reply-To: <20241024122839.71753-4-andrew.jones@linux.dev> References: <20241024122839.71753-4-andrew.jones@linux.dev> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Coming SBI IPI tests will use this, but as it could be useful for other tests too, add it to the library. Signed-off-by: Andrew Jones --- lib/riscv/asm/sbi.h | 1 + lib/riscv/sbi.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/riscv/asm/sbi.h b/lib/riscv/asm/sbi.h index 1319439b7118..102486c00de3 100644 --- a/lib/riscv/asm/sbi.h +++ b/lib/riscv/asm/sbi.h @@ -87,6 +87,7 @@ struct sbiret sbi_hart_get_status(unsigned long hartid); struct sbiret sbi_send_ipi(unsigned long hart_mask, unsigned long hart_mask_base); struct sbiret sbi_send_ipi_cpu(int cpu); struct sbiret sbi_send_ipi_cpumask(const cpumask_t *mask); +struct sbiret sbi_send_ipi_broadcast(void); struct sbiret sbi_set_timer(unsigned long stime_value); long sbi_probe(int ext); diff --git a/lib/riscv/sbi.c b/lib/riscv/sbi.c index f25bde169490..02dd338c1915 100644 --- a/lib/riscv/sbi.c +++ b/lib/riscv/sbi.c @@ -62,13 +62,18 @@ struct sbiret sbi_send_ipi_cpu(int cpu) return sbi_send_ipi(1UL, cpus[cpu].hartid); } +struct sbiret sbi_send_ipi_broadcast(void) +{ + return sbi_send_ipi(0, -1UL); +} + struct sbiret sbi_send_ipi_cpumask(const cpumask_t *mask) { struct sbiret ret; cpumask_t tmp; if (cpumask_full(mask)) - return sbi_send_ipi(0, -1UL); + return sbi_send_ipi_broadcast(); cpumask_copy(&tmp, mask); From patchwork Thu Oct 24 12:28:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13848859 Received: from out-179.mta0.migadu.com (out-179.mta0.migadu.com [91.218.175.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D636D1D5165 for ; Thu, 24 Oct 2024 12:28:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729772940; cv=none; b=Ld8E1n8OEOItgjBBO2YSM+4tYgYp0jjnOypyFGrwjo3v7zWz5rfZUl1zWrp1ul9T/1kyU9g1wHQz5q+rKsz5K0mfP8xk/mEW+/THbsZtw6v82r/ednaVaTrXkeC37vs7YW4tuC8/oH5Vf/+b/vbXvjvO4zDTT2l14rq5iDMF4+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729772940; c=relaxed/simple; bh=zVlcRR99ezKHwk1y0OCC9WOx780EPz68Dm4dagOAgcc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GoRH1Znz20+7ASai1fbh+GUpRN7n/b88EPVWBxYNHQWsuAXmuLX5C537MNy6r2xrxzfcCHEcNKIA/HxR8tZu350QtzSxYHcNyC2mSknODjht4d70S7s3p49IDVzOV7RvlIXLpgKesP/QtoivvkqEp1iKAHVLdsJiOd9rsfsfI48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=VmkMl5HN; arc=none smtp.client-ip=91.218.175.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="VmkMl5HN" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1729772934; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iuvqwX7Xl8Oqd3hqT+kimWuv1EwUZ8WYIXxTgppAxhI=; b=VmkMl5HN1h6oqSiOWG4PblVlgohhH4FjGUTcJ0/+gP95PX98j7qTYjHXpnpihK1nJhrDKK Suzi9qDUnKZSxqAVGSBhcM5WcjInz3R37NZpKgMCLz2UpJ8JIG3BTi7R308xR+HLOuBtXW SYgFusmQWJzBHmIb+lFXrWHwT/djH74= From: Andrew Jones To: kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Cc: cade.richard@gmail.com, atishp@rivosinc.com, jamestiotio@gmail.com, Cade Richard Subject: [kvm-unit-tests PATCH 2/2] riscv: sbi: Add IPI extension tests Date: Thu, 24 Oct 2024 14:28:42 +0200 Message-ID: <20241024122839.71753-6-andrew.jones@linux.dev> In-Reply-To: <20241024122839.71753-4-andrew.jones@linux.dev> References: <20241024122839.71753-4-andrew.jones@linux.dev> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT From: Cade Richard Ensure IPIs directed at single harts are received and also that all harts receive IPIs on broadcast. Also check for invalid param errors when the params result in hartids greater than the max. Signed-off-by: Cade Richard [Made all changes for the review comments from the last review, also additional fixes and cleanups, and rewrote the commit message.] Signed-off-by: Andrew Jones --- riscv/sbi.c | 149 +++++++++++++++++++++++++++++++++++++++++++- riscv/unittests.cfg | 1 + 2 files changed, 148 insertions(+), 2 deletions(-) diff --git a/riscv/sbi.c b/riscv/sbi.c index d46befa1c6c1..82a116ff1b40 100644 --- a/riscv/sbi.c +++ b/riscv/sbi.c @@ -6,11 +6,15 @@ */ #include #include +#include +#include +#include +#include +#include #include #include -#include #include -#include + #include #include #include @@ -47,6 +51,20 @@ static struct sbiret sbi_dbcn_write_byte(uint8_t byte) return sbi_ecall(SBI_EXT_DBCN, SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, byte, 0, 0, 0, 0, 0); } +static int rand_online_cpu(prng_state* ps) +{ + int cpu, me = smp_processor_id(); + + for (;;) { + cpu = prng32(ps) % nr_cpus; + cpu = cpumask_next(cpu - 1, &cpu_present_mask); + if (cpu != nr_cpus && cpu != me && cpu_present(cpu)) + break; + } + + return cpu; +} + static void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo) { *lo = (unsigned long)paddr; @@ -287,6 +305,132 @@ static void check_time(void) report_prefix_popn(2); } +static bool ipi_received[NR_CPUS]; +static bool ipi_timeout[NR_CPUS]; +static cpumask_t ipi_done; + +static void ipi_timeout_handler(struct pt_regs *regs) +{ + timer_stop(); + ipi_timeout[smp_processor_id()] = true; +} + +static void ipi_irq_handler(struct pt_regs *regs) +{ + ipi_ack(); + ipi_received[smp_processor_id()] = true; +} + +static void ipi_hart_wait(void *data) +{ + unsigned long timeout = (unsigned long)data; + int me = smp_processor_id(); + + install_irq_handler(IRQ_S_SOFT, ipi_irq_handler); + install_irq_handler(IRQ_S_TIMER, ipi_timeout_handler); + local_ipi_enable(); + timer_irq_enable(); + local_irq_enable(); + + timer_start(timeout); + while (!READ_ONCE(ipi_received[me]) && !READ_ONCE(ipi_timeout[me])) + cpu_relax(); + local_irq_disable(); + timer_stop(); + local_ipi_disable(); + timer_irq_disable(); + + cpumask_set_cpu(me, &ipi_done); +} + +static void ipi_hart_check(cpumask_t *mask) +{ + int cpu; + + for_each_cpu(cpu, mask) { + if (ipi_timeout[cpu]) { + const char *rec = ipi_received[cpu] ? "but was still received" + : "and has still not been received"; + report_fail("ipi timed out on cpu%d %s", cpu, rec); + } + + ipi_timeout[cpu] = false; + ipi_received[cpu] = false; + } +} + +static void check_ipi(void) +{ + unsigned long d = getenv("SBI_IPI_TIMEOUT") ? strtol(getenv("SBI_IPI_TIMEOUT"), NULL, 0) : 200000; + int nr_cpus_present = cpumask_weight(&cpu_present_mask); + int me = smp_processor_id(); + unsigned long max_hartid = 0; + static prng_state ps; + struct sbiret ret; + cpumask_t tmp; + int cpu; + + ps = prng_init(0xDEADBEEF); + + report_prefix_push("ipi"); + + if (!sbi_probe(SBI_EXT_IPI)) { + report_skip("ipi extension not available"); + report_prefix_pop(); + return; + } + + if (nr_cpus_present < 2) { + report_skip("At least 2 cpus required"); + report_prefix_pop(); + return; + } + + report_prefix_push("random hart"); + cpu = rand_online_cpu(&ps); + cpumask_copy(&ipi_done, &cpu_present_mask); + cpumask_clear_cpu(cpu, &ipi_done); + on_cpu_async(cpu, ipi_hart_wait, (void *)d); + ret = sbi_send_ipi_cpu(cpu); + report(ret.error == SBI_SUCCESS, "ipi returned success"); + while (cpumask_weight(&ipi_done) != nr_cpus_present) + cpu_relax(); + cpumask_clear(&ipi_done); + cpumask_clear(&tmp); + cpumask_set_cpu(cpu, &tmp); + ipi_hart_check(&tmp); + report_prefix_pop(); + + report_prefix_push("broadcast"); + cpumask_copy(&tmp, &cpu_present_mask); + cpumask_clear_cpu(me, &tmp); + on_cpumask_async(&tmp, ipi_hart_wait, (void *)d); + ret = sbi_send_ipi_broadcast(); + report(ret.error == SBI_SUCCESS, "ipi returned success"); + while (cpumask_weight(&ipi_done) != nr_cpus_present - 1) + cpu_relax(); + cpumask_clear(&ipi_done); + ipi_hart_check(&tmp); + report_prefix_pop(); + + report_prefix_push("invalid parameters"); + + for_each_present_cpu(cpu) { + if (cpus[cpu].hartid > max_hartid) + max_hartid = cpus[cpu].hartid; + } + + /* Try the next higher hartid than the max */ + ret = sbi_send_ipi(2, max_hartid); + report(ret.error == SBI_ERR_INVALID_PARAM, "hart_mask got expected error (%ld)", ret.error); + ret = sbi_send_ipi(1, max_hartid + 1); + report(ret.error == SBI_ERR_INVALID_PARAM, "hart_mask_base got expected error (%ld)", ret.error); + + report_prefix_pop(); + + report_prefix_pop(); +} + unsigned char sbi_hsm_stop_hart[NR_CPUS]; unsigned char sbi_hsm_hart_start_checks[NR_CPUS]; unsigned char sbi_hsm_non_retentive_hart_suspend_checks[NR_CPUS]; @@ -442,6 +586,7 @@ int main(int argc, char **argv) report_prefix_push("sbi"); check_base(); check_time(); + check_ipi(); check_dbcn(); return report_summary(); diff --git a/riscv/unittests.cfg b/riscv/unittests.cfg index cbd36bf63e14..2eb760eca24e 100644 --- a/riscv/unittests.cfg +++ b/riscv/unittests.cfg @@ -16,4 +16,5 @@ groups = selftest # Set $FIRMWARE_OVERRIDE to /path/to/firmware to select the SBI implementation. [sbi] file = sbi.flat +smp = $MAX_SMP groups = sbi