From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 584B2A0541 for ; Fri, 7 Feb 2020 11:59:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 11E1E1C045; Fri, 7 Feb 2020 11:59:07 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 9B21A1C045 for ; Fri, 7 Feb 2020 11:59:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581073144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=mek5KNIgQV4aKkdMYfNOhQMQMBhq9C0iromROd2Fssc=; b=aTVt53D/WYunl/iD0Oo99tiQhAeyeFRAinA+pD+Nzfam6GcbLW9Ndxuof+AhgNw0lLOaLX 7NIRkbMw7Ts/myt9aSuKwfJOBGEp18koVxk1XoLPj3w4z3OKkxG/IgTsazekcMFWJjA9SE FImvNtdThvIucHKYh9Ys8SpkfCQwCkk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-296-H13aKB95M8iv9XlZUSCMtg-1; Fri, 07 Feb 2020 05:59:00 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3E95801F77; Fri, 7 Feb 2020 10:58:59 +0000 (UTC) Received: from [10.33.36.76] (unknown [10.33.36.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 752EB60BF7; Fri, 7 Feb 2020 10:58:58 +0000 (UTC) To: Alexander Kozyrev , stable@dpdk.org Cc: stephen@networkplumber.org, viacheslavo@mellanox.com References: <1580225235-95187-1-git-send-email-akozyrev@mellanox.com> From: Kevin Traynor Autocrypt: addr=ktraynor@redhat.com; keydata= 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 Message-ID: Date: Fri, 7 Feb 2020 10:58:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <1580225235-95187-1-git-send-email-akozyrev@mellanox.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: H13aKB95M8iv9XlZUSCMtg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [18.11] net/mlx5: cache associated network device index X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 28/01/2020 15:27, Alexander Kozyrev wrote: > From: Viacheslav Ovsiienko > > [ upstream commit fa2e14d4921a2c4a1268231e72ccd73d1e7e58fc ] > > The associated device index is retrieved via Netlink request to > underlying Infiniband device driver. This network device index > is permanent throughout the lifetime of device. We do not > spawn the rte_eth_dev ports without associated network device, and > if network device is being unbound we get the remove notification > message and rte_eth_dev port is also detached. So, we may store > the ifindex in mlx5_device_spawn() routine at rte_eth_dev port > creation and initialization time and use the cached value further > instead of doing actual Netlink request. > > Reported-by: Stephen Hemminger > Signed-off-by: Viacheslav Ovsiienko > Acked-by: Yongseok Koh > --- > drivers/net/mlx5/mlx5.c | 11 +++++++++-- > drivers/net/mlx5/mlx5.h | 1 + > drivers/net/mlx5/mlx5_ethdev.c | 20 +++++++++----------- > 3 files changed, 19 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index d7833d0..29370f5 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -734,7 +734,8 @@ > mlx5_dev_spawn(struct rte_device *dpdk_dev, > struct ibv_device *ibv_dev, > struct mlx5_dev_config config, > - const struct mlx5_switch_info *switch_info) > + const struct mlx5_switch_info *switch_info, > + unsigned int ifindex) > { > struct ibv_context *ctx; > struct ibv_device_attr_ex attr; > @@ -1132,6 +1133,12 @@ > eth_dev->data->dev_flags |= RTE_ETH_DEV_REPRESENTOR; > eth_dev->data->representor_id = priv->representor_id; > } > + /* > + * Store associated network device interface index. This index > + * is permanent throughout the lifetime of device. So, we may store > + * the ifindex here and use the cached value further. > + */ > + priv->if_index = ifindex; > eth_dev->data->dev_private = priv; > priv->dev_data = eth_dev->data; > eth_dev->data->mac_addrs = priv->mac; > @@ -1492,7 +1499,7 @@ struct mlx5_dev_spawn_data { > > list[i].eth_dev = mlx5_dev_spawn(&pci_dev->device, > list[i].ibv_dev, dev_config, > - &list[i].info); > + &list[i].info, list[i].ifindex); > if (!list[i].eth_dev) { > if (rte_errno != EBUSY && rte_errno != EEXIST) > break; > diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h > index b409f20..26cbdbc 100644 > --- a/drivers/net/mlx5/mlx5.h > +++ b/drivers/net/mlx5/mlx5.h > @@ -197,6 +197,7 @@ struct mlx5_priv { > unsigned int representor:1; /* Device is a port representor. */ > uint16_t domain_id; /* Switch domain identifier. */ > int32_t representor_id; /* Port representor identifier. */ > + unsigned int if_index; /* Associated kernel network device index. */ > /* RX/TX queues. */ > unsigned int rxqs_n; /* RX queues array size. */ > unsigned int txqs_n; /* TX queues array size. */ > diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c > index 9c7fc6b..d49cb59 100644 > --- a/drivers/net/mlx5/mlx5_ethdev.c > +++ b/drivers/net/mlx5/mlx5_ethdev.c > @@ -220,10 +220,10 @@ struct ethtool_link_settings { > mlx5_get_ifname(const struct rte_eth_dev *dev, char (*ifname)[IF_NAMESIZE]) > { > struct mlx5_priv *priv = dev->data->dev_private; > - unsigned int ifindex = > - priv->nl_socket_rdma >= 0 ? > - mlx5_nl_ifindex(priv->nl_socket_rdma, priv->ibdev_name) : 0; > + unsigned int ifindex; > > + assert(priv); > + ifindex = mlx5_ifindex(dev); > if (!ifindex) { > if (!priv->representor) > return mlx5_get_master_ifname(dev, ifname); > @@ -248,14 +248,14 @@ struct ethtool_link_settings { > unsigned int > mlx5_ifindex(const struct rte_eth_dev *dev) > { > - char ifname[IF_NAMESIZE]; > + struct mlx5_priv *priv = dev->data->dev_private; > unsigned int ifindex; > > - if (mlx5_get_ifname(dev, &ifname)) > - return 0; > - ifindex = if_nametoindex(ifname); > + assert(priv); > + assert(priv->if_index); > + ifindex = priv->if_index; > if (!ifindex) > - rte_errno = errno; > + rte_errno = ENXIO; > return ifindex; > } > > @@ -502,7 +502,6 @@ struct ethtool_link_settings { > struct mlx5_priv *priv = dev->data->dev_private; > struct mlx5_dev_config *config = &priv->config; > unsigned int max; > - char ifname[IF_NAMESIZE]; > > /* FIXME: we should ask the device for these values. */ > info->min_rx_bufsize = 32; > @@ -523,8 +522,7 @@ struct ethtool_link_settings { > info->rx_offload_capa = (mlx5_get_rx_port_offloads() | > info->rx_queue_offload_capa); > info->tx_offload_capa = mlx5_get_tx_port_offloads(dev); > - if (mlx5_get_ifname(dev, &ifname) == 0) > - info->if_index = if_nametoindex(ifname); > + info->if_index = mlx5_ifindex(dev); > info->reta_size = priv->reta_idx_n ? > priv->reta_idx_n : config->ind_table_max_size; > info->hash_key_size = MLX5_RSS_HASH_KEY_LEN; > Applied, thanks.