mbox series

[net-next,0/9] Use __vlan_hwaccel_*() helpers

Message ID cover.1541718583.git.mirq-linux@rere.qmqm.pl
Headers show
Series Use __vlan_hwaccel_*() helpers | expand

Message

Michał Mirosław Nov. 8, 2018, 11:17 p.m. UTC 
This series removes from networking core and driver code an assumption
about how VLAN tag presence is stored in an skb. This will allow to free
up overloading of VLAN.CFI bit to incidate tag's presence.

Michał Mirosław (9):
  cxgb4: use __vlan_hwaccel helpers
  nfnetlink/queue: use __vlan_hwaccel helpers
  net/core: use __vlan_hwaccel helpers
  8021q: use __vlan_hwaccel helpers
  bridge: use __vlan_hwaccel helpers
  ipv4/tunnel: use __vlan_hwaccel helpers
  benet: use __vlan_hwaccel helpers
  mlx4: use __vlan_hwaccel helpers
  sky2: use __vlan_hwaccel helpers

 drivers/infiniband/hw/cxgb4/cm.c            |  2 +-
 drivers/net/ethernet/emulex/benet/be_main.c | 13 +++++++++----
 drivers/net/ethernet/marvell/sky2.c         |  6 ++----
 drivers/net/ethernet/mellanox/mlx4/en_rx.c  |  2 +-
 net/8021q/vlan_core.c                       |  2 +-
 net/bridge/br_netfilter_hooks.c             | 15 +++++++++------
 net/bridge/br_private.h                     |  2 +-
 net/bridge/br_vlan.c                        |  6 +++---
 net/core/dev.c                              |  8 +++++---
 net/core/skbuff.c                           |  2 +-
 net/ipv4/ip_tunnel_core.c                   |  2 +-
 net/netfilter/nfnetlink_queue.c             |  5 +++--
 net/sched/act_vlan.c                        |  2 +-
 13 files changed, 38 insertions(+), 29 deletions(-)

Comments

David Miller Nov. 9, 2018, 4:45 a.m. UTC | #1 
From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Date: Fri, 09 Nov 2018 00:17:58 +0100

> This series removes from networking core and driver code an assumption
> about how VLAN tag presence is stored in an skb. This will allow to free
> up overloading of VLAN.CFI bit to incidate tag's presence.

This looks good, series applied.

Thanks.
Tariq Toukan Nov. 11, 2018, 3:26 p.m. UTC | #2 
On 09/11/2018 6:45 AM, David Miller wrote:
> From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> Date: Fri, 09 Nov 2018 00:17:58 +0100
> 
>> This series removes from networking core and driver code an assumption
>> about how VLAN tag presence is stored in an skb. This will allow to free
>> up overloading of VLAN.CFI bit to incidate tag's presence.
> 
> This looks good, series applied.
> 
> Thanks.
> 

Hi Michal,

We started seeing the compilation errors below, they look related to 
this series.

Thanks,
Tariq

02:15:09 net/8021q/vlan_core.c: In function 'vlan_do_receive':
02:15:09 net/8021q/vlan_core.c:60:2: error: implicit declaration of 
function '__vlan_hwaccel_clear_tag'; did you mean 
'__vlan_hwaccel_get_tag'? [-Werror=implicit-function-declaration]
02:15:09   __vlan_hwaccel_clear_tag(skb);
02:15:09   ^~~~~~~~~~~~~~~~~~~~~~~~
02:15:09   __vlan_hwaccel_get_tag
02:15:09 cc1: some warnings being treated as errors
02:15:09 make[4]: *** [scripts/Makefile.build:293: 
net/8021q/vlan_core.o] Error 1
02:15:09 make[4]: *** Waiting for unfinished jobs....
02:15:11 make[3]: *** [scripts/Makefile.build:518: net/8021q] Error 2
02:15:11 make[3]: *** Waiting for unfinished jobs....
02:15:14 make[2]: *** [Makefile:1060: net] Error 2
02:15:14 make[2]: *** Waiting for unfinished jobs....
02:15:36 drivers/net/ethernet/mellanox/mlx4/en_rx.c: In function 
'mlx4_en_process_rx_cq':
02:15:36 drivers/net/ethernet/mellanox/mlx4/en_rx.c:878:4: error: 
implicit declaration of function '__vlan_hwaccel_clear_tag'; did you 
mean '__vlan_hwaccel_get_tag'? [-Werror=implicit-function-declaration]
02:15:36     __vlan_hwaccel_clear_tag(skb);
02:15:36     ^~~~~~~~~~~~~~~~~~~~~~~~
02:15:36     __vlan_hwaccel_get_tag
02:15:36 cc1: some warnings being treated as errors
02:15:37 make[7]: *** [scripts/Makefile.build:293: 
drivers/net/ethernet/mellanox/mlx4/en_rx.o] Error 1
02:15:37 make[7]: *** Waiting for unfinished jobs....
02:15:37 make[6]: *** [scripts/Makefile.build:518: 
drivers/net/ethernet/mellanox/mlx4] Error 2
02:15:37 make[6]: *** Waiting for unfinished jobs....
02:15:39 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c: In function 
'mlx5e_grp_sw_update_stats':
02:15:39 drivers/net/ethernet/mellanox/mlx5/core/en_stats.c:216:1: 
warning: the frame size of 1200 bytes is larger than 1024 bytes 
[-Wframe-larger-than=]
02:15:39  }
02:15:39  ^
02:15:49 make[5]: *** [scripts/Makefile.build:518: 
drivers/net/ethernet/mellanox] Error 2
02:15:49 make[4]: *** [scripts/Makefile.build:518: drivers/net/ethernet] 
Error 2
02:15:49 make[3]: *** [scripts/Makefile.build:518: drivers/net] Error 2
02:15:49 make[2]: *** [Makefile:1060: drivers] Error 2
02:15:49 make[1]: *** [scripts/package/Makefile:63: binrpm-pkg] Error 2
02:15:49 make: *** [Makefile:1399: binrpm-pkg] Error 2
Michał Mirosław Nov. 11, 2018, 4:12 p.m. UTC | #3 
On Sun, Nov 11, 2018 at 03:26:29PM +0000, Tariq Toukan wrote:
> 
> 
> On 09/11/2018 6:45 AM, David Miller wrote:
> > From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> > Date: Fri, 09 Nov 2018 00:17:58 +0100
> > 
> >> This series removes from networking core and driver code an assumption
> >> about how VLAN tag presence is stored in an skb. This will allow to free
> >> up overloading of VLAN.CFI bit to incidate tag's presence.
> > 
> > This looks good, series applied.
> > 
> > Thanks.
> > 
> 
> Hi Michal,
> 
> We started seeing the compilation errors below, they look related to 
> this series.

Do you have the previous series applied that introduced __vlan_hwaccel_clear_tag()?
It was applied to net-next before I sent this series.

I did a allmodconfig build of net-next and saw no failures (apart from
OVS that is fixed already).

Best Regards,
Michał Mirosław
Michał Mirosław Nov. 11, 2018, 4:16 p.m. UTC | #4 
On Sun, Nov 11, 2018 at 05:12:43PM +0100, mirq-linux@rere.qmqm.pl wrote:
> On Sun, Nov 11, 2018 at 03:26:29PM +0000, Tariq Toukan wrote:
> > On 09/11/2018 6:45 AM, David Miller wrote:
> > > From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> > > Date: Fri, 09 Nov 2018 00:17:58 +0100
> > >> This series removes from networking core and driver code an assumption
> > >> about how VLAN tag presence is stored in an skb. This will allow to free
> > >> up overloading of VLAN.CFI bit to incidate tag's presence.
> > > 
> > > This looks good, series applied.
> > > 
> > > Thanks.
> > Hi Michal,
> > 
> > We started seeing the compilation errors below, they look related to 
> > this series.
> 
> Do you have the previous series applied that introduced __vlan_hwaccel_clear_tag()?
> It was applied to net-next before I sent this series.
> 
> I did a allmodconfig build of net-next and saw no failures (apart from
> OVS that is fixed already).

The prerequisite commit in net-next is:

7025abb2e447b ("Merge branch 'vlan-prepare-for-removal-of-VLAN_TAG_PRESENT'")

Best Regards,
Michał Mirosław