PERFORCE change 196193 for review

[Takuya ASADA]

http://p4web.freebsd.org/@@196193?ac=10

Change 196193 by syuu at kikurage on 2011/07/15 08:59:51

	test_mqbpf implemented.

Affected files ...

.. //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#12 edit
.. //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#5 edit
.. //depot/projects/soc2011/mq_bpf/tests/Makefile#2 edit
.. //depot/projects/soc2011/mq_bpf/tests/test_mqbpf.c#1 add
.. //depot/projects/soc2011/mq_bpf/tests/test_sqbpf.c#2 edit

Differences ...

==== //depot/projects/soc2011/mq_bpf/src/sys/net/bpf.c#12 (text+ko) ====

@@ -1556,14 +1556,15 @@
 				break;
 			}
 			ifp = d->bd_bif->bif_ifp;
-			if (!((ifp->if_capabilities & IFCAP_MULTIQUEUE) |
-			      (ifp->if_capabilities & IFCAP_SOFT_MULTIQUEUE))) {
-				log(LOG_ERR, "if doesn't support multiqueue");
+			if (!(ifp->if_capabilities &
+				(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))) {
+				log(LOG_ERR, "if doesn't support multiqueue\n");
 				error = EINVAL;
 				SDT_PROBE1(bpf, functions, bpfioctl_biocenaqmask, entry, -1);
 				break;
-
 			}
+			KASSERT(ifp->if_get_rxqueue_len, ("ifp->if_get_rxqueue_len not set\n"));
+			KASSERT(ifp->if_get_txqueue_len, ("ifp->if_get_rxqueue_len not set\n"));
 			d->bd_qmask.qm_enabled = TRUE;
 			d->bd_qmask.qm_rxq_mask =
 				malloc(ifp->if_get_rxqueue_len(ifp) * sizeof(boolean_t), M_BPF, 

==== //depot/projects/soc2011/mq_bpf/src/sys/net/if.c#5 (text+ko) ====

@@ -2419,8 +2419,8 @@
 	}
 
 	case SIOCGIFQLEN:
-		if (!ifp->if_capabilities & 
-			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
+		if (!(ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE)))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_len, ("if_get_rxqueue_len not set"));
 		KASSERT(ifp->if_get_txqueue_len, ("if_get_txqueue_len not set"));
@@ -2429,8 +2429,8 @@
 		break;
 
 	case SIOCGIFRXQAFFINITY:
-		if (!ifp->if_capabilities & 
-			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
+		if (!(ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE)))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set"));
 		log(LOG_DEBUG, "%s: SIOCGIFRXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index);
@@ -2439,8 +2439,8 @@
 		break;
 
 	case SIOCGIFTXQAFFINITY:
-		if (!ifp->if_capabilities & 
-			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE))
+		if (!(ifp->if_capabilities & 
+			(IFCAP_MULTIQUEUE | IFCAP_SOFT_MULTIQUEUE)))
 			return (EOPNOTSUPP);
 		KASSERT(ifp->if_get_rxqueue_affinity, ("if_get_rxqueue_affinity not set"));
 		log(LOG_DEBUG, "%s: SIOCGIFTXQAFFINITY ifr_queue_affinity_index:%d\n", __func__, ifr->ifr_queue_affinity_index);

==== //depot/projects/soc2011/mq_bpf/tests/Makefile#2 (text+ko) ====

@@ -1,4 +1,10 @@
-TARGETS	= test_ifqueue test_sqbpf
+TARGETS	= test_ifqueue test_sqbpf test_mqbpf
 CFLAGS	= -Wall -Werror -g
 
+test_mqbpf:
+	$(CC) $(CFLAGS) -lpthread -o $@ test_mqbpf.c	
+
 all:	$(TARGETS)
+
+clean:
+	rm -f $(TARGETS) *.o

==== //depot/projects/soc2011/mq_bpf/tests/test_sqbpf.c#2 (text+ko) ====

@@ -132,11 +132,6 @@
 		return -1;
 	}
 
-	if (ioctl(bpf, BIOCLOCK, NULL) < 0) {
-		perror("lock");
-		return -1;
-	}
-
 	gettimeofday(&start, NULL);
 
 	/*