From owner-p4-projects@FreeBSD.ORG Fri Jul 28 20:20:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 34F9B16A4DF; Fri, 28 Jul 2006 20:20:26 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 0B32416A4DD for ; Fri, 28 Jul 2006 20:20:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AF57E43D49 for ; Fri, 28 Jul 2006 20:20:25 +0000 (GMT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6SKKPNH082953 for ; Fri, 28 Jul 2006 20:20:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6SKKPeR082939 for perforce@freebsd.org; Fri, 28 Jul 2006 20:20:25 GMT (envelope-from jhb@freebsd.org) Date: Fri, 28 Jul 2006 20:20:25 GMT Message-Id: <200607282020.k6SKKPeR082939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 102683 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: Fri, 28 Jul 2006 20:20:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=102683 Change 102683 by jhb@jhb_mutex on 2006/07/28 20:19:55 Retire SYF_ARGMASK and remove SYF_MPSAFE and SYF_ARGMASK. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/trap.c#51 edit .. //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#21 edit .. //depot/projects/smpng/sys/arm/arm/trap.c#24 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#100 edit .. //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#17 edit .. //depot/projects/smpng/sys/ia64/ia64/trap.c#88 edit .. //depot/projects/smpng/sys/notes#91 edit .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#57 edit .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#73 edit .. //depot/projects/smpng/sys/sys/sysent.h#16 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#51 (text+ko) ==== @@ -778,7 +778,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/amd64/ia32/ia32_syscall.c#21 (text+ko) ==== @@ -154,7 +154,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/arm/arm/trap.c#24 (text+ko) ==== @@ -910,7 +910,7 @@ callp = &p->p_sysent->sv_table[0]; else callp = &p->p_sysent->sv_table[code]; - nargs = callp->sy_narg & SYF_ARGMASK; + nargs = callp->sy_narg; memcpy(copyargs, ap, nap * sizeof(register_t)); if (nargs > nap) { error = copyin((void *)frame->tf_usr_sp, copyargs + nap, @@ -930,7 +930,7 @@ if (error == 0) { td->td_retval[0] = 0; td->td_retval[1] = 0; - STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + STOPEVENT(p, S_SCE, callp->sy_narg); PTRACESTOP_SC(p, td, S_PT_SCE); AUDIT_SYSCALL_ENTER(code, td); error = (*callp->sy_call)(td, args); ==== //depot/projects/smpng/sys/i386/i386/trap.c#100 (text+ko) ==== @@ -975,7 +975,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* * copyin and the ktrsyscall()/ktrsysret() code is MP-aware ==== //depot/projects/smpng/sys/ia64/ia32/ia32_trap.c#17 (text+ko) ==== @@ -96,7 +96,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; /* copyin and the ktrsyscall()/ktrsysret() code is MP-aware */ if (params != NULL && narg != 0) ==== //depot/projects/smpng/sys/ia64/ia64/trap.c#88 (text+ko) ==== @@ -1003,7 +1003,7 @@ #ifdef KTRACE if (KTRPOINT(td, KTR_SYSCALL)) - ktrsyscall(code, (callp->sy_narg & SYF_ARGMASK), args); + ktrsyscall(code, callp->sy_narg, args); #endif CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td, td->td_proc->p_pid, td->td_proc->p_comm, code); @@ -1012,7 +1012,7 @@ td->td_retval[1] = 0; tf->tf_scratch.gr10 = EJUSTRETURN; - STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + STOPEVENT(p, S_SCE, callp->sy_narg); PTRACESTOP_SC(p, td, S_PT_SCE); ==== //depot/projects/smpng/sys/notes#91 (text+ko) ==== @@ -75,11 +75,11 @@ as bad. - compat ABI cleanups + push Giant down and mark all remaining syscalls MPSAFE - - remove SYF_MPSAFE + + remove SYF_MPSAFE + stop conditionally acquiring Giant in syscall() functions + remove all the 'M's from the syscall files + remove support for the 'M' prefix from the syscall scripts - - retire SYF_ARGMASK, sy_narg is now back to just being an argument count + + retire SYF_ARGMASK, sy_narg is now back to just being an argument count Active child branches: - jhb_intr - MSI? ==== //depot/projects/smpng/sys/powerpc/powerpc/trap.c#57 (text+ko) ==== @@ -389,7 +389,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg > n) { bcopy(params, args, n * sizeof(register_t)); ==== //depot/projects/smpng/sys/sparc64/sparc64/trap.c#73 (text+ko) ==== @@ -560,7 +560,7 @@ else callp = &p->p_sysent->sv_table[code]; - narg = callp->sy_narg & SYF_ARGMASK; + narg = callp->sy_narg; if (narg <= regcnt) { argp = &tf->tf_out[reg]; ==== //depot/projects/smpng/sys/sys/sysent.h#16 (text+ko) ==== @@ -46,9 +46,6 @@ au_event_t sy_auevent; /* audit event associated with syscall */ }; -#define SYF_ARGMASK 0x0000FFFF -#define SYF_MPSAFE 0x00010000 - struct image_params; struct __sigset; struct trapframe;