From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by dpdk.org (Postfix) with ESMTP id F17362BD0 for ; Tue, 29 Aug 2017 17:35:26 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id f13so20800478wme.1 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:in-reply-to:references :in-reply-to:references; bh=6aIN363YeOKgGeaDDjhbeIh/ETVlt0aUPlMBHalRZIA=; b=GL+FcBuGzQF6HSqH9P76GqwRpIwbJI7faULeA04wfQqEfSjpeDMm8hV6I3e2vR70I4 pL4w5Yk3yAcrKxBqrVMy+LqUTblVzO641isYKAF34xdgHAueowJqSKfmmmtV2UZzcVUc PFhaUwGXQrSsCxV2teFZpMo4//T4UTdVxqvz26PX6d0htKWeXaFxn6lkboUh7PwnQHXj eAVveKl/TD7/BLtnFdhnaCsaWCtIhhbtDr6edzArCNi845y9Oij9JfXoikWQHK1e6NLL Rl6ZWvDgJf1U5IlJn3HDMNu0LbO8ABBONn4fqpix9URNIeDXDvMfdk8mCjJqgHm0Lfzq ivFw== 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:in-reply-to:references; bh=6aIN363YeOKgGeaDDjhbeIh/ETVlt0aUPlMBHalRZIA=; b=kTkgD4hYYL3PJgezHU+4SycqBZHVfXWdX1UQlmb3F0Gl+YJ5Pnpe8P60vcigSX9Wqp rU3z3JZkAa6Gg/sI491ewZ+E3picHG5EvL74fEWNaauFnmcDyP0Ld+Qu4vSCozrhCvsd iD3+2DOIhB367rRmIFO3MWYWOQPYbrhXQcz/XMpT57uy2+xR7zj1l2BLdPmaZTrFvamW Yf/O+Dz2zpnBgCfOLqR/TovGaqmGGvF9cgf0wqrg22Tex5XKMqRNMz/9Z5GnofWWdURp 5rhdlcD+qSt88iZaH8Za5bO07HXpnxC4ARwrpblvekpnaE79+4BUs9xy2zy1Q3bE5xa1 JCqw== X-Gm-Message-State: AHYfb5gjPrPqMlTE0Kb1+rXl6xkOW5i1HlXNAcLOvZNzkvdKlDUR+4Pe 2ZvST/ZOCN34s5tZlQCsuA== X-Received: by 10.28.144.4 with SMTP id s4mr19704wmd.89.1504020926686; 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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 08:35:26 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org Cc: stable@dpdk.org Date: Tue, 29 Aug 2017 17:35:03 +0200 Message-Id: <139a20a84bf2455ac0ded98984016f5557b75604.1504020810.git.nelio.laranjeiro@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> References: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> In-Reply-To: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> References: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> Subject: [dpdk-stable] [PATCH 2/2] net/mlx5: improve stack usage during link update 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: , X-List-Received-Date: Tue, 29 Aug 2017 15:35:27 -0000 Allocate no more memory than necessary for the second call to ETHTOOL_GLINKSETTINGS. Cc: stable@dpdk.org Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 0d2dae4..5af4d89 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -113,7 +113,6 @@ struct ethtool_link_settings { #define ETHTOOL_LINK_MODE_100000baseCR4_Full_BIT 38 #define ETHTOOL_LINK_MODE_100000baseLR4_ER4_Full_BIT 39 #endif -#define ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 (SCHAR_MAX) /** * Return private structure associated with an Ethernet device. @@ -805,11 +804,7 @@ static int mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); - 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 ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS }; struct ifreq ifr; struct rte_eth_link dev_link; uint64_t sc; @@ -822,15 +817,21 @@ 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->cmd = ETHTOOL_GLINKSETTINGS; - ifr.ifr_data = (void *)ecmd; + ifr.ifr_data = (void *)&gcmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); return -1; } - ecmd->link_mode_masks_nwords = -ecmd->link_mode_masks_nwords; + gcmd.link_mode_masks_nwords = -gcmd.link_mode_masks_nwords; + + alignas(struct ethtool_link_settings) + uint8_t data[offsetof(struct ethtool_link_settings, link_mode_masks) + + sizeof(uint32_t) * gcmd.link_mode_masks_nwords]; + struct ethtool_link_settings *ecmd = (void *)data; + + *ecmd = gcmd; + ifr.ifr_data = (void *)ecmd; if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", strerror(errno)); -- 2.1.4