From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3chas3@gmail.com> Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by dpdk.org (Postfix) with ESMTP id B043149E1 for ; Mon, 25 Jun 2018 17:34:08 +0200 (CEST) Received: by mail-it0-f68.google.com with SMTP id 16-v6so13026328itl.5 for ; Mon, 25 Jun 2018 08:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=XyTzCgeXxumGpOQodp5LLmuPjPnNtCliGqtxrefaR1w=; b=UlTQeXO0WGJE+sF4kwPXMCxjvCyPIFqXzYh711X7hCSddh5k1X9AFIQejwRRPlzZRJ gqHGcOzNhFJLWmt58gKaqWZmMWE3S6rrTvS5RUTMKfVd3QSWbm2fK5ShXr+mAiUo19x3 XWlbJ4B8v1djHJSQGaod4YbULjwziNugu4ThFTHRv1Xxzaq7c0c8IcwEBr6hK9vd3OgU s+3uTGcWcTA3Nrvc6HF449x3YAB6+G/DsdGT7gW9YMgeX5RnoICH4lR3h+4N7RSWeu8Z RxizymBP02GtP5R6NIRtoGeO6cUGNVUVCwtnvWBNlPL4M9fBF8XXk0xeKskBpt5HH6LE USVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=XyTzCgeXxumGpOQodp5LLmuPjPnNtCliGqtxrefaR1w=; b=Y4a/7VOzCjJOnNld3W8lkTzDG34Vc6UWXY7toa/lktOm92wWh8oQvw09zmxFFXVHIM 2Dt0m1FR8YlZA2mlXlXnRqTCFp73gyYToylwnbNc6VjUWGF8ZMVED/KNSR/0XXqMK5nd Npnje59cEdPM54EvOsv+tvdAqNiOVLSQG4IkW27LL77PqRBarUtMUKcBVDhuoDMvgGx2 68A7lWbiNIIWAx4o7gmZAtHB2niGfBB05xRsqeTzv/UTUeV3LiqMf6OWOmutoPi7csmy KSA2nCkZAME746QYicv42SlKUVsIotsOEOD8NM7OE46IvDWRljz+4/Uj2y/ULB+qfPfQ OILA== X-Gm-Message-State: APt69E30bPLXCg9lV+lxqKn/cbZS71lU+tLBSOzA7lCxdBoZQV1IxHRE iIOOtgaJVr/ZUWuXPJfna7fYbCe4vGdu2zBeANM= X-Google-Smtp-Source: AAOMgpeN45Dm1bV3P3EruigpijUzQ8DdbtVN19r2+duRiQh2EJCgJRhgbWh45nTjn0vW2wG8Oa/i9Fs80QjCPELy3io= X-Received: by 2002:a24:350c:: with SMTP id k12-v6mr1248578ita.95.1529940847966; Mon, 25 Jun 2018 08:34:07 -0700 (PDT) MIME-Version: 1.0 References: <5b2a1230.1c69fb81.79c57.3134SMTPIN_ADDED_MISSING@mx.google.com> In-Reply-To: <5b2a1230.1c69fb81.79c57.3134SMTPIN_ADDED_MISSING@mx.google.com> From: Chas Williams <3chas3@gmail.com> Date: Mon, 25 Jun 2018 11:33:56 -0400 Message-ID: To: Alex Kiselev Cc: dev@dpdk.org, Stephen Hemminger , Matan Azrad Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH v4] net/bonding: add add/remove mac addrs 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: , X-List-Received-Date: Mon, 25 Jun 2018 15:34:09 -0000 On Wed, Jun 20, 2018 at 4:37 AM Alex Kiselev wrote: > add functions to add/remove MAC addresses > Signed-off-by: Alex Kiselev > Acked-by: Chas Williams > --- > drivers/net/bonding/rte_eth_bond_api.c | 12 ++- > drivers/net/bonding/rte_eth_bond_pmd.c | 131 > ++++++++++++++++++++++++++++- > drivers/net/bonding/rte_eth_bond_private.h | 8 ++ > 3 files changed, 146 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/bonding/rte_eth_bond_api.c > b/drivers/net/bonding/rte_eth_bond_api.c > index d558df8b9..9123f4614 100644 > --- a/drivers/net/bonding/rte_eth_bond_api.c > +++ b/drivers/net/bonding/rte_eth_bond_api.c > @@ -373,6 +373,13 @@ __eth_bond_slave_add_lock_free(uint16_t > bonded_port_id, uint16_t slave_port_id) > return -1; > } > > + /* Add additional MAC addresses to the slave */ > + if (slave_add_mac_addresses(bonded_eth_dev, slave_port_id) != 0) { > + RTE_BOND_LOG(ERR, "Failed to add mac address(es) to slave > %hu", > + slave_port_id); > + return -1; > + } > + > internals->slave_count++; > > if (bonded_eth_dev->data->dev_started) { > @@ -387,7 +394,7 @@ __eth_bond_slave_add_lock_free(uint16_t > bonded_port_id, uint16_t slave_port_id) > /* Add slave details to bonded device */ > slave_eth_dev->data->dev_flags |= RTE_ETH_DEV_BONDED_SLAVE; > > - /* Update all slave devices MACs*/ > + /* Update all slave devices MACs */ > mac_address_slaves_update(bonded_eth_dev); > > /* Register link status change callback with bonded device pointer > as > @@ -491,6 +498,9 @@ __eth_bond_slave_remove_lock_free(uint16_t > bonded_port_id, > rte_eth_dev_default_mac_addr_set(slave_port_id, > > &(internals->slaves[slave_idx].persisted_mac_addr)); > > + /* remove additional MAC addresses from the slave */ > + slave_remove_mac_addresses(bonded_eth_dev, slave_port_id); > + > /* > * Remove bond device flows from slave device. > * Note: don't restore flow isolate mode. > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c > b/drivers/net/bonding/rte_eth_bond_pmd.c > index 02d94b1b1..20b8ec06f 100644 > --- a/drivers/net/bonding/rte_eth_bond_pmd.c > +++ b/drivers/net/bonding/rte_eth_bond_pmd.c > @@ -25,6 +25,7 @@ > > #define REORDER_PERIOD_MS 10 > #define DEFAULT_POLLING_INTERVAL_10_MS (10) > +#define BOND_MAX_MAC_ADDRS 16 > > #define HASH_L4_PORTS(h) ((h)->src_port ^ (h)->dst_port) > > @@ -1588,6 +1589,61 @@ mac_address_set(struct rte_eth_dev *eth_dev, struct > ether_addr *new_mac_addr) > return 0; > } > > +static const struct ether_addr null_mac_addr; > + > +/* > + * Add additional MAC addresses to the slave > + */ > +int > +slave_add_mac_addresses(struct rte_eth_dev *bonded_eth_dev, > + uint16_t slave_port_id) > +{ > + int i, ret; > + struct ether_addr *mac_addr; > + > + for (i = 1; i < BOND_MAX_MAC_ADDRS; i++) { > + mac_addr = &bonded_eth_dev->data->mac_addrs[i]; > + if (is_same_ether_addr(mac_addr, &null_mac_addr)) > + break; > + > + ret = rte_eth_dev_mac_addr_add(slave_port_id, mac_addr, 0); > + if (ret < 0) { > + /* rollback */ > + for (i--; i > 0; i--) > + rte_eth_dev_mac_addr_remove(slave_port_id, > + > &bonded_eth_dev->data->mac_addrs[i]); > + return ret; > + } > + } > + > + return 0; > +} > + > +/* > + * Remove additional MAC addresses from the slave > + */ > +int > +slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev, > + uint16_t slave_port_id) > +{ > + int i, rc, ret; > + struct ether_addr *mac_addr; > + > + rc = 0; > + for (i = 1; i < BOND_MAX_MAC_ADDRS; i++) { > + mac_addr = &bonded_eth_dev->data->mac_addrs[i]; > + if (is_same_ether_addr(mac_addr, &null_mac_addr)) > + break; > + > + ret = rte_eth_dev_mac_addr_remove(slave_port_id, mac_addr); > + /* save only the first error */ > + if (ret < 0 && rc == 0) > + rc = ret; > + } > + > + return rc; > +} > + > int > mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev) > { > @@ -2219,7 +2275,7 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct > rte_eth_dev_info *dev_info) > uint16_t max_nb_rx_queues = UINT16_MAX; > uint16_t max_nb_tx_queues = UINT16_MAX; > > - dev_info->max_mac_addrs = 1; > + dev_info->max_mac_addrs = BOND_MAX_MAC_ADDRS; > > dev_info->max_rx_pktlen = internals->candidate_max_rx_pktlen ? > internals->candidate_max_rx_pktlen : > @@ -2905,6 +2961,68 @@ bond_filter_ctrl(struct rte_eth_dev *dev > __rte_unused, > return -ENOTSUP; > } > > +static int > +bond_ethdev_mac_addr_add(struct rte_eth_dev *dev, struct ether_addr > *mac_addr, > + __rte_unused uint32_t index, uint32_t vmdq) > +{ > + struct rte_eth_dev *slave_eth_dev; > + struct bond_dev_private *internals = dev->data->dev_private; > + int ret, i; > + > + rte_spinlock_lock(&internals->lock); > + > + for (i = 0; i < internals->slave_count; i++) { > + slave_eth_dev = > &rte_eth_devices[internals->slaves[i].port_id]; > + if (*slave_eth_dev->dev_ops->mac_addr_add == NULL || > + *slave_eth_dev->dev_ops->mac_addr_remove == NULL) > { > + ret = -ENOTSUP; > + goto end; > + } > + } > + > + for (i = 0; i < internals->slave_count; i++) { > + ret = > rte_eth_dev_mac_addr_add(internals->slaves[i].port_id, > + mac_addr, vmdq); > + if (ret < 0) { > + /* rollback */ > + for (i--; i >= 0; i--) > + rte_eth_dev_mac_addr_remove( > + internals->slaves[i].port_id, > mac_addr); > + goto end; > + } > + } > + > + ret = 0; > +end: > + rte_spinlock_unlock(&internals->lock); > + return ret; > +} > + > +static void > +bond_ethdev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) > +{ > + struct rte_eth_dev *slave_eth_dev; > + struct bond_dev_private *internals = dev->data->dev_private; > + int i; > + > + rte_spinlock_lock(&internals->lock); > + > + for (i = 0; i < internals->slave_count; i++) { > + slave_eth_dev = > &rte_eth_devices[internals->slaves[i].port_id]; > + if (*slave_eth_dev->dev_ops->mac_addr_remove == NULL) > + goto end; > + } > + > + struct ether_addr *mac_addr = &dev->data->mac_addrs[index]; > + > + for (i = 0; i < internals->slave_count; i++) > + rte_eth_dev_mac_addr_remove(internals->slaves[i].port_id, > + mac_addr); > + > +end: > + rte_spinlock_unlock(&internals->lock); > +} > + > const struct eth_dev_ops default_dev_ops = { > .dev_start = bond_ethdev_start, > .dev_stop = bond_ethdev_stop, > @@ -2927,6 +3045,8 @@ const struct eth_dev_ops default_dev_ops = { > .rss_hash_conf_get = bond_ethdev_rss_hash_conf_get, > .mtu_set = bond_ethdev_mtu_set, > .mac_addr_set = bond_ethdev_mac_address_set, > + .mac_addr_add = bond_ethdev_mac_addr_add, > + .mac_addr_remove = bond_ethdev_mac_addr_remove, > .filter_ctrl = bond_filter_ctrl > }; > > @@ -2954,10 +3074,13 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t > mode) > eth_dev->data->nb_rx_queues = (uint16_t)1; > eth_dev->data->nb_tx_queues = (uint16_t)1; > > - eth_dev->data->mac_addrs = rte_zmalloc_socket(name, > ETHER_ADDR_LEN, 0, > - socket_id); > + /* Allocate memory for storing MAC addresses */ > + eth_dev->data->mac_addrs = rte_zmalloc_socket(name, ETHER_ADDR_LEN > * > + BOND_MAX_MAC_ADDRS, 0, socket_id); > if (eth_dev->data->mac_addrs == NULL) { > - RTE_BOND_LOG(ERR, "Unable to malloc mac_addrs"); > + RTE_BOND_LOG(ERR, > + "Failed to allocate %u bytes needed to store > MAC addresses", > + ETHER_ADDR_LEN * BOND_MAX_MAC_ADDRS); > goto err; > } > > diff --git a/drivers/net/bonding/rte_eth_bond_private.h > b/drivers/net/bonding/rte_eth_bond_private.h > index 65445b863..43e0e448d 100644 > --- a/drivers/net/bonding/rte_eth_bond_private.h > +++ b/drivers/net/bonding/rte_eth_bond_private.h > @@ -230,6 +230,14 @@ mac_address_get(struct rte_eth_dev *eth_dev, struct > ether_addr *dst_mac_addr); > int > mac_address_slaves_update(struct rte_eth_dev *bonded_eth_dev); > > +int > +slave_add_mac_addresses(struct rte_eth_dev *bonded_eth_dev, > + uint16_t slave_port_id); > + > +int > +slave_remove_mac_addresses(struct rte_eth_dev *bonded_eth_dev, > + uint16_t slave_port_id); > + > int > bond_ethdev_mode_set(struct rte_eth_dev *eth_dev, int mode); > > -- > 2.16.1.windows.1 > >