From patchwork Fri Jul 12 20:54:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 56417 X-Patchwork-Delegate: rasland@nvidia.com 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 C0EF51B9D6; Sat, 13 Jul 2019 00:15:38 +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 A8047493D for ; Sat, 13 Jul 2019 00:15:34 +0200 (CEST) Received: by mail-pf1-f196.google.com with SMTP id r7so4895038pfl.3 for ; Fri, 12 Jul 2019 15:15:34 -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=54EOHvWBIhAMDoysqV18ltcmurAzdmDB+sntQ/SnKXc=; b=q8izaBv+BQe3Vj27Itord8GJFSFZ+H7u3XHxIRBU8qlezZQkbnZm7d5JjhdXCQSTr7 0TCzpBMuKn6cP2+SqraDBGTTAZLp+cfAi4zeXdoRImgm/qpJVNxmtPrlFN1IicFabH2+ 1Ikz1YxD7Nqbb/xIymKYjorCriAmw2evjwqQLJRVjC7yXdqSXRp0zzTim5X4DJkjPuYh qkyXyQC0x8JV178ogqJgw5Xem12XuRcjCfzG9bBJOD6lqk0eKaUUmXKGGl3gpYxm0IKi hsynir76d7+JxmjBowK/Zk03vXcXmORYbeC+0yodENRTQY10+08ogx1kQkooGDaumDo5 GE8g== 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=54EOHvWBIhAMDoysqV18ltcmurAzdmDB+sntQ/SnKXc=; b=KcAi0RbG0AczsxGHfIWA4CkMEBb6VH46widXxDfkg6Kk/RMZxYr5BbUYOuxAnSS11H bZRmAtfC/cevviXjk6T3ZoKN2iqXcLEmpGs5h7V43XD2PrW1rX2qcRLSPw8nGSOB2Con EPiZy44SoPKZrR9Kf/6pD7oaXr1wFGW2HiHN4qdSlG/enep4FscvGrqyRPLsr0UyevDV SFV32CsWWF1jXSA+8it11D+TMp2/5Bgi8uxIcbmILLj4+sBQccx4WZieVdHDC0Wls2+B 8JXRsmX9qfBWaWTFEYwR1OoZFUHsthhDVRQmS4G1BWLGK4ZdnULrKsoJigchAZMeK5y4 UVgw== X-Gm-Message-State: APjAAAVUfcjqAM2x1kSQCFJ6TWD6FugmChkyLu+b6NKTlwXcr1Na1CZz RF0aIIhspZjMQCqM+icr7jE= X-Google-Smtp-Source: APXvYqyQtWaPeLAno8aTJ+O4HWnoa7/L2gQIYNZ0R+kCeHR+F0QcMSgrhsoek4JIpXzIVxzGli2e4A== X-Received: by 2002:a63:3f84:: with SMTP id m126mr13900380pga.213.1562969733813; Fri, 12 Jul 2019 15:15:33 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id q69sm16634170pjb.0.2019.07.12.15.15.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 12 Jul 2019 15:15:33 -0700 (PDT) From: Stephen Hemminger To: matan@mellanox.com, shahafs@mellanox.com, yskoh@mellanox.com, viacheslavo@mellanox.com Cc: dev@dpdk.org, sju@paloaltonetworks.com, Stephen Hemminger Date: Fri, 12 Jul 2019 13:54:25 -0700 Message-Id: <20190712205425.17781-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190712205425.17781-1-stephen@networkplumber.org> References: <20190712205425.17781-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] net/mlx5: fix crash in dev_info_get in secondary process 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" mlx5_dev_info_get calls mlx5_get_ifname, but mlx5_get_ifname uses priv->ctx which is not a valid pointer in a secondary process. The fix is to cache the value in primary. In the primary process, get and store the interface index of the device so that secondary process can see it. Fixes: e60fbd5b24fc ("mlx5: add device configure/start/stop") Signed-off-by: Stephen Hemminger --- drivers/net/mlx5/mlx5.c | 17 ++++++++--------- drivers/net/mlx5/mlx5.h | 1 + drivers/net/mlx5/mlx5_ethdev.c | 4 +--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index d93f92db56b5..27c5ef9b1763 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -1105,6 +1105,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, int own_domain_id = 0; uint16_t port_id; unsigned int i; + char ifname[IF_NAMESIZE]; /* Determine if this port representor is supposed to be spawned. */ if (switch_info->representor && dpdk_dev->devargs) { @@ -1479,18 +1480,16 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev, mac.addr_bytes[0], mac.addr_bytes[1], mac.addr_bytes[2], mac.addr_bytes[3], mac.addr_bytes[4], mac.addr_bytes[5]); -#ifndef NDEBUG - { - char ifname[IF_NAMESIZE]; - if (mlx5_get_ifname(eth_dev, &ifname) == 0) - DRV_LOG(DEBUG, "port %u ifname is \"%s\"", + if (mlx5_get_ifname(eth_dev, &ifname) == 0) { + priv->if_index = if_nametoindex(ifname); + DRV_LOG(DEBUG, "port %u ifname is \"%s\"", eth_dev->data->port_id, ifname); - else - DRV_LOG(DEBUG, "port %u ifname is unknown", - eth_dev->data->port_id); + } else { + DRV_LOG(DEBUG, "port %u ifname is unknown", + eth_dev->data->port_id); } -#endif + /* Get actual MTU if possible. */ err = mlx5_get_mtu(eth_dev, &priv->mtu); if (err) { diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 5af3f413cdcb..a06ffd444255 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -342,6 +342,7 @@ struct mlx5_priv { uint16_t vlan_filter[MLX5_MAX_VLAN_IDS]; /* VLAN filters table. */ unsigned int vlan_filter_n; /* Number of configured VLAN filters. */ /* Device properties. */ + unsigned int if_index; /* Associated kernel network device index. */ uint16_t mtu; /* Configured MTU. */ unsigned int isolated:1; /* Whether isolated mode is enabled. */ unsigned int representor:1; /* Device is a port representor. */ diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index eeefe4df3cd4..41e58db5e573 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -605,7 +605,6 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) 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; @@ -626,8 +625,7 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) 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 = priv->if_index; 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;