5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
259 lines
8.0 KiB
C
259 lines
8.0 KiB
C
#ifndef _LGUEST_H
|
|
#define _LGUEST_H
|
|
|
|
#ifndef __ASSEMBLY__
|
|
#include <linux/types.h>
|
|
#include <linux/init.h>
|
|
#include <linux/stringify.h>
|
|
#include <linux/lguest.h>
|
|
#include <linux/lguest_launcher.h>
|
|
#include <linux/wait.h>
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/err.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <asm/lguest.h>
|
|
|
|
void free_pagetables(void);
|
|
int init_pagetables(struct page **switcher_page, unsigned int pages);
|
|
|
|
struct pgdir {
|
|
unsigned long gpgdir;
|
|
pgd_t *pgdir;
|
|
};
|
|
|
|
/* We have two pages shared with guests, per cpu. */
|
|
struct lguest_pages {
|
|
/* This is the stack page mapped rw in guest */
|
|
char spare[PAGE_SIZE - sizeof(struct lguest_regs)];
|
|
struct lguest_regs regs;
|
|
|
|
/* This is the host state & guest descriptor page, ro in guest */
|
|
struct lguest_ro_state state;
|
|
} __attribute__((aligned(PAGE_SIZE)));
|
|
|
|
#define CHANGED_IDT 1
|
|
#define CHANGED_GDT 2
|
|
#define CHANGED_GDT_TLS 4 /* Actually a subset of CHANGED_GDT */
|
|
#define CHANGED_ALL 3
|
|
|
|
struct lg_cpu {
|
|
unsigned int id;
|
|
struct lguest *lg;
|
|
struct task_struct *tsk;
|
|
struct mm_struct *mm; /* == tsk->mm, but that becomes NULL on exit */
|
|
|
|
u32 cr2;
|
|
int ts;
|
|
u32 esp1;
|
|
u16 ss1;
|
|
|
|
/* Bitmap of what has changed: see CHANGED_* above. */
|
|
int changed;
|
|
|
|
unsigned long pending_notify; /* pfn from LHCALL_NOTIFY */
|
|
|
|
/* At end of a page shared mapped over lguest_pages in guest. */
|
|
unsigned long regs_page;
|
|
struct lguest_regs *regs;
|
|
|
|
struct lguest_pages *last_pages;
|
|
|
|
int cpu_pgd; /* Which pgd this cpu is currently using */
|
|
|
|
/* If a hypercall was asked for, this points to the arguments. */
|
|
struct hcall_args *hcall;
|
|
u32 next_hcall;
|
|
|
|
/* Virtual clock device */
|
|
struct hrtimer hrt;
|
|
|
|
/* Did the Guest tell us to halt? */
|
|
int halted;
|
|
|
|
/* Pending virtual interrupts */
|
|
DECLARE_BITMAP(irqs_pending, LGUEST_IRQS);
|
|
|
|
struct lg_cpu_arch arch;
|
|
};
|
|
|
|
struct lg_eventfd {
|
|
unsigned long addr;
|
|
struct eventfd_ctx *event;
|
|
};
|
|
|
|
struct lg_eventfd_map {
|
|
unsigned int num;
|
|
struct lg_eventfd map[];
|
|
};
|
|
|
|
/* The private info the thread maintains about the guest. */
|
|
struct lguest {
|
|
struct lguest_data __user *lguest_data;
|
|
struct lg_cpu cpus[NR_CPUS];
|
|
unsigned int nr_cpus;
|
|
|
|
u32 pfn_limit;
|
|
|
|
/*
|
|
* This provides the offset to the base of guest-physical memory in the
|
|
* Launcher.
|
|
*/
|
|
void __user *mem_base;
|
|
unsigned long kernel_address;
|
|
|
|
struct pgdir pgdirs[4];
|
|
|
|
unsigned long noirq_start, noirq_end;
|
|
|
|
unsigned int stack_pages;
|
|
u32 tsc_khz;
|
|
|
|
struct lg_eventfd_map *eventfds;
|
|
|
|
/* Dead? */
|
|
const char *dead;
|
|
};
|
|
|
|
extern struct mutex lguest_lock;
|
|
|
|
/* core.c: */
|
|
bool lguest_address_ok(const struct lguest *lg,
|
|
unsigned long addr, unsigned long len);
|
|
void __lgread(struct lg_cpu *, void *, unsigned long, unsigned);
|
|
void __lgwrite(struct lg_cpu *, unsigned long, const void *, unsigned);
|
|
|
|
/*H:035
|
|
* Using memory-copy operations like that is usually inconvient, so we
|
|
* have the following helper macros which read and write a specific type (often
|
|
* an unsigned long).
|
|
*
|
|
* This reads into a variable of the given type then returns that.
|
|
*/
|
|
#define lgread(cpu, addr, type) \
|
|
({ type _v; __lgread((cpu), &_v, (addr), sizeof(_v)); _v; })
|
|
|
|
/* This checks that the variable is of the given type, then writes it out. */
|
|
#define lgwrite(cpu, addr, type, val) \
|
|
do { \
|
|
typecheck(type, val); \
|
|
__lgwrite((cpu), (addr), &(val), sizeof(val)); \
|
|
} while(0)
|
|
/* (end of memory access helper routines) :*/
|
|
|
|
int run_guest(struct lg_cpu *cpu, unsigned long __user *user);
|
|
|
|
/*
|
|
* Helper macros to obtain the first 12 or the last 20 bits, this is only the
|
|
* first step in the migration to the kernel types. pte_pfn is already defined
|
|
* in the kernel.
|
|
*/
|
|
#define pgd_flags(x) (pgd_val(x) & ~PAGE_MASK)
|
|
#define pgd_pfn(x) (pgd_val(x) >> PAGE_SHIFT)
|
|
#define pmd_flags(x) (pmd_val(x) & ~PAGE_MASK)
|
|
#define pmd_pfn(x) (pmd_val(x) >> PAGE_SHIFT)
|
|
|
|
/* interrupts_and_traps.c: */
|
|
unsigned int interrupt_pending(struct lg_cpu *cpu, bool *more);
|
|
void try_deliver_interrupt(struct lg_cpu *cpu, unsigned int irq, bool more);
|
|
void set_interrupt(struct lg_cpu *cpu, unsigned int irq);
|
|
bool deliver_trap(struct lg_cpu *cpu, unsigned int num);
|
|
void load_guest_idt_entry(struct lg_cpu *cpu, unsigned int i,
|
|
u32 low, u32 hi);
|
|
void guest_set_stack(struct lg_cpu *cpu, u32 seg, u32 esp, unsigned int pages);
|
|
void pin_stack_pages(struct lg_cpu *cpu);
|
|
void setup_default_idt_entries(struct lguest_ro_state *state,
|
|
const unsigned long *def);
|
|
void copy_traps(const struct lg_cpu *cpu, struct desc_struct *idt,
|
|
const unsigned long *def);
|
|
void guest_set_clockevent(struct lg_cpu *cpu, unsigned long delta);
|
|
bool send_notify_to_eventfd(struct lg_cpu *cpu);
|
|
void init_clockdev(struct lg_cpu *cpu);
|
|
bool check_syscall_vector(struct lguest *lg);
|
|
int init_interrupts(void);
|
|
void free_interrupts(void);
|
|
|
|
/* segments.c: */
|
|
void setup_default_gdt_entries(struct lguest_ro_state *state);
|
|
void setup_guest_gdt(struct lg_cpu *cpu);
|
|
void load_guest_gdt_entry(struct lg_cpu *cpu, unsigned int i,
|
|
u32 low, u32 hi);
|
|
void guest_load_tls(struct lg_cpu *cpu, unsigned long tls_array);
|
|
void copy_gdt(const struct lg_cpu *cpu, struct desc_struct *gdt);
|
|
void copy_gdt_tls(const struct lg_cpu *cpu, struct desc_struct *gdt);
|
|
|
|
/* page_tables.c: */
|
|
int init_guest_pagetable(struct lguest *lg);
|
|
void free_guest_pagetable(struct lguest *lg);
|
|
void guest_new_pagetable(struct lg_cpu *cpu, unsigned long pgtable);
|
|
void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 i);
|
|
#ifdef CONFIG_X86_PAE
|
|
void guest_set_pmd(struct lguest *lg, unsigned long gpgdir, u32 i);
|
|
#endif
|
|
void guest_pagetable_clear_all(struct lg_cpu *cpu);
|
|
void guest_pagetable_flush_user(struct lg_cpu *cpu);
|
|
void guest_set_pte(struct lg_cpu *cpu, unsigned long gpgdir,
|
|
unsigned long vaddr, pte_t val);
|
|
void map_switcher_in_guest(struct lg_cpu *cpu, struct lguest_pages *pages);
|
|
bool demand_page(struct lg_cpu *cpu, unsigned long cr2, int errcode);
|
|
void pin_page(struct lg_cpu *cpu, unsigned long vaddr);
|
|
unsigned long guest_pa(struct lg_cpu *cpu, unsigned long vaddr);
|
|
void page_table_guest_data_init(struct lg_cpu *cpu);
|
|
|
|
/* <arch>/core.c: */
|
|
void lguest_arch_host_init(void);
|
|
void lguest_arch_host_fini(void);
|
|
void lguest_arch_run_guest(struct lg_cpu *cpu);
|
|
void lguest_arch_handle_trap(struct lg_cpu *cpu);
|
|
int lguest_arch_init_hypercalls(struct lg_cpu *cpu);
|
|
int lguest_arch_do_hcall(struct lg_cpu *cpu, struct hcall_args *args);
|
|
void lguest_arch_setup_regs(struct lg_cpu *cpu, unsigned long start);
|
|
|
|
/* <arch>/switcher.S: */
|
|
extern char start_switcher_text[], end_switcher_text[], switch_to_guest[];
|
|
|
|
/* lguest_user.c: */
|
|
int lguest_device_init(void);
|
|
void lguest_device_remove(void);
|
|
|
|
/* hypercalls.c: */
|
|
void do_hypercalls(struct lg_cpu *cpu);
|
|
void write_timestamp(struct lg_cpu *cpu);
|
|
|
|
/*L:035
|
|
* Let's step aside for the moment, to study one important routine that's used
|
|
* widely in the Host code.
|
|
*
|
|
* There are many cases where the Guest can do something invalid, like pass crap
|
|
* to a hypercall. Since only the Guest kernel can make hypercalls, it's quite
|
|
* acceptable to simply terminate the Guest and give the Launcher a nicely
|
|
* formatted reason. It's also simpler for the Guest itself, which doesn't
|
|
* need to check most hypercalls for "success"; if you're still running, it
|
|
* succeeded.
|
|
*
|
|
* Once this is called, the Guest will never run again, so most Host code can
|
|
* call this then continue as if nothing had happened. This means many
|
|
* functions don't have to explicitly return an error code, which keeps the
|
|
* code simple.
|
|
*
|
|
* It also means that this can be called more than once: only the first one is
|
|
* remembered. The only trick is that we still need to kill the Guest even if
|
|
* we can't allocate memory to store the reason. Linux has a neat way of
|
|
* packing error codes into invalid pointers, so we use that here.
|
|
*
|
|
* Like any macro which uses an "if", it is safely wrapped in a run-once "do {
|
|
* } while(0)".
|
|
*/
|
|
#define kill_guest(cpu, fmt...) \
|
|
do { \
|
|
if (!(cpu)->lg->dead) { \
|
|
(cpu)->lg->dead = kasprintf(GFP_ATOMIC, fmt); \
|
|
if (!(cpu)->lg->dead) \
|
|
(cpu)->lg->dead = ERR_PTR(-ENOMEM); \
|
|
} \
|
|
} while(0)
|
|
/* (End of aside) :*/
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
#endif /* _LGUEST_H */
|