X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fnull%2Frte_eth_null.c;h=0ce073fa4b08419687670506494f0c786df47d21;hb=858797bbcd9c6e36fb9d283a88edcd0bb89d5d67;hp=7fa3b9e456da789b92b2fcacf151d9047b0873b3;hpb=4df90194f2a26ffe3399f1b5a6fe5987180202f6;p=dpdk.git

diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c
index 7fa3b9e456..0ce073fa4b 100644
--- a/drivers/net/null/rte_eth_null.c
+++ b/drivers/net/null/rte_eth_null.c
@@ -14,13 +14,16 @@
 
 #define ETH_NULL_PACKET_SIZE_ARG	"size"
 #define ETH_NULL_PACKET_COPY_ARG	"copy"
+#define ETH_NULL_PACKET_NO_RX_ARG	"no-rx"
 
 static unsigned int default_packet_size = 64;
 static unsigned int default_packet_copy;
+static unsigned int default_no_rx;
 
 static const char *valid_arguments[] = {
 	ETH_NULL_PACKET_SIZE_ARG,
 	ETH_NULL_PACKET_COPY_ARG,
+	ETH_NULL_PACKET_NO_RX_ARG,
 	NULL
 };
 
@@ -36,9 +39,16 @@ struct null_queue {
 	rte_atomic64_t tx_pkts;
 };
 
+struct pmd_options {
+	unsigned int packet_copy;
+	unsigned int packet_size;
+	unsigned int no_rx;
+};
+
 struct pmd_internals {
 	unsigned int packet_size;
 	unsigned int packet_copy;
+	unsigned int no_rx;
 	uint16_t port_id;
 
 	struct null_queue rx_null_queues[RTE_MAX_QUEUES_PER_PORT];
@@ -63,7 +73,7 @@ static struct rte_eth_link pmd_link = {
 	.link_autoneg = ETH_LINK_FIXED,
 };
 
-static int eth_null_logtype;
+RTE_LOG_REGISTER(eth_null_logtype, pmd.net.null, NOTICE);
 
 #define PMD_LOG(level, fmt, args...) \
 	rte_log(RTE_LOG_ ## level, eth_null_logtype, \
@@ -121,6 +131,13 @@ eth_null_copy_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 	return i;
 }
 
+static uint16_t
+eth_null_no_rx(void *q __rte_unused, struct rte_mbuf **bufs __rte_unused,
+		uint16_t nb_bufs __rte_unused)
+{
+	return 0;
+}
+
 static uint16_t
 eth_null_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 {
@@ -462,9 +479,7 @@ static const struct eth_dev_ops ops = {
 };
 
 static int
-eth_dev_null_create(struct rte_vdev_device *dev,
-		unsigned int packet_size,
-		unsigned int packet_copy)
+eth_dev_null_create(struct rte_vdev_device *dev, struct pmd_options *args)
 {
 	const unsigned int nb_rx_queues = 1;
 	const unsigned int nb_tx_queues = 1;
@@ -499,8 +514,9 @@ eth_dev_null_create(struct rte_vdev_device *dev,
 	 * so the nulls are local per-process */
 
 	internals = eth_dev->data->dev_private;
-	internals->packet_size = packet_size;
-	internals->packet_copy = packet_copy;
+	internals->packet_size = args->packet_size;
+	internals->packet_copy = args->packet_copy;
+	internals->no_rx = args->no_rx;
 	internals->port_id = eth_dev->data->port_id;
 	rte_eth_random_addr(internals->eth_addr.addr_bytes);
 
@@ -520,9 +536,12 @@ eth_dev_null_create(struct rte_vdev_device *dev,
 	eth_dev->dev_ops = &ops;
 
 	/* finally assign rx and tx ops */
-	if (packet_copy) {
+	if (internals->packet_copy) {
 		eth_dev->rx_pkt_burst = eth_null_copy_rx;
 		eth_dev->tx_pkt_burst = eth_null_copy_tx;
+	} else if (internals->no_rx) {
+		eth_dev->rx_pkt_burst = eth_null_no_rx;
+		eth_dev->tx_pkt_burst = eth_null_tx;
 	} else {
 		eth_dev->rx_pkt_burst = eth_null_rx;
 		eth_dev->tx_pkt_burst = eth_null_tx;
@@ -566,12 +585,33 @@ get_packet_copy_arg(const char *key __rte_unused,
 	return 0;
 }
 
+static int
+get_packet_no_rx_arg(const char *key __rte_unused,
+		const char *value, void *extra_args)
+{
+	const char *a = value;
+	unsigned int no_rx;
+
+	if (value == NULL || extra_args == NULL)
+		return -EINVAL;
+
+	no_rx = (unsigned int)strtoul(a, NULL, 0);
+	if (no_rx != 0 && no_rx != 1)
+		return -1;
+
+	*(unsigned int *)extra_args = no_rx;
+	return 0;
+}
+
 static int
 rte_pmd_null_probe(struct rte_vdev_device *dev)
 {
 	const char *name, *params;
-	unsigned int packet_size = default_packet_size;
-	unsigned int packet_copy = default_packet_copy;
+	struct pmd_options args = {
+		.packet_copy = default_packet_copy,
+		.packet_size = default_packet_size,
+		.no_rx = default_no_rx,
+	};
 	struct rte_kvargs *kvlist = NULL;
 	struct rte_eth_dev *eth_dev;
 	int ret;
@@ -597,6 +637,9 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 		if (internals->packet_copy) {
 			eth_dev->rx_pkt_burst = eth_null_copy_rx;
 			eth_dev->tx_pkt_burst = eth_null_copy_tx;
+		} else if (internals->no_rx) {
+			eth_dev->rx_pkt_burst = eth_null_no_rx;
+			eth_dev->tx_pkt_burst = eth_null_tx;
 		} else {
 			eth_dev->rx_pkt_burst = eth_null_rx;
 			eth_dev->tx_pkt_burst = eth_null_tx;
@@ -612,23 +655,37 @@ rte_pmd_null_probe(struct rte_vdev_device *dev)
 
 		ret = rte_kvargs_process(kvlist,
 				ETH_NULL_PACKET_SIZE_ARG,
-				&get_packet_size_arg, &packet_size);
+				&get_packet_size_arg, &args.packet_size);
 		if (ret < 0)
 			goto free_kvlist;
 
 
 		ret = rte_kvargs_process(kvlist,
 				ETH_NULL_PACKET_COPY_ARG,
-				&get_packet_copy_arg, &packet_copy);
+				&get_packet_copy_arg, &args.packet_copy);
 		if (ret < 0)
 			goto free_kvlist;
+
+		ret = rte_kvargs_process(kvlist,
+				ETH_NULL_PACKET_NO_RX_ARG,
+				&get_packet_no_rx_arg, &args.no_rx);
+		if (ret < 0)
+			goto free_kvlist;
+
+		if (args.no_rx && args.packet_copy) {
+			PMD_LOG(ERR,
+				"Both %s and %s arguments at the same time not supported",
+				ETH_NULL_PACKET_COPY_ARG,
+				ETH_NULL_PACKET_NO_RX_ARG);
+			goto free_kvlist;
+		}
 	}
 
 	PMD_LOG(INFO, "Configure pmd_null: packet size is %d, "
-			"packet copy is %s", packet_size,
-			packet_copy ? "enabled" : "disabled");
+			"packet copy is %s", args.packet_size,
+			args.packet_copy ? "enabled" : "disabled");
 
-	ret = eth_dev_null_create(dev, packet_size, packet_copy);
+	ret = eth_dev_null_create(dev, &args);
 
 free_kvlist:
 	if (kvlist)
@@ -670,11 +727,5 @@ RTE_PMD_REGISTER_VDEV(net_null, pmd_null_drv);
 RTE_PMD_REGISTER_ALIAS(net_null, eth_null);
 RTE_PMD_REGISTER_PARAM_STRING(net_null,
 	"size=<int> "
-	"copy=<int>");
-
-RTE_INIT(eth_null_init_log)
-{
-	eth_null_logtype = rte_log_register("pmd.net.null");
-	if (eth_null_logtype >= 0)
-		rte_log_set_level(eth_null_logtype, RTE_LOG_NOTICE);
-}
+	"copy=<int> "
+	ETH_NULL_PACKET_NO_RX_ARG "=0|1");