From patchwork Wed May 15 22:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 53451 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6F7475F1B; Thu, 16 May 2019 00:20:05 +0200 (CEST) Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by dpdk.org (Postfix) with ESMTP id 1A49A5B1E for ; Thu, 16 May 2019 00:20:01 +0200 (CEST) Received: by mail-pl1-f195.google.com with SMTP id g5so543578plt.2 for ; Wed, 15 May 2019 15:20:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZWNZHay0xN3T3JMmVhQZ41r8L5iCV64FZ7UGs4mBQdk=; b=YrUmEgWaVra5y/1M+QyDIjF2pWc2uUh9la2jmJk181zm57j4HjDUWjZm3IDLY42QT+ w+9qSsvhDKIlG7baXEeLzGeqAPXHe/RumXPLJDC7wgqusTV7HrmKmda3uJJp5dOkbD9U 7g2g6uAuZ2mQblwpB74UJFrg3CwalWGpQ/T7qvIhbIF5nHbf503LzmfWW3IZnHyOutya uBx0COOWNUDXo3SzsqwtPJ4KW28y70xoZzpb6RSpCu6z+b7hAFua5L7inD6iCmk9GVEg q49sgNAhvwASF32vWrIYkh+xu7es2rito61jOM592y3WD0PY0+a09Pls2eoQ2a7IOhm6 KBkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZWNZHay0xN3T3JMmVhQZ41r8L5iCV64FZ7UGs4mBQdk=; b=VCt0opPfLdfwcqT7ynMB5KdeRJSxqjDsASrG+I6pIouCEMT8zS76f6Atm06VtYmc+a iuWEvw188ba/k7gc4aLphtpj0zSeKrT98Yin9CGfAVDfv/GsPwmZs0oHB5BWw3K8x+u6 UXXr94K4F2w9x/YSdhJV9Epw7JYOac3aRfis1YC2/ilg0Pixcx2ZKUxpFLXR3Ys4Jo5N bPtOBK4C1aqLo/V9fEPUkxyPDgQa5ZTZbHBbjenBrpWGfYhnipz+SqHYN0P2PfeIxnI8 nTqewRqA9MZTuHndIreU/yfCRvzvtVjemh0gFeK4K2A01ZXfDBfJO0m4FkRW5hN7DKRe 5Ktg== X-Gm-Message-State: APjAAAWQbswO7PND54n6i3NaZtYu1muMUFIe1lXKYrT0OBmpuxcNjjY3 IzcOptTrMLv4BUpCaczcm/TYpU6KAbc= X-Google-Smtp-Source: APXvYqx5AHmyGc8FDiUVXRiQXpUy40FLgR7dno1rU7dLv5bVSn/PPSuyuDVpL0EXkoJ1p2kmsqzx5g== X-Received: by 2002:a17:902:ca:: with SMTP id a68mr21023752pla.7.1557958800345; Wed, 15 May 2019 15:20:00 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d5sm3549964pgb.33.2019.05.15.15.19.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 15:19:59 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 15 May 2019 15:19:49 -0700 Message-Id: <20190515221952.21959-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515221952.21959-1-stephen@networkplumber.org> References: <20190515221952.21959-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC 1/4] net/ether: deinline non-critical functions X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Formatting ethernet address and getting a random value are not in critical path so they should not be inlined. Signed-off-by: Stephen Hemminger --- lib/librte_net/Makefile | 1 + lib/librte_net/rte_ether.c | 29 +++++++++++++++++++++++++++++ lib/librte_net/rte_ether.h | 24 ++++-------------------- lib/librte_net/rte_net_version.map | 8 ++++++++ 4 files changed, 42 insertions(+), 20 deletions(-) create mode 100644 lib/librte_net/rte_ether.c diff --git a/lib/librte_net/Makefile b/lib/librte_net/Makefile index c3082069ab50..f68b42cd0e8f 100644 --- a/lib/librte_net/Makefile +++ b/lib/librte_net/Makefile @@ -14,6 +14,7 @@ LIBABIVER := 1 SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_net.c SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_net_crc.c +SRCS-$(CONFIG_RTE_LIBRTE_NET) := rte_ether.c SRCS-$(CONFIG_RTE_LIBRTE_NET) += rte_arp.c # install includes diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c new file mode 100644 index 000000000000..d4b41f122a16 --- /dev/null +++ b/lib/librte_net/rte_ether.c @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation + */ + +#include + +void +eth_random_addr(uint8_t *addr) +{ + uint64_t rand = rte_rand(); + uint8_t *p = (uint8_t *)&rand; + + rte_memcpy(addr, p, ETHER_ADDR_LEN); + addr[0] &= (uint8_t)~ETHER_GROUP_ADDR; /* clear multicast bit */ + addr[0] |= ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */ +} + +void +ether_format_addr(char *buf, uint16_t size, + const struct ether_addr *eth_addr) +{ + snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X", + eth_addr->addr_bytes[0], + eth_addr->addr_bytes[1], + eth_addr->addr_bytes[2], + eth_addr->addr_bytes[3], + eth_addr->addr_bytes[4], + eth_addr->addr_bytes[5]); +} diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 3a87ff184900..46d40412763c 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -204,15 +204,8 @@ static inline int is_valid_assigned_ether_addr(const struct ether_addr *ea) * @param addr * A pointer to Ethernet address. */ -static inline void eth_random_addr(uint8_t *addr) -{ - uint64_t rand = rte_rand(); - uint8_t *p = (uint8_t *)&rand; - - rte_memcpy(addr, p, ETHER_ADDR_LEN); - addr[0] &= (uint8_t)~ETHER_GROUP_ADDR; /* clear multicast bit */ - addr[0] |= ETHER_LOCAL_ADMIN_ADDR; /* set local assignment bit */ -} +void +eth_random_addr(uint8_t *addr); /** * Fast copy an Ethernet address. @@ -251,18 +244,9 @@ static inline void ether_addr_copy(const struct ether_addr *ea_from, * @param eth_addr * A pointer to a ether_addr structure. */ -static inline void +void ether_format_addr(char *buf, uint16_t size, - const struct ether_addr *eth_addr) -{ - snprintf(buf, size, "%02X:%02X:%02X:%02X:%02X:%02X", - eth_addr->addr_bytes[0], - eth_addr->addr_bytes[1], - eth_addr->addr_bytes[2], - eth_addr->addr_bytes[3], - eth_addr->addr_bytes[4], - eth_addr->addr_bytes[5]); -} + const struct ether_addr *eth_addr); /** * Ethernet header: Contains the destination address, source address diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map index 26c06e7c7ae7..49d34093781c 100644 --- a/lib/librte_net/rte_net_version.map +++ b/lib/librte_net/rte_net_version.map @@ -13,6 +13,14 @@ DPDK_17.05 { } DPDK_16.11; +DPDK_19.08 { + global: + + eth_random_addr; + eth_format_addr; +} DPDK_17.05; + + EXPERIMENTAL { global: From patchwork Wed May 15 22:19:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 53452 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 01CF15F20; Thu, 16 May 2019 00:20:07 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id C66AF5B40 for ; Thu, 16 May 2019 00:20:03 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id g9so533652plm.6 for ; Wed, 15 May 2019 15:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Jbwl7Sd8my/F397rS6pt6XtuQsuPaXlJF2bq508V2S4=; b=p/rwcphDQOMRGMFxhSJR0g7DqHqUnZJkI+gZIcKoxK1CFt2Tp+mPmC27yGtraPsb3q 8zvRShXDVJiNqbrEtKscCxRtO/XVbcJzXUS6TrM6gfs+4gpmH1fMrBLSGPeaESj0Xvj3 WSoIit6TqdeD9pElQ5XN1+FH4wlJYduCNsT1+8Lp1hNjOAD6d/YvUSqL918OAsyDWxTD gereixDtoT/XFqwR9IihGluIob2boeV95OPARpFvcguWw9atWfXnfhhW2m9qxY7E3+9/ jGMwk/ssyZ1icD7rUG2o2Yha2SvieoZvZreT3dXQOkPwxVOH/yM+MEntgm8NPzNxnHab 2a7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Jbwl7Sd8my/F397rS6pt6XtuQsuPaXlJF2bq508V2S4=; b=afRnahWLS9RdP5PfikIRKY6XUokyU5Ixn0UdMR0wmiD7c5w6Mg4v53mXPvmwHdsjKt MKEF2RZ31fWdsd8C3e2UvpRQXBqvIB8RlYyjlXJ//d4S/MTZ97jdMb68yIP7b7L89amQ hiDyxJLOYSIbthGKXkAS2QdSks10yZn2/d9Ene2vjPOR0MEzZPH2WtYmzJXOj+OBz9SD 6+MYROYxWGfV5nnMMgQhlmrgPVrjpI154aqhANVwBoZNdoTo+1gLQjjijvyFNkigMgds 2GzxzsVGrG8dWQJSey78ZtmnU/OO08RrZjh3sQ2LZGJBqmpr6QQh7CCutF1OA798X6v9 x+4Q== X-Gm-Message-State: APjAAAUaL1Ph0ep9N3RT+wSxo9YhGLk9M3mkSE/zrJLkwxJnY1PhGp4p 214fdYsXAn3jAhXoq2kMYME2EfUiusI= X-Google-Smtp-Source: APXvYqyvGemc6HjmlGn/9ppL0NsHxZ6vg0doPObIcJKSD+Ul5BKLRcqAE/G19FR6PsPt6QAUzFYzww== X-Received: by 2002:a17:902:7406:: with SMTP id g6mr44872040pll.328.1557958802492; Wed, 15 May 2019 15:20:02 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d5sm3549964pgb.33.2019.05.15.15.20.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 15:20:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 15 May 2019 15:19:50 -0700 Message-Id: <20190515221952.21959-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515221952.21959-1-stephen@networkplumber.org> References: <20190515221952.21959-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC 2/4] net/ether: add eth_unformat_addr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make a function that coresponds with eth_aton_r which can be used to convert string to ether_addr. This also allows rte_ethdev to no longer depend on the cmdline library. Signed-off-by: Stephen Hemminger --- lib/librte_net/rte_ether.c | 12 ++++++++++++ lib/librte_net/rte_ether.h | 14 ++++++++++++++ lib/librte_net/rte_net_version.map | 1 + 3 files changed, 27 insertions(+) diff --git a/lib/librte_net/rte_ether.c b/lib/librte_net/rte_ether.c index d4b41f122a16..ca7c841db197 100644 --- a/lib/librte_net/rte_ether.c +++ b/lib/librte_net/rte_ether.c @@ -27,3 +27,15 @@ ether_format_addr(char *buf, uint16_t size, eth_addr->addr_bytes[4], eth_addr->addr_bytes[5]); } + +int __rte_experimental +ether_unformat_addr(const char *str, struct ether_addr *eth_addr) +{ + return (sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + ð_addr->addr_bytes[0], + ð_addr->addr_bytes[1], + ð_addr->addr_bytes[2], + ð_addr->addr_bytes[3], + ð_addr->addr_bytes[4], + ð_addr->addr_bytes[5]) == 6) ? 0 : -1; +} diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index 46d40412763c..b94e64b2195e 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -248,6 +248,20 @@ void ether_format_addr(char *buf, uint16_t size, const struct ether_addr *eth_addr); +/** + * Convert string with Ethernet address to an ether_addr. + * + * @param str + * A pointer to buffer contains the formatted MAC address. + * @param eth_addr + * A pointer to a ether_addr structure. + * @return + * 0 if successful + * -1 and sets rte_errno if invalid string + */ +int __rte_experimental +ether_unformat_addr(const char *str, struct ether_addr *eth_addr); + /** * Ethernet header: Contains the destination address, source address * and frame type. diff --git a/lib/librte_net/rte_net_version.map b/lib/librte_net/rte_net_version.map index 49d34093781c..bbf14ff1cdfa 100644 --- a/lib/librte_net/rte_net_version.map +++ b/lib/librte_net/rte_net_version.map @@ -26,4 +26,5 @@ EXPERIMENTAL { rte_net_make_rarp_packet; rte_net_skip_ip6_ext; + eth_unformat_addr; }; From patchwork Wed May 15 22:19:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 53453 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A4AF25F2A; Thu, 16 May 2019 00:20:08 +0200 (CEST) Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by dpdk.org (Postfix) with ESMTP id 117165F14 for ; Thu, 16 May 2019 00:20:05 +0200 (CEST) Received: by mail-pf1-f196.google.com with SMTP id y11so672624pfm.13 for ; Wed, 15 May 2019 15:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V6S4SrZPKD5RhbdoJ6Quu9gqFutejpSzCG3N29qiz80=; b=kAoHjGYkC6VbUkLCJ4uMDkBYwD4CALOG1mlz5jTyEPVNdGeh1qo2OAaLXcMCu7EKZl H9iTbFjaBmjyiOTuZwVaV/1fIz7R6oQo3L+94Ke2of5CmWEoIYwRGTfcfXiNODKKcUOV Uy/5a29Tzrs7zJt5F+5s5o6ixI6vdeSWaZ1eUXdzd5otqXXbTjzYBcp0rTIIR/Ww1zkz vUTDdJPntjdOIIdCfeHPG0jDrtq531gpXoq3Wc4OjcAASFAgd3lDdxXVcxe35A7kslau EnU2yhdh9bmdsHlLI6yJ7bgIirssaFCqjJOeY5RX4Vs3pUfumEqgUJ7KWJIT+9b+SPoM VIPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V6S4SrZPKD5RhbdoJ6Quu9gqFutejpSzCG3N29qiz80=; b=MifcX428UBh1XD9sFL+j+F3koYDYnZY7QIaRmu109WSX6EHy37Bbl67qmmxNS6tjSP 3eWOAo3x+P8FrkHi09IThrib/5zTrwcLzteoSEwacT56XpjVIf1WhCW1eX3caWL/7qci sEg+8euD+taWN2MqLjWjGGB1mGKp0w6dHmvn9nkzmgW2kq8g6bGS+xBBvqbXTbfZNftl 5sSf+sCSq2R6FgUznzvf+twe/uASR+cYAWKsTRo3NNjDHUpxpfwSKiBQddMHefJHLh2W +vf26osC6rX8qzgkcopBiu0Ak5tBumKX/0MC8ufl5Wg43vvKnwfH/Y6KonGdT6pWT6V1 k2gw== X-Gm-Message-State: APjAAAUnK6PPfuvMRaOAltSSne5qctX/BCLM/Y7YeyB1ymEbWWj4Mdn6 f9OocHuDEN480xdxnyB7e426ivU/qG4= X-Google-Smtp-Source: APXvYqx5X+zYWL0LljNhQKKY7IBLaIeEUpNLkcfKUbEPKQtrhKPxvrud2hN/xZ5ZAACRaM2DYO5f1w== X-Received: by 2002:a63:4a66:: with SMTP id j38mr27552446pgl.199.1557958803996; Wed, 15 May 2019 15:20:03 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d5sm3549964pgb.33.2019.05.15.15.20.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 15:20:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 15 May 2019 15:19:51 -0700 Message-Id: <20190515221952.21959-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515221952.21959-1-stephen@networkplumber.org> References: <20190515221952.21959-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC 3/4] ethdev: use eth_unformat_addr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use eth_unformat_addr, so that ethdev can be built and work without the cmdline library. The dependency on cmdline was an arrangement of convenience anyway. Signed-off-by: Stephen Hemminger --- lib/librte_ethdev/rte_class_eth.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/librte_ethdev/rte_class_eth.c b/lib/librte_ethdev/rte_class_eth.c index cb99c92ece93..40ca936230c6 100644 --- a/lib/librte_ethdev/rte_class_eth.c +++ b/lib/librte_ethdev/rte_class_eth.c @@ -4,7 +4,6 @@ #include -#include #include #include #include @@ -43,19 +42,13 @@ static int eth_mac_cmp(const char *key __rte_unused, const char *value, void *opaque) { - int ret; struct 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. */ - /* - * cannot use ether_aton_r(value, &mac) - * because of include conflict with rte_ether.h - */ - ret = cmdline_parse_etheraddr(NULL, value, &mac, sizeof(mac)); - if (ret < 0) + if (ether_unformat_addr(value, &mac) < 0) return -1; /* invalid devargs value */ /* Return 0 if devargs MAC is matching one of the device MACs. */ From patchwork Wed May 15 22:19:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 53454 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3AE885F34; Thu, 16 May 2019 00:20:10 +0200 (CEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by dpdk.org (Postfix) with ESMTP id 2E5955F1C for ; Thu, 16 May 2019 00:20:06 +0200 (CEST) Received: by mail-pg1-f180.google.com with SMTP id t187so459263pgb.13 for ; Wed, 15 May 2019 15:20:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=usySncatsxV2VcU8J+VYqa3cdTtdmtHu06jkvUhvS04=; b=Y/vfVpHeN8TDoC+xF/c/458NwxocPHgUZWIhw23dUF2TFz+v47WBRTH//eWg+PN6zg 9a3Vo4fkFWdIfwLa6ff4kLBNQH75f3c4aVo8lNHQgHAqwHw2wVijE4BmeLBeGCtiYdf6 htxM02vDnZIt53RihUVzlxVCcXkiGT7VVXchgwKjfyKVxv+VcxcLZZzfSDTPu7uH6Hwd OMB++dd/BGJmp7M/X5iLo1FudtrqQ346yH2pdtgWWZZMrmccMDJbNEAN1LyOwujGzIen VAO7AJFQgVTYIP47wlga6BuNW5z/WxdAJSOnEndgGR7V6jmXfH1PnITV25ZxxDsinwMj dfmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=usySncatsxV2VcU8J+VYqa3cdTtdmtHu06jkvUhvS04=; b=KSu4UGmd5DtQuzDEtwWvGEXF3RidS4CQPCjxaoTwPNC/CGPB4/ehd7CUBHqrG/26gA XoUNHjoHTAdy4XR9QhJIrkhjCybxnUGj0JMOKMxornTcvX4H+0BH5vHu2I4A9aRw0Yu4 mH0ncPKIOl3ZOJQw0r9LzFRXfUH2uojmk0ZxiNvPBLgAwPaH12LYYr7coPJZ0lK6E4vm fxYWxoaGLS5pxPckx7prgd3YDyBeRwhaDla2+5l5SQG5Ph/bGQFBXC7ysoiAYuCYBnhP 3A2MLlgRsdp+9MuI2AJZbIzuikFgLZ8R/AjnMk+Q3QNqITWhM9GtN7DyecLFIifqUPtM jyvw== X-Gm-Message-State: APjAAAU0iE6TmTKlnGUfVeAFFngN5xHP2t6MpM0/B68HeQ+oxG/88Un3 RgwYIua5lSMUokMfPzyzz+J+k87aLUY= X-Google-Smtp-Source: APXvYqzgjJ/WkrQMiS6AeLu6qwDmZ0JESuuaqHHJygQCr0RIPuEB69tyMFsmgBfMuR332leESJQcLw== X-Received: by 2002:a63:6ac1:: with SMTP id f184mr47439282pgc.25.1557958805080; Wed, 15 May 2019 15:20:05 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id d5sm3549964pgb.33.2019.05.15.15.20.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 May 2019 15:20:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 15 May 2019 15:19:52 -0700 Message-Id: <20190515221952.21959-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190515221952.21959-1-stephen@networkplumber.org> References: <20190515221952.21959-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC 4/4] net/ether: use bitops to speedup comparison X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Using bit operations like or and xor is faster than a loop on all architectures. Really just explicit unrolling. Similar cast to uint16 unaligned is already done in other functions here. Signed-off-by: Stephen Hemminger --- lib/librte_net/rte_ether.h | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h index b94e64b2195e..5d9242cda230 100644 --- a/lib/librte_net/rte_ether.h +++ b/lib/librte_net/rte_ether.h @@ -78,11 +78,10 @@ struct ether_addr { static inline int is_same_ether_addr(const struct ether_addr *ea1, const struct ether_addr *ea2) { - int i; - for (i = 0; i < ETHER_ADDR_LEN; i++) - if (ea1->addr_bytes[i] != ea2->addr_bytes[i]) - return 0; - return 1; + const unaligned_uint16_t *w1 = (const uint16_t *)ea1; + const unaligned_uint16_t *w2 = (const uint16_t *)ea2; + + return ((w1[0] ^ w2[0]) | (w1[1] ^ w2[1]) | (w1[2] ^ w2[2])) == 0; } /** @@ -97,11 +96,9 @@ static inline int is_same_ether_addr(const struct ether_addr *ea1, */ static inline int is_zero_ether_addr(const struct ether_addr *ea) { - int i; - for (i = 0; i < ETHER_ADDR_LEN; i++) - if (ea->addr_bytes[i] != 0x00) - return 0; - return 1; + const unaligned_uint16_t *w = (const uint16_t *)ea; + + return (w[0] | w[1] | w[2]) == 0; } /**