From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <3chas3@gmail.com> Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by dpdk.org (Postfix) with ESMTP id E985F201 for ; Mon, 24 Sep 2018 16:26:34 +0200 (CEST) Received: by mail-io1-f68.google.com with SMTP id y10-v6so17706606ioa.10 for ; Mon, 24 Sep 2018 07:26:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:sender:from:date:message-id :subject:to:cc; bh=0a80KEKqgznA0F1bGT90zzcsVJVa/hk2yQ0CMGVypow=; b=SmV38AS3J9SA6hEU6kEo6OuNGI9gSSbqg6s34wDVQrRnrUs+sL65sfXOzG1l9Z+psw a5UxWL5QfIW0Yymno6dvB3BaA5z6WcIg7bwwBxYYBUjVyHcB10dYUScK/rqM8P5bnhe3 0k+C6Svf5o78pKf8bmZ5oRAVu53r6Nz09vxQGQEVzvU8pdih9t+4M6hRIFzg6pnqERFL uheih/E7M+hl7n+9XqHc2RQdVu/fD0Z51qTCZwVjUnrksI3nfx2oVxdFogMaxtWarupO 76vXC2/c9BVKEbtS108POYq7XewbtctZRpf4ujaUscGlZTJXOeYnMNv+flRH1EaPqZcL GsbQ== 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:sender:from :date:message-id:subject:to:cc; bh=0a80KEKqgznA0F1bGT90zzcsVJVa/hk2yQ0CMGVypow=; b=BhO/JsVcwNZp7yDoLv4Xf4IDvWjxaqaBgGIXUPpEu0qUdIl4a2VK76EA3lhxwrIrrf 9PrOAgFxANjtU3371pseVsVzB4KM7Fd/zQDj6KHOkrIp8iw+9QPe+oie7EVSaEEUm2fW QjlgLbCXeHNnSDWKCRcmtAQ27Zj2HruMaPITeIf8MAC5MLk3wP3dePJY2dCFPonbzAXR r4UofW56+4YVoxRU3bFnwdXk0PE+IYciwsd1dDbk8wOncv5K3POCUL0hFZ6e0imx0tjX g1JAzddTEUGleuDEbHcHIPqJPIboynNVoqHGeP4585lxdjyaP4dtr1OrPBeYFCC8a3j7 511A== X-Gm-Message-State: ABuFfojhuT3talt/S7VbPauoQ5iyG84OdT31kNj7C+iOQUsaXdrKoYbd 4zKssRfwGrEgxXjyoq8k/72rJgRUAtNu+pg4H6k= X-Google-Smtp-Source: ACcGV63Y9icG/q/A2vBvHm5dYpPIfXOXIKhrN7WxXrhITX8RH1UuLOpxEusiRlLHtDu0Z56PUosCB/TPBpFHc46VKgY= X-Received: by 2002:a6b:3b8d:: with SMTP id i135-v6mr8065359ioa.215.1537799194191; Mon, 24 Sep 2018 07:26:34 -0700 (PDT) MIME-Version: 1.0 References: <1536138818-12342-1-git-send-email-arybchenko@solarflare.com> <1536138818-12342-2-git-send-email-arybchenko@solarflare.com> In-Reply-To: <1536138818-12342-2-git-send-email-arybchenko@solarflare.com> Sender: chasmosaurus@gmail.com X-Google-Sender-Delegation: chasmosaurus@gmail.com From: Chas Williams <3chas3@gmail.com> Date: Mon, 24 Sep 2018 10:26:22 -0400 X-Google-Sender-Auth: uW5ZMFgzakIqox_PQ5K7bzmXlLU Message-ID: To: arybchenko@solarflare.com Cc: Declan Doherty , Chas Williams , dev@dpdk.org, ivan.malov@oktetlabs.ru Content-Type: text/plain; charset="UTF-8" Subject: Re: [dpdk-dev] [PATCH 2/2] net/bonding: inherit descriptor limits from slaves 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, 24 Sep 2018 14:26:35 -0000 On Wed, Sep 5, 2018 at 5:14 AM Andrew Rybchenko wrote: > > From: Ivan Malov > > Descriptor limits are used by applications to take > optimal decisions on queue sizing. > > Signed-off-by: Ivan Malov > Signed-off-by: Andrew Rybchenko Acked-by: Chas Williams > --- > drivers/net/bonding/rte_eth_bond_api.c | 54 ++++++++++++++++++++++ > drivers/net/bonding/rte_eth_bond_pmd.c | 8 ++++ > drivers/net/bonding/rte_eth_bond_private.h | 2 + > 3 files changed, 64 insertions(+) > > diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c > index 206a5c797..9e039e73b 100644 > --- a/drivers/net/bonding/rte_eth_bond_api.c > +++ b/drivers/net/bonding/rte_eth_bond_api.c > @@ -399,6 +399,43 @@ eth_bond_slave_inherit_dev_info_tx_next(struct bond_dev_private *internals, > internals->tx_queue_offload_capa; > } > > +static void > +eth_bond_slave_inherit_desc_lim_first(struct rte_eth_desc_lim *bond_desc_lim, > + const struct rte_eth_desc_lim *slave_desc_lim) > +{ > + memcpy(bond_desc_lim, slave_desc_lim, sizeof(*bond_desc_lim)); > +} > + > +static int > +eth_bond_slave_inherit_desc_lim_next(struct rte_eth_desc_lim *bond_desc_lim, > + const struct rte_eth_desc_lim *slave_desc_lim) > +{ > + bond_desc_lim->nb_max = RTE_MIN(bond_desc_lim->nb_max, > + slave_desc_lim->nb_max); > + bond_desc_lim->nb_min = RTE_MAX(bond_desc_lim->nb_min, > + slave_desc_lim->nb_min); > + bond_desc_lim->nb_align = RTE_MAX(bond_desc_lim->nb_align, > + slave_desc_lim->nb_align); > + > + if (bond_desc_lim->nb_min > bond_desc_lim->nb_max || > + bond_desc_lim->nb_align > bond_desc_lim->nb_max) { > + RTE_BOND_LOG(ERR, "Failed to inherit descriptor limits"); > + return -EINVAL; > + } > + > + /* Treat maximum number of segments equal to 0 as unspecified */ > + if (slave_desc_lim->nb_seg_max != 0 && > + (bond_desc_lim->nb_seg_max == 0 || > + slave_desc_lim->nb_seg_max < bond_desc_lim->nb_seg_max)) > + bond_desc_lim->nb_seg_max = slave_desc_lim->nb_seg_max; > + if (slave_desc_lim->nb_mtu_seg_max != 0 && > + (bond_desc_lim->nb_mtu_seg_max == 0 || > + slave_desc_lim->nb_mtu_seg_max < bond_desc_lim->nb_mtu_seg_max)) > + bond_desc_lim->nb_mtu_seg_max = slave_desc_lim->nb_mtu_seg_max; > + > + return 0; > +} > + > static int > __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) > { > @@ -458,9 +495,26 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) > > eth_bond_slave_inherit_dev_info_rx_first(internals, &dev_info); > eth_bond_slave_inherit_dev_info_tx_first(internals, &dev_info); > + > + eth_bond_slave_inherit_desc_lim_first(&internals->rx_desc_lim, > + &dev_info.rx_desc_lim); > + eth_bond_slave_inherit_desc_lim_first(&internals->tx_desc_lim, > + &dev_info.tx_desc_lim); > } else { > + int ret; > + > eth_bond_slave_inherit_dev_info_rx_next(internals, &dev_info); > eth_bond_slave_inherit_dev_info_tx_next(internals, &dev_info); > + > + ret = eth_bond_slave_inherit_desc_lim_next( > + &internals->rx_desc_lim, &dev_info.rx_desc_lim); > + if (ret != 0) > + return ret; > + > + ret = eth_bond_slave_inherit_desc_lim_next( > + &internals->tx_desc_lim, &dev_info.tx_desc_lim); > + if (ret != 0) > + return ret; > } > > bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_hf &= > diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c > index ee24e9658..46b660396 100644 > --- a/drivers/net/bonding/rte_eth_bond_pmd.c > +++ b/drivers/net/bonding/rte_eth_bond_pmd.c > @@ -2239,6 +2239,11 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) > memcpy(&dev_info->default_txconf, &internals->default_txconf, > sizeof(dev_info->default_txconf)); > > + memcpy(&dev_info->rx_desc_lim, &internals->rx_desc_lim, > + sizeof(dev_info->rx_desc_lim)); > + memcpy(&dev_info->tx_desc_lim, &internals->tx_desc_lim, > + sizeof(dev_info->tx_desc_lim)); > + > /** > * If dedicated hw queues enabled for link bonding device in LACP mode > * then we need to reduce the maximum number of data path queues by 1. > @@ -3064,6 +3069,9 @@ bond_alloc(struct rte_vdev_device *dev, uint8_t mode) > memset(&internals->default_txconf, 0, > sizeof(internals->default_txconf)); > > + memset(&internals->rx_desc_lim, 0, sizeof(internals->rx_desc_lim)); > + memset(&internals->tx_desc_lim, 0, sizeof(internals->tx_desc_lim)); > + > memset(internals->active_slaves, 0, sizeof(internals->active_slaves)); > memset(internals->slaves, 0, sizeof(internals->slaves)); > > diff --git a/drivers/net/bonding/rte_eth_bond_private.h b/drivers/net/bonding/rte_eth_bond_private.h > index d12a0ebbe..c81baa094 100644 > --- a/drivers/net/bonding/rte_eth_bond_private.h > +++ b/drivers/net/bonding/rte_eth_bond_private.h > @@ -162,6 +162,8 @@ struct bond_dev_private { > > struct rte_eth_rxconf default_rxconf; /**< Default RxQ conf. */ > struct rte_eth_txconf default_txconf; /**< Default TxQ conf. */ > + struct rte_eth_desc_lim rx_desc_lim; /**< Rx descriptor limits */ > + struct rte_eth_desc_lim tx_desc_lim; /**< Tx descriptor limits */ > > uint16_t reta_size; > struct rte_eth_rss_reta_entry64 reta_conf[ETH_RSS_RETA_SIZE_512 / > -- > 2.17.1 >