From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CDFF1A0351 for ; Thu, 6 Aug 2020 11:58:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C65D71C0AE; Thu, 6 Aug 2020 11:58:33 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 891111C0D9 for ; Thu, 6 Aug 2020 11:58:32 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id l2so32854186wrc.7 for ; Thu, 06 Aug 2020 02:58:32 -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 :mime-version:content-transfer-encoding; bh=hEOjzuxkdFi3+2tgmT/N1ZV2Q+U5isnBDc27YPCLaIo=; b=LqbPtm+wGIscx/W3p/ewLTzZFIgaRuiBUcYmHQnEkI2srxZAvB+kAyBDDltB+5o/X2 6FN8gkRZPRr5onwRl4CCVK8PoCq/HSWo0G0nEenw4xX1ppKXwVa0akQ9mQHoIIzTSMDm evbY5wd5T3HVXhoQc7lqTwJ3D9bJbPW2OYCyf6WX/qHyDvwu0FiEoFbmEIJNNuyEGSs/ jnPOcX3Y31dRdlPEN+0YH5f9usWlKUVMLEpTlfH/gj1iDm0D0qy8z29AWt7V2xuc+m7h uwnFmsCbbKWC4RPL8ClArTuF2WR7Fp8iiIHrAZOVP9pbCzNAZpaiZYuxLLrMGyDdTZpT oWqA== 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:mime-version:content-transfer-encoding; bh=hEOjzuxkdFi3+2tgmT/N1ZV2Q+U5isnBDc27YPCLaIo=; b=kuE5jXoBF/iFmoGHU1L2EaSbZn4ToH6hCitGZof4C30OfEvsBmglkJEQccSUYEC4vO 3aXEVD3jX/DGzCdwKKYoU+BkEPEWY43si/G+HO+pbcn9syt9Yo/DXHvZgOILBVi6ulkP 2BnYdWB9oQNPOk5vW1E3NoObsgJ0r6jomhZ2bRM7rdFFkRErYn+8D+KGM8eoP2u5BPsK 7ZGAYtnxaRual0gysv1FGadTw+dyiv82nzETla/A38a51jIklnEp3/oD7pnFkCXjUS7m 6LtBEGuZsp+gKDcShxcU0BZZm9PyLpAjuXhRkpH0zIX7V5HZvMyLd1yjgOeJYV9DSEwy uBlw== X-Gm-Message-State: AOAM533a7FiE376DN+yd5fGfkvli6zNtMUScqEFyLEx+uZuFwx+Mybs5 di1RzV0nSDZxSD+Slc3p5Vrsgfm0NaI= X-Google-Smtp-Source: ABdhPJyLxbB4uKNtM9SSaqaiovqlhyJvoWHVuSRQ4ZjwrufGBRRXCWt0dJXX1YPWB2fCHeAluY03XQ== X-Received: by 2002:adf:ffc1:: with SMTP id x1mr6875051wrs.54.1596707912270; Thu, 06 Aug 2020 02:58:32 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o7sm5873558wrv.50.2020.08.06.02.58.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:58:31 -0700 (PDT) From: luca.boccassi@gmail.com To: Raslan Darawsheh Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 6 Aug 2020 10:53:46 +0100 Message-Id: <20200806095411.774624-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix VF MAC address set over BlueField' has been queued to stable release 19.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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.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 08/08/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 95eb85e2f49bfd05feff56ff9ab18bfbbe48ff49 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Wed, 22 Jul 2020 12:07:55 +0300 Subject: [PATCH] net/mlx5: fix VF MAC address set over BlueField [ upstream commit 753dd70283c772ddcaf20c6f0ccb0ce5de5a5228 ] When trying to set MAC address of an ethernet device and if it was a representor, PMD sets the MAC over the corresponding VF instead. For the case of HPF (Host PF representor on BlueField), PMD shouldn't attempt to set it, since it doesn't have any corresponding VF and fails. This will fix the issue by setting the MAC on the dev directly. Fixes: 0d1d73170820 ("net/mlx5: set VF MAC address from host") Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_mac.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c index 7bdaa2a39..94f102d8a 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c @@ -200,8 +200,11 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) uint16_t port_id; struct mlx5_priv *priv = dev->data->dev_private; - /* Configuring the VF instead of its representor. */ - if (priv->representor) { + /* + * Configuring the VF instead of its representor, + * need to skip the special case of HPF on Bluefield. + */ + if (priv->representor && priv->representor_id >= 0) { DRV_LOG(DEBUG, "VF represented by port %u setting primary MAC address", dev->data->port_id); RTE_ETH_FOREACH_DEV_SIBLING(port_id, dev->data->port_id) { -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:16.500060756 +0100 +++ 0018-net-mlx5-fix-VF-MAC-address-set-over-BlueField.patch 2020-08-06 10:53:15.764596689 +0100 @@ -1,8 +1,10 @@ -From 753dd70283c772ddcaf20c6f0ccb0ce5de5a5228 Mon Sep 17 00:00:00 2001 +From 95eb85e2f49bfd05feff56ff9ab18bfbbe48ff49 Mon Sep 17 00:00:00 2001 From: Raslan Darawsheh Date: Wed, 22 Jul 2020 12:07:55 +0300 Subject: [PATCH] net/mlx5: fix VF MAC address set over BlueField +[ upstream commit 753dd70283c772ddcaf20c6f0ccb0ce5de5a5228 ] + When trying to set MAC address of an ethernet device and if it was a representor, PMD sets the MAC over the corresponding VF instead. @@ -12,7 +14,6 @@ This will fix the issue by setting the MAC on the dev directly. Fixes: 0d1d73170820 ("net/mlx5: set VF MAC address from host") -Cc: stable@dpdk.org Signed-off-by: Raslan Darawsheh Acked-by: Viacheslav Ovsiienko @@ -21,10 +22,10 @@ 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_mac.c b/drivers/net/mlx5/mlx5_mac.c -index 2d808d629..88c52b29f 100644 +index 7bdaa2a39..94f102d8a 100644 --- a/drivers/net/mlx5/mlx5_mac.c +++ b/drivers/net/mlx5/mlx5_mac.c -@@ -157,8 +157,11 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) +@@ -200,8 +200,11 @@ mlx5_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) uint16_t port_id; struct mlx5_priv *priv = dev->data->dev_private;