diff mbox series

[v5,05/11] net/nfp: use rte_pktmbuf_mtod_offset

Message ID	20230708015718.75565-6-stephen@networkplumber.org (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Stephen Hemminger <stephen@networkplumber.org> To: dev@dpdk.org Cc: Stephen Hemminger <stephen@networkplumber.org>, Chaoyong He <chaoyong.he@corigine.com>, =?utf-8?q?Niklas_S=C3=B6derlund?= <niklas.soderlund@corigine.com> Subject: [PATCH v5 05/11] net/nfp: use rte_pktmbuf_mtod_offset Date: Fri, 7 Jul 2023 18:57:12 -0700 Message-Id: <20230708015718.75565-6-stephen@networkplumber.org> In-Reply-To: <20230708015718.75565-1-stephen@networkplumber.org> References: <20230505174813.133894-1-stephen@networkplumber.org> <20230708015718.75565-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	use rte_pktmbuf_mto_offset \| [v5,00/11] use rte_pktmbuf_mto_offset [v5,01/11] gro: use rte_pktmbuf_mtod_offset [v5,02/11] gso: use rte_pktmbuf_mtod_offset [v5,03/11] test/crypto_dev: use rte_pktmbuf_mtod_offset [v5,04/11] drivers/crypto: use rte_pktmbuf_mtod_offset [v5,05/11] net/nfp: use rte_pktmbuf_mtod_offset [v5,06/11] net/tap: use rte_pktmbuf_motd_offset [v5,07/11] baseband/fpga: use rte_pktmbuf_offset [v5,08/11] cpt: use rte_pktmbuf_mtod_offset [v5,09/11] testpmd: use rte_pktmbuf_mtod_offset [v5,10/11] examples/ptpclient: use rte_pktmbuf_mtod_offset [v5,11/11] examples/l2fwd-crypto: use rte_pktmbuf_mtod_offset

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Stephen Hemminger July 8, 2023, 1:57 a.m. UTC

  Replace explicit packet offset computations with rte_pktmbuf_mtod_offset().

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 drivers/net/nfp/flower/nfp_flower_cmsg.h | 3 ++-
 drivers/net/nfp/flower/nfp_flower_ctrl.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

Comments

Niklas Söderlund July 10, 2023, 12:19 p.m. UTC | #1

On 2023-07-07 18:57:12 -0700, Stephen Hemminger wrote:
> Replace explicit packet offset computations with rte_pktmbuf_mtod_offset().
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>

> ---
>  drivers/net/nfp/flower/nfp_flower_cmsg.h | 3 ++-
>  drivers/net/nfp/flower/nfp_flower_ctrl.c | 4 ++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
> index f643d54d39a4..787a38dc9aa0 100644
> --- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
> +++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
> @@ -381,7 +381,8 @@ enum nfp_flower_cmsg_port_vnic_type {
>  static inline char*
>  nfp_flower_cmsg_get_data(struct rte_mbuf *m)
>  {
> -	return rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN;
> +	return rte_pktmbuf_mtod_offset(m, char *,
> +				       4 + 4 + NFP_FLOWER_CMSG_HLEN);
>  }
>  
>  /*
> diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c
> index 4cb2c2f99e04..18823a97887d 100644
> --- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
> +++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
> @@ -389,7 +389,7 @@ nfp_flower_cmsg_rx_stats(struct nfp_flow_priv *flow_priv,
>  	uint32_t ctx_id;
>  	struct nfp_flower_stats_frame *stats;
>  
> -	msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
> +	msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
>  	msg_len = mbuf->data_len - NFP_FLOWER_CMSG_HLEN;
>  	count = msg_len / sizeof(struct nfp_flower_stats_frame);
>  
> @@ -412,7 +412,7 @@ nfp_flower_cmsg_rx_qos_stats(struct nfp_mtr_priv *mtr_priv,
>  	struct nfp_mtr *mtr;
>  	struct nfp_mtr_stats_reply *mtr_stats;
>  
> -	msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
> +	msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
>  
>  	mtr_stats = (struct nfp_mtr_stats_reply *)msg;
>  	profile_id = rte_be_to_cpu_32(mtr_stats->head.profile_id);
> -- 
> 2.39.2
>

Thomas Monjalon Jan. 24, 2024, 1:44 p.m. UTC | #2

10/07/2023 14:19, Niklas Söderlund:
> On 2023-07-07 18:57:12 -0700, Stephen Hemminger wrote:
> > Replace explicit packet offset computations with rte_pktmbuf_mtod_offset().
> > 
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> 
> Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>

A similar change by Chaoyong He has been merged in 23.11.

diff mbox series

Patch

diff --git a/drivers/net/nfp/flower/nfp_flower_cmsg.h b/drivers/net/nfp/flower/nfp_flower_cmsg.h
index f643d54d39a4..787a38dc9aa0 100644
--- a/drivers/net/nfp/flower/nfp_flower_cmsg.h
+++ b/drivers/net/nfp/flower/nfp_flower_cmsg.h
@@ -381,7 +381,8 @@  enum nfp_flower_cmsg_port_vnic_type {
 static inline char*
 nfp_flower_cmsg_get_data(struct rte_mbuf *m)
 {
-	return rte_pktmbuf_mtod(m, char *) + 4 + 4 + NFP_FLOWER_CMSG_HLEN;
+	return rte_pktmbuf_mtod_offset(m, char *,
+				       4 + 4 + NFP_FLOWER_CMSG_HLEN);
 }
 
 /*
diff --git a/drivers/net/nfp/flower/nfp_flower_ctrl.c b/drivers/net/nfp/flower/nfp_flower_ctrl.c
index 4cb2c2f99e04..18823a97887d 100644
--- a/drivers/net/nfp/flower/nfp_flower_ctrl.c
+++ b/drivers/net/nfp/flower/nfp_flower_ctrl.c
@@ -389,7 +389,7 @@  nfp_flower_cmsg_rx_stats(struct nfp_flow_priv *flow_priv,
 	uint32_t ctx_id;
 	struct nfp_flower_stats_frame *stats;
 
-	msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
+	msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
 	msg_len = mbuf->data_len - NFP_FLOWER_CMSG_HLEN;
 	count = msg_len / sizeof(struct nfp_flower_stats_frame);
 
@@ -412,7 +412,7 @@  nfp_flower_cmsg_rx_qos_stats(struct nfp_mtr_priv *mtr_priv,
 	struct nfp_mtr *mtr;
 	struct nfp_mtr_stats_reply *mtr_stats;
 
-	msg = rte_pktmbuf_mtod(mbuf, char *) + NFP_FLOWER_CMSG_HLEN;
+	msg = rte_pktmbuf_mtod_offset(mbuf, char *, NFP_FLOWER_CMSG_HLEN);
 
 	mtr_stats = (struct nfp_mtr_stats_reply *)msg;
 	profile_id = rte_be_to_cpu_32(mtr_stats->head.profile_id);