From patchwork Wed Jun 22 10:49:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhichao Zeng X-Patchwork-Id: 113240 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 C91D9A04FD; Wed, 22 Jun 2022 12:49:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91160427EE; Wed, 22 Jun 2022 12:49:14 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id A34FE40689; Wed, 22 Jun 2022 12:49:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655894952; x=1687430952; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cSTR6JGhBHsE+JaAazFXH6YPRedVqdVpcWrcli5yub8=; b=Ujovd9EALnykWNsVQMI+kXYcNgmiAz5Wm84WY3NapYnF7wLmKh9HU5NZ aMmp8M3jHGHTgF3JMEbTUYH/B5/JbTc0U61zJm4cIdBzwnrkIUgWYyuKl mR6+NMzgFxkjxVC23J/lj01rSqdtM3t9QBVGKt+DSO2/KMGR9km7Q9xH6 BeBnnv1XnCaNprWEhy+z77BYdcAZ5gaXnJB5E7RXjUhfDsgfjLTWYhYzK 4ZiXzeo0l7r1y+JSl6xQYUIMiXF6LByEgTvLjU71XGgWC0Yg3HFk0yyQu BvYgoRk7MaQoleDNBWoU0iVcodmjZoZAR3Pm4i09Hz7n/lbhM3D4Ffe5N A==; X-IronPort-AV: E=McAfee;i="6400,9594,10385"; a="260204380" X-IronPort-AV: E=Sophos;i="5.92,212,1650956400"; d="scan'208";a="260204380" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 03:49:11 -0700 X-IronPort-AV: E=Sophos;i="5.92,212,1650956400"; d="scan'208";a="620865914" Received: from unknown (HELO localhost.localdomain) ([10.239.252.103]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 03:49:08 -0700 From: zhichaox.zeng@intel.com To: dev@dpdk.org Cc: stable@dpdk.org, qiming.yang@intel.com, Zhichao Zeng , alvinx.zhang@intel.com, Junfeng Guo , Simei Su , Ferruh Yigit Subject: [PATCH v2] net/igc: fix segmentation fault in secondary dpdk-symmetric_mp Date: Wed, 22 Jun 2022 18:49:07 +0800 Message-Id: <20220622104907.862666-1-zhichaox.zeng@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220615073915.13309-1-zhichaox.zeng@intel.com> References: <20220615073915.13309-1-zhichaox.zeng@intel.com> 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. Fixes: 66fde1b943eb ("net/igc: add skeleton") Cc: alvinx.zhang@intel.com Cc: stable@dpdk.org Signed-off-by: Zhichao Zeng --- v2: remove unnecessary parameters, move declaration to relevant header file --- drivers/net/igc/igc_ethdev.c | 3 +++ drivers/net/igc/igc_txrx.c | 6 +++--- drivers/net/igc/igc_txrx.h | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c index b9933b395d..25fb91bfec 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 = eth_igc_prep_pkts; /* * for secondary processes, we don't initialize any further as primary 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; diff --git a/drivers/net/igc/igc_txrx.h b/drivers/net/igc/igc_txrx.h index 535108a868..a5240df9d7 100644 --- a/drivers/net/igc/igc_txrx.h +++ b/drivers/net/igc/igc_txrx.h @@ -49,6 +49,10 @@ void eth_igc_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id, struct rte_eth_txq_info *qinfo); void eth_igc_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t rx_queue_id, int on); +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); #ifdef __cplusplus } #endif