From owner-p4-projects@FreeBSD.ORG Wed May 20 22:56:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02EB106567C; Wed, 20 May 2009 22:56:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8B7F1065677 for ; Wed, 20 May 2009 22:56:27 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D9358FC1F for ; Wed, 20 May 2009 22:56:27 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4KMuRvp031600 for ; Wed, 20 May 2009 22:56:27 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4KMuRtP031598 for perforce@freebsd.org; Wed, 20 May 2009 22:56:27 GMT (envelope-from peter@wemm.org) Date: Wed, 20 May 2009 22:56:27 GMT Message-Id: <200905202256.n4KMuRtP031598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 162412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2009 22:56:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=162412 Change 162412 by peter@peter_daintree on 2009/05/20 22:55:56 %gs hacks are obe. remove stray whitespace change. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#54 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#40 edit .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#40 edit .. //depot/projects/hammer/sys/amd64/include/md_var.h#45 edit .. //depot/projects/hammer/sys/kern/kern_proc.c#82 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#54 (text+ko) ==== @@ -308,9 +308,6 @@ leaq doreti_iret(%rip),%rdi /* iretq trapped */ cmpq %rdi,TF_RIP(%rsp) je 1f /* kernel but with user gsbase!! */ - leaq load_gs_load(%rip),%rdi /* load_gs() trapped */ - cmpq %rdi,TF_RIP(%rsp) - je 1f testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */ jz 2f /* already running with kernel GS.base */ 1: swapgs ==== //depot/projects/hammer/sys/amd64/amd64/support.S#40 (text+ko) ==== @@ -665,25 +665,6 @@ lretq END(lgdt) -/* - * Special handling of %gs selector. - * This is done as an asm function so that traps can be recovered - * from while in the intermediate gsbase state. - * %edi - */ -/* void load_gs(u_int sel); */ -ENTRY(load_gs) - pushfq - cli - swapgs - .globl load_gs_load -load_gs_load: - movl %edi,%gs - swapgs - mfence /* CPU errata */ - popfq - ret - /*****************************************************************************/ /* setjump, longjump */ /*****************************************************************************/ ==== //depot/projects/hammer/sys/amd64/include/cpufunc.h#40 (text+ko) ==== @@ -462,10 +462,7 @@ __asm __volatile("movl %0,%%fs" : : "rm" (sel)); } -#ifdef _KERNEL -/* In assembler so we can recover from traps */ -void load_gs(u_int sel); -#else +#ifndef _KERNEL /* Do not use in kernel */ static __inline void load_gs(u_int sel) { ==== //depot/projects/hammer/sys/amd64/include/md_var.h#45 (text+ko) ==== @@ -87,7 +87,6 @@ void gs_load_fault(void) __asm(__STRING(gs_load_fault)); void dump_add_page(vm_paddr_t); void dump_drop_page(vm_paddr_t); -void load_gs_load(void) __asm(__STRING(load_gs_load)); void initializecpu(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); ==== //depot/projects/hammer/sys/kern/kern_proc.c#82 (text+ko) ==== @@ -1509,7 +1509,6 @@ } vput(vp); VFS_UNLOCK_GIANT(vfslocked); - } } else { kve->kve_type = KVME_TYPE_NONE;