From patchwork Tue Oct 3 20:29:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132287 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A4BA426B2; Tue, 3 Oct 2023 22:29:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FF18402EE; Tue, 3 Oct 2023 22:29:23 +0200 (CEST) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id B4E2140262 for ; Tue, 3 Oct 2023 22:29:21 +0200 (CEST) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1c735473d1aso10792105ad.1 for ; Tue, 03 Oct 2023 13:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696364960; x=1696969760; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4QZe6WYA0CDFej04+XTXp3gVPaIsdae0CLYbbl20RYE=; b=KByKKFvFK7maFn5RH9P52KPjGblaUwO5nEoEV8kV4NrUi8Fj/DAQUICLXzsUhKm+NG IEWkqrUzB1YBgEH3VFHWWvBR4IafOSP2BJLiCKmxAryZGVXNqYfhlXI0S3PcmNIHjbFd nQnb24svn878vVMjvbNFX3nsWhb6xZaYsF56aUxc+Mxbh7rtqBYAk6Nrsc6+OW4p/d3v elLfj6xEHDLxd1R2AZa1exdz1O0zmB73BNEIwlmLyR5mu0hNdJa8S2XHJ7ijEjN0ydB9 cVHLvZglkSs6mHSNe4wbfGgBj6k/d23kmV0D+as+l9C0E4LDxJmbldmq0Uo07zZkKL5I jT/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696364960; x=1696969760; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4QZe6WYA0CDFej04+XTXp3gVPaIsdae0CLYbbl20RYE=; b=ocq5QujnNebV55tCf0lenV3RB7m+zmTKYjbgkrnGLm6EUvMm3BBzasfxxhwWl3MFn0 ue728SUH1jNd2wi06pWKg1LBQWFnVqKovVjIHj7GTyee69SRoNuhTYx3u+RUKKjajHdx gQwEmqbF3BxhZ9yQWPDZQYfWFP++RZuve3iSZwTcVleqRzoDr83jUIiARkePY7o+jULI LiWaCSACR4Y8GWyHHHvaWUYNGa3ga24JLdARpGNw9My9wJqsYy8OH16aRQsL4ztkwbCc +AZQR+3jmVRd+MkrhaBEjsjMYzDz3XMF55QB4wsxLaFNCR/us1DVaw4ot6u0IDt0dI0D icAg== X-Gm-Message-State: AOJu0YzNwXdTh4h9cSlhAjQAw0NYfBoA7+N8RWoPwTOV3TB3dTCi0bbK 0r4BHBml8vpROPZT4Gw2eduecbzvzQxpAdmXYdQ= X-Google-Smtp-Source: AGHT+IGOEByuWDm8N5uMGlLWkR1JPElvJA5l2u/x9jJ/HKE6gbAwfYKZPs27i4xT0DWJTkjPfDG7Cw== X-Received: by 2002:a17:902:e74f:b0:1c6:112f:5cff with SMTP id p15-20020a170902e74f00b001c6112f5cffmr766905plf.61.1696364960540; Tue, 03 Oct 2023 13:29:20 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001c5f62a639asm2014138plm.196.2023.10.03.13.29.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 13:29:20 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , =?utf-8?q?Morten_Br?= =?utf-8?q?=C3=B8rup?= , Olivier Matz Subject: [PATCH v3 1/4] test: remove some strings from cmdline_etheraddr tests Date: Tue, 3 Oct 2023 13:29:06 -0700 Message-Id: <20231003202909.391330-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003202909.391330-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231003202909.391330-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Some of the ethernet address formats which were invalid will now become valid inputs when rte_ether_unformat_addr is modified to allow leading zeros. Also, make local variables static. Acked-by: Morten Brørup Signed-off-by: Stephen Hemminger --- app/test/test_cmdline_etheraddr.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/test/test_cmdline_etheraddr.c b/app/test/test_cmdline_etheraddr.c index 9691c32ba250..74953dea6cb9 100644 --- a/app/test/test_cmdline_etheraddr.c +++ b/app/test/test_cmdline_etheraddr.c @@ -20,7 +20,7 @@ struct ether_addr_str { }; /* valid strings */ -const struct ether_addr_str ether_addr_valid_strs[] = { +static const struct ether_addr_str ether_addr_valid_strs[] = { {"01:23:45:67:89:AB", 0xAB8967452301ULL}, {"4567:89AB:CDEF", 0xEFCDAB896745ULL}, }; @@ -30,7 +30,7 @@ const struct ether_addr_str ether_addr_valid_strs[] = { * end of token, which is either space chars, null char or * a hash sign. */ -const char * ether_addr_garbage_strs[] = { +static const char * const ether_addr_garbage_strs[] = { "00:11:22:33:44:55\0garbage", "00:11:22:33:44:55#garbage", "00:11:22:33:44:55 garbage", @@ -46,14 +46,13 @@ const char * ether_addr_garbage_strs[] = { #define GARBAGE_ETHERADDR 0x554433221100ULL /* corresponding address */ -const char * ether_addr_invalid_strs[] = { +static const char * const ether_addr_invalid_strs[] = { /* valid chars, invalid syntax */ "0123:45:67:89:AB", "01:23:4567:89:AB", "01:23:45:67:89AB", "012:345:678:9AB", "01:23:45:67:89:ABC", - "01:23:45:67:89:A", "01:23:45:67:89", "01:23:45:67:89:AB:CD", /* invalid chars, valid syntax */ @@ -61,7 +60,6 @@ const char * ether_addr_invalid_strs[] = { "INVA:LIDC:HARS", /* misc */ "01 23 45 67 89 AB", - "01.23.45.67.89.AB", "01,23,45,67,89,AB", "01:23:45\0:67:89:AB", "01:23:45#:67:89:AB", From patchwork Tue Oct 3 20:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132288 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 33607426B2; Tue, 3 Oct 2023 22:29:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7267940A6C; Tue, 3 Oct 2023 22:29:24 +0200 (CEST) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id B5B0F402E1 for ; Tue, 3 Oct 2023 22:29:22 +0200 (CEST) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1c328b53aeaso10854055ad.2 for ; Tue, 03 Oct 2023 13:29:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696364961; x=1696969761; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sP6/bW96ydkOqViq+9pHtcGmfDIQkWN1rR8Kg+2Xby4=; b=Ep9LYFMTA6dJ4WJbreIE2kFSYMbAEQg6j2HmrGQW7kpnKoCB21GCYCsR2Oc18+vKmO gBj9D1FgOBEqkNlUAx8rZ800aI2sIjhsFCmI5uekIcwzEeXXp6XMGTLYxOxHZtOQ3uYh ITKLOCrmSYM8Rbb3i781yWlpJoXPifN09ezjDu3QUJ21ycaDrrf4ClzDuc4kJY76fCaY +tWi3AJYvUPHYIu/UiTxvOXHT+JaWf+mtyGocb/kdDkMB9OBLV1/Hl0+3gQq4FbexYIm NnpjC4NUXDzFsiSc3my/YL91VOeErl/NCoxRW6Uf+tB1qLHqaFvKpVxTMoiJRUxTBlE5 1u5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696364961; x=1696969761; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sP6/bW96ydkOqViq+9pHtcGmfDIQkWN1rR8Kg+2Xby4=; b=hWqHQZmHkLSoK2M+r/KK3Frg+l3hZeO/J+Zz+dfipuNJmhnpZacGG/DWW3U5JgwJ3d wHpPEwE7pAqxfSmoTqiv06qpkKDyayFNEAPOw5SnewZEw1qlLX7fOzpWVRJEQ297/n1G Y9h5p7/+agbQemaFy+aKk1qOGsdyjpbrSDbd7yBJRN9DKy+xcIkGyK5nhuhod153QsJl xf8M+TF7+KeJWGd/WKuqNFsrpinh6G3Mtjc9ipTBumwc104YzeMI+MtYVDXKfwKADUck TcGiam5fmFp9KB1syom9/jMYg7bZutjlfSTrDhm0JFziefm7uXdmX0r6c9kldzwf6eoe WqsQ== X-Gm-Message-State: AOJu0YzIXY2IMKc4ITtEn7sVrwlIEh8c6mFrLDIVR+zEs6btXSe+0jH/ wv9FhdFiJB/S5pYPRmN4w4klDb7PAV+Rx/0dgYE= X-Google-Smtp-Source: AGHT+IFdeXzSo7oQzD89RwMc0kzx0dLvUnmTj/tG9lhh9cWRDjAHM1KTYQvXd2Qrw/6XdOIxaPsZOA== X-Received: by 2002:a17:902:c412:b0:1bd:aeb3:9504 with SMTP id k18-20020a170902c41200b001bdaeb39504mr925193plk.15.1696364961536; Tue, 03 Oct 2023 13:29:21 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001c5f62a639asm2014138plm.196.2023.10.03.13.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 13:29:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , =?utf-8?q?Morten_Br?= =?utf-8?q?=C3=B8rup?= , Olivier Matz Subject: [PATCH v3 2/4] rte_ether_unformat: accept more inputs Date: Tue, 3 Oct 2023 13:29:07 -0700 Message-Id: <20231003202909.391330-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003202909.391330-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231003202909.391330-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This updates rte_ether_addr_unformat() to accept more types formats for MAC address. It allows IEEE, IETF and Cisco formats. Leading zeros are allowed for byte formats. Acked-by: Morten Brørup Signed-off-by: Stephen Hemminger --- lib/net/rte_ether.c | 85 ++++++++++++++++++++++++++++++++++----------- lib/net/rte_ether.h | 10 ++++-- 2 files changed, 73 insertions(+), 22 deletions(-) diff --git a/lib/net/rte_ether.c b/lib/net/rte_ether.c index 66d9a9d0699a..f59c20289d37 100644 --- a/lib/net/rte_ether.c +++ b/lib/net/rte_ether.c @@ -38,7 +38,8 @@ static int8_t get_xdigit(char ch) } /* Convert 00:11:22:33:44:55 to ethernet address */ -static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea) +static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea, + const char sep) { const char *s = s0; int i; @@ -48,25 +49,29 @@ static bool get_ether_addr6(const char *s0, struct rte_ether_addr *ea) x = get_xdigit(*s++); if (x < 0) - return false; + return false; /* not a hex digit */ - ea->addr_bytes[i] = x << 4; - x = get_xdigit(*s++); - if (x < 0) - return false; - ea->addr_bytes[i] |= x; + ea->addr_bytes[i] = x; + if (*s != sep && *s != '\0') { + x = get_xdigit(*s++); + if (x < 0) + return false; /* not a hex digit */ + ea->addr_bytes[i] <<= 4; + ea->addr_bytes[i] |= x; + } if (i < RTE_ETHER_ADDR_LEN - 1 && - *s++ != ':') - return false; + *s++ != sep) + return false; /* premature end of string */ } - /* return true if at end of string */ + /* return true if no trailing characters */ return *s == '\0'; } /* Convert 0011:2233:4455 to ethernet address */ -static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) +static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea, + const char sep) { int i, j; @@ -78,14 +83,15 @@ static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) x = get_xdigit(*s++); if (x < 0) - return false; + return false; /* not a hex digit */ w = (w << 4) | x; } + ea->addr_bytes[i] = w >> 8; ea->addr_bytes[i + 1] = w & 0xff; if (i < RTE_ETHER_ADDR_LEN - 2 && - *s++ != ':') + *s++ != sep) return false; } @@ -93,17 +99,56 @@ static bool get_ether_addr3(const char *s, struct rte_ether_addr *ea) } /* - * Like ether_aton_r but can handle either - * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX - * and is more restrictive. + * Scan input to see if separated by dash, colon or period + * Returns separator and number of matches + * If separators are mixed will return + */ +static unsigned int get_ether_sep(const char *s, char *sep) +{ + static const char separators[] = "-:."; + unsigned int count = 0; + const char *cp; + + cp = strpbrk(s, separators); + if (cp == NULL) + return 0; /* no separator found */ + + *sep = *cp; /* return the separator */ + do { + ++count; + /* find next instance of separator */ + cp = strchr(cp + 1, *sep); + } while (cp != NULL); + + return count; +} + +/* + * Be liberal in accepting a wide variety of notational formats + * for MAC address including: + * - Linux format six groups of hexadecimal digits separated by colon + * - Windows format six groups separated by hyphen + * - two groups hexadecimal digits */ int rte_ether_unformat_addr(const char *s, struct rte_ether_addr *ea) { - if (get_ether_addr6(s, ea)) - return 0; - if (get_ether_addr3(s, ea)) - return 0; + unsigned int count; + char sep = '\0'; + + count = get_ether_sep(s, &sep); + switch (count) { + case 5: /* i.e 01:23:45:67:89:AB */ + if (get_ether_addr6(s, ea, sep)) + return 0; + break; + case 2: /* i.e 0123.4567.89AB */ + if (get_ether_addr3(s, ea, sep)) + return 0; + break; + default: + break; + } rte_errno = EINVAL; return -1; diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h index b35c72c7b0e0..ce073ea818a2 100644 --- a/lib/net/rte_ether.h +++ b/lib/net/rte_ether.h @@ -254,9 +254,15 @@ rte_ether_format_addr(char *buf, uint16_t size, * * @param str * A pointer to buffer contains the formatted MAC address. - * The supported formats are: - * XX:XX:XX:XX:XX:XX or XXXX:XXXX:XXXX + * Accepts either byte or word format separated by colon, + * hyphen or period. + * + * The example formats are: + * XX:XX:XX:XX:XX:XX - Canonical form + * XX-XX-XX-XX-XX-XX - Windows and IEEE 802 + * XXXX.XXXX.XXXX - Cisco * where XX is a hex digit: 0-9, a-f, or A-F. + * In the byte format, leading zeros are optional. * @param eth_addr * A pointer to a ether_addr structure. * @return From patchwork Tue Oct 3 20:29:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132289 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6DEB7426B2; Tue, 3 Oct 2023 22:29:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96B2940A72; Tue, 3 Oct 2023 22:29:25 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mails.dpdk.org (Postfix) with ESMTP id B8B6F40608 for ; Tue, 3 Oct 2023 22:29:23 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6934202b8bdso1083984b3a.1 for ; Tue, 03 Oct 2023 13:29:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696364962; x=1696969762; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MYx472k3BjwaIoEKo8D2zP3PanhZssBLZLscHcGJ5Ok=; b=lDoW8SRsAvCm2ioCMNFg3CUTUI56kRP8Gl6rwyzozo9SgCtr5EWbVLj3CeLiEXzv+N PmTwJ5zH9Oqjntg8mevyqHGo3I0r7ifLaPU9HpurMtkPCKFYye8EmTRd60uKYuUdpeJJ ReV6JcOLo6oesmee9VjhLspH8shLgMsPgVzeHd8hjoTIj7Tksj7+3onXNetOWFXnKL/k tL5UXsxyBGu63oYUhKmYsHAUET+OiKYTZQ5aQxKnVfYJFXQbmSeeumh9IpJ7C5te29Fx FgUnyiylimu7npdZlVpJcp/hE/NuquRzj5oN52BT0fI2zWWO6oRczfNxXVvB6cll68fS F7lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696364962; x=1696969762; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MYx472k3BjwaIoEKo8D2zP3PanhZssBLZLscHcGJ5Ok=; b=hKfZaA4HhOANH7NykARrOVGC4qtrF/iT/ATNDDSpc81uxmEvH1hTTBSO9JytOXpZEQ LYyw8mYVS7NwW2jxFj+GQ5bEdP6dek3pgQ997rX60zVOyh8GL/pij4q7UtEWON8ajoDI lEqLQiA8inHCsqKAoMjGEEhO6cRRH2uoBBKRZuxnfefYat9/1uWbcfdd0yLHo4X31SUh ENB4pV1Q2kOb/H1Qfq2P5EmG3NSItE5kAy6VA+IJl3wg8X7yCeJA1m6bVKSwz8wqXJh1 v286EAyFguUzrq19Zd0vrcx+HmMsA4lRKa17MIXdkv3yXuwnztPe2yZyump5sK/5fuq3 5UUw== X-Gm-Message-State: AOJu0YwnItwvXrItIUIS/iRxKS5ru0OZDw8aGhljr6f6iXfmRMPG6Z0h OpFXpE44kIoYYTVw5tRHHb32vqgAV+olMkriphw= X-Google-Smtp-Source: AGHT+IHu9dOjMX1Bv1Ntye+2VpmSIV4gLmuBtU4dUtqmjOd1PW2T4rYvIl23LyZ5m3FsSWz4recJNA== X-Received: by 2002:a05:6a21:9982:b0:142:952d:3e61 with SMTP id ve2-20020a056a21998200b00142952d3e61mr673971pzb.7.1696364962438; Tue, 03 Oct 2023 13:29:22 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001c5f62a639asm2014138plm.196.2023.10.03.13.29.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 13:29:22 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , =?utf-8?q?Morten_Br?= =?utf-8?q?=C3=B8rup?= Subject: [PATCH v3 3/4] test: add tests for rte_ether routines Date: Tue, 3 Oct 2023 13:29:08 -0700 Message-Id: <20231003202909.391330-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003202909.391330-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231003202909.391330-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org This add some basic tests for rte_unformat_ether_addr and other functions in rte_ether. Acked-by: Morten Brørup Signed-off-by: Stephen Hemminger --- app/test/meson.build | 1 + app/test/test_net_ether.c | 165 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 app/test/test_net_ether.c diff --git a/app/test/meson.build b/app/test/meson.build index bf9fc906128f..20a9333c726d 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -124,6 +124,7 @@ source_file_deps = { 'test_meter.c': ['meter'], 'test_metrics.c': ['metrics'], 'test_mp_secondary.c': ['hash', 'lpm'], + 'test_net_ether.c': ['net'], 'test_pcapng.c': ['ethdev', 'net', 'pcapng'], 'test_pdcp.c': ['eventdev', 'pdcp', 'net', 'timer', 'security'], 'test_pdump.c': ['pdump'] + sample_packet_forward_deps, diff --git a/app/test/test_net_ether.c b/app/test/test_net_ether.c new file mode 100644 index 000000000000..1cb6845a9c48 --- /dev/null +++ b/app/test/test_net_ether.c @@ -0,0 +1,165 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2023 Stephen Hemminger + */ + +#include + +#include +#include "test.h" + +#define N 1000000 + +static const struct rte_ether_addr zero_ea; +static const struct rte_ether_addr bcast_ea = { + .addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }, +}; + +static int +test_ether_addr(void) +{ + struct rte_ether_addr rand_ea = { }; + unsigned int i; + + RTE_TEST_ASSERT(rte_is_zero_ether_addr(&zero_ea), "Zero address is not zero"); + RTE_TEST_ASSERT(!rte_is_zero_ether_addr(&bcast_ea), "Broadcast is zero"); + + for (i = 0; i < N; i++) { + rte_eth_random_addr(rand_ea.addr_bytes); + RTE_TEST_ASSERT(!rte_is_zero_ether_addr(&rand_ea), + "Random address is zero"); + RTE_TEST_ASSERT(rte_is_unicast_ether_addr(&rand_ea), + "Random address is not unicast"); + RTE_TEST_ASSERT(rte_is_local_admin_ether_addr(&rand_ea), + "Random address is not local admin"); + } + + return 0; +} + +static int +test_format_addr(void) +{ + struct rte_ether_addr rand_ea = { }; + char buf[RTE_ETHER_ADDR_FMT_SIZE]; + unsigned int i; + + for (i = 0; i < N; i++) { + struct rte_ether_addr result = { }; + int ret; + + rte_eth_random_addr(rand_ea.addr_bytes); + + rte_ether_format_addr(buf, sizeof(buf), &rand_ea); + + ret = rte_ether_unformat_addr(buf, &result); + if (ret != 0) { + fprintf(stderr, "rte_ether_unformat_addr(%s) failed\n", buf); + return -1; + } + RTE_TEST_ASSERT(rte_is_same_ether_addr(&rand_ea, &result), + "rte_ether_format/unformat mismatch"); + } + return 0; + +} + +static int +test_unformat_addr(void) +{ + const struct rte_ether_addr expected = { + .addr_bytes = { 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc }, + }; + const struct rte_ether_addr nozero_ea = { + .addr_bytes = { 1, 2, 3, 4, 5, 6 }, + }; + struct rte_ether_addr result; + int ret; + + /* Test IETF format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("12:34:56:78:9a:bc", &result); + RTE_TEST_ASSERT(ret == 0, "IETF unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "IETF unformat mismatch"); + + /* Test IEEE format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("12-34-56-78-9A-BC", &result); + RTE_TEST_ASSERT(ret == 0, "IEEE unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "IEEE unformat mismatch"); + + /* Test Cisco format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1234.5678.9ABC", &result); + RTE_TEST_ASSERT(ret == 0, "Cisco unformat failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&expected, &result), + "Cisco unformat mismatch"); + + /* Test no leading zeros - IETF */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1:2:3:4:5:6", &result); + RTE_TEST_ASSERT(ret == 0, "IETF leading zero failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&nozero_ea, &result), + "IETF leading zero mismatch"); + + /* Test no-leading zero - IEEE format */ + memset(&result, 0, sizeof(result)); + ret = rte_ether_unformat_addr("1-2-3-4-5-6", &result); + RTE_TEST_ASSERT(ret == 0, "IEEE leading zero failed"); + RTE_TEST_ASSERT(rte_is_same_ether_addr(&nozero_ea, &result), + "IEEE leading zero mismatch"); + + + return 0; +} + +static int +test_invalid_addr(void) +{ + static const char * const invalid[] = { + "123", + "123:456", + "12:34:56:78:9a:gh", + "12:34:56:78:9a", + "100:34:56:78:9a:bc", + "34-56-78-9a-bc", + "12:34:56-78:9a:bc", + "12:34:56.78:9a:bc", + "123:456:789:abc", + "NOT.AN.ADDRESS", + "102.304.506", + "", + }; + struct rte_ether_addr result; + unsigned int i; + + for (i = 0; i < RTE_DIM(invalid); ++i) { + if (!rte_ether_unformat_addr(invalid[i], &result)) { + fprintf(stderr, "rte_ether_unformat_addr(%s) succeeded!\n", + invalid[i]); + return -1; + } + } + return 0; +} + +static int +test_net_ether(void) +{ + if (test_ether_addr()) + return -1; + + if (test_format_addr()) + return -1; + + if (test_unformat_addr()) + return -1; + + if (test_invalid_addr()) + return -1; + + return 0; +} + +REGISTER_FAST_TEST(net_ether_autotest, true, true, test_net_ether); From patchwork Tue Oct 3 20:29:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 132290 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CF04A426B2; Tue, 3 Oct 2023 22:29:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E11FB40A7F; Tue, 3 Oct 2023 22:29:26 +0200 (CEST) Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mails.dpdk.org (Postfix) with ESMTP id 512B6406B4 for ; Tue, 3 Oct 2023 22:29:24 +0200 (CEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1c60f1a2652so1970085ad.0 for ; Tue, 03 Oct 2023 13:29:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1696364963; x=1696969763; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vwwODn05ke3sSauHLybwTs8ZNGKb1GSkj9OLdb3j6cc=; b=Bhrw33zmW7V4wj8/MDQl4GkCeOCn8dcOEbbq3qvEceGpw8a++40rJ0B8RVJUUv/ioY rvOKNswhvCM/hb5AjtH9E7+eB25+l++Jsjq3wkY6DD3JHqmQzD14oQeSCIjCGjH9X6ap 0RgFI7dCg3e5rl5fG9j9b/OoJ2gUr+SC2N+d/6hrXoEcdbpDAQwgu2nxCT7IZcyPHWkY QPFiI7hrCJnFaX7xFY9OxVZym42QQCB6zm4F5BharB0w0kSLNqcUTJbkaGufqqILiHlh R8a/9Ejenmy4rkUkU3ZMY2gwutSYnwSRGBlSYQo1V2PMOUoWsBHqpfRyEFAbff4qL6aO vRtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696364963; x=1696969763; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vwwODn05ke3sSauHLybwTs8ZNGKb1GSkj9OLdb3j6cc=; b=aWUAGFeeVgriND86y64Y7nAy0OPh/Fm2/T81FFpa/b8h1tyIpj2trG5gi/idXuhAXX yA4THMUWu3uUvqPlKLrVo2mZQB9AtBcmZwIuxd8rJ2QI+Lnk/zdmCiz9a5nCtpY9FiGK z+Um5ezqVj93GOD0WghFdTJcNCInWTcw5uSGR3lArW2OvigqOo7hQzdKZNrIHELKsK1U YxKUiQ2QiWrzRvVyyXZkYIWsCpA6LZK4LvAVNZlSUEBXH56qXAnBAYvUMoO/l1TnWqkA IEOMR+jWN8IoRonFk+v539sWOG9eWZwH3a8fbGh6016NNgY+AwRBunKd+HF0Qu6ThxqW +oFg== X-Gm-Message-State: AOJu0Ywg+YhoFLl4/S+OX2POdnTmXBjl9J0Is3PflEPC8BnIQMMEmLqF g5nOmyFzIbytoWbCSgtgrDiQ1ZduHJrBLGoRIwc= X-Google-Smtp-Source: AGHT+IH/+w7JMdZfroA5z7pcMVfThkovmoaBNdcEQHA82PsY7Nl1GVm1xFkrywIgJnIHjT4FddDv9Q== X-Received: by 2002:a17:902:f7ce:b0:1c7:47f4:7c86 with SMTP id h14-20020a170902f7ce00b001c747f47c86mr468696plw.15.1696364963279; Tue, 03 Oct 2023 13:29:23 -0700 (PDT) Received: from hermes.local (204-195-126-68.wavecable.com. [204.195.126.68]) by smtp.gmail.com with ESMTPSA id a11-20020a1709027d8b00b001c5f62a639asm2014138plm.196.2023.10.03.13.29.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 13:29:22 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: David Christensen , stable@dpdk.org, Stephen Hemminger Subject: [PATCH v3 4/4] net/tap: use rte_ether_unformat_address Date: Tue, 3 Oct 2023 13:29:09 -0700 Message-Id: <20231003202909.391330-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231003202909.391330-1-stephen@networkplumber.org> References: <20230929163611.62691-1-stephen@networkplumber.org> <20231003202909.391330-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: David Christensen Building DPDK with gcc 12 on a ppc64le system generates a stringop-overflow warning. Replace the local MAC address validation function parse_user_mac() with a call to rte_ether_unformat_addr() instead. Bugzilla ID: 1197 Cc: stable@dpdk.org Signed-off-by: David Christensen Signed-off-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index bf98f7555990..b25a52655fa2 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -2267,29 +2267,6 @@ set_remote_iface(const char *key __rte_unused, return 0; } -static int parse_user_mac(struct rte_ether_addr *user_mac, - const char *value) -{ - unsigned int index = 0; - char mac_temp[strlen(ETH_TAP_USR_MAC_FMT) + 1], *mac_byte = NULL; - - if (user_mac == NULL || value == NULL) - return 0; - - strlcpy(mac_temp, value, sizeof(mac_temp)); - mac_byte = strtok(mac_temp, ":"); - - while ((mac_byte != NULL) && - (strlen(mac_byte) <= 2) && - (strlen(mac_byte) == strspn(mac_byte, - ETH_TAP_CMP_MAC_FMT))) { - user_mac->addr_bytes[index++] = strtoul(mac_byte, NULL, 16); - mac_byte = strtok(NULL, ":"); - } - - return index; -} - static int set_mac_type(const char *key __rte_unused, const char *value, @@ -2311,7 +2288,7 @@ set_mac_type(const char *key __rte_unused, goto success; } - if (parse_user_mac(user_mac, value) != 6) + if (rte_ether_unformat_addr(value, user_mac) < 0) goto error; success: TAP_LOG(DEBUG, "TAP user MAC param (%s)", value);