examples/l3fwd: fix issue with MTU set on event mode

Message ID 20220421141632.21676-1-ndabilpuram@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series examples/l3fwd: fix issue with MTU set on event mode |

Checks

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

Commit Message

Nithin Dabilpuram April 21, 2022, 2:16 p.m. UTC
  MTU configuration is missing for ethdev when using eventmode
when user provides it via "--max-pkt-len" config. It is only
done in poll mode setup. Fix the event mode setup code to
do the same.

Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")
Cc: ferruh.yigit@intel.com
Cc: stable@dpdk.org

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
 examples/l3fwd/l3fwd.h       | 5 +++++
 examples/l3fwd/l3fwd_event.c | 6 ++++++
 examples/l3fwd/main.c        | 4 ++--
 3 files changed, 13 insertions(+), 2 deletions(-)
  

Comments

Jerin Jacob June 2, 2022, 7:45 a.m. UTC | #1
On Thu, Apr 21, 2022 at 7:47 PM Nithin Dabilpuram
<ndabilpuram@marvell.com> wrote:
>
> MTU configuration is missing for ethdev when using eventmode
> when user provides it via "--max-pkt-len" config. It is only
> done in poll mode setup. Fix the event mode setup code to
> do the same.
>
> Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")
> Cc: ferruh.yigit@intel.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>

Acked-by: Jerin Jacob <jerinj@marvell.com>


> ---
>  examples/l3fwd/l3fwd.h       | 5 +++++
>  examples/l3fwd/l3fwd_event.c | 6 ++++++
>  examples/l3fwd/main.c        | 4 ++--
>  3 files changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
> index ad39496..b0bfdcc 100644
> --- a/examples/l3fwd/l3fwd.h
> +++ b/examples/l3fwd/l3fwd.h
> @@ -107,6 +107,8 @@ extern struct lcore_conf lcore_conf[RTE_MAX_LCORE];
>
>  extern struct parm_cfg parm_config;
>
> +extern uint32_t max_pkt_len;
> +
>  /* Send burst of packets on an output interface */
>  static inline int
>  send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
> @@ -193,6 +195,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
>  int
>  init_mem(uint16_t portid, unsigned int nb_mbuf);
>
> +int config_port_max_pkt_len(struct rte_eth_conf *conf,
> +                           struct rte_eth_dev_info *dev_info);
> +
>  /* Function pointers for LPM, EM or FIB functionality. */
>  void
>  setup_lpm(const int socketid);
> diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
> index 7a40129..e72add8 100644
> --- a/examples/l3fwd/l3fwd_event.c
> +++ b/examples/l3fwd/l3fwd_event.c
> @@ -73,6 +73,12 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
>                         rte_panic("Error during getting device (port %u) info:"
>                                   "%s\n", port_id, strerror(-ret));
>
> +               ret = config_port_max_pkt_len(&local_port_conf, &dev_info);
> +               if (ret != 0)
> +                       rte_exit(EXIT_FAILURE,
> +                               "Invalid max packet length: %u (port %u)\n",
> +                               max_pkt_len, port_id);
> +
>                 if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
>                         local_port_conf.txmode.offloads |=
>                                                 RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
> index a629198..6585c8b 100644
> --- a/examples/l3fwd/main.c
> +++ b/examples/l3fwd/main.c
> @@ -135,7 +135,7 @@ static struct rte_eth_conf port_conf = {
>         },
>  };
>
> -static uint32_t max_pkt_len;
> +uint32_t max_pkt_len;
>
>  static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
>  static struct rte_mempool *vector_pool[RTE_MAX_ETHPORTS];
> @@ -1136,7 +1136,7 @@ eth_dev_get_overhead_len(uint32_t max_rx_pktlen, uint16_t max_mtu)
>         return overhead_len;
>  }
>
> -static int
> +int
>  config_port_max_pkt_len(struct rte_eth_conf *conf,
>                 struct rte_eth_dev_info *dev_info)
>  {
> --
> 2.8.4
>
  
Nithin Dabilpuram July 18, 2022, 2:30 p.m. UTC | #2
Ping.

On 2022-06-02 1:15 PM, Jerin Jacob wrote:
> On Thu, Apr 21, 2022 at 7:47 PM Nithin Dabilpuram
> <ndabilpuram@marvell.com> wrote:
>>
>> MTU configuration is missing for ethdev when using eventmode
>> when user provides it via "--max-pkt-len" config. It is only
>> done in poll mode setup. Fix the event mode setup code to
>> do the same.
>>
>> Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")
>> Cc: ferruh.yigit@intel.com
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> 
> Acked-by: Jerin Jacob <jerinj@marvell.com>
> 
> 
>> ---
>>   examples/l3fwd/l3fwd.h       | 5 +++++
>>   examples/l3fwd/l3fwd_event.c | 6 ++++++
>>   examples/l3fwd/main.c        | 4 ++--
>>   3 files changed, 13 insertions(+), 2 deletions(-)
>>
>> diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
>> index ad39496..b0bfdcc 100644
>> --- a/examples/l3fwd/l3fwd.h
>> +++ b/examples/l3fwd/l3fwd.h
>> @@ -107,6 +107,8 @@ extern struct lcore_conf lcore_conf[RTE_MAX_LCORE];
>>
>>   extern struct parm_cfg parm_config;
>>
>> +extern uint32_t max_pkt_len;
>> +
>>   /* Send burst of packets on an output interface */
>>   static inline int
>>   send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
>> @@ -193,6 +195,9 @@ is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
>>   int
>>   init_mem(uint16_t portid, unsigned int nb_mbuf);
>>
>> +int config_port_max_pkt_len(struct rte_eth_conf *conf,
>> +                           struct rte_eth_dev_info *dev_info);
>> +
>>   /* Function pointers for LPM, EM or FIB functionality. */
>>   void
>>   setup_lpm(const int socketid);
>> diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
>> index 7a40129..e72add8 100644
>> --- a/examples/l3fwd/l3fwd_event.c
>> +++ b/examples/l3fwd/l3fwd_event.c
>> @@ -73,6 +73,12 @@ l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
>>                          rte_panic("Error during getting device (port %u) info:"
>>                                    "%s\n", port_id, strerror(-ret));
>>
>> +               ret = config_port_max_pkt_len(&local_port_conf, &dev_info);
>> +               if (ret != 0)
>> +                       rte_exit(EXIT_FAILURE,
>> +                               "Invalid max packet length: %u (port %u)\n",
>> +                               max_pkt_len, port_id);
>> +
>>                  if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
>>                          local_port_conf.txmode.offloads |=
>>                                                  RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
>> diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
>> index a629198..6585c8b 100644
>> --- a/examples/l3fwd/main.c
>> +++ b/examples/l3fwd/main.c
>> @@ -135,7 +135,7 @@ static struct rte_eth_conf port_conf = {
>>          },
>>   };
>>
>> -static uint32_t max_pkt_len;
>> +uint32_t max_pkt_len;
>>
>>   static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
>>   static struct rte_mempool *vector_pool[RTE_MAX_ETHPORTS];
>> @@ -1136,7 +1136,7 @@ eth_dev_get_overhead_len(uint32_t max_rx_pktlen, uint16_t max_mtu)
>>          return overhead_len;
>>   }
>>
>> -static int
>> +int
>>   config_port_max_pkt_len(struct rte_eth_conf *conf,
>>                  struct rte_eth_dev_info *dev_info)
>>   {
>> --
>> 2.8.4
>>
  
Thomas Monjalon Oct. 10, 2022, 9:55 p.m. UTC | #3
02/06/2022 09:45, Jerin Jacob:
> On Thu, Apr 21, 2022 at 7:47 PM Nithin Dabilpuram
> <ndabilpuram@marvell.com> wrote:
> >
> > MTU configuration is missing for ethdev when using eventmode
> > when user provides it via "--max-pkt-len" config. It is only
> > done in poll mode setup. Fix the event mode setup code to
> > do the same.
> >
> > Fixes: 1bb4a528c41f ("ethdev: fix max Rx packet length")
> > Cc: ferruh.yigit@intel.com
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> 
> Acked-by: Jerin Jacob <jerinj@marvell.com>

Applied, thanks.
  

Patch

diff --git a/examples/l3fwd/l3fwd.h b/examples/l3fwd/l3fwd.h
index ad39496..b0bfdcc 100644
--- a/examples/l3fwd/l3fwd.h
+++ b/examples/l3fwd/l3fwd.h
@@ -107,6 +107,8 @@  extern struct lcore_conf lcore_conf[RTE_MAX_LCORE];
 
 extern struct parm_cfg parm_config;
 
+extern uint32_t max_pkt_len;
+
 /* Send burst of packets on an output interface */
 static inline int
 send_burst(struct lcore_conf *qconf, uint16_t n, uint16_t port)
@@ -193,6 +195,9 @@  is_valid_ipv4_pkt(struct rte_ipv4_hdr *pkt, uint32_t link_len)
 int
 init_mem(uint16_t portid, unsigned int nb_mbuf);
 
+int config_port_max_pkt_len(struct rte_eth_conf *conf,
+			    struct rte_eth_dev_info *dev_info);
+
 /* Function pointers for LPM, EM or FIB functionality. */
 void
 setup_lpm(const int socketid);
diff --git a/examples/l3fwd/l3fwd_event.c b/examples/l3fwd/l3fwd_event.c
index 7a40129..e72add8 100644
--- a/examples/l3fwd/l3fwd_event.c
+++ b/examples/l3fwd/l3fwd_event.c
@@ -73,6 +73,12 @@  l3fwd_eth_dev_port_setup(struct rte_eth_conf *port_conf)
 			rte_panic("Error during getting device (port %u) info:"
 				  "%s\n", port_id, strerror(-ret));
 
+		ret = config_port_max_pkt_len(&local_port_conf, &dev_info);
+		if (ret != 0)
+			rte_exit(EXIT_FAILURE,
+				"Invalid max packet length: %u (port %u)\n",
+				max_pkt_len, port_id);
+
 		if (dev_info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE)
 			local_port_conf.txmode.offloads |=
 						RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index a629198..6585c8b 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -135,7 +135,7 @@  static struct rte_eth_conf port_conf = {
 	},
 };
 
-static uint32_t max_pkt_len;
+uint32_t max_pkt_len;
 
 static struct rte_mempool *pktmbuf_pool[RTE_MAX_ETHPORTS][NB_SOCKETS];
 static struct rte_mempool *vector_pool[RTE_MAX_ETHPORTS];
@@ -1136,7 +1136,7 @@  eth_dev_get_overhead_len(uint32_t max_rx_pktlen, uint16_t max_mtu)
 	return overhead_len;
 }
 
-static int
+int
 config_port_max_pkt_len(struct rte_eth_conf *conf,
 		struct rte_eth_dev_info *dev_info)
 {