From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: [patch 10/20] XEN-paravirt: mm lifetime hooks Date: Fri, 12 Jan 2007 17:45:49 -0800 Message-ID: <20070113014648.102890184@goop.org> References: <20070113014539.408244126@goop.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline; filename=mm-lifetime-hooks.patch List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.osdl.org Errors-To: virtualization-bounces@lists.osdl.org To: Andrew Morton Cc: virtualization@lists.osdl.org, xen-devel@lists.xensource.com, Chris Wright , Andi Kleen , linux-kernel@vger.kernel.org List-Id: virtualization@lists.linuxfoundation.org Add hooks to allow a paravirt implementation to track the lifetime of an mm. Unfortunately dup_mmap and exit_mmap are in generic code, so we need to #ifdef CONFIG_PARAVIRT. Signed-off-by: Jeremy Fitzhardinge Cc: Chris Wright Cc: Zachary Amsden Cc: Andi Kleen Cc: Andrew Morton Cc: Rusty Russell -- arch/i386/kernel/paravirt.c | 4 ++++ include/asm-i386/mmu_context.h | 8 ++++++-- include/asm-i386/paravirt.h | 38 ++++++++++++++++++++++++++++++++++++= ++ kernel/fork.c | 3 +++ mm/mmap.c | 4 ++++ 5 files changed, 55 insertions(+), 2 deletions(-) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/arch/i386/kernel/paravirt.c +++ b/arch/i386/kernel/paravirt.c @@ -706,6 +706,10 @@ struct paravirt_ops paravirt_ops =3D { .irq_enable_sysexit =3D native_irq_enable_sysexit, .iret =3D native_iret, = + .dup_mmap =3D (void *)native_nop, + .exit_mmap =3D (void *)native_nop, + .activate_mm =3D (void *)native_nop, + .startup_ipi_hook =3D (void *)native_nop, }; = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/include/asm-i386/mmu_context.h +++ b/include/asm-i386/mmu_context.h @@ -5,6 +5,7 @@ #include #include #include +#include = /* * Used for LDT copy/destruction. @@ -65,7 +66,10 @@ static inline void switch_mm(struct mm_s #define deactivate_mm(tsk, mm) \ asm("movl %0,%%gs": :"r" (0)); = -#define activate_mm(prev, next) \ - switch_mm((prev),(next),NULL) +#define activate_mm(prev, next) \ + do { \ + paravirt_activate_mm(prev, next); \ + switch_mm((prev),(next),NULL); \ + } while(0); = #endif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/include/asm-i386/paravirt.h +++ b/include/asm-i386/paravirt.h @@ -126,6 +126,12 @@ struct paravirt_ops void (fastcall *io_delay)(void); void (*const_udelay)(unsigned long loops); = + void (fastcall *activate_mm)(struct mm_struct *prev, + struct mm_struct *next); + void (fastcall *dup_mmap)(struct mm_struct *oldmm, = + struct mm_struct *mm); + void (fastcall *exit_mmap)(struct mm_struct *mm); + #ifdef CONFIG_X86_LOCAL_APIC void (fastcall *apic_write)(unsigned long reg, unsigned long v); void (fastcall *apic_write_atomic)(unsigned long reg, unsigned long v); @@ -429,6 +435,23 @@ static inline void startup_ipi_hook(int = } #endif = +static inline void paravirt_activate_mm(struct mm_struct *prev, + struct mm_struct *next) +{ + paravirt_ops.activate_mm(prev, next); +} + +static inline void paravirt_dup_mmap(struct mm_struct *oldmm, + struct mm_struct *mm) +{ + paravirt_ops.dup_mmap(oldmm, mm); +} + +static inline void paravirt_exit_mmap(struct mm_struct *mm) +{ + paravirt_ops.exit_mmap(mm); +} + #define __flush_tlb() paravirt_ops.flush_tlb_user() #define __flush_tlb_global() paravirt_ops.flush_tlb_kernel() #define __flush_tlb_single(addr) paravirt_ops.flush_tlb_single(addr) @@ -673,5 +696,20 @@ static inline void paravirt_pagetable_se set_pgd(&base[0], base[USER_PTRS_PER_PGD]); #endif } + +static inline void paravirt_activate_mm(struct mm_struct *prev, + struct mm_struct *next) +{ +} + +static inline void paravirt_dup_mmap(struct mm_struct *oldmm, + struct mm_struct *mm) +{ +} + +static inline void paravirt_exit_mmap(struct mm_struct *mm) +{ +} + #endif /* CONFIG_PARAVIRT */ #endif /* __ASM_PARAVIRT_H */ =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/kernel/fork.c +++ b/kernel/fork.c @@ -287,6 +287,9 @@ static inline int dup_mmap(struct mm_str if (retval) goto out; } +#ifdef CONFIG_PARAVIRT + paravirt_dup_mmap(oldmm, mm); +#endif retval =3D 0; out: up_write(&mm->mmap_sem); =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1969,6 +1969,10 @@ void exit_mmap(struct mm_struct *mm) struct vm_area_struct *vma =3D mm->mmap; unsigned long nr_accounted =3D 0; unsigned long end; + +#ifdef CONFIG_PARAVIRT + paravirt_exit_mmap(mm); +#endif = lru_add_drain(); flush_cache_mm(mm); -- =