[1/2] examples/ipsec-secgw: fix width of variables

Message ID 20231219052923.196-1-anoobj@marvell.com (mailing list archive)
State Accepted, archived
Delegated to: akhil goyal
Headers
Series [1/2] examples/ipsec-secgw: fix width of variables |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Anoob Joseph Dec. 19, 2023, 5:29 a.m. UTC
  'rte_eth_rx_burst' returns uint16_t. The same value need to be passed
to 'process_packets' functions which performs further processing. Having
this function use 'uint8_t' can result in issues when MAX_PKT_BURST is
larger.

The route functions (route4_pkts & route6_pkts) take uint8_t as the
argument. The caller can pass larger values as the field that is passed
is of type uint32_t. And the function can work with uint32_t as it loops
through the packets and sends it out. Using uint8_t can result in silent
packet drops.

Fixes: 4fbfa6c7c921 ("examples/ipsec-secgw: update eth header during route lookup")

Signed-off-by: Anoob Joseph <anoobj@marvell.com>
---
 examples/ipsec-secgw/ipsec-secgw.c  | 5 ++---
 examples/ipsec-secgw/ipsec_worker.h | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)
  

Comments

Konstantin Ananyev Dec. 19, 2023, 9:51 a.m. UTC | #1
> 'rte_eth_rx_burst' returns uint16_t. The same value need to be passed
> to 'process_packets' functions which performs further processing. Having
> this function use 'uint8_t' can result in issues when MAX_PKT_BURST is
> larger.
> 
> The route functions (route4_pkts & route6_pkts) take uint8_t as the
> argument. The caller can pass larger values as the field that is passed
> is of type uint32_t. And the function can work with uint32_t as it loops
> through the packets and sends it out. Using uint8_t can result in silent
> packet drops.
> 
> Fixes: 4fbfa6c7c921 ("examples/ipsec-secgw: update eth header during route lookup")
> 
> Signed-off-by: Anoob Joseph <anoobj@marvell.com>
> ---
>  examples/ipsec-secgw/ipsec-secgw.c  | 5 ++---
>  examples/ipsec-secgw/ipsec_worker.h | 4 ++--
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
> index bf98d2618b..a61bea400a 100644
> --- a/examples/ipsec-secgw/ipsec-secgw.c
> +++ b/examples/ipsec-secgw/ipsec-secgw.c
> @@ -568,7 +568,7 @@ process_pkts_outbound_nosp(struct ipsec_ctx *ipsec_ctx,
> 
>  static inline void
>  process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts,
> -	     uint8_t nb_pkts, uint16_t portid, void *ctx)
> +	     uint16_t nb_pkts, uint16_t portid, void *ctx)
>  {
>  	struct ipsec_traffic traffic;
> 
> @@ -695,8 +695,7 @@ ipsec_poll_mode_worker(void)
>  	struct rte_mbuf *pkts[MAX_PKT_BURST];
>  	uint32_t lcore_id;
>  	uint64_t prev_tsc, diff_tsc, cur_tsc;
> -	int32_t i, nb_rx;
> -	uint16_t portid;
> +	uint16_t i, nb_rx, portid;
>  	uint8_t queueid;
>  	struct lcore_conf *qconf;
>  	int32_t rc, socket_id;
> diff --git a/examples/ipsec-secgw/ipsec_worker.h b/examples/ipsec-secgw/ipsec_worker.h
> index ac980b8bcf..8e937fda3e 100644
> --- a/examples/ipsec-secgw/ipsec_worker.h
> +++ b/examples/ipsec-secgw/ipsec_worker.h
> @@ -469,7 +469,7 @@ get_hop_for_offload_pkt(struct rte_mbuf *pkt, int is_ipv6)
> 
>  static __rte_always_inline void
>  route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[],
> -	    uint8_t nb_pkts, uint64_t tx_offloads, bool ip_cksum)
> +	    uint32_t nb_pkts, uint64_t tx_offloads, bool ip_cksum)
>  {
>  	uint32_t hop[MAX_PKT_BURST * 2];
>  	uint32_t dst_ip[MAX_PKT_BURST * 2];
> @@ -557,7 +557,7 @@ route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[],
>  }
> 
>  static __rte_always_inline void
> -route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint8_t nb_pkts)
> +route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint32_t nb_pkts)
>  {
>  	int32_t hop[MAX_PKT_BURST * 2];
>  	uint8_t dst_ip[MAX_PKT_BURST * 2][16];
> --

Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
 

> 2.25.1
  
Akhil Goyal Jan. 9, 2024, 5:38 p.m. UTC | #2
> 
> > 'rte_eth_rx_burst' returns uint16_t. The same value need to be passed
> > to 'process_packets' functions which performs further processing. Having
> > this function use 'uint8_t' can result in issues when MAX_PKT_BURST is
> > larger.
> >
> > The route functions (route4_pkts & route6_pkts) take uint8_t as the
> > argument. The caller can pass larger values as the field that is passed
> > is of type uint32_t. And the function can work with uint32_t as it loops
> > through the packets and sends it out. Using uint8_t can result in silent
> > packet drops.
> >
> > Fixes: 4fbfa6c7c921 ("examples/ipsec-secgw: update eth header during route
> lookup")

Cc: stable@dpdk.org

> >
> > Signed-off-by: Anoob Joseph <anoobj@marvell.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>

Applied to dpdk-next-crypto
 
> Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
Email Id shows warning in mailmap
Contributor name/email mismatch with .mailmap:
        Konstantin Ananyev <konstantin.ananyev@huawei.com> is not the primary email address

I believe Konstantin is using both email ids, but mailmap is taking the first one as primary one.
Konstantin,
Is it possible for you to use a single email ID and update mailmap accordingly?
  

Patch

diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index bf98d2618b..a61bea400a 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -568,7 +568,7 @@  process_pkts_outbound_nosp(struct ipsec_ctx *ipsec_ctx,
 
 static inline void
 process_pkts(struct lcore_conf *qconf, struct rte_mbuf **pkts,
-	     uint8_t nb_pkts, uint16_t portid, void *ctx)
+	     uint16_t nb_pkts, uint16_t portid, void *ctx)
 {
 	struct ipsec_traffic traffic;
 
@@ -695,8 +695,7 @@  ipsec_poll_mode_worker(void)
 	struct rte_mbuf *pkts[MAX_PKT_BURST];
 	uint32_t lcore_id;
 	uint64_t prev_tsc, diff_tsc, cur_tsc;
-	int32_t i, nb_rx;
-	uint16_t portid;
+	uint16_t i, nb_rx, portid;
 	uint8_t queueid;
 	struct lcore_conf *qconf;
 	int32_t rc, socket_id;
diff --git a/examples/ipsec-secgw/ipsec_worker.h b/examples/ipsec-secgw/ipsec_worker.h
index ac980b8bcf..8e937fda3e 100644
--- a/examples/ipsec-secgw/ipsec_worker.h
+++ b/examples/ipsec-secgw/ipsec_worker.h
@@ -469,7 +469,7 @@  get_hop_for_offload_pkt(struct rte_mbuf *pkt, int is_ipv6)
 
 static __rte_always_inline void
 route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[],
-	    uint8_t nb_pkts, uint64_t tx_offloads, bool ip_cksum)
+	    uint32_t nb_pkts, uint64_t tx_offloads, bool ip_cksum)
 {
 	uint32_t hop[MAX_PKT_BURST * 2];
 	uint32_t dst_ip[MAX_PKT_BURST * 2];
@@ -557,7 +557,7 @@  route4_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[],
 }
 
 static __rte_always_inline void
-route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint8_t nb_pkts)
+route6_pkts(struct rt_ctx *rt_ctx, struct rte_mbuf *pkts[], uint32_t nb_pkts)
 {
 	int32_t hop[MAX_PKT_BURST * 2];
 	uint8_t dst_ip[MAX_PKT_BURST * 2][16];