diff mbox series

[v2] net/igc: fix segmentation fault in secondary dpdk-symmetric_mp

Message ID 20220622104907.862666-1-zhichaox.zeng@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Qi Zhang
Headers
Series [v2] net/igc: fix segmentation fault in secondary dpdk-symmetric_mp |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-abi-testing warning Testing issues

Commit Message

Zhichao Zeng June 22, 2022, 10:49 a.m. UTC 
  From: Zhichao Zeng <zhichaox.zeng@intel.com>

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 <zhichaox.zeng@intel.com>

---
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(-)

Comments

Qi Zhang June 23, 2022, 3:50 a.m. UTC | #1 
> -----Original Message-----
> From: zhichaox.zeng@intel.com <zhichaox.zeng@intel.com>
> Sent: Wednesday, June 22, 2022 6:49 PM
> To: dev@dpdk.org
> Cc: stable@dpdk.org; Yang, Qiming <qiming.yang@intel.com>; Zeng, ZhichaoX
> <zhichaox.zeng@intel.com>; alvinx.zhang@intel.com; Guo, Junfeng
> <junfeng.guo@intel.com>; Su, Simei <simei.su@intel.com>; Ferruh Yigit
> <ferruh.yigit@intel.com>
> Subject: [PATCH v2] net/igc: fix segmentation fault in secondary dpdk-
> symmetric_mp
> 
> From: Zhichao Zeng <zhichaox.zeng@intel.com>
> 
> 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 <zhichaox.zeng@intel.com>
> 
> ---
> 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;

If you already assign the function point in dev_init, you should remove the following redundant code.
diff mbox series

Patch

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