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 76572A057F for ; Tue, 28 Jun 2022 17:20:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 721A04069F; Tue, 28 Jun 2022 17:20:24 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 52D8040042 for ; Tue, 28 Jun 2022 17:20:22 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656429621; 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=Qx4N3hcGpBY7kzc+NLiSu5qJH9FQWGRVMmvIo9hesO8=; b=OoAk/71YPlqBWh1pRoU/mcW0w3Fsi9X5lUhl8/EALm6Kf5VlW4BYdMRE4/Yx1DFcvbDqTI TkRhBZVyfC0tUiyspJHNn5GsoLJehHQxjunooAC/VCibjEbvj9wpkRDma1fCcAESwIsEkO 4YfB2g+y3T7//PlxoXThf6zIv8Ty/No= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-302-h6bSGuAGM0aSdwdxhFPQXA-1; Tue, 28 Jun 2022 11:20:18 -0400 X-MC-Unique: h6bSGuAGM0aSdwdxhFPQXA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 61A463C138A2; Tue, 28 Jun 2022 15:20:18 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 25D2A1415108; Tue, 28 Jun 2022 15:20:16 +0000 (UTC) From: Kevin Traynor To: Damodharam Ammepalli Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: cleanup MTU setting' has been queued to stable release 21.11.2 Date: Tue, 28 Jun 2022 16:19:37 +0100 Message-Id: <20220628151938.2278711-25-ktraynor@redhat.com> In-Reply-To: <20220628151938.2278711-1-ktraynor@redhat.com> References: <20220628151938.2278711-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/30/22. 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/44e391b5c233943c7a96c9fc11e87cafb8e28e55 Thanks. Kevin --- >From 44e391b5c233943c7a96c9fc11e87cafb8e28e55 Mon Sep 17 00:00:00 2001 From: Damodharam Ammepalli Date: Wed, 15 Jun 2022 20:27:02 +0530 Subject: [PATCH] net/bnxt: cleanup MTU setting [ upstream commit 89670e3b0f852615c29c510d5f6c04d147675c7e ] Minor cleanup in bnxt_mtu_set_op() to move pre-mature setting of jumbo flag post mtu check and remove a redundant mtu set operation from rxq vnic configs. Fixes: daef48efe5e5 ("net/bnxt: support set MTU") Signed-off-by: Damodharam Ammepalli Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 10 +++++----- drivers/net/bnxt/bnxt_rxq.c | 4 ---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 93d17b7670..517e4b3898 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3039,13 +3039,13 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) return -ENOTSUP; - if (new_mtu > RTE_ETHER_MTU) - bp->flags |= BNXT_FLAG_JUMBO; - else - bp->flags &= ~BNXT_FLAG_JUMBO; - /* Is there a change in mtu setting? */ if (eth_dev->data->mtu == new_mtu) return 0; + if (new_mtu > RTE_ETHER_MTU) + bp->flags |= BNXT_FLAG_JUMBO; + else + bp->flags &= ~BNXT_FLAG_JUMBO; + for (i = 0; i < bp->nr_vnics; i++) { struct bnxt_vnic_info *vnic = &bp->vnic_info[i]; diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index 9b5ff4ce2d..4f2e0e7376 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -404,8 +404,4 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, rxq->vnic = BNXT_GET_DEFAULT_VNIC(bp); - /* Configure mtu if it is different from what was configured before */ - if (!queue_idx) - bnxt_mtu_set_op(eth_dev, eth_dev->data->mtu); - return 0; err: -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-28 16:18:04.643339052 +0100 +++ 0025-net-bnxt-cleanup-MTU-setting.patch 2022-06-28 16:18:04.071387173 +0100 @@ -1 +1 @@ -From 89670e3b0f852615c29c510d5f6c04d147675c7e Mon Sep 17 00:00:00 2001 +From 44e391b5c233943c7a96c9fc11e87cafb8e28e55 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 89670e3b0f852615c29c510d5f6c04d147675c7e ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index f040cdcf94..e275d3a53f 100644 +index 93d17b7670..517e4b3898 100644 @@ -25 +26 @@ -@@ -3038,13 +3038,13 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) +@@ -3039,13 +3039,13 @@ int bnxt_mtu_set_op(struct rte_eth_dev *eth_dev, uint16_t new_mtu) @@ -45 +46 @@ -index f4b641773d..fabbbd4560 100644 +index 9b5ff4ce2d..4f2e0e7376 100644 @@ -48 +49 @@ -@@ -403,8 +403,4 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev, +@@ -404,8 +404,4 @@ int bnxt_rx_queue_setup_op(struct rte_eth_dev *eth_dev,