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 E4194A0518 for ; Fri, 24 Jul 2020 14:02:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DD0161C031; Fri, 24 Jul 2020 14:02:33 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 95EA91C031 for ; Fri, 24 Jul 2020 14:02:33 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id x5so7174215wmi.2 for ; Fri, 24 Jul 2020 05:02:33 -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=Nb6klb9fvWnKMCBtCkwk30SYVBvPd39JH+g/GimwwvM=; b=pw5ND7/iXux1suJEL9lgvpNbF/PxCW34Q9OOUPWjzvbZloKJP6aLL3CSzVs7r1HW+f 5hQJ3we+GkOl80SwLDobtzSD9Hs1WivLLjRv3UaokUmTAglNsziCDUjj93MDUUlRxUIo gMWBMXp4nyzeF3v9PJvFfpRmMZ25Dv2VgqDul7HEBYJDnlA9qUJQe6+NgD/KcJRzPwCj ik59mENTzLuzMkwqCL9JlO6tvaSeFu1KrEiYvla7gCzDhgWvh0LjgRNasMA7V1BU0Na4 oYRQd1jrab9U9TbybYk8EiAlOnl7b4Abhqy5p6f3k/dK84dsIqTSKjDrMmfX5VyJrZof 2mCA== 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=Nb6klb9fvWnKMCBtCkwk30SYVBvPd39JH+g/GimwwvM=; b=RDUOcYZcJkcBfupjbdNeiqjJB1k+CxJu7+Vf9UcxxWAPTeFJcM4HU62EgssRAEtgq2 jx+C6QNTVUEpMO3yLEjMbPi1UzobNEdj4QJSraD5yukBnW13kBxrjbVQZiwtnpQOk1MJ EDo2N5RY/kHC+HIneovLELYgQJnbGzx0iHQWokk72UmVYjTwz3e9axT9VtOZa+Ds09kD bIHxh3T8LG+GK8rWmSHZxXuKRhEzx+RqT2wkA1YfE9/85ELshNbLE5EK1lotqRiR5TIa OKQNyvQb+ygKDbcvGyDIPklGm5IkmBTAC5xRJciEyx+L0Hj4ZtxU9PNTwAczYOQLcJeE JYEg== X-Gm-Message-State: AOAM532eQJx+JruPH/OmKnRAt2g6Nq4oIVkOy3/mucqfg9R3cr1CUxkp AuyVyMO1clAMQY6tUwgl/7o= X-Google-Smtp-Source: ABdhPJwtZJuXZBBYCasCNztGYvxR1JOXuOnxkIraVvVvEJhSWKLyliHk2YxLoEJYOcjqjrDDDG1xyQ== X-Received: by 2002:a7b:cb46:: with SMTP id v6mr8966262wmj.73.1595592153300; Fri, 24 Jul 2020 05:02:33 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id w16sm1305951wrg.95.2020.07.24.05.02.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:02:32 -0700 (PDT) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Fri, 24 Jul 2020 12:57:50 +0100 Message-Id: <20200724120030.1863487-32-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: do not select legacy MPW implicitly' 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 07/26/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 f0ba791d7bafa43caecac02748cb655529633c63 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 11 Jun 2020 17:42:00 +0000 Subject: [PATCH] net/mlx5: do not select legacy MPW implicitly [ upstream commit a23d96ae59e21f7b0ada43d2757a726fc565005a ] The Legacy MPW (multi-packet write) should not be engaged implicitly. We should exclude this function from a Tx burst routine selection process unless it is requested specifically by setting the txq_mpw_en devarg. Exclude this function from the selection process the same way it is done for the Enhanced MPW in the mlx5_select_tx_function() routine. Fixes: eb8121ab9dac ("net/mlx5: introduce Tx burst routine template") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxtx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index 488a87f59..90625e71f 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -5365,6 +5365,9 @@ mlx5_select_tx_function(struct rte_eth_dev *dev) /* Does not meet requested offloads at all. */ continue; } + if ((olx ^ tmp) & MLX5_TXOFF_CONFIG_MPW) + /* Do not enable legacy MPW if not configured. */ + continue; if ((olx ^ tmp) & MLX5_TXOFF_CONFIG_EMPW) /* Do not enable eMPW if not configured. */ continue; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.835804063 +0100 +++ 0032-net-mlx5-do-not-select-legacy-MPW-implicitly.patch 2020-07-24 12:53:48.223005267 +0100 @@ -1,8 +1,10 @@ -From a23d96ae59e21f7b0ada43d2757a726fc565005a Mon Sep 17 00:00:00 2001 +From f0ba791d7bafa43caecac02748cb655529633c63 Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Thu, 11 Jun 2020 17:42:00 +0000 Subject: [PATCH] net/mlx5: do not select legacy MPW implicitly +[ upstream commit a23d96ae59e21f7b0ada43d2757a726fc565005a ] + The Legacy MPW (multi-packet write) should not be engaged implicitly. We should exclude this function from a Tx burst routine selection process unless it is requested specifically by setting the txq_mpw_en @@ -11,7 +13,6 @@ routine. Fixes: eb8121ab9dac ("net/mlx5: introduce Tx burst routine template") -Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko @@ -20,10 +21,10 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c -index 22cdf1518..4d67925e5 100644 +index 488a87f59..90625e71f 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c -@@ -5542,6 +5542,9 @@ mlx5_select_tx_function(struct rte_eth_dev *dev) +@@ -5365,6 +5365,9 @@ mlx5_select_tx_function(struct rte_eth_dev *dev) /* Does not meet requested offloads at all. */ continue; }