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 377D3206 for ; Wed, 30 Aug 2017 16:47:30 +0200 (CEST) Received: by mail-wm0-f42.google.com with SMTP id u26so12137431wma.0 for ; Wed, 30 Aug 2017 07:47:30 -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=Owa3lNgUDn2vo1kOHfTUcwXU5nMWbVm8ykSIUIXGtGw=; b=HiPyWoPgcXe/w+zPhCk1wZuJ21GjfKcY74NA173NDXxckLnPnLx3zJSc8sGC5bprlD 5v3hr87lHggzDtYtp0Rq977yPBuR+e74Tu61gMxXwmyqLrXICxHWXDxHOH4zoKCPQcbQ ZPzzS5IMtAP7kOgGdPSKYdkMzrWr9b4RfwP/pLXp88jSaJgGBZPiTHghOSApzGFI3a+/ pcHmwH9aFpzkvp4oX+yzY9hH2gCAatlarAJEG8RJScKyYzQrbB6f2l0TafFtQExNqiWz eg5OnB84knlqdE+XhXc4sXQQu3SIrPT01N00jhEV+YS55UMiwkFJimJFdYY93YqNejt4 4xLA== 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=Owa3lNgUDn2vo1kOHfTUcwXU5nMWbVm8ykSIUIXGtGw=; b=qDHwKcX+vMCFOta3/tTVh6fulpKo3ABc7xIndEyQd9mZgAlW5rvBkY3DwN/6SQp4GN aVBJdUP+K/ABWRbaYvWAdwM2jJAMHxc80JDS9qrS4kaid40lvubNVtRE+A1a2RGEPYiD NfapZ+Icaz8x0VAh9A3zE3CfIUvAmlncRG7resm5V/AXBq3d2XJ2EsjZxpZKhbr9/5RR 8S+tXYVdskch0rWcGU+nkGRFgzIy+NzYZotiG+ykTQMrDt1b1ut9tFOnVd/M7AiO6J0f 9lWLlO5jZk1jfwc2BZ8HIsLzGuZV6mhRkAYaeh3Z3uK8N7rdjm5Crdw25xpBuXoxBkLu 3DcA== X-Gm-Message-State: AHYfb5gqiI4yBcRmLeYKB+8GDk3FEpv3HuBSXUWsonVnJXdYRsmssTsX vbFFIF+sk7zQ1YCh X-Received: by 10.28.199.193 with SMTP id x184mr1448890wmf.76.1504104449833; Wed, 30 Aug 2017 07:47:29 -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 201sm1912338wmm.39.2017.08.30.07.47.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Aug 2017 07:47:29 -0700 (PDT) From: Nelio Laranjeiro To: dev@dpdk.org, Ferruh Yigit Cc: stable@dpdk.org Date: Wed, 30 Aug 2017 16:47:07 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: <7b005e17d5b2a1221e6d7237e3d36fea57a33c6a.1504104367.git.nelio.laranjeiro@6wind.com> References: <7b005e17d5b2a1221e6d7237e3d36fea57a33c6a.1504104367.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 v2 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: Wed, 30 Aug 2017 14:47:30 -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 -- Changes in v2: Fix the memory space, link_mode_mask_nwords has the size for the three expected arrays. --- 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..53a23ab 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 * 3]; + 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