X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_ethdev%2Frte_class_eth.c;h=6338355e25574c901cfb6385bf53d71f6355250e;hb=35a7fe80c29446eab49ffd7e81a4f610fd1f98ce;hp=fca7fe4d410f4a5554bfb2da52d801d4a83d34f7;hpb=a7d3c6271d558e881e3ba1304e9f8683aca944e4;p=dpdk.git

diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c
index fca7fe4d41..6338355e25 100644
--- a/lib/librte_ethdev/rte_class_eth.c
+++ b/lib/librte_ethdev/rte_class_eth.c
@@ -16,11 +16,13 @@
 #include "ethdev_private.h"
 
 enum eth_params {
+	RTE_ETH_PARAM_MAC,
 	RTE_ETH_PARAM_REPRESENTOR,
 	RTE_ETH_PARAM_MAX,
 };
 
 static const char * const eth_params_keys[] = {
+	[RTE_ETH_PARAM_MAC] = "mac",
 	[RTE_ETH_PARAM_REPRESENTOR] = "representor",
 	[RTE_ETH_PARAM_MAX] = NULL,
 };
@@ -36,6 +38,27 @@ struct eth_dev_match_arg {
 		.kvlist = (k), \
 	})
 
+static int
+eth_mac_cmp(const char *key __rte_unused,
+		const char *value, void *opaque)
+{
+	struct rte_ether_addr mac;
+	const struct rte_eth_dev_data *data = opaque;
+	struct rte_eth_dev_info dev_info;
+	uint32_t index;
+
+	/* Parse devargs MAC address. */
+	if (rte_ether_unformat_addr(value, &mac) < 0)
+		return -1; /* invalid devargs value */
+
+	/* Return 0 if devargs MAC is matching one of the device MACs. */
+	rte_eth_dev_info_get(data->port_id, &dev_info);
+	for (index = 0; index < dev_info.max_mac_addrs; index++)
+		if (rte_is_same_ether_addr(&mac, &data->mac_addrs[index]))
+			return 0;
+	return -1; /* no match */
+}
+
 static int
 eth_representor_cmp(const char *key __rte_unused,
 		const char *value, void *opaque)
@@ -76,20 +99,35 @@ eth_dev_match(const struct rte_eth_dev *edev,
 	int ret;
 	const struct eth_dev_match_arg *arg = _arg;
 	const struct rte_kvargs *kvlist = arg->kvlist;
+	unsigned int pair;
 
 	if (edev->state == RTE_ETH_DEV_UNUSED)
 		return -1;
 	if (arg->device != NULL && arg->device != edev->device)
 		return -1;
-	if (kvlist == NULL)
-		/* Empty string matches everything. */
-		return 0;
+
+	ret = rte_kvargs_process(kvlist,
+			eth_params_keys[RTE_ETH_PARAM_MAC],
+			eth_mac_cmp, edev->data);
+	if (ret != 0)
+		return -1;
 
 	ret = rte_kvargs_process(kvlist,
 			eth_params_keys[RTE_ETH_PARAM_REPRESENTOR],
 			eth_representor_cmp, edev->data);
 	if (ret != 0)
 		return -1;
+	/* search for representor key */
+	for (pair = 0; pair < kvlist->count; pair++) {
+		ret = strcmp(kvlist->pairs[pair].key,
+				eth_params_keys[RTE_ETH_PARAM_REPRESENTOR]);
+		if (ret == 0)
+			break; /* there is a representor key */
+	}
+	/* if no representor key, default is to not match representor ports */
+	if (ret != 0)
+		if ((edev->data->dev_flags & RTE_ETH_DEV_REPRESENTOR) != 0)
+			return -1; /* do not match any representor */
 
 	return 0;
 }
@@ -121,7 +159,7 @@ eth_dev_iterate(const void *start,
 	return edev;
 }
 
-struct rte_class rte_class_eth = {
+static struct rte_class rte_class_eth = {
 	.dev_iterate = eth_dev_iterate,
 };