From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E7A1A0524 for ; Fri, 5 Feb 2021 12:22:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 681784067B; Fri, 5 Feb 2021 12:22:33 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 39BE04067B for ; Fri, 5 Feb 2021 12:22:32 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id w4so5715051wmi.4 for ; Fri, 05 Feb 2021 03:22:32 -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=KqYTXxqwGJY60rVaYu0R7snSlfaPin1qFRxKokw3wAM=; b=pfV1RhfTkl9y0jwqbQGa6Dxu552mCPLzNG6iQSa8ckxdNpwc+WVXMQacU5dnF0q9gL 0wUIG5bvoCfLodQEr6x3M/GZTbZz6xC3a/V7BzyosPcUAYZi8EjuAeEbGgiqXyWmLn5a CvJSpL/ToE6TLdxoPBM9x035EOWrkri8zNzjy5vai9wkD/0WVK5Ce+K7whWol2HdyqfN VDj76QcaYP9sk0pdxdGNu5GJuneYdAZ9x3nJs4+5sJVpBKAOm9K6Yx2garVMpxuxevRx 16c/gGksBpz1eyR/qH72LH1Bnx7BLqvgUysBhz/Oxo2o6dMiZHPqFZmIxId7osz6y1NI nHDQ== 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=KqYTXxqwGJY60rVaYu0R7snSlfaPin1qFRxKokw3wAM=; b=mO848RCODK4vB9ofbBe3nureSBGtsORS9aZbqNk6bVMYDeF+pPIobEdjkpzeLK9r0x N6+O8XswbNTWNo3ldOqLTpkp+tbskLO1kDFeTdPJe7nssOOZRlpT50QnPaQbpCg9KXef UR2wCZnds8FE3Vm8gOlbKkThiwmCu1Ekg2h32rhTrrWcIns/XYLzThre2LC7fa+T6/fV dibrmK66nVEyXJmiOvSiVwptpRPeAaZ3RO76qL/si8TLNX7uTG1qyDntdKl8g5lmcFFH B+oMQ+FJ3cuGRyk2HrD24K/ce94mXdfONDiQM4wugqWfksqeljtfKLKpJx2pTwSlBsLt DaNw== X-Gm-Message-State: AOAM533jXVHmG621BUz2xqCQse/lkD8jg2Rvqwb/Ptpo+RTYx9vuxN72 mb9OEiz7bC7nbwTEfXeRHYc= X-Google-Smtp-Source: ABdhPJy1Bvr8cWTga4vB3Qku4Tc0K/byGIYssvFmgiLhtj4hTT0SEYzYVx18sDM7FBhNHqdM71mCUw== X-Received: by 2002:a05:600c:4f4d:: with SMTP id m13mr3213215wmq.118.1612524151901; Fri, 05 Feb 2021 03:22:31 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l14sm12038196wrq.87.2021.02.05.03.22.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:22:31 -0800 (PST) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Asaf Penso , dpdk stable Date: Fri, 5 Feb 2021 11:15:42 +0000 Message-Id: <20210205111920.1272063-56-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: fix buffer split offload advertising' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/68a10f5e5acb13cd68102f4cef4b4f80350695e4 Thanks. Luca Boccassi --- >From 68a10f5e5acb13cd68102f4cef4b4f80350695e4 Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Fri, 11 Dec 2020 11:44:52 +0000 Subject: [PATCH] net/mlx5: fix buffer split offload advertising [ upstream commit ddb0384346be3e1a0f0f478831b3c5f4adc20be9 ] The buffer split Rx offload is not compatible with Multi-Packet Receiving Queue (MPRQ) Rx offload, hence, the buffer split offload flag RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT and other related values should be advertised only if there is no MPRQ engaged. Fixes: 6c8f7f1c1877 ("net/mlx5: report Rx buffer split capabilities") Signed-off-by: Viacheslav Ovsiienko Reviewed-by: Asaf Penso --- drivers/net/mlx5/mlx5_ethdev.c | 4 ++-- drivers/net/mlx5/mlx5_rxq.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index a3910cf922..45ee7e4488 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -310,8 +310,8 @@ mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info) info->max_mac_addrs = MLX5_MAX_UC_MAC_ADDRESSES; info->rx_queue_offload_capa = mlx5_get_rx_queue_offloads(dev); info->rx_seg_capa.max_nseg = MLX5_MAX_RXQ_NSEG; - info->rx_seg_capa.multi_pools = 1; - info->rx_seg_capa.offset_allowed = 1; + info->rx_seg_capa.multi_pools = !config->mprq.enabled; + info->rx_seg_capa.offset_allowed = !config->mprq.enabled; info->rx_seg_capa.offset_align_log2 = 0; info->rx_offload_capa = (mlx5_get_rx_port_offloads() | info->rx_queue_offload_capa); diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c index 114f75b42b..4d788788e1 100644 --- a/drivers/net/mlx5/mlx5_rxq.c +++ b/drivers/net/mlx5/mlx5_rxq.c @@ -404,14 +404,14 @@ mlx5_get_rx_queue_offloads(struct rte_eth_dev *dev) struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_dev_config *config = &priv->config; uint64_t offloads = (DEV_RX_OFFLOAD_SCATTER | - RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT | DEV_RX_OFFLOAD_TIMESTAMP | DEV_RX_OFFLOAD_JUMBO_FRAME | DEV_RX_OFFLOAD_RSS_HASH); + if (!config->mprq.enabled) + offloads |= RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT; if (config->hw_fcs_strip) offloads |= DEV_RX_OFFLOAD_KEEP_CRC; - if (config->hw_csum) offloads |= (DEV_RX_OFFLOAD_IPV4_CKSUM | DEV_RX_OFFLOAD_UDP_CKSUM | -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:31.797285479 +0000 +++ 0056-net-mlx5-fix-buffer-split-offload-advertising.patch 2021-02-05 11:18:28.794690883 +0000 @@ -1 +1 @@ -From ddb0384346be3e1a0f0f478831b3c5f4adc20be9 Mon Sep 17 00:00:00 2001 +From 68a10f5e5acb13cd68102f4cef4b4f80350695e4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ddb0384346be3e1a0f0f478831b3c5f4adc20be9 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org