PERFORCE change 131288 for review
Kip Macy
kmacy at FreeBSD.org
Wed Dec 19 21:42:18 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=131288
Change 131288 by kmacy at kmacy:entropy:iwarp on 2007/12/20 05:41:22
IFethng 131287
Affected files ...
.. //depot/projects/iwarp/lib/libthr/pthread.map#4 integrate
.. //depot/projects/iwarp/lib/libthr/thread/thr_syscalls.c#2 integrate
.. //depot/projects/iwarp/lib/msun/src/math.h#3 integrate
.. //depot/projects/iwarp/share/man/man4/ng_car.4#3 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#5 integrate
.. //depot/projects/iwarp/sys/dev/cxgb/t3cdev.h#4 integrate
.. //depot/projects/iwarp/sys/dev/ofw/openpromio.c#2 integrate
.. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/iwarp/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate
Differences ...
==== //depot/projects/iwarp/lib/libthr/pthread.map#4 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libthr/pthread.map,v 1.20 2007/12/14 06:25:57 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/pthread.map,v 1.21 2007/12/20 04:32:28 davidxu Exp $
*/
/*
@@ -169,7 +169,6 @@
system;
tcdrain;
usleep;
- vfork;
wait;
wait3;
wait4;
@@ -366,7 +365,6 @@
_spinlock;
_spinlock_debug;
_spinunlock;
- _vfork;
/* Debugger needs these. */
_libthr_debug;
==== //depot/projects/iwarp/lib/libthr/thread/thr_syscalls.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.16 2007/01/12 07:26:21 imp Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_syscalls.c,v 1.17 2007/12/20 04:32:28 davidxu Exp $
*/
/*
@@ -149,7 +149,6 @@
pid_t __wait4(pid_t, int *, int, struct rusage *);
ssize_t __write(int, const void *, size_t);
ssize_t __writev(int, const struct iovec *, int);
-int _vfork(void);
__weak_reference(__accept, accept);
@@ -529,14 +528,6 @@
return (ret);
}
-__weak_reference(_vfork, vfork);
-
-int
-_vfork(void)
-{
- return (fork());
-}
-
__weak_reference(___wait, wait);
pid_t
==== //depot/projects/iwarp/lib/msun/src/math.h#3 (text+ko) ====
@@ -11,7 +11,7 @@
/*
* from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD: src/lib/msun/src/math.h,v 1.63 2007/12/16 21:19:28 das Exp $
+ * $FreeBSD: src/lib/msun/src/math.h,v 1.65 2007/12/20 03:16:55 das Exp $
*/
#ifndef _MATH_H_
@@ -436,10 +436,10 @@
long double log10l(long double);
long double log1pl(long double);
long double log2l(long double);
+#endif
long double logbl(long double);
-#endif
+#if 0
long double logl(long double);
-#if 0
long lrintl(long double);
#endif
long lroundl(long double);
==== //depot/projects/iwarp/share/man/man4/ng_car.4#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ng_car.4,v 1.5 2007/10/31 18:33:23 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ng_car.4,v 1.6 2007/12/19 23:12:37 mav Exp $
.\"
.Dd March 11, 2007
.Dt NG_CAR 4
@@ -108,6 +108,9 @@
links with bandwidth * delay product less than 6-8 TCP segments, but it
consumes additional system resources for queue processing.
.El
+By default, all information rates are measured in bits per second and bursts
+are measured in bytes. But when NG_CAR_COUNT_PACKETS option is enabled,
+rates are measured in packets per second and bursts are in packets.
.Sh CONTROL MESSAGES
This node type supports the generic control messages and the following
specific messages.
@@ -120,17 +123,34 @@
.Vt "struct ng_car_bulkconf"
.Bd -literal
struct ng_car_hookconf {
- u_int64_t cbs; /* Committed burst size (bytes) */
- u_int64_t ebs; /* Exceeded/Peak burst size (bytes) */
- u_int64_t cir; /* Committed information rate (bits/s) */
- u_int64_t pir; /* Peak information rate (bits/s) */
+ u_int64_t cbs; /* Committed burst size */
+ u_int64_t ebs; /* Exceeded/Peak burst size */
+ u_int64_t cir; /* Committed information rate */
+ u_int64_t pir; /* Peak information rate */
u_int8_t green_action; /* Action for green packets */
u_int8_t yellow_action; /* Action for yellow packets */
u_int8_t red_action; /* Action for red packets */
- u_int8_t mode; /* single/double rate, ... */
- u_int8_t opt; /* color-aware or color-blind */
+ u_int8_t mode; /* operation mode */
+ u_int8_t opt; /* mode options */
+};
+
+/* possible actions (..._action) */
+enum {
+ NG_CAR_ACTION_FORWARD = 1,
+ NG_CAR_ACTION_DROP
+};
+
+/* operation modes (mode) */
+enum {
+ NG_CAR_SINGLE_RATE = 0,
+ NG_CAR_DOUBLE_RATE,
+ NG_CAR_RED,
+ NG_CAR_SHAPE
};
+/* mode options (opt) */
+#define NG_CAR_COUNT_PACKETS 2
+
struct ng_car_bulkconf {
struct ng_car_hookconf upstream;
struct ng_car_hookconf downstream;
==== //depot/projects/iwarp/sys/dev/cxgb/sys/cxgb_support.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/sys/cxgb_support.c,v 1.2 2007/12/17 08:17:50 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,11 +126,11 @@
if ((err = buf_stack_init(&ccp->ccp_cluster_free, (FL_Q_SIZE >> 1))))
return (err);
- if (jumbo_phys_contig)
+#if __FreeBSD_version > 800000
ccp->ccp_jumbo_zone = zone_jumbo16;
- else
+#else
ccp->ccp_jumbo_zone = zone_jumbop;
-
+#endif
return (0);
}
==== //depot/projects/iwarp/sys/dev/cxgb/t3cdev.h#4 (text+ko) ====
@@ -24,7 +24,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/cxgb/t3cdev.h,v 1.1 2007/12/15 21:54:58 kmacy Exp $
+ * $FreeBSD: src/sys/dev/cxgb/t3cdev.h,v 1.2 2007/12/17 08:17:49 kmacy Exp $
*/
#ifndef _T3CDEV_H_
#define _T3CDEV_H_
==== //depot/projects/iwarp/sys/dev/ofw/openpromio.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/openpromio.c,v 1.7 2005/05/19 15:23:17 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/openpromio.c,v 1.8 2007/12/20 00:31:04 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -101,12 +101,17 @@
char *buf;
int error;
+ if ((flags & FREAD) == 0)
+ return (EPERM);
+
prop = buf = NULL;
error = 0;
- oprom = *(void **)data;
switch (cmd) {
case OPROMCHILD:
case OPROMNEXT:
+ if (data == NULL || *(void **)data == NULL)
+ return (EINVAL);
+ oprom = *(void **)data;
error = copyin(&oprom->oprom_size, &len, sizeof(len));
if (error != 0)
break;
@@ -135,6 +140,9 @@
break;
case OPROMGETPROP:
case OPROMNXTPROP:
+ if (data == NULL || *(void **)data == NULL)
+ return (EINVAL);
+ oprom = *(void **)data;
error = copyin(&oprom->oprom_size, &len, sizeof(len));
if (error != 0)
break;
==== //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/cxgb/Makefile,v 1.10 2007/09/09 01:28:02 kmacy Exp $
+# $FreeBSD: src/sys/modules/cxgb/cxgb/Makefile,v 1.3 2007/12/17 08:17:51 kmacy Exp $
CXGB = ${.CURDIR}/../../../dev/cxgb
.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
@@ -8,9 +8,11 @@
SRCS+= cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c
SRCS+= cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
SRCS+= device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
-SRCS+= uipc_mvec.c cxgb_multiq.c cxgb_support.c
+SRCS+= uipc_mvec.c cxgb_support.c
+SRCS+= cxgb_multiq.c
CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
+#CFLAGS+= -DDISABLE_MBUF_IOVEC
CFLAGS+= -DIFNET_MULTIQUEUE
#CFLAGS+= -DDISABLE_MBUF_IOVEC
==== //depot/projects/iwarp/sys/vm/vm_phys.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_phys.c,v 1.4 2007/09/25 06:25:06 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_phys.c,v 1.5 2007/12/19 23:09:45 alc Exp $");
#include "opt_ddb.h"
@@ -486,7 +486,7 @@
*/
seg = &vm_phys_segs[m->segind];
for (m_set = m, order = 0; m_set->order == VM_NFREEORDER &&
- order < VM_NFREEORDER; ) {
+ order < VM_NFREEORDER - 1; ) {
order++;
pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order));
KASSERT(pa >= seg->start && pa < seg->end,
@@ -499,8 +499,6 @@
KASSERT(m_set->order < VM_NFREEORDER,
("vm_phys_unfree_page: page %p has unexpected order %d",
m_set, m_set->order));
- KASSERT(order < VM_NFREEORDER,
- ("vm_phys_unfree_page: order %d is out of range", order));
/*
* Next, remove "m_set" from the free lists. Finally, extract
==== //depot/projects/iwarp/usr.sbin/wpa/wpa_supplicant/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Makefile,v 1.13 2007/11/10 20:26:08 sam Exp $
+# $FreeBSD: src/usr.sbin/wpa/wpa_supplicant/Makefile,v 1.14 2007/12/20 00:52:02 sam Exp $
.include <bsd.own.mk>
@@ -10,6 +10,7 @@
wpa_supplicant.c events.c wpa.c preauth.c pmksa_cache.c \
ctrl_iface.c ctrl_iface_unix.c l2_packet.c main.c drivers.c \
driver_ndis.c Packet32.c \
+ driver_wired.c \
driver_freebsd.c os_unix.c
MAN= wpa_supplicant.8 wpa_supplicant.conf.5
@@ -22,6 +23,7 @@
CFLAGS+= -I${.CURDIR} -I${WPA_SUPPLICANT_DISTDIR}
CFLAGS+= -DCONFIG_DRIVER_BSD
CFLAGS+= -DCONFIG_DRIVER_NDIS
+CFLAGS+= -DCONFIG_DRIVER_WIRED
CFLAGS+= -DCONFIG_CTRL_IFACE
CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX
CFLAGS+= -DCONFIG_TERMINATE_ONLASTIF
More information about the p4-projects
mailing list