From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nelio Laranjeiro Subject: [PATCH 2/2] net/mlx5: improve stack usage during link update Date: Tue, 29 Aug 2017 17:35:03 +0200 Message-ID: <139a20a84bf2455ac0ded98984016f5557b75604.1504020810.git.nelio.laranjeiro@6wind.com> References: <20f8cf112084a36f203b80e212a9f08463bd3c91.1504020810.git.nelio.laranjeiro@6wind.com> Cc: stable@dpdk.org To: dev@dpdk.org Return-path: Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by dpdk.org (Postfix) with ESMTP id 369522BD0 for ; Tue, 29 Aug 2017 17:35:27 +0200 (CEST) Received: by mail-wm0-f50.google.com with SMTP id b14so20939569wme.0 for ; Tue, 29 Aug 2017 08:35:27 -0700 (PDT) In-Reply-To: <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> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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