Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

sbi: sbi_domain_context: Add spinlock for updating domain assigned_harts

Browse Source 
Add spinlock protection to avoid race condition on assigned_harts
during domain context switching. Also, rename/add variables for
accessing the corresponding domain of target/current context.

Signed-off-by: Alvin Chang <alvinga@andestech.com>
Reviewed-by: Yu Chien Peter Lin <peterlin@andestech.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Alvin Chang
2024-04-16 13:02:13 +08:00
committed by Anup Patel
parent 1d89a9da64
commit 17e829129d
4 changed files with 55 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/sbi/sbi_domain_context.c
View File

@@ -26,18 +26,23 @@
static void switch_to_next_domain_context(struct sbi_context *ctx,
struct sbi_context *dom_ctx)
{
u32 hartindex;
u32 hartindex = sbi_hartid_to_hartindex(current_hartid());
struct sbi_trap_regs *trap_regs;
struct sbi_domain *dom = dom_ctx->dom;
struct sbi_domain *current_dom = ctx->dom;
struct sbi_domain *target_dom = dom_ctx->dom;
struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
unsigned int pmp_count = sbi_hart_pmp_count(scratch);
/* Assign current hart to target domain */
hartindex = sbi_hartid_to_hartindex(current_hartid());
sbi_hartmask_clear_hartindex(
hartindex, &sbi_domain_thishart_ptr()->assigned_harts);
sbi_update_hartindex_to_domain(hartindex, dom);
sbi_hartmask_set_hartindex(hartindex, &dom->assigned_harts);
spin_lock(&current_dom->assigned_harts_lock);
sbi_hartmask_clear_hartindex(hartindex, &current_dom->assigned_harts);
spin_unlock(&current_dom->assigned_harts_lock);
sbi_update_hartindex_to_domain(hartindex, target_dom);
spin_lock(&target_dom->assigned_harts_lock);
sbi_hartmask_set_hartindex(hartindex, &target_dom->assigned_harts);
spin_unlock(&target_dom->assigned_harts_lock);
/* Reconfigure PMP settings for the new domain */
for (int i = 0; i < pmp_count; i++) {
@@ -72,9 +77,11 @@ static void switch_to_next_domain_context(struct sbi_context *ctx,
/* If target domain context is not initialized or runnable */
if (!dom_ctx->initialized) {
/* Startup boot HART of target domain */
if (current_hartid() == dom->boot_hartid)
sbi_hart_switch_mode(dom->boot_hartid, dom->next_arg1,
dom->next_addr, dom->next_mode,
if (current_hartid() == target_dom->boot_hartid)
sbi_hart_switch_mode(target_dom->boot_hartid,
target_dom->next_arg1,
target_dom->next_addr,
target_dom->next_mode,
false);
else
sbi_hsm_hart_stop(scratch, true);