From owner-p4-projects@FreeBSD.ORG Mon Dec 24 22:52:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E66A916A468; Mon, 24 Dec 2007 22:52:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7BD4B16A41B for ; Mon, 24 Dec 2007 22:52:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6717413C45D for ; Mon, 24 Dec 2007 22:52:31 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBOMqVCX041918 for ; Mon, 24 Dec 2007 22:52:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBOMqVLO041914 for perforce@freebsd.org; Mon, 24 Dec 2007 22:52:31 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 24 Dec 2007 22:52:31 GMT Message-Id: <200712242252.lBOMqVLO041914@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 131554 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: Mon, 24 Dec 2007 22:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=131554 Change 131554 by rwatson@rwatson_cinnamon on 2007/12/24 22:51:45 Rather than using an environmental variable to trigger use of zero-copy BPF, instead always enable it in libcap if the kernel is willing to service it. Add a new sysctl, net.bpf.zerocopy_enable to enable/disable zero-copy support. Default to enable, so that if zero-copy support is compiled into the kernel, we use it by default. Wee. Affected files ... .. //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#17 edit .. //depot/projects/zcopybpf/src/sys/net/bpf.c#35 edit Differences ... ==== //depot/projects/zcopybpf/src/contrib/libpcap/pcap-bpf.c#17 (text+ko) ==== @@ -805,8 +805,7 @@ */ #ifdef BIOCSETBUFMODE bufmode = BPF_BUFMODE_ZBUF; - if (getenv("BPF_ZEROCOPY") && - ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) { + if (ioctl(fd, BIOCSETBUFMODE, (caddr_t)&bufmode) == 0) { p->zerocopy = 1; if (ioctl(fd, BIOCGETZMAX, (caddr_t)&zbufmax) < 0) { snprintf(ebuf, PCAP_ERRBUF_SIZE, "BIOCGETZMAX: %s", ==== //depot/projects/zcopybpf/src/sys/net/bpf.c#35 (text+ko) ==== @@ -134,6 +134,11 @@ static int bpf_maxinsns = BPF_MAXINSNS; SYSCTL_INT(_net_bpf, OID_AUTO, maxinsns, CTLFLAG_RW, &bpf_maxinsns, 0, "Maximum bpf program instructions"); +#ifdef BPF_ZEROCOPY +static int bpf_zerocopy_enable = 1; +SYSCTL_INT(_net_bpf, OID_AUTO, zerocopy_enable, CTLFLAG_RW, + &bpf_zerocopy_enable, 0, "Enable new zero-copy BPF buffer sessions"); +#endif SYSCTL_NODE(_net_bpf, OID_AUTO, stats, CTLFLAG_RW, bpf_stats_sysctl, "bpf statistics portal"); @@ -1305,7 +1310,9 @@ #ifdef BPF_ZEROCOPY case BPF_BUFMODE_ZBUF: - break; + if (bpf_zerocopy_enable) + break; + /* FALLSTHROUGH */ #endif default: