From owner-p4-projects@FreeBSD.ORG Wed Nov 5 13:22:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 54AB616A4D0; Wed, 5 Nov 2003 13:22:14 -0800 (PST) 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 17A0016A4CE for ; Wed, 5 Nov 2003 13:22:14 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 813CC43F85 for ; Wed, 5 Nov 2003 13:22:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA5LMDXJ043839 for ; Wed, 5 Nov 2003 13:22:13 -0800 (PST) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA5LMDSe043836 for perforce@freebsd.org; Wed, 5 Nov 2003 13:22:13 -0800 (PST) (envelope-from sam@freebsd.org) Date: Wed, 5 Nov 2003 13:22:13 -0800 (PST) Message-Id: <200311052122.hA5LMDSe043836@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 41478 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: Wed, 05 Nov 2003 21:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=41478 Change 41478 by sam@sam_ebb on 2003/11/05 13:21:23 Add assertions about needing Giant to do socket operations to tied us over until NFS and sockets are properly locked. Affected files ... .. //depot/projects/netperf/sys/nfsclient/bootp_subr.c#7 edit .. //depot/projects/netperf/sys/nfsclient/krpc_subr.c#3 edit .. //depot/projects/netperf/sys/nfsclient/nfs_socket.c#3 edit .. //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#6 edit .. //depot/projects/netperf/sys/nfsserver/nfs_srvsock.c#2 edit .. //depot/projects/netperf/sys/nfsserver/nfs_syscalls.c#3 edit Differences ... ==== //depot/projects/netperf/sys/nfsclient/bootp_subr.c#7 (text+ko) ==== @@ -587,6 +587,8 @@ int retry; const char *s; + GIANT_REQUIRED; /* XXX until socket locking done */ + /* * Create socket and set its recieve timeout. */ @@ -977,6 +979,8 @@ struct ifaddr *ifa; struct sockaddr_dl *sdl; + GIANT_REQUIRED; /* XXX until socket locking done */ + error = socreate(AF_INET, &ifctx->so, SOCK_DGRAM, 0, td->td_ucred, td); if (error != 0) panic("nfs_boot: socreate, error=%d", error); ==== //depot/projects/netperf/sys/nfsclient/krpc_subr.c#3 (text+ko) ==== @@ -213,6 +213,8 @@ nam = mhead = NULL; from = NULL; + GIANT_REQUIRED; /* XXX until socket locking done */ + /* * Create socket and set its recieve timeout. */ ==== //depot/projects/netperf/sys/nfsclient/nfs_socket.c#3 (text+ko) ==== @@ -161,6 +161,8 @@ struct sockaddr *saddr; struct thread *td = &thread0; /* only used for socreate and sobind */ + GIANT_REQUIRED; /* XXX until socket locking done */ + nmp->nm_so = NULL; saddr = nmp->nm_nam; error = socreate(saddr->sa_family, &nmp->nm_so, nmp->nm_sotype, @@ -377,6 +379,8 @@ { struct socket *so; + GIANT_REQUIRED; /* XXX until socket locking done */ + if (nmp->nm_so) { so = nmp->nm_so; nmp->nm_so = NULL; @@ -411,6 +415,8 @@ struct sockaddr *sendnam; int error, soflags, flags; + GIANT_REQUIRED; /* XXX until socket locking done */ + KASSERT(rep, ("nfs_send: called with rep == NULL")); if (rep->r_flags & R_SOFTTERM) { @@ -484,6 +490,8 @@ int error, sotype, rcvflg; struct thread *td = curthread; /* XXX */ + GIANT_REQUIRED; /* XXX until socket locking done */ + /* * Set up arguments for soreceive() */ ==== //depot/projects/netperf/sys/nfsclient/nfs_vfsops.c#6 (text+ko) ==== @@ -376,6 +376,8 @@ u_long l; char buf[128]; + GIANT_REQUIRED; /* XXX until socket locking done */ + #if defined(BOOTP_NFSROOT) && defined(BOOTP) bootpc_init(); /* use bootp to get nfs_diskless filled in */ #elif defined(NFS_ROOT) ==== //depot/projects/netperf/sys/nfsserver/nfs_srvsock.c#2 (text+ko) ==== @@ -425,6 +425,8 @@ goto dorecs; } #endif + GIANT_REQUIRED; /* XXX until socket locking is done */ + auio.uio_td = NULL; if (so->so_type == SOCK_STREAM) { /* @@ -725,6 +727,8 @@ struct sockaddr *sendnam; int error, soflags, flags; + GIANT_REQUIRED; /* XXX until socket locking is done */ + soflags = so->so_proto->pr_flags; if ((soflags & PR_CONNREQUIRED) || (so->so_state & SS_ISCONNECTED)) sendnam = NULL; ==== //depot/projects/netperf/sys/nfsserver/nfs_syscalls.c#3 (text+ko) ==== @@ -199,6 +199,8 @@ struct socket *so; int error, s; + GIANT_REQUIRED; /* XXX until socket locking done */ + so = fp->f_data; #if 0 tslp = NULL;