From owner-p4-projects@FreeBSD.ORG Tue Apr 22 14:05:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9AE837B404; Tue, 22 Apr 2003 14:05:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5943B37B401 for ; Tue, 22 Apr 2003 14:05:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D979A43FB1 for ; Tue, 22 Apr 2003 14:05:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3ML510U089666 for ; Tue, 22 Apr 2003 14:05:01 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3ML51YF089659 for perforce@freebsd.org; Tue, 22 Apr 2003 14:05:01 -0700 (PDT) Date: Tue, 22 Apr 2003 14:05:01 -0700 (PDT) Message-Id: <200304222105.h3ML51YF089659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 29445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2003 21:05:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=29445 Change 29445 by peter@peter_overcee on 2003/04/22 14:04:50 cpu_switch_load_gs isn't here. Affected files ... .. //depot/projects/hammer/sys/x86_64/include/md_var.h#15 edit .. //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#18 edit .. //depot/projects/hammer/sys/x86_64/x86_64/trap.c#25 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/include/md_var.h#15 (text+ko) ==== @@ -62,7 +62,6 @@ void cpu_halt(void); void cpu_reset(void); void cpu_setregs(void); -void cpu_switch_load_gs(void) __asm(__STRING(cpu_switch_load_gs)); void doreti_iret(void) __asm(__STRING(doreti_iret)); void doreti_iret_fault(void) __asm(__STRING(doreti_iret_fault)); void doreti_popl_ds(void) __asm(__STRING(doreti_popl_ds)); ==== //depot/projects/hammer/sys/x86_64/x86_64/swtch.s#18 (text+ko) ==== @@ -168,9 +168,6 @@ movq %rdx, PCPU(CURPCB) movq %rsi, PCPU(CURTHREAD) /* into next thread */ - .globl cpu_switch_load_gs -cpu_switch_load_gs: - ret #ifdef INVARIANTS ==== //depot/projects/hammer/sys/x86_64/x86_64/trap.c#25 (text+ko) ==== @@ -198,8 +198,7 @@ * and we shouldn't enable interrupts while holding a * spin lock. */ - if (type != T_PAGEFLT && PCPU_GET(spinlocks) == NULL && - frame.tf_eip != (int)cpu_switch_load_gs) + if (type != T_PAGEFLT && PCPU_GET(spinlocks) == NULL) enable_intr(); } } @@ -353,28 +352,6 @@ case T_PROTFLT: /* general protection fault */ case T_SEGNPFLT: /* segment not present fault */ - /* - * Invalid %fs's and %gs's can be created using - * procfs or PT_SETREGS or by invalidating the - * underlying LDT entry. This causes a fault - * in kernel mode when the kernel attempts to - * switch contexts. Lose the bad context - * (XXX) so that we can continue, and generate - * a signal. - */ - if (frame.tf_rip == (long)cpu_switch_load_gs) { - PCPU_GET(curpcb)->pcb_gs = 0; - printf( - "Process %d has bad %%gs, reset to zero\n", - p->p_pid); -#if 0 - PROC_LOCK(p); - psignal(p, SIGBUS); - PROC_UNLOCK(p); -#endif - goto out; - } - if (td->td_intr_nesting_level != 0) break;