hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lguest: move changed bitmap to lg_cpu 

events represented in the 'changed' bitmap are per-cpu, not per-guest.
move it to the lg_cpu structure

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Glauber de Oliveira Costa 2008-01-17 19:14:46 -02:00 committed by Rusty Russell
parent f34f8c5fea
commit ae3749dcd8
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/lguest/interrupts_and_traps.c
View File

@ -395,7 +395,7 @@ void load_guest_idt_entry(struct lg_cpu *cpu, unsigned int num, u32 lo, u32 hi)
/* Mark the IDT as changed: next time the Guest runs we'll know we have /* Mark the IDT as changed: next time the Guest runs we'll know we have
* to copy this again. */ * to copy this again. */
cpu->lg->changed |= CHANGED_IDT; cpu->changed |= CHANGED_IDT;
/* Check that the Guest doesn't try to step outside the bounds. */ /* Check that the Guest doesn't try to step outside the bounds. */
if (num >= ARRAY_SIZE(cpu->arch.idt)) if (num >= ARRAY_SIZE(cpu->arch.idt))

6
drivers/lguest/lg.h
View File

@ -51,6 +51,9 @@ struct lg_cpu {
u32 esp1; u32 esp1;
u8 ss1; u8 ss1;
/* Bitmap of what has changed: see CHANGED_* above. */
int changed;
unsigned long pending_notify; /* pfn from LHCALL_NOTIFY */ unsigned long pending_notify; /* pfn from LHCALL_NOTIFY */
/* At end of a page shared mapped over lguest_pages in guest. */ /* At end of a page shared mapped over lguest_pages in guest. */
@ -92,9 +95,6 @@ struct lguest
void __user *mem_base; void __user *mem_base;
unsigned long kernel_address; unsigned long kernel_address;
/* Bitmap of what has changed: see CHANGED_* above. */
int changed;
struct pgdir pgdirs[4]; struct pgdir pgdirs[4];
unsigned long noirq_start, noirq_end; unsigned long noirq_start, noirq_end;

4
drivers/lguest/segments.c
View File

@ -159,7 +159,7 @@ void load_guest_gdt(struct lg_cpu *cpu, unsigned long table, u32 num)
fixup_gdt_table(cpu, 0, ARRAY_SIZE(cpu->arch.gdt)); fixup_gdt_table(cpu, 0, ARRAY_SIZE(cpu->arch.gdt));
/* Mark that the GDT changed so the core knows it has to copy it again, /* Mark that the GDT changed so the core knows it has to copy it again,
* even if the Guest is run on the same CPU. */ * even if the Guest is run on the same CPU. */
lg->changed |= CHANGED_GDT; cpu->changed |= CHANGED_GDT;
} }
/* This is the fast-track version for just changing the three TLS entries. /* This is the fast-track version for just changing the three TLS entries.
@ -174,7 +174,7 @@ void guest_load_tls(struct lg_cpu *cpu, unsigned long gtls)
__lgread(lg, tls, gtls, sizeof(*tls)*GDT_ENTRY_TLS_ENTRIES); __lgread(lg, tls, gtls, sizeof(*tls)*GDT_ENTRY_TLS_ENTRIES);
fixup_gdt_table(cpu, GDT_ENTRY_TLS_MIN, GDT_ENTRY_TLS_MAX+1); fixup_gdt_table(cpu, GDT_ENTRY_TLS_MIN, GDT_ENTRY_TLS_MAX+1);
/* Note that just the TLS entries have changed. */ /* Note that just the TLS entries have changed. */
lg->changed |= CHANGED_GDT_TLS; cpu->changed |= CHANGED_GDT_TLS;
} }
/*:*/ /*:*/

11
drivers/lguest/x86/core.c
View File

@ -75,7 +75,6 @@ static DEFINE_PER_CPU(struct lg_cpu *, last_cpu);
*/ */
static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages) static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
{ {
struct lguest *lg = cpu->lg;
/* Copying all this data can be quite expensive. We usually run the /* Copying all this data can be quite expensive. We usually run the
* same Guest we ran last time (and that Guest hasn't run anywhere else * same Guest we ran last time (and that Guest hasn't run anywhere else
* meanwhile). If that's not the case, we pretend everything in the * meanwhile). If that's not the case, we pretend everything in the
@ -83,7 +82,7 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
if (__get_cpu_var(last_cpu) != cpu || cpu->last_pages != pages) { if (__get_cpu_var(last_cpu) != cpu || cpu->last_pages != pages) {
__get_cpu_var(last_cpu) = cpu; __get_cpu_var(last_cpu) = cpu;
cpu->last_pages = pages; cpu->last_pages = pages;
lg->changed = CHANGED_ALL; cpu->changed = CHANGED_ALL;
} }
/* These copies are pretty cheap, so we do them unconditionally: */ /* These copies are pretty cheap, so we do them unconditionally: */
@ -99,18 +98,18 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
pages->state.guest_tss.ss1 = cpu->ss1; pages->state.guest_tss.ss1 = cpu->ss1;
/* Copy direct-to-Guest trap entries. */ /* Copy direct-to-Guest trap entries. */
if (lg->changed & CHANGED_IDT) if (cpu->changed & CHANGED_IDT)
copy_traps(cpu, pages->state.guest_idt, default_idt_entries); copy_traps(cpu, pages->state.guest_idt, default_idt_entries);
/* Copy all GDT entries which the Guest can change. */ /* Copy all GDT entries which the Guest can change. */
if (lg->changed & CHANGED_GDT) if (cpu->changed & CHANGED_GDT)
copy_gdt(cpu, pages->state.guest_gdt); copy_gdt(cpu, pages->state.guest_gdt);
/* If only the TLS entries have changed, copy them. */ /* If only the TLS entries have changed, copy them. */
else if (lg->changed & CHANGED_GDT_TLS) else if (cpu->changed & CHANGED_GDT_TLS)
copy_gdt_tls(cpu, pages->state.guest_gdt); copy_gdt_tls(cpu, pages->state.guest_gdt);
/* Mark the Guest as unchanged for next time. */ /* Mark the Guest as unchanged for next time. */
lg->changed = 0; cpu->changed = 0;
} }
/* Finally: the code to actually call into the Switcher to run the Guest. */ /* Finally: the code to actually call into the Switcher to run the Guest. */