PERFORCE change 128254 for review

Kip Macy kmacy at FreeBSD.org
Sun Oct 28 15:24:20 PDT 2007


http://perforce.freebsd.org/chv.cgi?CH=128254

Change 128254 by kmacy at kmacy:storage:toestack on 2007/10/28 22:23:22

	- add missing symbols
	- don't malloc with M_WAITOK as locks are being held

Affected files ...

.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 edit
.. //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 edit

Differences ...

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 (text+ko) ====

@@ -123,6 +123,14 @@
 
 static struct toe_usrreqs cxgb_toe_usrreqs;
 
+
+void
+t3_enable_ddp(struct socket *so, int on)
+{
+	printf("t3_enable_ddp unimplemented !!!! \n");
+		
+}
+
 static inline void
 so_insert_tid(struct tom_data *d, struct socket *so, unsigned int tid)
 {

==== //depot/projects/toestack/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 (text+ko) ====

@@ -115,6 +115,13 @@
 };
 
 void
+toepcb_init(struct toepcb *toep)
+{
+	bzero(toep, sizeof(*toep));
+	
+}
+
+void
 toepcb_hold(struct toepcb *toep)
 {
 	atomic_add_acq_int(&toep->tp_refcount, 1);
@@ -150,7 +157,7 @@
 	struct toedev *tdev;
 	struct adap_ports *port_info;
 
-	t = malloc(sizeof(*t), M_DEVBUF, M_WAITOK|M_ZERO);
+	t = malloc(sizeof(*t), M_DEVBUF, M_NOWAIT|M_ZERO);
 	
 	if (!t)
 		return;
@@ -158,7 +165,7 @@
 	if (cdev->ctl(cdev, GET_WR_LEN, &wr_len) < 0)
 		goto out_free_tom;
 
-	port_info = malloc(sizeof(*port_info), M_DEVBUF, M_WAITOK|M_ZERO);
+	port_info = malloc(sizeof(*port_info), M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (!port_info)
 		goto out_free_tom;
 
@@ -368,6 +375,9 @@
 #ifdef notyet
 	register_listen_offload_notifier(&listen_notifier);
 #endif
+	TAILQ_INIT(&cxgb_list);
+	
+	mtx_init(&cxgb_list_lock, "cxgb tom list", NULL, MTX_DEF);
 	/* Register to offloading devices */
 	t3c_tom_client.add = t3c_tom_add;
 	cxgb_register_client(&t3c_tom_client);


More information about the p4-projects mailing list