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 3C072A0093 for ; Tue, 19 May 2020 15:11:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 233DF1D70E; Tue, 19 May 2020 15:11:36 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id A41E91D70C for ; Tue, 19 May 2020 15:11:34 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id f13so2995160wmc.5 for ; Tue, 19 May 2020 06:11:34 -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=bWQqar9sfLbX09yQ06szkYqpRIMO3jHx/rqYleUHtyA=; b=BJLnCVn6/695Uk48EjJVXX41PrS+fOS7Gfrj26psSkXqrL/Q8ikcBybFsXyQcUGTRY AkbE25ouPj0AzSv15DINiEZ95Q9HjY2Pc1znNhHZ/26Ipn6JSyENeHzyrUvduEL9gBGr OnIaSZGhbG4nX1mM8OV2mbl1766/OjqCTLPsS5e28Tx/kUJYl7+N9ViwTNM3JJ9w3H5+ ZJ1dceTDMlK7TQTdWzV1fRUFNirHwlQTVQsiP6FzOkOuiOw8UrZHG8xw57CWKeToLv/h 6sxmBhniigrB8t2FFDvcU0WBUhUdflL0+NUMzVGRgQwCw2DVDSls0JmKmCu1xO7mMM3z 0IXw== 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=bWQqar9sfLbX09yQ06szkYqpRIMO3jHx/rqYleUHtyA=; b=UB20Yho94D+AKqyWOP/DQDtMo2vWgWfGbS6kEO6IyxVf4Rsk4K4VZedtMwCsBYvH1g M28kW9SRUrBTjbbN6LyWrSTjC7OroazuxrLfhlEr3eoMmuxZhvy5rep37gBIM/2A9omj UmSFJuT4gu16CtTUR9eBf5vAqHWgmvKbucBvdli7vWDBnrxNOQoaLTIjMMbLPWbIoZy5 k0rfsgrJkR9q1r/vD0tHvDRxKxhnTNOmryM9rXxZPDmDpNex8nPyue/q45u6aBqitLsz TUXkID3qTBVIErHIjnC6T1dCjZ3L665G+vEDHPtopvGOlHex0kpBu/qNqWvMWtzAoiLu WAuw== X-Gm-Message-State: AOAM533Fj3eDPYKlf+sCnJrpoVOW6kXFjpZVk7QmYqChY4KDh6rh0cLx kA4dDkoTpKD8Mh7HZjYxxC0hQixfRl4pBjoN X-Google-Smtp-Source: ABdhPJzNYL/jSevifgk1jkfWQOJrV//ySq3I90PccigIoB7dmDEa6v1g7Xh9/v5tZBTGS3yaaMLFzg== X-Received: by 2002:a1c:2707:: with SMTP id n7mr5543774wmn.147.1589893894404; Tue, 19 May 2020 06:11:34 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 5sm3980015wmz.16.2020.05.19.06.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Alexander Kozyrev Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 14:04:03 +0100 Message-Id: <20200519130549.112823-108-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: improve logging of MPRQ selection' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 4c84ef15a76a8a0e4352baa71938c780cc4a514b Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Fri, 17 Apr 2020 17:20:39 +0000 Subject: [PATCH] net/mlx5: improve logging of MPRQ selection [ upstream commit a24431dffb206948de15687e6b49198b5d50fb12 ] MPRQ is silently turned off in case there is not enough Rx queues configured. Improve the logging to show a warning in this case to notify a user about the Rx burst function selected. Fixes: 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support") Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_rxq.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index a4071f891e..c687752cb7 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -1896,19 +1896,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, tmpl->rxq.sges_n = sges_n; max_lro_size = max_rx_pkt_len; } - if (mprq_en && !mlx5_rxq_mprq_enabled(&tmpl->rxq)) + if (config->mprq.enabled && !mlx5_rxq_mprq_enabled(&tmpl->rxq)) DRV_LOG(WARNING, - "port %u MPRQ is requested but cannot be enabled" - " (requested: packet size = %u, desc = %u," - " stride_sz = %u, stride_num = %u," - " supported: min_stride_sz = %u, max_stride_sz = %u).", - dev->data->port_id, non_scatter_min_mbuf_size, desc, + "port %u MPRQ is requested but cannot be enabled\n" + " (requested: pkt_sz = %u, desc_num = %u," + " rxq_num = %u, stride_sz = %u, stride_num = %u\n" + " supported: min_rxqs_num = %u," + " min_stride_sz = %u, max_stride_sz = %u).", + dev->data->port_id, non_scatter_min_mbuf_size, + desc, priv->rxqs_n, config->mprq.stride_size_n ? (1U << config->mprq.stride_size_n) : (1U << mprq_stride_size), config->mprq.stride_num_n ? (1U << config->mprq.stride_num_n) : (1U << mprq_stride_nums), + config->mprq.min_rxqs_num, (1U << config->mprq.min_stride_size_n), (1U << config->mprq.max_stride_size_n)); DRV_LOG(DEBUG, "port %u maximum number of segments per packet: %u", -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.883667543 +0100 +++ 0108-net-mlx5-improve-logging-of-MPRQ-selection.patch 2020-05-19 14:04:44.356650911 +0100 @@ -1,15 +1,16 @@ -From a24431dffb206948de15687e6b49198b5d50fb12 Mon Sep 17 00:00:00 2001 +From 4c84ef15a76a8a0e4352baa71938c780cc4a514b Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Fri, 17 Apr 2020 17:20:39 +0000 Subject: [PATCH] net/mlx5: improve logging of MPRQ selection +[ upstream commit a24431dffb206948de15687e6b49198b5d50fb12 ] + MPRQ is silently turned off in case there is not enough Rx queues configured. Improve the logging to show a warning in this case to notify a user about the Rx burst function selected. Fixes: 7d6bf6b866b8 ("net/mlx5: add Multi-Packet Rx support") -Cc: stable@dpdk.org Signed-off-by: Alexander Kozyrev Acked-by: Viacheslav Ovsiienko @@ -18,10 +19,10 @@ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c -index 9bc7af6d92..7a50ec6f16 100644 +index a4071f891e..c687752cb7 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c -@@ -1921,19 +1921,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, +@@ -1896,19 +1896,22 @@ mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, tmpl->rxq.sges_n = sges_n; max_lro_size = max_rx_pkt_len; }