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 5C1BF427F7 for ; Tue, 21 Mar 2023 10:24:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 92AFD42D12; Tue, 21 Mar 2023 10:24:33 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id 5B61742D12 for ; Tue, 21 Mar 2023 10:24:30 +0100 (CET) Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4PgmMg55nmzKsgx; Tue, 21 Mar 2023 17:22:07 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 21 Mar 2023 17:24:23 +0800 From: Huisong Li To: , CC: , , , Subject: [PATCH 21.11 01/17] net/hns3: separate Tx prepare from getting Tx function Date: Tue, 21 Mar 2023 17:22:50 +0800 Message-ID: <20230321092306.16918-2-lihuisong@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20230321092306.16918-1-lihuisong@huawei.com> References: <20230321092306.16918-1-lihuisong@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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 [ upstream commit 6a934ba4c6c48691b119a878981a4e3748766518 ] Separate getting tx prepare from hns3_get_tx_function by extracting an independent function. Fixes: d7ec2c076579 ("net/hns3: select Tx prepare based on Tx offload") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rxtx.c | 32 ++++++++++++++------------------ drivers/net/hns3/hns3_rxtx.h | 3 +-- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 5c7de80e7b..18f96f3055 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -4327,26 +4327,30 @@ hns3_get_tx_prep_needed(struct rte_eth_dev *dev) RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO) uint64_t tx_offload = dev->data->dev_conf.txmode.offloads; + if (tx_offload & HNS3_DEV_TX_CSKUM_TSO_OFFLOAD_MASK) return true; return false; } +static eth_tx_prep_t +hns3_get_tx_prepare(struct rte_eth_dev *dev) +{ + return hns3_get_tx_prep_needed(dev) ? hns3_prep_pkts : NULL; +} + eth_tx_burst_t -hns3_get_tx_function(struct rte_eth_dev *dev, eth_tx_prep_t *prep) +hns3_get_tx_function(struct rte_eth_dev *dev) { struct hns3_adapter *hns = dev->data->dev_private; bool vec_allowed, sve_allowed, simple_allowed; - bool vec_support, tx_prepare_needed; + bool vec_support; vec_support = hns3_tx_check_vec_support(dev) == 0; vec_allowed = vec_support && hns3_get_default_vec_support(); sve_allowed = vec_support && hns3_get_sve_support(); simple_allowed = hns3_tx_check_simple_support(dev); - tx_prepare_needed = hns3_get_tx_prep_needed(dev); - - *prep = NULL; if (hns->tx_func_hint == HNS3_IO_FUNC_HINT_VEC && vec_allowed) return hns3_xmit_pkts_vec; @@ -4354,19 +4358,14 @@ hns3_get_tx_function(struct rte_eth_dev *dev, eth_tx_prep_t *prep) return hns3_xmit_pkts_vec_sve; if (hns->tx_func_hint == HNS3_IO_FUNC_HINT_SIMPLE && simple_allowed) return hns3_xmit_pkts_simple; - if (hns->tx_func_hint == HNS3_IO_FUNC_HINT_COMMON) { - if (tx_prepare_needed) - *prep = hns3_prep_pkts; + if (hns->tx_func_hint == HNS3_IO_FUNC_HINT_COMMON) return hns3_xmit_pkts; - } if (vec_allowed) return hns3_xmit_pkts_vec; if (simple_allowed) return hns3_xmit_pkts_simple; - if (tx_prepare_needed) - *prep = hns3_prep_pkts; return hns3_xmit_pkts; } @@ -4414,7 +4413,6 @@ hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) { struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private); struct hns3_adapter *hns = eth_dev->data->dev_private; - eth_tx_prep_t prep = NULL; if (hns->hw.adapter_state == HNS3_NIC_STARTED && __atomic_load_n(&hns->hw.reset.resetting, __ATOMIC_RELAXED) == 0) { @@ -4422,8 +4420,8 @@ hns3_set_rxtx_function(struct rte_eth_dev *eth_dev) eth_dev->rx_descriptor_status = hns3_dev_rx_descriptor_status; eth_dev->tx_pkt_burst = hw->set_link_down ? hns3_dummy_rxtx_burst : - hns3_get_tx_function(eth_dev, &prep); - eth_dev->tx_pkt_prepare = prep; + hns3_get_tx_function(eth_dev); + eth_dev->tx_pkt_prepare = hns3_get_tx_prepare(eth_dev); eth_dev->tx_descriptor_status = hns3_dev_tx_descriptor_status; } else { eth_dev->rx_pkt_burst = hns3_dummy_rxtx_burst; @@ -4769,10 +4767,8 @@ hns3_stop_tx_datapath(struct rte_eth_dev *dev) void hns3_start_tx_datapath(struct rte_eth_dev *dev) { - eth_tx_prep_t prep = NULL; - - dev->tx_pkt_burst = hns3_get_tx_function(dev, &prep); - dev->tx_pkt_prepare = prep; + dev->tx_pkt_burst = hns3_get_tx_function(dev); + dev->tx_pkt_prepare = hns3_get_tx_prepare(dev); hns3_eth_dev_fp_ops_config(dev); if (rte_eal_process_type() == RTE_PROC_SECONDARY) diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h index 0e412d07b3..b24a0f31bb 100644 --- a/drivers/net/hns3/hns3_rxtx.h +++ b/drivers/net/hns3/hns3_rxtx.h @@ -729,8 +729,7 @@ int hns3_tx_burst_mode_get(struct rte_eth_dev *dev, const uint32_t *hns3_dev_supported_ptypes_get(struct rte_eth_dev *dev); void hns3_init_rx_ptype_tble(struct rte_eth_dev *dev); void hns3_set_rxtx_function(struct rte_eth_dev *eth_dev); -eth_tx_burst_t hns3_get_tx_function(struct rte_eth_dev *dev, - eth_tx_prep_t *prep); +eth_tx_burst_t hns3_get_tx_function(struct rte_eth_dev *dev); uint16_t hns3_dummy_rxtx_burst(void *dpdk_txq __rte_unused, struct rte_mbuf **pkts __rte_unused, uint16_t pkts_n __rte_unused); -- 2.22.0