From patchwork Wed Jun 15 07:39:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhichao Zeng X-Patchwork-Id: 112748 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BD074A0548; Wed, 15 Jun 2022 09:39:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A0CDC40221; Wed, 15 Jun 2022 09:39:33 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mails.dpdk.org (Postfix) with ESMTP id 6A0EC40220 for ; Wed, 15 Jun 2022 09:39:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655278772; x=1686814772; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=sSFsR3oPcL5Hl00EdcTvGWZUIA06hOLQQ7RltDnzQVA=; b=XGAka25tL+fj9uC2kDmzau+mvUstTLkiaNBJINSouHsW6FRBBA6WGafU H6+Pch1qufLY+Awgx7PRtIzayBBdFtleWTc+EL1ebKJiMEFMGfrOfCvSl tODu+JlWzIErFUrIJH7N8RG8CHOwsXPoDDINpk4vow+p88U186x1sZHYC ohMCn2d3Z4sBbtCZX8DgWFg1S7kiP131bpOj2UVQzAJQA1lRpdnwtt0Nr v5dH0FMQWKQY8mQXFdZ/JdbqOiWfbs7CAB1vRUast8AZSZVMij/AwXwUy r4tA2ajhc7CXBPMiiKGGRiT7OMeKAwMS9Fsg4l4+hHA8gxgTPjRL9hMSB A==; X-IronPort-AV: E=McAfee;i="6400,9594,10378"; a="342831225" X-IronPort-AV: E=Sophos;i="5.91,300,1647327600"; d="scan'208";a="342831225" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 00:39:26 -0700 X-IronPort-AV: E=Sophos;i="5.91,300,1647327600"; d="scan'208";a="640851077" Received: from unknown (HELO localhost.localdomain) ([10.239.252.103]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jun 2022 00:39:21 -0700 From: zhichaox.zeng@intel.com To: dev@dpdk.org Cc: qiming.yang@intel.com, Zhichao Zeng , Junfeng Guo , Simei Su Subject: [PATCH] net/igc: fix segmentation fault in secondary dpdk-symmetric_mp Date: Wed, 15 Jun 2022 15:39:15 +0800 Message-Id: <20220615073915.13309-1-zhichaox.zeng@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Zhichao Zeng In the secondary dpdk-symmetric_mp process, the "smp_port_init" was skipped, which cause some function pointers not to be initialized, and a segmentation fault occurred when calling these function pointers. This patch assigns initial values to rx_pkt_burst, tx_pkt_burst and tx_pkt_prepare pointers to avoid calling null function pointer. Signed-off-by: Zhichao Zeng --- drivers/net/igc/igc_ethdev.c | 3 +++ drivers/net/igc/igc_ethdev.h | 5 +++++ drivers/net/igc/igc_txrx.c | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index b9933b395d..dd4a028ea1 100644 --- a/drivers/net/igc/igc_ethdev.c +++ b/drivers/net/igc/igc_ethdev.c @@ -1234,6 +1234,9 @@ eth_igc_dev_init(struct rte_eth_dev *dev) dev->rx_queue_count = eth_igc_rx_queue_count; dev->rx_descriptor_status = eth_igc_rx_descriptor_status; dev->tx_descriptor_status = eth_igc_tx_descriptor_status; + dev->rx_pkt_burst = &igc_recv_pkts; + dev->tx_pkt_burst = &igc_xmit_pkts; + dev->tx_pkt_prepare = ð_igc_prep_pkts; /* * for secondary processes, we don't initialize any further as primary diff --git a/drivers/net/igc/igc_ethdev.h b/drivers/net/igc/igc_ethdev.h index f56cad79e9..2fa3d51bba 100644 --- a/drivers/net/igc/igc_ethdev.h +++ b/drivers/net/igc/igc_ethdev.h @@ -263,6 +263,11 @@ struct igc_adapter { #define IGC_DEV_PRIVATE_FLOW_LIST(_dev) \ (&((struct igc_adapter *)(_dev)->data->dev_private)->flow_list) +uint16_t igc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts); +uint16_t igc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts); +uint16_t eth_igc_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, + uint16_t nb_pkts); + static inline void igc_read_reg_check_set_bits(struct igc_hw *hw, uint32_t reg, uint32_t bits) { diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c index e48d5df11a..753ac8a411 100644 --- a/drivers/net/igc/igc_txrx.c +++ b/drivers/net/igc/igc_txrx.c @@ -345,7 +345,7 @@ rx_desc_get_pkt_info(struct igc_rx_queue *rxq, struct rte_mbuf *rxm, rxm->packet_type = rx_desc_pkt_info_to_pkt_type(pkt_info); } -static uint16_t +uint16_t igc_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) { struct igc_rx_queue * const rxq = rx_queue; @@ -1397,7 +1397,7 @@ eth_igc_rx_queue_setup(struct rte_eth_dev *dev, } /* prepare packets for transmit */ -static uint16_t +uint16_t eth_igc_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { @@ -1604,7 +1604,7 @@ tx_desc_cksum_flags_to_olinfo(uint64_t ol_flags) return tmp; } -static uint16_t +uint16_t igc_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts) { struct igc_tx_queue * const txq = tx_queue;