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 BE8F542ECF for ; Thu, 20 Jul 2023 17:25:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BACAF42D5C; Thu, 20 Jul 2023 17:25:12 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 0D613400D6 for ; Thu, 20 Jul 2023 17:25:10 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2PmuIf9m7TnaWiz8fNiy7+SANThbt1T+TeZDhSFmnCc=; b=AQzCKJuLU1DRjuY1NhpsPHkJW+6i1yQvswWLC0TkMT9AJ7Vhib7ZRK/JCbK5slpkupt7Wq 1jgKQv5zjTLMnd5QfMwhXbyAd/JkHFEWYzLQFNmQ9coSSwvCLNrPWmNId0Gx/ouXtkgY7N OjEvtWxiQg9le2Xg3orl8ax2ACY3Ogc= Received: from mimecast-mx02.redhat.com (66.187.233.88 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-5-n26vLa7cOb-7V6YLJoZt_w-1; Thu, 20 Jul 2023 11:21:51 -0400 X-MC-Unique: n26vLa7cOb-7V6YLJoZt_w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B2A0C936D2B; Thu, 20 Jul 2023 15:21:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC91A4A9004; Thu, 20 Jul 2023 15:21:41 +0000 (UTC) From: Kevin Traynor To: Wenjun Wu Cc: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix Rx data buffer size' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:18 +0100 Message-ID: <20230720151942.262154-67-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 Hi, FYI, your patch has been queued to stable release 21.11.5 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/25/23. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/0a060a3c1ee0eed54d8f77fe7d4e156e648505de Thanks. Kevin --- >From 0a060a3c1ee0eed54d8f77fe7d4e156e648505de Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 14 Apr 2023 13:47:42 +0800 Subject: [PATCH] net/iavf: fix Rx data buffer size [ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] According to hardware spec, the data buffer size should not be greater than 16K - 128. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/iavf/iavf_rxtx.c | 1 + drivers/net/iavf/iavf_rxtx.h | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 2211297220..19b46b2a5d 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -652,4 +652,5 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, len = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM; rxq->rx_buf_len = RTE_ALIGN_FLOOR(len, (1 << IAVF_RXQ_CTX_DBUFF_SHIFT)); + rxq->rx_buf_len = RTE_MIN(rxq->rx_buf_len, IAVF_RX_MAX_DATA_BUF_SIZE); /* Allocate the software ring. */ diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h index 743ff5e9d8..ebf362e0ba 100644 --- a/drivers/net/iavf/iavf_rxtx.h +++ b/drivers/net/iavf/iavf_rxtx.h @@ -17,4 +17,7 @@ #define IAVF_RX_MAX_BURST 32 +/* Max data buffer size must be 16K - 128 bytes */ +#define IAVF_RX_MAX_DATA_BUF_SIZE (16 * 1024 - 128) + /* used for Vector PMD */ #define IAVF_VPMD_RX_MAX_BURST 32 -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:03.020214608 +0100 +++ 0067-net-iavf-fix-Rx-data-buffer-size.patch 2023-07-20 16:17:54.863751333 +0100 @@ -1 +1 @@ -From c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 Mon Sep 17 00:00:00 2001 +From 0a060a3c1ee0eed54d8f77fe7d4e156e648505de Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c5549f1d9b1bf2bf2b09517daf89c84fbf5b18e0 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index b1d0fbceb6..0db3aabd92 100644 +index 2211297220..19b46b2a5d 100644 @@ -23 +24 @@ -@@ -698,4 +698,5 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, +@@ -652,4 +652,5 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, @@ -30 +31 @@ -index 09e2127db0..f205a2aaf1 100644 +index 743ff5e9d8..ebf362e0ba 100644