From patchwork Tue Aug 29 15:35:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?N=C3=A9lio_Laranjeiro?= X-Patchwork-Id: 28063 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 1D3822C02; Tue, 29 Aug 2017 17:35:28 +0200 (CEST) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by dpdk.org (Postfix) with ESMTP id A61022BD0 for ; Tue, 29 Aug 2017 17:35:26 +0200 (CEST) Received: by mail-wr0-f171.google.com with SMTP id j29so10444855wre.2 for ; Tue, 29 Aug 2017 08:35:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=IHkReLLfh2BGV7vZRk9yO/RcBHLFQ/Rgi2V0LP4EakE=; b=fAdWNecMX9UeICH0ZtSsztyUaBmnRJgyJgHEuuuWnRKSJe72Xua3uJUrHjAGhkwmbY bvpKZZiTKsnndB7oqM3jaDqCnghQrlsHi4KYXM2ymg/0qgsPmycP0AntmfkVxhQp84zx 05Zi8wKo+kNnaDQHpd8Njza3dS6hT2T5l7beEetgEONhWxAA+vqQn1x9GTvIAXbUktOp Avf0SnvTwBAlKOifyXjPAHBEEoZDb+POTVH+UjxR0xC68jmqLv4vG7x6WcRD1xhw3ez/ siODe7MXsY9dQnrdXs8SjopCIb2EoYKx8Y6w8hZgD7vD9bjiVCpk0/XZZK4WjupKwCUv 2GVQ== 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; bh=IHkReLLfh2BGV7vZRk9yO/RcBHLFQ/Rgi2V0LP4EakE=; b=ui/XpcPBrZKBc1CprGbG4khW7kmHgWrdIpuwYMJb79nUtVpRLJDMnpoO09eFSJXUdZ FQm5tK/kihmKrbDq+/PZXJlV/L1HMYuqKY+XUvn/e1vqOch7hjyUdzZyaJ2gh8V4/DlL 0xLvM9b9HA7csdX/T3HXIZClJwsRuvTRhs8hEDTyxJsObva/2V4KSq8hBqXalnJn3pLQ oPNsZM3tKvtE3Jaxgw28KhT+Nc8jwtGM7NSf8BDAS2lxmNhopLI2mKbBLDYU0qxb0oQX YxRbxxcAra5nH1w27DR2Yed6rAJk6a42RdxOclcB2j7mkanSgFqHQ7sdrmH4B03Y/5LV uK7w== X-Gm-Message-State: AHYfb5j/HvXeKQtmQ46nsgO+/5bbsq30O1OYbNh+9AxBLBhq/OsRBjQC I7qVfYZjcZrv0BIVAE92/A== X-Received: by 10.223.166.78 with SMTP id k72mr485732wrc.124.1504020926066; Tue, 29 Aug 2017 08:35:26 -0700 (PDT) Received: from ping.dev.6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id t5sm1794344wma.44.2017.08.29.08.35.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 08:35:25 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: gowrishankar.m@linux.vnet.ibm.com, stable@dpdk.org Date: Tue, 29 Aug 2017 17:35:02 +0200 Message-Id: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 Subject: [dpdk-dev] [PATCH 1/2] net/mlx5: fix clang compilation 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" On redhat 7.2 clang reports the following error: CC mlx5_rxmode.o /drivers/net/mlx5/mlx5_ethdev.c:820:32: error: field 'edata' with variable sized type 'struct ethtool_link_settings' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end] struct ethtool_link_settings edata; Use alternative approach to reserve buffer space on the stack. Fixes: ef09a7fc7620 ("net/mlx5: fix inconsistent link status query") Cc: gowrishankar.m@linux.vnet.ibm.com Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 57f6237..0d2dae4 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -804,12 +805,11 @@ static int mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - __extension__ struct { - struct ethtool_link_settings edata; - uint32_t link_mode_data[3 * - ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32]; - } ecmd; - + alignas(struct ethtool_link_settings) + uint8_t data[offsetof(struct ethtool_link_settings, link_mode_masks) + + sizeof(uint32_t) * + ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 * 3]; + struct ethtool_link_settings *ecmd = (void *)data; struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -822,23 +822,23 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) memset(&dev_link, 0, sizeof(dev_link)); dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && (ifr.ifr_flags & IFF_RUNNING)); - memset(&ecmd, 0, sizeof(ecmd)); - ecmd.edata.cmd = ETHTOOL_GLINKSETTINGS; - ifr.ifr_data = (void *)&ecmd; + memset(ecmd, 0, sizeof(*ecmd)); + ecmd->cmd = ETHTOOL_GLINKSETTINGS; + ifr.ifr_data = (void *)ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - ecmd.edata.link_mode_masks_nwords = -ecmd.edata.link_mode_masks_nwords; + ecmd->link_mode_masks_nwords = -ecmd->link_mode_masks_nwords; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - dev_link.link_speed = ecmd.edata.speed; - sc = ecmd.edata.link_mode_masks[0] | - ((uint64_t)ecmd.edata.link_mode_masks[1] << 32); + dev_link.link_speed = ecmd->speed; + sc = ecmd->link_mode_masks[0] | + ((uint64_t)ecmd->link_mode_masks[1] << 32); priv->link_speed_capa = 0; if (sc & ETHTOOL_LINK_MODE_Autoneg_BIT) priv->link_speed_capa |= ETH_LINK_SPEED_AUTONEG; @@ -874,7 +874,7 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT | ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT)) priv->link_speed_capa |= ETH_LINK_SPEED_100G; - dev_link.link_duplex = ((ecmd.edata.duplex == DUPLEX_HALF) ? + dev_link.link_duplex = ((ecmd->duplex == DUPLEX_HALF) ? ETH_LINK_HALF_DUPLEX : ETH_LINK_FULL_DUPLEX); dev_link.link_autoneg = !(dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED);