XDP hardware hints discussion mail archive
 help / color / mirror / Atom feed
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To: Larysa Zaremba <larysa.zaremba@intel.com>
Cc: bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net,
	andrii@kernel.org, martin.lau@linux.dev, song@kernel.org,
	yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org,
	sdf@google.com, haoluo@google.com, jolsa@kernel.org,
	David Ahern <dsahern@gmail.com>, Jakub Kicinski <kuba@kernel.org>,
	Willem de Bruijn <willemb@google.com>,
	Jesper Dangaard Brouer <hawk@kernel.org>,
	Anatoly Burakov <anatoly.burakov@intel.com>,
	Alexander Lobakin <alexandr.lobakin@intel.com>,
	Magnus Karlsson <magnus.karlsson@gmail.com>,
	Maryam Tahhan <mtahhan@redhat.com>,
	xdp-hints@xdp-project.net, netdev@vger.kernel.org,
	Willem de Bruijn <willemdebruijn.kernel@gmail.com>,
	Alexei Starovoitov <alexei.starovoitov@gmail.com>,
	Tariq Toukan <tariqt@mellanox.com>,
	Saeed Mahameed <saeedm@mellanox.com>
Subject: [xdp-hints] Re: [PATCH bpf-next v7 11/18] ice: use VLAN proto from ring packet context in skb path
Date: Fri, 17 Nov 2023 09:10:44 +0100	[thread overview]
Message-ID: <ZVcgBGRwcyaOl+yl@boxer> (raw)
In-Reply-To: <20231115175301.534113-12-larysa.zaremba@intel.com>

On Wed, Nov 15, 2023 at 06:52:53PM +0100, Larysa Zaremba wrote:
> VLAN proto, used in ice XDP hints implementation is stored in ring packet
> context. Utilize this value in skb VLAN processing too instead of checking
> netdev features.
> 
> At the same time, use vlan_tci instead of vlan_tag in touched code,
> because VLAN tag often refers to VLAN proto and VLAN TCI combined,
> while in the code we clearly store only VLAN TCI.
> 
> Signed-off-by: Larysa Zaremba <larysa.zaremba@intel.com>
> ---
>  drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 14 +++++---------
>  drivers/net/ethernet/intel/ice/ice_txrx_lib.h |  2 +-
>  2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> index 63bf9f882363..a1f5243299c5 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.c
> @@ -246,21 +246,17 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring,
>   * ice_receive_skb - Send a completed packet up the stack
>   * @rx_ring: Rx ring in play
>   * @skb: packet to send up
> - * @vlan_tag: VLAN tag for packet
> + * @vlan_tci: VLAN TCI for packet
>   *
>   * This function sends the completed packet (via. skb) up the stack using
>   * gro receive functions (with/without VLAN tag)
>   */
>  void
> -ice_receive_skb(struct ice_rx_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)
> +ice_receive_skb(struct ice_rx_ring *rx_ring, struct sk_buff *skb, u16 vlan_tci)
>  {
> -	netdev_features_t features = rx_ring->netdev->features;
> -	bool non_zero_vlan = !!(vlan_tag & VLAN_VID_MASK);
> -
> -	if ((features & NETIF_F_HW_VLAN_CTAG_RX) && non_zero_vlan)
> -		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021Q), vlan_tag);
> -	else if ((features & NETIF_F_HW_VLAN_STAG_RX) && non_zero_vlan)
> -		__vlan_hwaccel_put_tag(skb, htons(ETH_P_8021AD), vlan_tag);
> +	if ((vlan_tci & VLAN_VID_MASK) && rx_ring->vlan_proto)
> +		__vlan_hwaccel_put_tag(skb, rx_ring->vlan_proto,

Umm... pkt_ctx.vlan_proto ?

> +				       vlan_tci);
>  
>  	napi_gro_receive(&rx_ring->q_vector->napi, skb);
>  }
> diff --git a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> index 3893af1c11f3..762047508619 100644
> --- a/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> +++ b/drivers/net/ethernet/intel/ice/ice_txrx_lib.h
> @@ -150,7 +150,7 @@ ice_process_skb_fields(struct ice_rx_ring *rx_ring,
>  		       union ice_32b_rx_flex_desc *rx_desc,
>  		       struct sk_buff *skb);
>  void
> -ice_receive_skb(struct ice_rx_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag);
> +ice_receive_skb(struct ice_rx_ring *rx_ring, struct sk_buff *skb, u16 vlan_tci);
>  
>  static inline void
>  ice_xdp_meta_set_desc(struct xdp_buff *xdp,
> -- 
> 2.41.0
> 

  reply	other threads:[~2023-11-17  8:10 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-15 17:52 [xdp-hints] [PATCH bpf-next v7 00/18] XDP metadata via kfuncs for ice + VLAN hint Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 01/18] ice: make RX hash reading code more reusable Larysa Zaremba
2023-11-16 15:04   ` [xdp-hints] " Maciej Fijalkowski
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 02/18] ice: make RX HW timestamp " Larysa Zaremba
2023-11-16 15:19   ` [xdp-hints] " Maciej Fijalkowski
2023-11-17 14:26     ` Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 03/18] ice: Make ptype internal to descriptor info processing Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 04/18] ice: Introduce ice_xdp_buff Larysa Zaremba
2023-11-16 12:52   ` [xdp-hints] " Maciej Fijalkowski
2023-11-16  2:55     ` Larysa Zaremba
2023-12-01 13:51       ` Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 05/18] ice: Support HW timestamp hint Larysa Zaremba
2023-11-16 15:21   ` [xdp-hints] " Maciej Fijalkowski
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 06/18] ice: Support RX hash XDP hint Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 07/18] xsk: add functions to fill control buffer Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 08/18] ice: Support XDP hints in AF_XDP ZC mode Larysa Zaremba
2023-11-16 12:49   ` [xdp-hints] " Maciej Fijalkowski
2023-11-16  3:01     ` Larysa Zaremba
2023-11-16 15:01       ` Maciej Fijalkowski
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 09/18] xdp: Add VLAN tag hint Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 10/18] ice: Implement " Larysa Zaremba
2023-11-16 15:47   ` [xdp-hints] " Maciej Fijalkowski
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 11/18] ice: use VLAN proto from ring packet context in skb path Larysa Zaremba
2023-11-17  8:10   ` Maciej Fijalkowski [this message]
2023-11-17 14:07     ` [xdp-hints] " Larysa Zaremba
2023-11-17 15:14       ` Maciej Fijalkowski
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 12/18] veth: Implement VLAN tag XDP hint Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 13/18] net: make vlan_get_tag() return -ENODATA instead of -EINVAL Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 14/18] mlx5: implement VLAN tag XDP hint Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 15/18] selftests/bpf: Allow VLAN packets in xdp_hw_metadata Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 16/18] selftests/bpf: Add flags and VLAN hint to xdp_hw_metadata Larysa Zaremba
2023-11-15 17:52 ` [xdp-hints] [PATCH bpf-next v7 17/18] selftests/bpf: Use AF_INET for TX in xdp_metadata Larysa Zaremba
2023-11-20 21:15   ` [xdp-hints] " Stanislav Fomichev
     [not found]   ` <170051500599.3770946.2674696540245347885@gauss.local>
2023-11-21  9:02     ` Larysa Zaremba
2023-11-15 17:53 ` [xdp-hints] [PATCH bpf-next v7 18/18] selftests/bpf: Check VLAN tag and proto " Larysa Zaremba

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://lists.xdp-project.net/postorius/lists/xdp-hints.xdp-project.net/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZVcgBGRwcyaOl+yl@boxer \
    --to=maciej.fijalkowski@intel.com \
    --cc=alexandr.lobakin@intel.com \
    --cc=alexei.starovoitov@gmail.com \
    --cc=anatoly.burakov@intel.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=haoluo@google.com \
    --cc=hawk@kernel.org \
    --cc=john.fastabend@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=kpsingh@kernel.org \
    --cc=kuba@kernel.org \
    --cc=larysa.zaremba@intel.com \
    --cc=magnus.karlsson@gmail.com \
    --cc=martin.lau@linux.dev \
    --cc=mtahhan@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=saeedm@mellanox.com \
    --cc=sdf@google.com \
    --cc=song@kernel.org \
    --cc=tariqt@mellanox.com \
    --cc=willemb@google.com \
    --cc=willemdebruijn.kernel@gmail.com \
    --cc=xdp-hints@xdp-project.net \
    --cc=yhs@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox