Date: Sun, 4 Apr 2004 20:36:45 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50377 for review Message-ID: <200404050336.i353ajYg036494@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50377 Change 50377 by rwatson@rwatson_paprika on 2004/04/04 20:35:51 Integrate netperf_socket: - pmap_init() arguments removed. - 0/boolean/NULL cleanup in TCP code. - vm_page_start() arguments simplified. Affected files ... .. //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/netperf_socket/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/netperf_socket/sys/i386/i386/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#4 integrate .. //depot/projects/netperf_socket/sys/pci/agpreg.h#2 integrate .. //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#5 integrate .. //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/netperf_socket/sys/vm/pmap.h#3 integrate .. //depot/projects/netperf_socket/sys/vm/vm_init.c#2 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.c#4 integrate .. //depot/projects/netperf_socket/sys/vm/vm_page.h#3 integrate Differences ... ==== //depot/projects/netperf_socket/sys/alpha/alpha/pmap.c#3 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.140 2004/03/07 21:06:46 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.141 2004/04/05 00:37:47 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -615,8 +615,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_offset_t phys_start, phys_end; +pmap_init(void) { int i; int initial_pvs; ==== //depot/projects/netperf_socket/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.455 2004/04/03 20:53:49 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.456 2004/04/05 00:37:47 alc Exp $"); /* * Manages physical address maps. @@ -527,8 +527,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_paddr_t phys_start, phys_end; +pmap_init(void) { int i; ==== //depot/projects/netperf_socket/sys/dev/puc/puc_sbus.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.1 2003/09/06 21:48:50 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/puc_sbus.c,v 1.2 2004/04/05 01:58:02 marcel Exp $"); #include "opt_puc.h" @@ -68,7 +68,7 @@ for (i = 0; i < 2; i++) { dd.ports[i].type = PUC_PORT_TYPE_UART | PUC_PORT_UART_Z8530; dd.ports[i].bar = 0; - dd.ports[i].offset = 4 * i; + dd.ports[i].offset = 4 - 4 * i; dd.ports[i].serialfreq = 0; dd.ports[i].flags = PUC_FLAGS_MEMORY; dd.ports[i].regshft = 1; ==== //depot/projects/netperf_socket/sys/i386/i386/pmap.c#4 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.463 2004/03/07 21:06:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/pmap.c,v 1.464 2004/04/05 00:37:48 alc Exp $"); /* * Manages physical address maps. @@ -458,8 +458,7 @@ * way, discontiguous physical memory. */ void -pmap_init(phys_start, phys_end) - vm_paddr_t phys_start, phys_end; +pmap_init(void) { int i; ==== //depot/projects/netperf_socket/sys/ia64/ia64/pmap.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.127 2004/03/07 21:06:47 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.128 2004/04/05 00:37:48 alc Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -504,7 +504,7 @@ * way, discontiguous physical memory. */ void -pmap_init(vm_offset_t phys_start, vm_offset_t phys_end) +pmap_init(void) { int i; int initial_pvs; ==== //depot/projects/netperf_socket/sys/netinet/tcp_subr.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.184 2004/02/28 15:12:20 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.186 2004/04/05 00:52:05 rwatson Exp $ */ #include "opt_compat.h" @@ -372,7 +372,7 @@ /* * Send a single message to the TCP at address specified by - * the given TCP/IP header. If m == 0, then we make a copy + * the given TCP/IP header. If m == NULL, then we make a copy * of the tcpiphdr at ti and send directly to the addressed host. * This is used to force keep alive messages out using the TCP * template for a connection. If flags are given then we send @@ -412,7 +412,7 @@ #endif /* INET6 */ ip = ipgen; - if (tp) { + if (tp != NULL) { inp = tp->t_inpcb; KASSERT(inp != NULL, ("tcp control block w/o inpcb")); INP_INFO_WLOCK_ASSERT(&tcbinfo); @@ -423,7 +423,7 @@ win = (long)TCP_MAXWIN << tp->rcv_scale; } } - if (m == 0) { + if (m == NULL) { m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) return; @@ -446,7 +446,7 @@ flags = TH_ACK; } else { m_freem(m->m_next); - m->m_next = 0; + m->m_next = NULL; m->m_data = (caddr_t)ipgen; /* m_len is set later */ tlen = 0; @@ -492,7 +492,7 @@ } m->m_len = tlen; m->m_pkthdr.len = tlen; - m->m_pkthdr.rcvif = (struct ifnet *) 0; + m->m_pkthdr.rcvif = NULL; #ifdef MAC if (inp != NULL) { /* @@ -513,7 +513,7 @@ nth->th_x2 = 0; nth->th_off = sizeof (struct tcphdr) >> 2; nth->th_flags = flags; - if (tp) + if (tp != NULL) nth->th_win = htons((u_short) (win >> tp->rcv_scale)); else nth->th_win = htons((u_short)win); @@ -524,7 +524,8 @@ nth->th_sum = in6_cksum(m, IPPROTO_TCP, sizeof(struct ip6_hdr), tlen - sizeof(struct ip6_hdr)); - ip6->ip6_hlim = in6_selecthlim(tp ? tp->t_inpcb : NULL, NULL); + ip6->ip6_hlim = in6_selecthlim(tp != NULL ? tp->t_inpcb : + NULL, NULL); } else #endif /* INET6 */ { @@ -745,7 +746,7 @@ #endif in_pcbdetach(inp); tcpstat.tcps_closed++; - return ((struct tcpcb *)0); + return (NULL); } void @@ -770,7 +771,7 @@ if (inpb->inp_vflag & INP_TIMEWAIT) continue; INP_LOCK(inpb); - if ((tcpb = intotcpcb(inpb))) { + if ((tcpb = intotcpcb(inpb)) != NULL) { while ((te = LIST_FIRST(&tcpb->t_segq)) != NULL) { LIST_REMOVE(te, tqe_q); @@ -839,14 +840,14 @@ * The process of preparing the TCB list is too time-consuming and * resource-intensive to repeat twice on every request. */ - if (req->oldptr == 0) { + if (req->oldptr == NULL) { n = tcbinfo.ipi_count; req->oldidx = 2 * (sizeof xig) + (n + n/8) * sizeof(struct xtcpcb); return 0; } - if (req->newptr != 0) + if (req->newptr != NULL) return EPERM; /* @@ -873,12 +874,12 @@ return error; inp_list = malloc(n * sizeof *inp_list, M_TEMP, M_WAITOK); - if (inp_list == 0) + if (inp_list == NULL) return ENOMEM; s = splnet(); INP_INFO_RLOCK(&tcbinfo); - for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp && i < n; + for (inp = LIST_FIRST(tcbinfo.listhead), i = 0; inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) { INP_LOCK(inp); if (inp->inp_gencnt <= gencnt) { @@ -919,7 +920,7 @@ xt.xt_tp.t_state = TCPS_TIME_WAIT; } else bcopy(inp_ppcb, &xt.xt_tp, sizeof xt.xt_tp); - if (inp->inp_socket) + if (inp->inp_socket != NULL) sotoxsocket(inp->inp_socket, &xt.xt_socket); else { bzero(&xt.xt_socket, sizeof xt.xt_socket); @@ -1099,10 +1100,10 @@ * excellent DoS attack on machines with many connections. */ else if (cmd == PRC_HOSTDEAD) - ip = 0; + ip = NULL; else if ((unsigned)cmd >= PRC_NCMDS || inetctlerrmap[cmd] == 0) return; - if (ip) { + if (ip != NULL) { s = splnet(); th = (struct tcphdr *)((caddr_t)ip + (ip->ip_hl << 2)); @@ -1118,7 +1119,7 @@ SEQ_LT(icmp_seq, tp->snd_max)) inp = (*notify)(inp, inetctlerrmap[cmd]); } - if (inp) + if (inp != NULL) INP_UNLOCK(inp); } else { struct in_conninfo inc; @@ -1183,7 +1184,7 @@ sa6_src = &sa6_any; } - if (ip6) { + if (ip6 != NULL) { struct in_conninfo inc; /* * XXX: We assume that when IPV6 is non NULL, @@ -1300,7 +1301,7 @@ { struct tcpcb *tp = intotcpcb(inp); - if (tp) + if (tp != NULL) tp->snd_cwnd = tp->t_maxseg; return (inp); } @@ -1317,7 +1318,7 @@ { struct tcpcb *tp = intotcpcb(inp); - if (tp && tp->t_state == TCPS_SYN_SENT) { + if (tp != NULL && tp->t_state == TCPS_SYN_SENT) { tcp_drop(tp, errno); return (struct inpcb *)0; } @@ -1346,7 +1347,7 @@ #endif /* INET6 */ bzero(&tao, sizeof(tao)); - if (tp) { + if (tp != NULL) { maxmtu = tcp_hc_getmtu(&inp->inp_inc); /* IPv4 and IPv6 */ romtu = #ifdef INET6 ==== //depot/projects/netperf_socket/sys/pci/agpreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/agpreg.h,v 1.9 2003/08/23 18:00:31 mdodd Exp $ + * $FreeBSD: src/sys/pci/agpreg.h,v 1.10 2004/04/05 02:32:07 imp Exp $ */ #ifndef _PCI_AGPREG_H_ @@ -46,6 +46,28 @@ #define AGP_STATUS 0x4 #define AGP_COMMAND 0x8 +#define AGP_STATUS_AGP3 0x0008 +#define AGP_STATUS_RQ_MASK 0xff000000 +#define AGP_COMMAND_RQ_MASK 0xff000000 +#define AGP_STATUS_ARQSZ_MASK 0xe000 +#define AGP_COMMAND_ARQSZ_MASK 0xe000 +#define AGP_STATUS_CAL_MASK 0x1c00 +#define AGP_COMMAND_CAL_MASK 0x1c00 +#define AGP_STATUS_ISOCH 0x10000 +#define AGP_STATUS_SBA 0x0200 +#define AGP_STATUS_ITA_COH 0x0100 +#define AGP_STATUS_GART64 0x0080 +#define AGP_STATUS_HTRANS 0x0040 +#define AGP_STATUS_64BIT 0x0020 +#define AGP_STATUS_FW 0x0010 +#define AGP_COMMAND_RQ_MASK 0xff000000 +#define AGP_COMMAND_ARQSZ_MASK 0xe000 +#define AGP_COMMAND_CAL_MASK 0x1c00 +#define AGP_COMMAND_SBA 0x0200 +#define AGP_COMMAND_AGP 0x0100 +#define AGP_COMMAND_GART64 0x0080 +#define AGP_COMMAND_64BIT 0x0020 +#define AGP_COMMAND_FW 0x0010 /* * Config offsets for Intel AGP chipsets. ==== //depot/projects/netperf_socket/sys/powerpc/powerpc/pmap.c#5 (text+ko) ==== @@ -91,7 +91,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.72 2004/03/07 21:06:48 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/pmap.c,v 1.73 2004/04/05 00:37:49 alc Exp $"); /* * Manages physical address maps. @@ -1086,7 +1086,7 @@ } void -pmap_init(vm_offset_t phys_start, vm_offset_t phys_end) +pmap_init(void) { CTR0(KTR_PMAP, "pmap_init"); ==== //depot/projects/netperf_socket/sys/sparc64/sparc64/pmap.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.127 2004/03/07 21:06:48 alc Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/pmap.c,v 1.128 2004/04/05 00:37:49 alc Exp $ */ /* @@ -563,7 +563,7 @@ * Initialize the pmap module. */ void -pmap_init(vm_paddr_t phys_start, vm_paddr_t phys_end) +pmap_init(void) { vm_offset_t addr; vm_size_t size; ==== //depot/projects/netperf_socket/sys/vm/pmap.h#3 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/pmap.h,v 1.66 2004/03/07 21:06:48 alc Exp $ + * $FreeBSD: src/sys/vm/pmap.h,v 1.67 2004/04/05 00:37:50 alc Exp $ */ /* @@ -109,7 +109,7 @@ vm_page_t pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot); void pmap_growkernel(vm_offset_t); -void pmap_init(vm_paddr_t, vm_paddr_t); +void pmap_init(void); boolean_t pmap_is_modified(vm_page_t m); boolean_t pmap_is_prefaultable(pmap_t pmap, vm_offset_t va); boolean_t pmap_ts_referenced(vm_page_t m); ==== //depot/projects/netperf_socket/sys/vm/vm_init.c#2 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_init.c,v 1.39 2003/09/01 16:46:47 eivind Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_init.c,v 1.41 2004/04/05 00:37:50 alc Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -113,7 +113,7 @@ * memory is accounted for, and we use only virtual addresses. */ vm_set_page_size(); - virtual_avail = vm_page_startup(avail_start, avail_end, virtual_avail); + virtual_avail = vm_page_startup(virtual_avail); /* * Initialize other VM packages @@ -121,7 +121,7 @@ vm_object_init(); vm_map_startup(); kmem_init(virtual_avail, virtual_end); - pmap_init(avail_start, avail_end); + pmap_init(); vm_pager_init(); } ==== //depot/projects/netperf_socket/sys/vm/vm_page.c#4 (text+ko) ==== @@ -101,7 +101,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.277 2004/03/02 08:25:58 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_page.c,v 1.278 2004/04/04 23:33:36 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -162,7 +162,7 @@ * Each page cell is initialized and placed on the free list. */ vm_offset_t -vm_page_startup(vm_offset_t starta, vm_offset_t enda, vm_offset_t vaddr) +vm_page_startup(vm_offset_t vaddr) { vm_offset_t mapped; vm_size_t npages; ==== //depot/projects/netperf_socket/sys/vm/vm_page.h#3 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_page.h,v 1.126 2004/03/04 04:26:14 alc Exp $ + * $FreeBSD: src/sys/vm/vm_page.h,v 1.127 2004/04/04 23:33:36 alc Exp $ */ /* @@ -368,7 +368,7 @@ void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); vm_page_t vm_page_select_cache(int); vm_page_t vm_page_splay(vm_pindex_t, vm_page_t); -vm_offset_t vm_page_startup (vm_offset_t, vm_offset_t, vm_offset_t); +vm_offset_t vm_page_startup(vm_offset_t vaddr); void vm_page_unmanage (vm_page_t); void vm_page_unwire (vm_page_t, int); void vm_page_wire (vm_page_t);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404050336.i353ajYg036494>