diff mbox series

examples/client_server_mp: check port ownership

Message ID 20190529224321.20760-1-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Headers
Series examples/client_server_mp: check port ownership |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation fail Compilation issues
ci/mellanox-Performance-Testing success Performance Testing PASS
ci/intel-Performance-Testing success Performance Testing PASS

Commit Message

Stephen Hemminger May 29, 2019, 10:43 p.m. UTC 
  The mp_server would accept a port mask that included hidden (owned)
ports and which later caused either lost packets or failed initialization.

This fixes explictly checks for ownership when parsing the port mask.

Fixes: 5b7ba31148a8 ("ethdev: add port ownership")
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
---
 .../client_server_mp/mp_server/args.c         | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/examples/multi_process/client_server_mp/mp_server/args.c b/examples/multi_process/client_server_mp/mp_server/args.c
index b0d8d7665c85..933f69a54296 100644
--- a/examples/multi_process/client_server_mp/mp_server/args.c
+++ b/examples/multi_process/client_server_mp/mp_server/args.c
@@ -10,6 +10,7 @@ 
 #include <errno.h>
 
 #include <rte_memory.h>
+#include <rte_ethdev.h>
 #include <rte_string_fns.h>
 
 #include "common.h"
@@ -45,27 +46,36 @@  parse_portmask(uint8_t max_ports, const char *portmask)
 {
 	char *end = NULL;
 	unsigned long pm;
-	uint16_t count = 0;
+	uint16_t count;
 
 	if (portmask == NULL || *portmask == '\0')
 		return -1;
 
 	/* convert parameter to a number and verify */
 	pm = strtoul(portmask, &end, 16);
-	if (end == NULL || *end != '\0' || pm == 0)
+	if (end == NULL || *end != '\0' || pm > UINT16_MAX || pm == 0)
 		return -1;
 
 	/* loop through bits of the mask and mark ports */
-	while (pm != 0){
-		if (pm & 0x01){ /* bit is set in mask, use port */
-			if (count >= max_ports)
-				printf("WARNING: requested port %u not present"
-				" - ignoring\n", (unsigned)count);
-			else
-			    ports->id[ports->num_ports++] = count;
+	for (count = 0; pm != 0; pm >>= 1, ++count) {
+		struct rte_eth_dev_owner owner;
+
+		if ((pm & 0x1) == 0)
+			continue;
+
+		if (count >= max_ports) {
+			printf("WARNING: requested port %u not present - ignoring\n",
+				count);
+		} else if (rte_eth_dev_owner_get(count, &owner) < 0) {
+			printf("ERROR: can not find port %u owner\n", count);
+			return -1;
+		} else if (owner.id != RTE_ETH_DEV_NO_OWNER) {
+			printf("ERROR: requested port %u is owned by device %s\n",
+					count, owner.name);
+			return -1;
+		} else {
+			ports->id[ports->num_ports++] = count;
 		}
-		pm = (pm >> 1);
-		count++;
 	}
 
 	return 0;