netdev - RE: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID:
 <PAXPR04MB85104DCA7DED14565615E4A588472@PAXPR04MB8510.eurprd04.prod.outlook.com>
Date: Thu, 17 Oct 2024 03:33:09 +0000
From: Wei Fang <wei.fang@....com>
To: Marc Kleine-Budde <mkl@...gutronix.de>, Shenwei Wang
	<shenwei.wang@....com>, Clark Wang <xiaoning.wang@....com>, "David S. Miller"
	<davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski
	<kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Richard Cochran
	<richardcochran@...il.com>
CC: "imx@...ts.linux.dev" <imx@...ts.linux.dev>, "netdev@...r.kernel.org"
	<netdev@...r.kernel.org>, "linux-kernel@...r.kernel.org"
	<linux-kernel@...r.kernel.org>, "kernel@...gutronix.de"
	<kernel@...gutronix.de>
Subject: RE: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out
 VLAN handling into separate function fec_enet_rx_vlan()

> -----Original Message-----
> From: Marc Kleine-Budde <mkl@...gutronix.de>
> Sent: 2024年10月17日 5:52
> To: Wei Fang <wei.fang@....com>; Shenwei Wang <shenwei.wang@....com>;
> Clark Wang <xiaoning.wang@....com>; David S. Miller
> <davem@...emloft.net>; Eric Dumazet <edumazet@...gle.com>; Jakub
> Kicinski <kuba@...nel.org>; Paolo Abeni <pabeni@...hat.com>; Richard
> Cochran <richardcochran@...il.com>
> Cc: imx@...ts.linux.dev; netdev@...r.kernel.org; linux-kernel@...r.kernel.org;
> kernel@...gutronix.de; Marc Kleine-Budde <mkl@...gutronix.de>
> Subject: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out
> VLAN handling into separate function fec_enet_rx_vlan()
> 
> In order to clean up of the VLAN handling, factor out the VLAN
> handling into separate function fec_enet_rx_vlan().
> 
> Signed-off-by: Marc Kleine-Budde <mkl@...gutronix.de>
> ---
>  drivers/net/ethernet/freescale/fec_main.c | 32
> ++++++++++++++++++-------------
>  1 file changed, 19 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/net/ethernet/freescale/fec_main.c
> b/drivers/net/ethernet/freescale/fec_main.c
> index
> d9415c7c16cea3fc3d91e198c21af9fe9e21747e..e14000ba85586b9cd73151e
> 62924c3b4597bb580 100644
> --- a/drivers/net/ethernet/freescale/fec_main.c
> +++ b/drivers/net/ethernet/freescale/fec_main.c
> @@ -1672,6 +1672,22 @@ fec_enet_run_xdp(struct fec_enet_private *fep,
> struct bpf_prog *prog,
>  	return ret;
>  }
> 
> +static void fec_enet_rx_vlan(struct net_device *ndev, struct sk_buff *skb)
> +{
> +	struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);

Why not move vlan_header into the if statement?

> +
> +	if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) {
> +		/* Push and remove the vlan tag */
> +		u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI);
> +
> +		memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2);
> +		skb_pull(skb, VLAN_HLEN);
> +		__vlan_hwaccel_put_tag(skb,
> +				       htons(ETH_P_8021Q),
> +				       vlan_tag);
> +	}
> +}
> +
>  /* During a receive, the bd_rx.cur points to the current incoming buffer.
>   * When we update through the ring, if the next incoming buffer has
>   * not been given to the system, we just set the empty indicator,
> @@ -1812,19 +1828,9 @@ fec_enet_rx_queue(struct net_device *ndev, u16
> queue_id, int budget)
>  			ebdp = (struct bufdesc_ex *)bdp;
> 
>  		/* If this is a VLAN packet remove the VLAN Tag */
> -		if ((ndev->features & NETIF_F_HW_VLAN_CTAG_RX) &&
> -		    fep->bufdesc_ex &&
> -		    (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) {
> -			/* Push and remove the vlan tag */
> -			struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);
> -			u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI);
> -
> -			memmove(skb->data + VLAN_HLEN, skb->data, ETH_ALEN * 2);
> -			skb_pull(skb, VLAN_HLEN);
> -			__vlan_hwaccel_put_tag(skb,
> -					       htons(ETH_P_8021Q),
> -					       vlan_tag);
> -		}
> +		if (fep->bufdesc_ex &&
> +		    (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN)))
> +			fec_enet_rx_vlan(ndev, skb);
> 
>  		skb->protocol = eth_type_trans(skb, ndev);
> 
> 
> --
> 2.45.2
>