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 4D1F9A04DB for ; Tue, 17 Nov 2020 12:15:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0FF80C8B0; Tue, 17 Nov 2020 12:15:06 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id EC1125916 for ; Tue, 17 Nov 2020 12:15:03 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id 10so2866783wml.2 for ; Tue, 17 Nov 2020 03:15:03 -0800 (PST) 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=XH2IzJtoafoSL+jCivMxuQXYJWqMMMFnHgdWcoVJkNY=; b=nw3lhVWD+Efre9kspkGchIa/923MdrbUN43R2GP58lV1mYn/NrtiKhamz0KE9qV7B3 b5wkUkRPEJRUfJIMZXF8n6KVVTuQyfjuCH6d77lXEyxEz+/71sEr7Xm2WybAKWU+Z7zZ a+iVVFykx8vjVn8iFC8z9EpVvACZV+k7BOU9hBvDlzFSY+89ybxGbN4/bQzfLJXObRJq h2Q9X2ALFvY7iJ/PPAph5RQ7nsAo6TmJov8+0a93QXPI3Pl/2NaPKVItCv/oVlC2qcqv 4QzWv1a7YwaQHhk+2A7064s1082LXlSw9W5HyyiTTqYdF3a7chlJYASFoT/hVN5DOJCx l6fA== 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=XH2IzJtoafoSL+jCivMxuQXYJWqMMMFnHgdWcoVJkNY=; b=sI+DAeWYHzXYUkfvWa4Gw501We2Af7jSBLNJZxmpR1bczxao9tU8QO1oqKJcRkoxAZ WY1zBpCPTqrQYYv5JS4zrS+sYbwQxKgYh6tH/lBCsr5I2zplQ4BJ4j2gpCDVgpXz4yME xq5UyOaIb8A5sFoYDDDT3ySHfRk2nAawMtAms9Z829guk3yblsZE3nLe1n+8HfTYmAoz 4gUDQSV06r42/xSobhKH5c8qwFeJfaNUlB6XdFacnTjYyisFht6SFefWVckNfWWG0brh vja6GQIwteTTNXrZQOhI/SPa6IXWm5Xm3JdQ6O6KjMUkE1Nlml/ZHH4tb7f+xOvzSZQD ZpYQ== X-Gm-Message-State: AOAM532Ni+M3TksQTOHg9nxlrLAxida74399nOF084IHLKDK15ZkbuWp z5YbHOzvDXKcyud2duVDc3s= X-Google-Smtp-Source: ABdhPJwwqj5lPYw15+HenT+61g9XuH4oVFg/MAONZP6B6BNOmyttywj25ggkm2Y/iYGEt2kaPNUgKw== X-Received: by 2002:a1c:a5d8:: with SMTP id o207mr3840329wme.0.1605611702733; Tue, 17 Nov 2020 03:15:02 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i6sm3087645wma.42.2020.11.17.03.15.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Nov 2020 03:15:02 -0800 (PST) From: luca.boccassi@gmail.com To: Dong Zhou Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 17 Nov 2020 11:13:49 +0000 Message-Id: <20201117111416.1961049-15-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201117111416.1961049-1-luca.boccassi@gmail.com> References: <20201109185030.3478760-2-luca.boccassi@gmail.com> <20201117111416.1961049-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix switch port id when representor in bonding' has been queued to stable release 19.11.6 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.6 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/19/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. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b056b956bb62564d08f8451664bbc47932865f8f Thanks. Luca Boccassi --- >From b056b956bb62564d08f8451664bbc47932865f8f Mon Sep 17 00:00:00 2001 From: Dong Zhou Date: Wed, 4 Nov 2020 08:04:55 +0200 Subject: [PATCH] net/mlx5: fix switch port id when representor in bonding [ upstream commit cdbdcd46a2b915c0781ecb2f48f412237daf03da ] In the bonding configurations the port switch id for representors was composed of pf index in bonding as the 1 MSB and the representor's index as the remaining 15 LSBs. The special corner case for the host PF representor on BF setups with representor id 0xFFFF was missed as well. The new switch port id consists of 4 MSBs for the pf bonding index and the remaining 12 LSBs for the representor index. The switch port id ranges for each type of representors are as follows: Uplink representor(AKA master): 0xFFFF Host PF representor: 0xFFF VF representor: 0x[0-FFE] Fixes: bee57a0a3565 ("net/mlx5: update switch port id in bonding configuration") Signed-off-by: Dong Zhou Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_defs.h | 2 +- drivers/net/mlx5/mlx5_ethdev.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h index 418e744d65..2836099b75 100644 --- a/drivers/net/mlx5/mlx5_defs.h +++ b/drivers/net/mlx5/mlx5_defs.h @@ -61,7 +61,7 @@ /* Switch port ID parameters for bonding configurations. */ #define MLX5_PORT_ID_BONDING_PF_MASK 0xf -#define MLX5_PORT_ID_BONDING_PF_SHIFT 0xf +#define MLX5_PORT_ID_BONDING_PF_SHIFT 12 /* Alarm timeout. */ #define MLX5_ALARM_TIMEOUT_US 100000 diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index a6a091259e..efcc69ca44 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -646,14 +646,22 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) * representors (more than 4K) or PFs (more than 15) * this approach must be reconsidered. */ - if ((info->switch_info.port_id >> - MLX5_PORT_ID_BONDING_PF_SHIFT) || + /* Switch port ID for VF representors: 0 - 0xFFE */ + if ((info->switch_info.port_id != 0xffff && + info->switch_info.port_id >= + ((1 << MLX5_PORT_ID_BONDING_PF_SHIFT) - 1)) || priv->pf_bond > MLX5_PORT_ID_BONDING_PF_MASK) { DRV_LOG(ERR, "can't update switch port ID" " for bonding device"); assert(false); return -ENODEV; } + /* + * Switch port ID for Host PF representor + * (representor_id is -1) , set to 0xFFF + */ + if (info->switch_info.port_id == 0xffff) + info->switch_info.port_id = 0xfff; info->switch_info.port_id |= priv->pf_bond << MLX5_PORT_ID_BONDING_PF_SHIFT; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-17 11:13:13.606868936 +0000 +++ 0015-net-mlx5-fix-switch-port-id-when-representor-in-bond.patch 2020-11-17 11:13:12.885115884 +0000 @@ -1 +1 @@ -From cdbdcd46a2b915c0781ecb2f48f412237daf03da Mon Sep 17 00:00:00 2001 +From b056b956bb62564d08f8451664bbc47932865f8f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cdbdcd46a2b915c0781ecb2f48f412237daf03da ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -30 +31 @@ -index 3c34234152..aa55db3750 100644 +index 418e744d65..2836099b75 100644 @@ -33 +34 @@ -@@ -50,7 +50,7 @@ +@@ -61,7 +61,7 @@ @@ -43 +44 @@ -index ee97480dcb..a3910cf922 100644 +index a6a091259e..efcc69ca44 100644 @@ -46 +47 @@ -@@ -338,14 +338,22 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) +@@ -646,14 +646,22 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) @@ -59 +60 @@ - MLX5_ASSERT(false); + assert(false);