From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 64F471B270 for ; Mon, 30 Oct 2017 16:36:05 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id y39so13060029wrd.4 for ; Mon, 30 Oct 2017 08:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zm3HkxUpFEQFLr92/tJwh+6zSrjxwFmEtLZQULj3MTE=; b=cLMOdOx3QPan0HQKX+122CZdZabQyVdW5SgaHYEiVpoHQffQ0aXthFS1DmlIwVHA7Q KEu0VwqMm4PgvwEVJY7fkek1gs3sROymntF1tvRsrXEwyqkvI/ExWlDSGi633pd7zoOE 4sn/y7uKFn9kIuKl7ezguD/Dl2SpcYgdN5ZaKZq52dwSVVTyO+0MiRYX3XGi4Tcbg8bK /KFqHsPajDYXQCD7aESXocC75LEQTeNCqd6cXdsNY+rjkxNIV2AI+JiAep4tVdUOg5Li 5iQw/EBi376b2ktP/Kf7DvXR+i7O78ywkZ21YCR+k+/nNcBvsVQPwRW4AU7I7kua7zhR Ahjg== 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; bh=zm3HkxUpFEQFLr92/tJwh+6zSrjxwFmEtLZQULj3MTE=; b=aJzpI9IxSqvJzfLeV/84L/w/bRT3Vy/z1Byg3hY9G4ui9Ta+cr7f6jlJSfOvdXbWct gZl7KVedmt+fADHCYtYm8oRwh2e1FmfC+oC64GgFvWyzGHxFa+E3ywU7BtvciHhfD9bX iJAzzucg0kgfMPe1mLzUA1HBHAhvRaJp1JXEdf34l4ZRUi4XnJLpQ4BVOie90ryh/8zA gCxf4NC4nbsyCWKBLYTlaetS3FoKnNJ48kdh3W2Z6Ji8hsl+n1wfc5oaliEMGIhwgpUJ 2AFVM1TwXvjcuh2P/9VIz1Dn4mj0UyRFgJHiB8srkgimHgo65rb8PIDMTyrORRYlYraG coYw== X-Gm-Message-State: AMCzsaUW3VaNI2jLm/U3B4idJ91+5+go6jDmEmGA8l+B9ZXMS8vWKT0w XZZ8I/V3YcQkSUGNNjEh3v7Eo6/3ut4= X-Google-Smtp-Source: ABhQp+Sd+blCtd97KqGlNQcwF9MsZNf0Kvzw3Qv255JmgG74zh79xyzE23gFYX7boGoUZtifVXgcYw== X-Received: by 10.223.174.142 with SMTP id y14mr7165275wrc.222.1509377764761; Mon, 30 Oct 2017 08:36:04 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id q74sm12155237wrb.51.2017.10.30.08.36.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:36:03 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= Cc: Adrien Mazarguil , dpdk stable Date: Mon, 30 Oct 2017 15:34:14 +0000 Message-Id: <20171030153511.13322-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'net/mlx5: improve stack usage during link update' has been queued to LTS release 16.11.4 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: Mon, 30 Oct 2017 15:36:05 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From cf34c0a6e345b2c5d3d1a3d8a7f37646a4ec8265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?N=C3=A9lio=20Laranjeiro?= Date: Wed, 30 Aug 2017 16:47:07 +0200 Subject: [PATCH] net/mlx5: improve stack usage during link update [ upstream commit 37a4406cdf457fb636d3bcdd0a1922fdef23f55a ] Allocate no more memory than necessary for the second call to ETHTOOL_GLINKSETTINGS. Signed-off-by: Nelio Laranjeiro Acked-by: Adrien Mazarguil --- drivers/net/mlx5/mlx5_ethdev.c | 45 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 5384a880a..8ffb2d861 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -120,7 +120,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. @@ -756,37 +755,39 @@ static int mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, int wait_to_complete) { struct priv *priv = mlx5_get_priv(dev); + struct ethtool_link_settings gcmd = { .cmd = ETHTOOL_GLINKSETTINGS }; + struct ifreq ifr; + struct rte_eth_link dev_link; + uint64_t sc; + + (void)wait_to_complete; + if (priv_ifreq(priv, SIOCGIFFLAGS, &ifr)) { + WARN("ioctl(SIOCGIFFLAGS) failed: %s", strerror(errno)); + return -1; + } + memset(&dev_link, 0, sizeof(dev_link)); + dev_link.link_status = ((ifr.ifr_flags & IFF_UP) && + (ifr.ifr_flags & IFF_RUNNING)); + ifr.ifr_data = (void *)&gcmd; + if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { + DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", + strerror(errno)); + return -1; + } + 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) * - ETHTOOL_LINK_MODE_MASK_MAX_KERNEL_NU32 * 3]; + sizeof(uint32_t) * gcmd.link_mode_masks_nwords * 3]; struct ethtool_link_settings *ecmd = (void *)data; - struct ifreq ifr; - struct rte_eth_link dev_link; - uint64_t sc; - (void)wait_to_complete; - if (priv_ifreq(priv, SIOCGIFFLAGS, &ifr)) { - WARN("ioctl(SIOCGIFFLAGS) failed: %s", strerror(errno)); - return -1; - } - 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; + *ecmd = gcmd; ifr.ifr_data = (void *)ecmd; 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; - if (priv_ifreq(priv, SIOCETHTOOL, &ifr)) { - DEBUG("ioctl(SIOCETHTOOL, ETHTOOL_GLINKSETTINGS) failed: %s", - strerror(errno)); - return -1; - } dev_link.link_speed = ecmd->speed; sc = ecmd->link_mode_masks[0] | ((uint64_t)ecmd->link_mode_masks[1] << 32); -- 2.11.0