From owner-svn-src-head@FreeBSD.ORG Mon Mar 9 13:11:16 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED9491065676; Mon, 9 Mar 2009 13:11:16 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D99908FC32; Mon, 9 Mar 2009 13:11:16 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n29DBGAG027073; Mon, 9 Mar 2009 13:11:16 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n29DBGCu027070; Mon, 9 Mar 2009 13:11:16 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200903091311.n29DBGCu027070@svn.freebsd.org> From: Robert Watson Date: Mon, 9 Mar 2009 13:11:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189572 - in head/sys: amd64/amd64 i386/i386 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Mar 2009 13:11:18 -0000 Author: rwatson Date: Mon Mar 9 13:11:16 2009 New Revision: 189572 URL: http://svn.freebsd.org/changeset/base/189572 Log: Trim comments about the MP-safety of various bits of the amd64/i386 system call entry path and i386 IP checksum generation: we now assume all code is MPSAFE unless explicitly marked otherwise. Remove XXX Giant comments along similar lines: the code by the comments either doesn't need or doesn't want Giant (especially the NMI handler). MFC after: 3 days Modified: head/sys/amd64/amd64/trap.c head/sys/i386/i386/in_cksum.c head/sys/i386/i386/trap.c Modified: head/sys/amd64/amd64/trap.c ============================================================================== --- head/sys/amd64/amd64/trap.c Mon Mar 9 11:18:41 2009 (r189571) +++ head/sys/amd64/amd64/trap.c Mon Mar 9 13:11:16 2009 (r189572) @@ -386,7 +386,6 @@ trap(struct trapframe *frame) #ifdef DEV_ISA case T_NMI: /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -530,7 +529,6 @@ trap(struct trapframe *frame) #ifdef DEV_ISA case T_NMI: - /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { #ifdef KDB @@ -820,9 +818,6 @@ syscall(struct trapframe *frame) orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { - /* - * The prep code is MP aware. - */ (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { @@ -841,10 +836,6 @@ syscall(struct trapframe *frame) callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg; - - /* - * copyin and the ktrsyscall()/ktrsysret() code is MP-aware - */ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; Modified: head/sys/i386/i386/in_cksum.c ============================================================================== --- head/sys/i386/i386/in_cksum.c Mon Mar 9 11:18:41 2009 (r189571) +++ head/sys/i386/i386/in_cksum.c Mon Mar 9 13:11:16 2009 (r189572) @@ -33,9 +33,6 @@ #include __FBSDID("$FreeBSD$"); -/* - * MPsafe: alfred - */ #include #include #include Modified: head/sys/i386/i386/trap.c ============================================================================== --- head/sys/i386/i386/trap.c Mon Mar 9 11:18:41 2009 (r189571) +++ head/sys/i386/i386/trap.c Mon Mar 9 13:11:16 2009 (r189572) @@ -461,7 +461,6 @@ trap(struct trapframe *frame) goto userout; #else /* !POWERFAIL_NMI */ /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -658,7 +657,6 @@ trap(struct trapframe *frame) * in kernel space because that is useful when * debugging the kernel. */ - /* XXX Giant */ if (user_dbreg_trap() && !(PCPU_GET(curpcb)->pcb_flags & PCB_VM86CALL)) { /* @@ -692,7 +690,6 @@ trap(struct trapframe *frame) } goto out; #else /* !POWERFAIL_NMI */ - /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { #ifdef KDB @@ -999,14 +996,10 @@ syscall(struct trapframe *frame) orig_tf_eflags = frame->tf_eflags; if (p->p_sysent->sv_prepsyscall) { - /* - * The prep code is MP aware. - */ (*p->p_sysent->sv_prepsyscall)(frame, args, &code, ¶ms); } else { /* * Need to check if this is a 32 bit or 64 bit syscall. - * fuword is MP aware. */ if (code == SYS_syscall) { /* @@ -1034,9 +1027,6 @@ syscall(struct trapframe *frame) narg = callp->sy_narg; - /* - * copyin and the ktrsyscall()/ktrsysret() code is MP-aware - */ if (params != NULL && narg != 0) error = copyin(params, (caddr_t)args, (u_int)(narg * sizeof(int)));