RE: RE: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor out VLAN handling into separate function fec_enet_rx_vlan()
From: Wei Fang
Date: Thu Oct 17 2024 - 03:48:54 EST
> -----Original Message-----
> From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> Sent: 2024年10月17日 15:09
> To: Wei Fang <wei.fang@xxxxxxx>
> Cc: Shenwei Wang <shenwei.wang@xxxxxxx>; Clark Wang
> <xiaoning.wang@xxxxxxx>; David S. Miller <davem@xxxxxxxxxxxxx>; Eric
> Dumazet <edumazet@xxxxxxxxxx>; Jakub Kicinski <kuba@xxxxxxxxxx>; Paolo
> Abeni <pabeni@xxxxxxxxxx>; Richard Cochran <richardcochran@xxxxxxxxx>;
> imx@xxxxxxxxxxxxxxx; netdev@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
> kernel@xxxxxxxxxxxxxx
> Subject: Re: RE: [PATCH net-next 13/13] net: fec: fec_enet_rx_queue(): factor
> out VLAN handling into separate function fec_enet_rx_vlan()
>
> On 17.10.2024 03:33:09, Wei Fang wrote:
> > > -----Original Message-----
> > > From: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> > > Sent: 2024年10月17日 5:52
> > > To: Wei Fang <wei.fang@xxxxxxx>; Shenwei Wang
> <shenwei.wang@xxxxxxx>;
> > > Clark Wang <xiaoning.wang@xxxxxxx>; David S. Miller
> > > <davem@xxxxxxxxxxxxx>; Eric Dumazet <edumazet@xxxxxxxxxx>; Jakub
> > > Kicinski <kuba@xxxxxxxxxx>; Paolo Abeni <pabeni@xxxxxxxxxx>; Richard
> > > Cochran <richardcochran@xxxxxxxxx>
> > > Cc: imx@xxxxxxxxxxxxxxx; netdev@xxxxxxxxxxxxxxx;
> linux-kernel@xxxxxxxxxxxxxxx;
> > > kernel@xxxxxxxxxxxxxx; Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
> > > 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@xxxxxxxxxxxxxx>
> > > ---
> > > 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?
>
> I've an upcoming patch that adds NETIF_F_HW_VLAN_STAG_RX (a.k.a.
> 801.2ad, S-VLAN) handling that changes this function.
>
> One hunk looks like this, it uses the vlan_header outside of the if:
>
You can move valn_header out of the 'if' when it happens.
> @@ -1675,15 +1678,19 @@ fec_enet_run_xdp(struct fec_enet_private *fep,
> struct bpf_prog *prog,
> static void fec_enet_rx_vlan(struct net_device *ndev, struct sk_buff *skb)
> {
> struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb);
> + __be16 vlan_proto = vlan_header->h_vlan_proto;
>
> - if (ndev->features & NETIF_F_HW_VLAN_CTAG_RX) {
> + if ((vlan_proto == htons(ETH_P_8021Q) &&
> + ndev->features & NETIF_F_HW_VLAN_CTAG_RX) ||
> + (vlan_proto == htons(ETH_P_8021AD) &&
> + ndev->features & NETIF_F_HW_VLAN_STAG_RX)) {
> /* Push and remove the vlan tag */
> u16 vlan_tag = ntohs(vlan_header->h_vlan_TCI);
>
> regards,
> Marc
>
> --
> Pengutronix e.K. | Marc Kleine-Budde |
> Embedded Linux | https://www.pengutronix.de |
> Vertretung Nürnberg | Phone: +49-5121-206917-129 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |