2005-04-17 02:20:36 +04:00
|
|
|
/* -*- linux-c -*-
|
|
|
|
* INET 802.1Q VLAN
|
|
|
|
* Ethernet-type device handling.
|
|
|
|
*
|
|
|
|
* Authors: Ben Greear <greearb@candelatech.com>
|
2008-01-21 11:27:00 +03:00
|
|
|
* Please send support related email to: netdev@vger.kernel.org
|
2005-04-17 02:20:36 +04:00
|
|
|
* VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
|
2007-02-09 17:24:25 +03:00
|
|
|
*
|
2005-04-17 02:20:36 +04:00
|
|
|
* Fixes: Mar 22 2001: Martin Bokaemper <mbokaemper@unispherenetworks.com>
|
|
|
|
* - reset skb->pkt_type on incoming packets when MAC was changed
|
|
|
|
* - see that changed MAC is saddr for outgoing packets
|
|
|
|
* Oct 20, 2001: Ard van Breeman:
|
|
|
|
* - Fix MC-list, finally.
|
|
|
|
* - Flush MC-list on VLAN destroy.
|
2007-02-09 17:24:25 +03:00
|
|
|
*
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
2011-05-26 14:58:31 +04:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/module.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 11:04:11 +03:00
|
|
|
#include <linux/slab.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <linux/skbuff.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
2008-07-08 14:22:42 +04:00
|
|
|
#include <linux/ethtool.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
#include <net/arp.h>
|
|
|
|
|
|
|
|
#include "vlan.h"
|
|
|
|
#include "vlanproc.h"
|
|
|
|
#include <linux/if_vlan.h>
|
2011-12-08 10:20:49 +04:00
|
|
|
#include <linux/netpoll.h>
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Rebuild the Ethernet MAC header. This is called after an ARP
|
|
|
|
* (or in future other address resolution) has completed on this
|
|
|
|
* sk_buff. We now let ARP fill in the other fields.
|
|
|
|
*
|
|
|
|
* This routine CANNOT use cached dst->neigh!
|
|
|
|
* Really, it is used only when dst->neigh is wrong.
|
|
|
|
*
|
|
|
|
* TODO: This needs a checkup, I'm ignorant here. --BLG
|
|
|
|
*/
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_rebuild_header(struct sk_buff *skb)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
struct net_device *dev = skb->dev;
|
|
|
|
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
|
|
|
|
|
|
|
|
switch (veth->h_vlan_encapsulated_proto) {
|
|
|
|
#ifdef CONFIG_INET
|
2008-09-21 09:20:49 +04:00
|
|
|
case htons(ETH_P_IP):
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/* TODO: Confirm this will work with VLAN headers... */
|
|
|
|
return arp_find(veth->h_dest, skb);
|
2007-02-09 17:24:25 +03:00
|
|
|
#endif
|
2005-04-17 02:20:36 +04:00
|
|
|
default:
|
2011-05-26 14:58:31 +04:00
|
|
|
pr_debug("%s: unable to resolve type %X addresses\n",
|
2008-01-21 11:24:30 +03:00
|
|
|
dev->name, ntohs(veth->h_vlan_encapsulated_proto));
|
2007-02-09 17:24:25 +03:00
|
|
|
|
2014-01-20 21:52:14 +04:00
|
|
|
ether_addr_copy(veth->h_source, dev->dev_addr);
|
2005-04-17 02:20:36 +04:00
|
|
|
break;
|
2007-04-21 04:09:22 +04:00
|
|
|
}
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2007-02-09 17:24:25 +03:00
|
|
|
* Create the VLAN header for an arbitrary protocol layer
|
2005-04-17 02:20:36 +04:00
|
|
|
*
|
|
|
|
* saddr=NULL means use device source address
|
|
|
|
* daddr=NULL means leave destination address (eg unresolved arp)
|
|
|
|
*
|
|
|
|
* This is called when the SKB is moving down the stack towards the
|
|
|
|
* physical devices.
|
|
|
|
*/
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
unsigned short type,
|
|
|
|
const void *daddr, const void *saddr,
|
|
|
|
unsigned int len)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2013-04-19 06:04:29 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
struct vlan_hdr *vhdr;
|
2008-07-15 09:51:19 +04:00
|
|
|
unsigned int vhdrlen = 0;
|
2008-07-08 14:24:44 +04:00
|
|
|
u16 vlan_tci = 0;
|
2008-07-15 09:51:19 +04:00
|
|
|
int rc;
|
2005-04-17 02:20:36 +04:00
|
|
|
|
2013-08-03 12:54:50 +04:00
|
|
|
if (!(vlan->flags & VLAN_FLAG_REORDER_HDR)) {
|
2005-04-17 02:20:36 +04:00
|
|
|
vhdr = (struct vlan_hdr *) skb_push(skb, VLAN_HLEN);
|
|
|
|
|
2013-08-03 12:54:50 +04:00
|
|
|
vlan_tci = vlan->vlan_id;
|
2013-11-11 09:42:07 +04:00
|
|
|
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);
|
2008-07-08 14:24:44 +04:00
|
|
|
vhdr->h_vlan_TCI = htons(vlan_tci);
|
2005-04-17 02:20:36 +04:00
|
|
|
|
|
|
|
/*
|
2009-12-26 14:50:59 +03:00
|
|
|
* Set the protocol type. For a packet of type ETH_P_802_3/2 we
|
|
|
|
* put the length in here instead.
|
2005-04-17 02:20:36 +04:00
|
|
|
*/
|
2009-12-26 14:50:59 +03:00
|
|
|
if (type != ETH_P_802_3 && type != ETH_P_802_2)
|
2005-04-17 02:20:36 +04:00
|
|
|
vhdr->h_vlan_encapsulated_proto = htons(type);
|
2008-01-21 11:26:41 +03:00
|
|
|
else
|
2005-04-17 02:20:36 +04:00
|
|
|
vhdr->h_vlan_encapsulated_proto = htons(len);
|
2007-04-14 03:12:47 +04:00
|
|
|
|
2013-04-19 06:04:29 +04:00
|
|
|
skb->protocol = vlan->vlan_proto;
|
|
|
|
type = ntohs(vlan->vlan_proto);
|
2008-07-15 09:51:19 +04:00
|
|
|
vhdrlen = VLAN_HLEN;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Before delegating work to the lower layer, enter our MAC-address */
|
|
|
|
if (saddr == NULL)
|
|
|
|
saddr = dev->dev_addr;
|
|
|
|
|
2008-07-15 09:51:19 +04:00
|
|
|
/* Now make the underlying real hard header */
|
2013-08-03 12:54:50 +04:00
|
|
|
dev = vlan->real_dev;
|
2008-07-15 09:51:19 +04:00
|
|
|
rc = dev_hard_header(skb, dev, type, daddr, saddr, len + vhdrlen);
|
|
|
|
if (rc > 0)
|
|
|
|
rc += vhdrlen;
|
2005-04-17 02:20:36 +04:00
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
2012-08-10 05:24:48 +04:00
|
|
|
static inline netdev_tx_t vlan_netpoll_send_skb(struct vlan_dev_priv *vlan, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
if (vlan->netpoll)
|
|
|
|
netpoll_send_skb(vlan->netpoll, skb);
|
|
|
|
#else
|
|
|
|
BUG();
|
|
|
|
#endif
|
|
|
|
return NETDEV_TX_OK;
|
|
|
|
}
|
|
|
|
|
2009-08-31 23:50:41 +04:00
|
|
|
static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
|
|
|
|
struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2012-08-10 05:24:48 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)(skb->data);
|
2009-09-03 04:39:16 +04:00
|
|
|
unsigned int len;
|
|
|
|
int ret;
|
2008-02-24 07:09:11 +03:00
|
|
|
|
2005-04-17 02:20:36 +04:00
|
|
|
/* Handle non-VLAN frames if they are sent to us, for example by DHCP.
|
|
|
|
*
|
|
|
|
* NOTE: THIS ASSUMES DIX ETHERNET, SPECIFICALLY NOT SUPPORTING
|
|
|
|
* OTHER THINGS LIKE FDDI/TokenRing/802.3 SNAPs...
|
|
|
|
*/
|
2013-04-19 06:04:29 +04:00
|
|
|
if (veth->h_vlan_proto != vlan->vlan_proto ||
|
2012-08-10 05:24:48 +04:00
|
|
|
vlan->flags & VLAN_FLAG_REORDER_HDR) {
|
2008-07-08 14:24:44 +04:00
|
|
|
u16 vlan_tci;
|
2012-08-10 05:24:48 +04:00
|
|
|
vlan_tci = vlan->vlan_id;
|
2013-11-11 09:42:07 +04:00
|
|
|
vlan_tci |= vlan_dev_get_egress_qos_mask(dev, skb->priority);
|
2013-04-19 06:04:30 +04:00
|
|
|
skb = __vlan_hwaccel_put_tag(skb, vlan->vlan_proto, vlan_tci);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2012-08-10 05:24:48 +04:00
|
|
|
skb->dev = vlan->real_dev;
|
2009-09-03 04:39:16 +04:00
|
|
|
len = skb->len;
|
2012-08-10 05:24:48 +04:00
|
|
|
if (unlikely(netpoll_tx_running(dev)))
|
|
|
|
return vlan_netpoll_send_skb(vlan, skb);
|
|
|
|
|
2009-09-03 04:39:16 +04:00
|
|
|
ret = dev_queue_xmit(skb);
|
|
|
|
|
2010-05-10 08:51:02 +04:00
|
|
|
if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {
|
2010-11-11 02:42:00 +03:00
|
|
|
struct vlan_pcpu_stats *stats;
|
|
|
|
|
2012-08-10 05:24:48 +04:00
|
|
|
stats = this_cpu_ptr(vlan->vlan_pcpu_stats);
|
2010-11-11 02:42:00 +03:00
|
|
|
u64_stats_update_begin(&stats->syncp);
|
|
|
|
stats->tx_packets++;
|
|
|
|
stats->tx_bytes += len;
|
2011-06-01 02:53:19 +04:00
|
|
|
u64_stats_update_end(&stats->syncp);
|
2010-11-11 02:42:00 +03:00
|
|
|
} else {
|
2012-08-10 05:24:48 +04:00
|
|
|
this_cpu_inc(vlan->vlan_pcpu_stats->tx_dropped);
|
2010-11-11 02:42:00 +03:00
|
|
|
}
|
2009-09-03 04:39:16 +04:00
|
|
|
|
2009-11-10 09:14:24 +03:00
|
|
|
return ret;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
|
|
|
/* TODO: gotta make sure the underlying layer can handle it,
|
|
|
|
* maybe an IFF_VLAN_CAPABLE flag for devices?
|
|
|
|
*/
|
2011-12-08 08:11:15 +04:00
|
|
|
if (vlan_dev_priv(dev)->real_dev->mtu < new_mtu)
|
2005-04-17 02:20:36 +04:00
|
|
|
return -ERANGE;
|
|
|
|
|
|
|
|
dev->mtu = new_mtu;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-13 23:05:22 +04:00
|
|
|
void vlan_dev_set_ingress_priority(const struct net_device *dev,
|
2008-07-08 14:24:44 +04:00
|
|
|
u32 skb_prio, u16 vlan_prio)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2007-06-13 23:07:22 +04:00
|
|
|
|
|
|
|
if (vlan->ingress_priority_map[vlan_prio & 0x7] && !skb_prio)
|
|
|
|
vlan->nr_ingress_mappings--;
|
|
|
|
else if (!vlan->ingress_priority_map[vlan_prio & 0x7] && skb_prio)
|
|
|
|
vlan->nr_ingress_mappings++;
|
|
|
|
|
|
|
|
vlan->ingress_priority_map[vlan_prio & 0x7] = skb_prio;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-06-13 23:05:22 +04:00
|
|
|
int vlan_dev_set_egress_priority(const struct net_device *dev,
|
2008-07-08 14:24:44 +04:00
|
|
|
u32 skb_prio, u16 vlan_prio)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
struct vlan_priority_tci_mapping *mp = NULL;
|
|
|
|
struct vlan_priority_tci_mapping *np;
|
2009-10-27 04:40:35 +03:00
|
|
|
u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
|
2007-02-09 17:24:25 +03:00
|
|
|
|
2007-06-13 23:05:22 +04:00
|
|
|
/* See if a priority mapping exists.. */
|
2007-06-13 23:07:22 +04:00
|
|
|
mp = vlan->egress_priority_map[skb_prio & 0xF];
|
2007-06-13 23:05:22 +04:00
|
|
|
while (mp) {
|
|
|
|
if (mp->priority == skb_prio) {
|
2007-06-13 23:07:22 +04:00
|
|
|
if (mp->vlan_qos && !vlan_qos)
|
|
|
|
vlan->nr_egress_mappings--;
|
|
|
|
else if (!mp->vlan_qos && vlan_qos)
|
|
|
|
vlan->nr_egress_mappings++;
|
|
|
|
mp->vlan_qos = vlan_qos;
|
2007-06-13 23:05:22 +04:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-06-13 23:05:22 +04:00
|
|
|
mp = mp->next;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2007-06-13 23:05:22 +04:00
|
|
|
|
|
|
|
/* Create a new mapping then. */
|
2007-06-13 23:07:22 +04:00
|
|
|
mp = vlan->egress_priority_map[skb_prio & 0xF];
|
2007-06-13 23:05:22 +04:00
|
|
|
np = kmalloc(sizeof(struct vlan_priority_tci_mapping), GFP_KERNEL);
|
|
|
|
if (!np)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
|
|
|
np->next = mp;
|
|
|
|
np->priority = skb_prio;
|
2007-06-13 23:07:22 +04:00
|
|
|
np->vlan_qos = vlan_qos;
|
2013-07-18 20:35:10 +04:00
|
|
|
/* Before inserting this element in hash table, make sure all its fields
|
|
|
|
* are committed to memory.
|
2013-11-11 09:42:07 +04:00
|
|
|
* coupled with smp_rmb() in vlan_dev_get_egress_qos_mask()
|
2013-07-18 20:35:10 +04:00
|
|
|
*/
|
|
|
|
smp_wmb();
|
2007-06-13 23:07:22 +04:00
|
|
|
vlan->egress_priority_map[skb_prio & 0xF] = np;
|
|
|
|
if (vlan_qos)
|
|
|
|
vlan->nr_egress_mappings++;
|
2007-06-13 23:05:22 +04:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-06-13 23:07:37 +04:00
|
|
|
/* Flags are defined in the vlan_flags enum in include/linux/if_vlan.h file. */
|
2008-07-06 08:26:27 +04:00
|
|
|
int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2008-07-06 08:26:27 +04:00
|
|
|
u32 old_flags = vlan->flags;
|
|
|
|
|
2009-11-25 10:54:54 +03:00
|
|
|
if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
|
2013-02-08 21:17:07 +04:00
|
|
|
VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP))
|
2008-07-06 08:26:27 +04:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
vlan->flags = (old_flags & ~mask) | (flags & mask);
|
2008-07-06 08:26:57 +04:00
|
|
|
|
|
|
|
if (netif_running(dev) && (vlan->flags ^ old_flags) & VLAN_FLAG_GVRP) {
|
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_join(dev);
|
|
|
|
else
|
|
|
|
vlan_gvrp_request_leave(dev);
|
|
|
|
}
|
2013-02-08 21:17:07 +04:00
|
|
|
|
|
|
|
if (netif_running(dev) && (vlan->flags ^ old_flags) & VLAN_FLAG_MVRP) {
|
|
|
|
if (vlan->flags & VLAN_FLAG_MVRP)
|
|
|
|
vlan_mvrp_request_join(dev);
|
|
|
|
else
|
|
|
|
vlan_mvrp_request_leave(dev);
|
|
|
|
}
|
2008-07-06 08:26:27 +04:00
|
|
|
return 0;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2007-06-13 23:05:22 +04:00
|
|
|
void vlan_dev_get_realdev_name(const struct net_device *dev, char *result)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
strncpy(result, vlan_dev_priv(dev)->real_dev->name, 23);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_open(struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2007-07-12 06:45:24 +04:00
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
|
|
|
int err;
|
|
|
|
|
2009-11-25 10:54:54 +03:00
|
|
|
if (!(real_dev->flags & IFF_UP) &&
|
|
|
|
!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
|
2005-04-17 02:20:36 +04:00
|
|
|
return -ENETDOWN;
|
|
|
|
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:47 +04:00
|
|
|
if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr)) {
|
2010-04-02 01:22:09 +04:00
|
|
|
err = dev_uc_add(real_dev, dev->dev_addr);
|
2007-07-12 06:45:24 +04:00
|
|
|
if (err < 0)
|
2008-07-15 07:59:03 +04:00
|
|
|
goto out;
|
2007-07-12 06:45:24 +04:00
|
|
|
}
|
|
|
|
|
2008-07-15 07:59:03 +04:00
|
|
|
if (dev->flags & IFF_ALLMULTI) {
|
|
|
|
err = dev_set_allmulti(real_dev, 1);
|
|
|
|
if (err < 0)
|
|
|
|
goto del_unicast;
|
|
|
|
}
|
|
|
|
if (dev->flags & IFF_PROMISC) {
|
|
|
|
err = dev_set_promiscuity(real_dev, 1);
|
|
|
|
if (err < 0)
|
|
|
|
goto clear_allmulti;
|
|
|
|
}
|
|
|
|
|
2014-01-20 21:52:14 +04:00
|
|
|
ether_addr_copy(vlan->real_dev_addr, real_dev->dev_addr);
|
2007-07-15 05:52:56 +04:00
|
|
|
|
2008-07-06 08:26:57 +04:00
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_join(dev);
|
|
|
|
|
2013-02-08 21:17:07 +04:00
|
|
|
if (vlan->flags & VLAN_FLAG_MVRP)
|
|
|
|
vlan_mvrp_request_join(dev);
|
|
|
|
|
2010-08-17 22:45:08 +04:00
|
|
|
if (netif_carrier_ok(real_dev))
|
|
|
|
netif_carrier_on(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
2008-07-15 07:59:03 +04:00
|
|
|
|
|
|
|
clear_allmulti:
|
|
|
|
if (dev->flags & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, -1);
|
|
|
|
del_unicast:
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:47 +04:00
|
|
|
if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2008-07-15 07:59:03 +04:00
|
|
|
out:
|
2009-04-26 05:03:35 +04:00
|
|
|
netif_carrier_off(dev);
|
2008-07-15 07:59:03 +04:00
|
|
|
return err;
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_stop(struct net_device *dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2008-07-06 08:26:57 +04:00
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
|
|
|
|
2007-07-15 05:53:28 +04:00
|
|
|
dev_mc_unsync(real_dev, dev);
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_unsync(real_dev, dev);
|
2007-07-15 05:52:56 +04:00
|
|
|
if (dev->flags & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, -1);
|
|
|
|
if (dev->flags & IFF_PROMISC)
|
|
|
|
dev_set_promiscuity(real_dev, -1);
|
|
|
|
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:47 +04:00
|
|
|
if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2007-07-12 06:45:24 +04:00
|
|
|
|
2009-04-26 05:03:35 +04:00
|
|
|
netif_carrier_off(dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_set_mac_address(struct net_device *dev, void *p)
|
2007-11-11 08:52:35 +03:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2007-11-11 08:52:35 +03:00
|
|
|
struct sockaddr *addr = p;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!is_valid_ether_addr(addr->sa_data))
|
|
|
|
return -EADDRNOTAVAIL;
|
|
|
|
|
|
|
|
if (!(dev->flags & IFF_UP))
|
|
|
|
goto out;
|
|
|
|
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:47 +04:00
|
|
|
if (!ether_addr_equal(addr->sa_data, real_dev->dev_addr)) {
|
2010-04-02 01:22:09 +04:00
|
|
|
err = dev_uc_add(real_dev, addr->sa_data);
|
2007-11-11 08:52:35 +03:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 22:56:47 +04:00
|
|
|
if (!ether_addr_equal(dev->dev_addr, real_dev->dev_addr))
|
2010-04-02 01:22:09 +04:00
|
|
|
dev_uc_del(real_dev, dev->dev_addr);
|
2007-11-11 08:52:35 +03:00
|
|
|
|
|
|
|
out:
|
2014-01-20 21:52:14 +04:00
|
|
|
ether_addr_copy(dev->dev_addr, addr->sa_data);
|
2007-11-11 08:52:35 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2008-11-20 08:53:47 +03:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
2005-04-17 02:20:36 +04:00
|
|
|
struct ifreq ifrr;
|
|
|
|
int err = -EOPNOTSUPP;
|
|
|
|
|
|
|
|
strncpy(ifrr.ifr_name, real_dev->name, IFNAMSIZ);
|
|
|
|
ifrr.ifr_ifru = ifr->ifr_ifru;
|
|
|
|
|
2008-01-21 11:26:41 +03:00
|
|
|
switch (cmd) {
|
2005-04-17 02:20:36 +04:00
|
|
|
case SIOCGMIIPHY:
|
|
|
|
case SIOCGMIIREG:
|
|
|
|
case SIOCSMIIREG:
|
2008-11-20 08:53:47 +03:00
|
|
|
if (netif_device_present(real_dev) && ops->ndo_do_ioctl)
|
|
|
|
err = ops->ndo_do_ioctl(real_dev, &ifrr, cmd);
|
2005-04-17 02:20:36 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-02-09 17:24:25 +03:00
|
|
|
if (!err)
|
2005-04-17 02:20:36 +04:00
|
|
|
ifr->ifr_ifru = ifrr.ifr_ifru;
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2009-01-08 21:50:20 +03:00
|
|
|
static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-01-08 21:50:20 +03:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int err = 0;
|
|
|
|
|
|
|
|
if (netif_device_present(real_dev) && ops->ndo_neigh_setup)
|
2009-03-05 10:46:25 +03:00
|
|
|
err = ops->ndo_neigh_setup(real_dev, pa);
|
2009-01-08 21:50:20 +03:00
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-10-29 21:22:28 +04:00
|
|
|
#if IS_ENABLED(CONFIG_FCOE)
|
2009-08-14 16:41:07 +04:00
|
|
|
static int vlan_dev_fcoe_ddp_setup(struct net_device *dev, u16 xid,
|
|
|
|
struct scatterlist *sgl, unsigned int sgc)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-08-14 16:41:07 +04:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_ddp_setup)
|
|
|
|
rc = ops->ndo_fcoe_ddp_setup(real_dev, xid, sgl, sgc);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vlan_dev_fcoe_ddp_done(struct net_device *dev, u16 xid)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-08-14 16:41:07 +04:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int len = 0;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_ddp_done)
|
|
|
|
len = ops->ndo_fcoe_ddp_done(real_dev, xid);
|
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
2009-08-31 16:31:55 +04:00
|
|
|
|
|
|
|
static int vlan_dev_fcoe_enable(struct net_device *dev)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-08-31 16:31:55 +04:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_enable)
|
|
|
|
rc = ops->ndo_fcoe_enable(real_dev);
|
|
|
|
return rc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int vlan_dev_fcoe_disable(struct net_device *dev)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-08-31 16:31:55 +04:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_disable)
|
|
|
|
rc = ops->ndo_fcoe_disable(real_dev);
|
|
|
|
return rc;
|
|
|
|
}
|
2009-10-28 21:25:16 +03:00
|
|
|
|
|
|
|
static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2009-10-28 21:25:16 +03:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = -EINVAL;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_get_wwn)
|
|
|
|
rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
|
|
|
|
return rc;
|
|
|
|
}
|
2011-02-01 10:22:11 +03:00
|
|
|
|
|
|
|
static int vlan_dev_fcoe_ddp_target(struct net_device *dev, u16 xid,
|
|
|
|
struct scatterlist *sgl, unsigned int sgc)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2011-02-01 10:22:11 +03:00
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
|
|
|
int rc = 0;
|
|
|
|
|
|
|
|
if (ops->ndo_fcoe_ddp_target)
|
|
|
|
rc = ops->ndo_fcoe_ddp_target(real_dev, xid, sgl, sgc);
|
|
|
|
|
|
|
|
return rc;
|
|
|
|
}
|
2009-08-14 16:41:07 +04:00
|
|
|
#endif
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
|
2007-07-15 05:52:56 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2007-07-15 05:52:56 +04:00
|
|
|
|
2011-10-31 08:53:13 +04:00
|
|
|
if (dev->flags & IFF_UP) {
|
|
|
|
if (change & IFF_ALLMULTI)
|
|
|
|
dev_set_allmulti(real_dev, dev->flags & IFF_ALLMULTI ? 1 : -1);
|
|
|
|
if (change & IFF_PROMISC)
|
|
|
|
dev_set_promiscuity(real_dev, dev->flags & IFF_PROMISC ? 1 : -1);
|
|
|
|
}
|
2007-07-15 05:52:56 +04:00
|
|
|
}
|
|
|
|
|
vlan: Fix lockdep warning when vlan dev handle notification
When I open the LOCKDEP config and run these steps:
modprobe 8021q
vconfig add eth2 20
vconfig add eth2.20 30
ifconfig eth2 xx.xx.xx.xx
then the Call Trace happened:
[32524.386288] =============================================
[32524.386293] [ INFO: possible recursive locking detected ]
[32524.386298] 3.14.0-rc2-0.7-default+ #35 Tainted: G O
[32524.386302] ---------------------------------------------
[32524.386306] ifconfig/3103 is trying to acquire lock:
[32524.386310] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386326]
[32524.386326] but task is already holding lock:
[32524.386330] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386341]
[32524.386341] other info that might help us debug this:
[32524.386345] Possible unsafe locking scenario:
[32524.386345]
[32524.386350] CPU0
[32524.386352] ----
[32524.386354] lock(&vlan_netdev_addr_lock_key/1);
[32524.386359] lock(&vlan_netdev_addr_lock_key/1);
[32524.386364]
[32524.386364] *** DEADLOCK ***
[32524.386364]
[32524.386368] May be due to missing lock nesting notation
[32524.386368]
[32524.386373] 2 locks held by ifconfig/3103:
[32524.386376] #0: (rtnl_mutex){+.+.+.}, at: [<ffffffff81431d42>] rtnl_lock+0x12/0x20
[32524.386387] #1: (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386398]
[32524.386398] stack backtrace:
[32524.386403] CPU: 1 PID: 3103 Comm: ifconfig Tainted: G O 3.14.0-rc2-0.7-default+ #35
[32524.386409] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007
[32524.386414] ffffffff81ffae40 ffff8800d9625ae8 ffffffff814f68a2 ffff8800d9625bc8
[32524.386421] ffffffff810a35fb ffff8800d8a8d9d0 00000000d9625b28 ffff8800d8a8e5d0
[32524.386428] 000003cc00000000 0000000000000002 ffff8800d8a8e5f8 0000000000000000
[32524.386435] Call Trace:
[32524.386441] [<ffffffff814f68a2>] dump_stack+0x6a/0x78
[32524.386448] [<ffffffff810a35fb>] __lock_acquire+0x7ab/0x1940
[32524.386454] [<ffffffff810a323a>] ? __lock_acquire+0x3ea/0x1940
[32524.386459] [<ffffffff810a4874>] lock_acquire+0xe4/0x110
[32524.386464] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386471] [<ffffffff814fc07a>] _raw_spin_lock_nested+0x2a/0x40
[32524.386476] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386481] [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386489] [<ffffffffa0500cab>] vlan_dev_set_rx_mode+0x2b/0x50 [8021q]
[32524.386495] [<ffffffff8141addf>] __dev_set_rx_mode+0x5f/0xb0
[32524.386500] [<ffffffff8141af8b>] dev_set_rx_mode+0x2b/0x40
[32524.386506] [<ffffffff8141b3cf>] __dev_open+0xef/0x150
[32524.386511] [<ffffffff8141b177>] __dev_change_flags+0xa7/0x190
[32524.386516] [<ffffffff8141b292>] dev_change_flags+0x32/0x80
[32524.386524] [<ffffffff8149ca56>] devinet_ioctl+0x7d6/0x830
[32524.386532] [<ffffffff81437b0b>] ? dev_ioctl+0x34b/0x660
[32524.386540] [<ffffffff814a05b0>] inet_ioctl+0x80/0xa0
[32524.386550] [<ffffffff8140199d>] sock_do_ioctl+0x2d/0x60
[32524.386558] [<ffffffff81401a52>] sock_ioctl+0x82/0x2a0
[32524.386568] [<ffffffff811a7123>] do_vfs_ioctl+0x93/0x590
[32524.386578] [<ffffffff811b2705>] ? rcu_read_lock_held+0x45/0x50
[32524.386586] [<ffffffff811b39e5>] ? __fget_light+0x105/0x110
[32524.386594] [<ffffffff811a76b1>] SyS_ioctl+0x91/0xb0
[32524.386604] [<ffffffff815057e2>] system_call_fastpath+0x16/0x1b
========================================================================
The reason is that all of the addr_lock_key for vlan dev have the same class,
so if we change the status for vlan dev, the vlan dev and its real dev will
hold the same class of addr_lock_key together, so the warning happened.
we should distinguish the lock depth for vlan dev and its real dev.
v1->v2: Convert the vlan_netdev_addr_lock_key to an array of eight elements, which
could support to add 8 vlan id on a same vlan dev, I think it is enough for current
scene, because a netdev's name is limited to IFNAMSIZ which could not hold 8 vlan id,
and the vlan dev would not meet the same class key with its real dev.
The new function vlan_dev_get_lockdep_subkey() will return the subkey and make the vlan
dev could get a suitable class key.
v2->v3: According David's suggestion, I use the subclass to distinguish the lock key for vlan dev
and its real dev, but it make no sense, because the difference for subclass in the
lock_class_key doesn't mean that the difference class for lock_key, so I use lock_depth
to distinguish the different depth for every vlan dev, the same depth of the vlan dev
could have the same lock_class_key, I import the MAX_LOCK_DEPTH from the include/linux/sched.h,
I think it is enough here, the lockdep should never exceed that value.
v3->v4: Add a huge array of locking keys will waste static kernel memory and is not a appropriate method,
we could use _nested() variants to fix the problem, calculate the depth for every vlan dev,
and use the depth as the subclass for addr_lock_key.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-17 14:40:36 +04:00
|
|
|
static int vlan_calculate_locking_subclass(struct net_device *real_dev)
|
|
|
|
{
|
|
|
|
int subclass = 0;
|
|
|
|
|
|
|
|
while (is_vlan_dev(real_dev)) {
|
|
|
|
subclass++;
|
|
|
|
real_dev = vlan_dev_priv(real_dev)->real_dev;
|
|
|
|
}
|
|
|
|
|
|
|
|
return subclass;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_dev_mc_sync(struct net_device *to, struct net_device *from)
|
|
|
|
{
|
|
|
|
int err = 0, subclass;
|
|
|
|
|
|
|
|
subclass = vlan_calculate_locking_subclass(to);
|
|
|
|
|
|
|
|
spin_lock_nested(&to->addr_list_lock, subclass);
|
|
|
|
err = __hw_addr_sync(&to->mc, &from->mc, to->addr_len);
|
|
|
|
if (!err)
|
|
|
|
__dev_set_rx_mode(to);
|
|
|
|
spin_unlock(&to->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_dev_uc_sync(struct net_device *to, struct net_device *from)
|
|
|
|
{
|
|
|
|
int err = 0, subclass;
|
|
|
|
|
|
|
|
subclass = vlan_calculate_locking_subclass(to);
|
|
|
|
|
|
|
|
spin_lock_nested(&to->addr_list_lock, subclass);
|
|
|
|
err = __hw_addr_sync(&to->uc, &from->uc, to->addr_len);
|
|
|
|
if (!err)
|
|
|
|
__dev_set_rx_mode(to);
|
|
|
|
spin_unlock(&to->addr_list_lock);
|
|
|
|
}
|
|
|
|
|
2008-02-01 03:53:23 +03:00
|
|
|
static void vlan_dev_set_rx_mode(struct net_device *vlan_dev)
|
2005-04-17 02:20:36 +04:00
|
|
|
{
|
vlan: Fix lockdep warning when vlan dev handle notification
When I open the LOCKDEP config and run these steps:
modprobe 8021q
vconfig add eth2 20
vconfig add eth2.20 30
ifconfig eth2 xx.xx.xx.xx
then the Call Trace happened:
[32524.386288] =============================================
[32524.386293] [ INFO: possible recursive locking detected ]
[32524.386298] 3.14.0-rc2-0.7-default+ #35 Tainted: G O
[32524.386302] ---------------------------------------------
[32524.386306] ifconfig/3103 is trying to acquire lock:
[32524.386310] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386326]
[32524.386326] but task is already holding lock:
[32524.386330] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386341]
[32524.386341] other info that might help us debug this:
[32524.386345] Possible unsafe locking scenario:
[32524.386345]
[32524.386350] CPU0
[32524.386352] ----
[32524.386354] lock(&vlan_netdev_addr_lock_key/1);
[32524.386359] lock(&vlan_netdev_addr_lock_key/1);
[32524.386364]
[32524.386364] *** DEADLOCK ***
[32524.386364]
[32524.386368] May be due to missing lock nesting notation
[32524.386368]
[32524.386373] 2 locks held by ifconfig/3103:
[32524.386376] #0: (rtnl_mutex){+.+.+.}, at: [<ffffffff81431d42>] rtnl_lock+0x12/0x20
[32524.386387] #1: (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386398]
[32524.386398] stack backtrace:
[32524.386403] CPU: 1 PID: 3103 Comm: ifconfig Tainted: G O 3.14.0-rc2-0.7-default+ #35
[32524.386409] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007
[32524.386414] ffffffff81ffae40 ffff8800d9625ae8 ffffffff814f68a2 ffff8800d9625bc8
[32524.386421] ffffffff810a35fb ffff8800d8a8d9d0 00000000d9625b28 ffff8800d8a8e5d0
[32524.386428] 000003cc00000000 0000000000000002 ffff8800d8a8e5f8 0000000000000000
[32524.386435] Call Trace:
[32524.386441] [<ffffffff814f68a2>] dump_stack+0x6a/0x78
[32524.386448] [<ffffffff810a35fb>] __lock_acquire+0x7ab/0x1940
[32524.386454] [<ffffffff810a323a>] ? __lock_acquire+0x3ea/0x1940
[32524.386459] [<ffffffff810a4874>] lock_acquire+0xe4/0x110
[32524.386464] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386471] [<ffffffff814fc07a>] _raw_spin_lock_nested+0x2a/0x40
[32524.386476] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386481] [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386489] [<ffffffffa0500cab>] vlan_dev_set_rx_mode+0x2b/0x50 [8021q]
[32524.386495] [<ffffffff8141addf>] __dev_set_rx_mode+0x5f/0xb0
[32524.386500] [<ffffffff8141af8b>] dev_set_rx_mode+0x2b/0x40
[32524.386506] [<ffffffff8141b3cf>] __dev_open+0xef/0x150
[32524.386511] [<ffffffff8141b177>] __dev_change_flags+0xa7/0x190
[32524.386516] [<ffffffff8141b292>] dev_change_flags+0x32/0x80
[32524.386524] [<ffffffff8149ca56>] devinet_ioctl+0x7d6/0x830
[32524.386532] [<ffffffff81437b0b>] ? dev_ioctl+0x34b/0x660
[32524.386540] [<ffffffff814a05b0>] inet_ioctl+0x80/0xa0
[32524.386550] [<ffffffff8140199d>] sock_do_ioctl+0x2d/0x60
[32524.386558] [<ffffffff81401a52>] sock_ioctl+0x82/0x2a0
[32524.386568] [<ffffffff811a7123>] do_vfs_ioctl+0x93/0x590
[32524.386578] [<ffffffff811b2705>] ? rcu_read_lock_held+0x45/0x50
[32524.386586] [<ffffffff811b39e5>] ? __fget_light+0x105/0x110
[32524.386594] [<ffffffff811a76b1>] SyS_ioctl+0x91/0xb0
[32524.386604] [<ffffffff815057e2>] system_call_fastpath+0x16/0x1b
========================================================================
The reason is that all of the addr_lock_key for vlan dev have the same class,
so if we change the status for vlan dev, the vlan dev and its real dev will
hold the same class of addr_lock_key together, so the warning happened.
we should distinguish the lock depth for vlan dev and its real dev.
v1->v2: Convert the vlan_netdev_addr_lock_key to an array of eight elements, which
could support to add 8 vlan id on a same vlan dev, I think it is enough for current
scene, because a netdev's name is limited to IFNAMSIZ which could not hold 8 vlan id,
and the vlan dev would not meet the same class key with its real dev.
The new function vlan_dev_get_lockdep_subkey() will return the subkey and make the vlan
dev could get a suitable class key.
v2->v3: According David's suggestion, I use the subclass to distinguish the lock key for vlan dev
and its real dev, but it make no sense, because the difference for subclass in the
lock_class_key doesn't mean that the difference class for lock_key, so I use lock_depth
to distinguish the different depth for every vlan dev, the same depth of the vlan dev
could have the same lock_class_key, I import the MAX_LOCK_DEPTH from the include/linux/sched.h,
I think it is enough here, the lockdep should never exceed that value.
v3->v4: Add a huge array of locking keys will waste static kernel memory and is not a appropriate method,
we could use _nested() variants to fix the problem, calculate the depth for every vlan dev,
and use the depth as the subclass for addr_lock_key.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-17 14:40:36 +04:00
|
|
|
vlan_dev_mc_sync(vlan_dev_priv(vlan_dev)->real_dev, vlan_dev);
|
|
|
|
vlan_dev_uc_sync(vlan_dev_priv(vlan_dev)->real_dev, vlan_dev);
|
2005-04-17 02:20:36 +04:00
|
|
|
}
|
2008-01-21 11:22:11 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* vlan network devices have devices nesting below it, and are a special
|
|
|
|
* "super class" of normal network devices; split their locks off into a
|
|
|
|
* separate class since they always nest.
|
|
|
|
*/
|
|
|
|
static struct lock_class_key vlan_netdev_xmit_lock_key;
|
2008-07-23 01:16:42 +04:00
|
|
|
static struct lock_class_key vlan_netdev_addr_lock_key;
|
2008-01-21 11:22:11 +03:00
|
|
|
|
2008-07-17 11:34:19 +04:00
|
|
|
static void vlan_dev_set_lockdep_one(struct net_device *dev,
|
|
|
|
struct netdev_queue *txq,
|
|
|
|
void *_subclass)
|
2008-07-09 10:13:53 +04:00
|
|
|
{
|
|
|
|
lockdep_set_class_and_subclass(&txq->_xmit_lock,
|
2008-07-17 11:34:19 +04:00
|
|
|
&vlan_netdev_xmit_lock_key,
|
|
|
|
*(int *)_subclass);
|
2008-07-09 10:13:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_dev_set_lockdep_class(struct net_device *dev, int subclass)
|
|
|
|
{
|
2008-07-23 01:16:42 +04:00
|
|
|
lockdep_set_class_and_subclass(&dev->addr_list_lock,
|
|
|
|
&vlan_netdev_addr_lock_key,
|
|
|
|
subclass);
|
2008-07-17 11:34:19 +04:00
|
|
|
netdev_for_each_tx_queue(dev, vlan_dev_set_lockdep_one, &subclass);
|
2008-07-09 10:13:53 +04:00
|
|
|
}
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static const struct header_ops vlan_header_ops = {
|
|
|
|
.create = vlan_dev_hard_header,
|
|
|
|
.rebuild = vlan_dev_rebuild_header,
|
|
|
|
.parse = eth_header_parse,
|
|
|
|
};
|
|
|
|
|
2014-01-01 01:23:35 +04:00
|
|
|
static int vlan_passthru_hard_header(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
unsigned short type,
|
|
|
|
const void *daddr, const void *saddr,
|
|
|
|
unsigned int len)
|
|
|
|
{
|
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
|
|
|
|
2014-03-10 19:17:15 +04:00
|
|
|
if (saddr == NULL)
|
|
|
|
saddr = dev->dev_addr;
|
|
|
|
|
2014-01-01 01:23:35 +04:00
|
|
|
return dev_hard_header(skb, real_dev, type, daddr, saddr, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct header_ops vlan_passthru_header_ops = {
|
|
|
|
.create = vlan_passthru_hard_header,
|
|
|
|
.rebuild = dev_rebuild_header,
|
|
|
|
.parse = eth_header_parse,
|
|
|
|
};
|
|
|
|
|
2012-10-21 23:53:57 +04:00
|
|
|
static struct device_type vlan_type = {
|
|
|
|
.name = "vlan",
|
|
|
|
};
|
|
|
|
|
2010-11-11 12:42:45 +03:00
|
|
|
static const struct net_device_ops vlan_netdev_ops;
|
2008-12-26 03:45:19 +03:00
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
static int vlan_dev_init(struct net_device *dev)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2014-02-13 23:46:28 +04:00
|
|
|
int subclass = 0;
|
2008-01-21 11:22:11 +03:00
|
|
|
|
2009-04-26 05:03:35 +04:00
|
|
|
netif_carrier_off(dev);
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
/* IFF_BROADCAST|IFF_MULTICAST; ??? */
|
2010-05-13 01:31:06 +04:00
|
|
|
dev->flags = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |
|
|
|
|
IFF_MASTER | IFF_SLAVE);
|
2008-01-21 11:22:11 +03:00
|
|
|
dev->iflink = real_dev->ifindex;
|
|
|
|
dev->state = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
|
|
|
|
(1<<__LINK_STATE_DORMANT))) |
|
|
|
|
(1<<__LINK_STATE_PRESENT);
|
|
|
|
|
2011-07-13 18:10:29 +04:00
|
|
|
dev->hw_features = NETIF_F_ALL_CSUM | NETIF_F_SG |
|
|
|
|
NETIF_F_FRAGLIST | NETIF_F_ALL_TSO |
|
|
|
|
NETIF_F_HIGHDMA | NETIF_F_SCTP_CSUM |
|
|
|
|
NETIF_F_ALL_FCOE;
|
|
|
|
|
2011-04-03 09:49:12 +04:00
|
|
|
dev->features |= real_dev->vlan_features | NETIF_F_LLTX;
|
2008-09-12 07:17:05 +04:00
|
|
|
dev->gso_max_size = real_dev->gso_max_size;
|
2014-03-28 06:14:49 +04:00
|
|
|
if (dev->features & NETIF_F_VLAN_FEATURES)
|
|
|
|
netdev_warn(real_dev, "VLAN features are set incorrectly. Q-in-Q configurations may not work correctly.\n");
|
|
|
|
|
2008-05-21 01:54:50 +04:00
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
/* ipv6 shared card related stuff */
|
|
|
|
dev->dev_id = real_dev->dev_id;
|
|
|
|
|
|
|
|
if (is_zero_ether_addr(dev->dev_addr))
|
2013-08-30 20:08:45 +04:00
|
|
|
eth_hw_addr_inherit(dev, real_dev);
|
2008-01-21 11:22:11 +03:00
|
|
|
if (is_zero_ether_addr(dev->broadcast))
|
|
|
|
memcpy(dev->broadcast, real_dev->broadcast, dev->addr_len);
|
|
|
|
|
2012-10-29 21:22:28 +04:00
|
|
|
#if IS_ENABLED(CONFIG_FCOE)
|
2009-08-14 16:41:07 +04:00
|
|
|
dev->fcoe_ddp_xid = real_dev->fcoe_ddp_xid;
|
|
|
|
#endif
|
|
|
|
|
2011-03-18 03:27:27 +03:00
|
|
|
dev->needed_headroom = real_dev->needed_headroom;
|
2014-03-26 19:47:56 +04:00
|
|
|
if (vlan_hw_offload_capable(real_dev->features,
|
|
|
|
vlan_dev_priv(dev)->vlan_proto)) {
|
2014-01-01 01:23:35 +04:00
|
|
|
dev->header_ops = &vlan_passthru_header_ops;
|
2008-01-21 11:22:11 +03:00
|
|
|
dev->hard_header_len = real_dev->hard_header_len;
|
|
|
|
} else {
|
|
|
|
dev->header_ops = &vlan_header_ops;
|
|
|
|
dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
|
|
|
|
}
|
|
|
|
|
2010-11-11 12:42:45 +03:00
|
|
|
dev->netdev_ops = &vlan_netdev_ops;
|
2010-10-30 18:22:42 +04:00
|
|
|
|
2012-10-21 23:53:57 +04:00
|
|
|
SET_NETDEV_DEVTYPE(dev, &vlan_type);
|
|
|
|
|
vlan: Fix lockdep warning when vlan dev handle notification
When I open the LOCKDEP config and run these steps:
modprobe 8021q
vconfig add eth2 20
vconfig add eth2.20 30
ifconfig eth2 xx.xx.xx.xx
then the Call Trace happened:
[32524.386288] =============================================
[32524.386293] [ INFO: possible recursive locking detected ]
[32524.386298] 3.14.0-rc2-0.7-default+ #35 Tainted: G O
[32524.386302] ---------------------------------------------
[32524.386306] ifconfig/3103 is trying to acquire lock:
[32524.386310] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386326]
[32524.386326] but task is already holding lock:
[32524.386330] (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386341]
[32524.386341] other info that might help us debug this:
[32524.386345] Possible unsafe locking scenario:
[32524.386345]
[32524.386350] CPU0
[32524.386352] ----
[32524.386354] lock(&vlan_netdev_addr_lock_key/1);
[32524.386359] lock(&vlan_netdev_addr_lock_key/1);
[32524.386364]
[32524.386364] *** DEADLOCK ***
[32524.386364]
[32524.386368] May be due to missing lock nesting notation
[32524.386368]
[32524.386373] 2 locks held by ifconfig/3103:
[32524.386376] #0: (rtnl_mutex){+.+.+.}, at: [<ffffffff81431d42>] rtnl_lock+0x12/0x20
[32524.386387] #1: (&vlan_netdev_addr_lock_key/1){+.....}, at: [<ffffffff8141af83>] dev_set_rx_mode+0x23/0x40
[32524.386398]
[32524.386398] stack backtrace:
[32524.386403] CPU: 1 PID: 3103 Comm: ifconfig Tainted: G O 3.14.0-rc2-0.7-default+ #35
[32524.386409] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2007
[32524.386414] ffffffff81ffae40 ffff8800d9625ae8 ffffffff814f68a2 ffff8800d9625bc8
[32524.386421] ffffffff810a35fb ffff8800d8a8d9d0 00000000d9625b28 ffff8800d8a8e5d0
[32524.386428] 000003cc00000000 0000000000000002 ffff8800d8a8e5f8 0000000000000000
[32524.386435] Call Trace:
[32524.386441] [<ffffffff814f68a2>] dump_stack+0x6a/0x78
[32524.386448] [<ffffffff810a35fb>] __lock_acquire+0x7ab/0x1940
[32524.386454] [<ffffffff810a323a>] ? __lock_acquire+0x3ea/0x1940
[32524.386459] [<ffffffff810a4874>] lock_acquire+0xe4/0x110
[32524.386464] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386471] [<ffffffff814fc07a>] _raw_spin_lock_nested+0x2a/0x40
[32524.386476] [<ffffffff814275f4>] ? dev_mc_sync+0x64/0xb0
[32524.386481] [<ffffffff814275f4>] dev_mc_sync+0x64/0xb0
[32524.386489] [<ffffffffa0500cab>] vlan_dev_set_rx_mode+0x2b/0x50 [8021q]
[32524.386495] [<ffffffff8141addf>] __dev_set_rx_mode+0x5f/0xb0
[32524.386500] [<ffffffff8141af8b>] dev_set_rx_mode+0x2b/0x40
[32524.386506] [<ffffffff8141b3cf>] __dev_open+0xef/0x150
[32524.386511] [<ffffffff8141b177>] __dev_change_flags+0xa7/0x190
[32524.386516] [<ffffffff8141b292>] dev_change_flags+0x32/0x80
[32524.386524] [<ffffffff8149ca56>] devinet_ioctl+0x7d6/0x830
[32524.386532] [<ffffffff81437b0b>] ? dev_ioctl+0x34b/0x660
[32524.386540] [<ffffffff814a05b0>] inet_ioctl+0x80/0xa0
[32524.386550] [<ffffffff8140199d>] sock_do_ioctl+0x2d/0x60
[32524.386558] [<ffffffff81401a52>] sock_ioctl+0x82/0x2a0
[32524.386568] [<ffffffff811a7123>] do_vfs_ioctl+0x93/0x590
[32524.386578] [<ffffffff811b2705>] ? rcu_read_lock_held+0x45/0x50
[32524.386586] [<ffffffff811b39e5>] ? __fget_light+0x105/0x110
[32524.386594] [<ffffffff811a76b1>] SyS_ioctl+0x91/0xb0
[32524.386604] [<ffffffff815057e2>] system_call_fastpath+0x16/0x1b
========================================================================
The reason is that all of the addr_lock_key for vlan dev have the same class,
so if we change the status for vlan dev, the vlan dev and its real dev will
hold the same class of addr_lock_key together, so the warning happened.
we should distinguish the lock depth for vlan dev and its real dev.
v1->v2: Convert the vlan_netdev_addr_lock_key to an array of eight elements, which
could support to add 8 vlan id on a same vlan dev, I think it is enough for current
scene, because a netdev's name is limited to IFNAMSIZ which could not hold 8 vlan id,
and the vlan dev would not meet the same class key with its real dev.
The new function vlan_dev_get_lockdep_subkey() will return the subkey and make the vlan
dev could get a suitable class key.
v2->v3: According David's suggestion, I use the subclass to distinguish the lock key for vlan dev
and its real dev, but it make no sense, because the difference for subclass in the
lock_class_key doesn't mean that the difference class for lock_key, so I use lock_depth
to distinguish the different depth for every vlan dev, the same depth of the vlan dev
could have the same lock_class_key, I import the MAX_LOCK_DEPTH from the include/linux/sched.h,
I think it is enough here, the lockdep should never exceed that value.
v3->v4: Add a huge array of locking keys will waste static kernel memory and is not a appropriate method,
we could use _nested() variants to fix the problem, calculate the depth for every vlan dev,
and use the depth as the subclass for addr_lock_key.
Signed-off-by: Ding Tianhong <dingtianhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2014-04-17 14:40:36 +04:00
|
|
|
subclass = vlan_calculate_locking_subclass(dev);
|
2008-07-09 10:13:53 +04:00
|
|
|
vlan_dev_set_lockdep_class(dev, subclass);
|
2009-11-17 07:53:09 +03:00
|
|
|
|
2014-02-13 23:46:28 +04:00
|
|
|
vlan_dev_priv(dev)->vlan_pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);
|
2011-12-08 08:11:15 +04:00
|
|
|
if (!vlan_dev_priv(dev)->vlan_pcpu_stats)
|
2009-11-17 07:53:09 +03:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-04-04 23:45:12 +04:00
|
|
|
static void vlan_dev_uninit(struct net_device *dev)
|
|
|
|
{
|
|
|
|
struct vlan_priority_tci_mapping *pm;
|
2011-12-08 08:11:15 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2008-04-04 23:45:12 +04:00
|
|
|
int i;
|
|
|
|
|
2010-11-11 02:42:00 +03:00
|
|
|
free_percpu(vlan->vlan_pcpu_stats);
|
|
|
|
vlan->vlan_pcpu_stats = NULL;
|
2008-04-04 23:45:12 +04:00
|
|
|
for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
|
|
|
|
while ((pm = vlan->egress_priority_map[i]) != NULL) {
|
|
|
|
vlan->egress_priority_map[i] = pm->next;
|
|
|
|
kfree(pm);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-11-15 19:29:55 +04:00
|
|
|
static netdev_features_t vlan_dev_fix_features(struct net_device *dev,
|
|
|
|
netdev_features_t features)
|
2011-04-03 09:49:12 +04:00
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
struct net_device *real_dev = vlan_dev_priv(dev)->real_dev;
|
2013-05-02 03:06:42 +04:00
|
|
|
netdev_features_t old_features = features;
|
2011-04-03 09:49:12 +04:00
|
|
|
|
2011-05-06 11:56:29 +04:00
|
|
|
features &= real_dev->vlan_features;
|
2011-11-15 19:29:55 +04:00
|
|
|
features |= NETIF_F_RXCSUM;
|
|
|
|
features &= real_dev->features;
|
2011-07-06 07:43:12 +04:00
|
|
|
|
2011-07-15 01:39:29 +04:00
|
|
|
features |= old_features & NETIF_F_SOFT_FEATURES;
|
2011-05-06 11:56:29 +04:00
|
|
|
features |= NETIF_F_LLTX;
|
2011-04-03 09:49:12 +04:00
|
|
|
|
|
|
|
return features;
|
|
|
|
}
|
|
|
|
|
2008-10-29 08:12:36 +03:00
|
|
|
static int vlan_ethtool_get_settings(struct net_device *dev,
|
|
|
|
struct ethtool_cmd *cmd)
|
|
|
|
{
|
2011-12-08 08:11:15 +04:00
|
|
|
const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2011-09-03 07:34:30 +04:00
|
|
|
|
|
|
|
return __ethtool_get_settings(vlan->real_dev, cmd);
|
2008-10-29 08:12:36 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void vlan_ethtool_get_drvinfo(struct net_device *dev,
|
|
|
|
struct ethtool_drvinfo *info)
|
|
|
|
{
|
2013-01-06 04:44:26 +04:00
|
|
|
strlcpy(info->driver, vlan_fullname, sizeof(info->driver));
|
|
|
|
strlcpy(info->version, vlan_version, sizeof(info->version));
|
|
|
|
strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
|
2008-10-29 08:12:36 +03:00
|
|
|
}
|
|
|
|
|
2010-07-08 01:58:56 +04:00
|
|
|
static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
|
2009-11-17 07:53:09 +03:00
|
|
|
{
|
2014-04-21 15:49:08 +04:00
|
|
|
struct vlan_pcpu_stats *p;
|
|
|
|
u32 rx_errors = 0, tx_dropped = 0;
|
|
|
|
int i;
|
2009-11-17 07:53:09 +03:00
|
|
|
|
2014-04-21 15:49:08 +04:00
|
|
|
for_each_possible_cpu(i) {
|
|
|
|
u64 rxpackets, rxbytes, rxmulticast, txpackets, txbytes;
|
|
|
|
unsigned int start;
|
|
|
|
|
|
|
|
p = per_cpu_ptr(vlan_dev_priv(dev)->vlan_pcpu_stats, i);
|
|
|
|
do {
|
|
|
|
start = u64_stats_fetch_begin_irq(&p->syncp);
|
|
|
|
rxpackets = p->rx_packets;
|
|
|
|
rxbytes = p->rx_bytes;
|
|
|
|
rxmulticast = p->rx_multicast;
|
|
|
|
txpackets = p->tx_packets;
|
|
|
|
txbytes = p->tx_bytes;
|
|
|
|
} while (u64_stats_fetch_retry_irq(&p->syncp, start));
|
|
|
|
|
|
|
|
stats->rx_packets += rxpackets;
|
|
|
|
stats->rx_bytes += rxbytes;
|
|
|
|
stats->multicast += rxmulticast;
|
|
|
|
stats->tx_packets += txpackets;
|
|
|
|
stats->tx_bytes += txbytes;
|
|
|
|
/* rx_errors & tx_dropped are u32 */
|
|
|
|
rx_errors += p->rx_errors;
|
|
|
|
tx_dropped += p->tx_dropped;
|
2009-11-17 07:53:09 +03:00
|
|
|
}
|
2014-04-21 15:49:08 +04:00
|
|
|
stats->rx_errors = rx_errors;
|
|
|
|
stats->tx_dropped = tx_dropped;
|
|
|
|
|
2009-11-17 07:53:09 +03:00
|
|
|
return stats;
|
|
|
|
}
|
|
|
|
|
2011-12-08 10:20:49 +04:00
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
2011-12-14 00:57:54 +04:00
|
|
|
static void vlan_dev_poll_controller(struct net_device *dev)
|
2011-12-08 10:20:49 +04:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-03-28 02:36:38 +04:00
|
|
|
static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
|
2011-12-08 10:20:49 +04:00
|
|
|
{
|
2012-08-10 05:24:47 +04:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
2011-12-08 10:20:49 +04:00
|
|
|
struct netpoll *netpoll;
|
|
|
|
int err = 0;
|
|
|
|
|
2014-03-28 02:36:38 +04:00
|
|
|
netpoll = kzalloc(sizeof(*netpoll), GFP_KERNEL);
|
2011-12-08 10:20:49 +04:00
|
|
|
err = -ENOMEM;
|
|
|
|
if (!netpoll)
|
|
|
|
goto out;
|
|
|
|
|
2014-03-28 02:36:38 +04:00
|
|
|
err = __netpoll_setup(netpoll, real_dev);
|
2011-12-08 10:20:49 +04:00
|
|
|
if (err) {
|
|
|
|
kfree(netpoll);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-08-10 05:24:47 +04:00
|
|
|
vlan->netpoll = netpoll;
|
2011-12-08 10:20:49 +04:00
|
|
|
|
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2011-12-14 00:57:54 +04:00
|
|
|
static void vlan_dev_netpoll_cleanup(struct net_device *dev)
|
2011-12-08 10:20:49 +04:00
|
|
|
{
|
2012-08-10 05:24:47 +04:00
|
|
|
struct vlan_dev_priv *vlan= vlan_dev_priv(dev);
|
|
|
|
struct netpoll *netpoll = vlan->netpoll;
|
2011-12-08 10:20:49 +04:00
|
|
|
|
|
|
|
if (!netpoll)
|
|
|
|
return;
|
|
|
|
|
2012-08-10 05:24:47 +04:00
|
|
|
vlan->netpoll = NULL;
|
2011-12-08 10:20:49 +04:00
|
|
|
|
2013-02-11 14:25:30 +04:00
|
|
|
__netpoll_free_async(netpoll);
|
2011-12-08 10:20:49 +04:00
|
|
|
}
|
|
|
|
#endif /* CONFIG_NET_POLL_CONTROLLER */
|
|
|
|
|
2008-07-08 14:22:42 +04:00
|
|
|
static const struct ethtool_ops vlan_ethtool_ops = {
|
2008-10-29 08:12:36 +03:00
|
|
|
.get_settings = vlan_ethtool_get_settings,
|
|
|
|
.get_drvinfo = vlan_ethtool_get_drvinfo,
|
2008-07-08 14:22:42 +04:00
|
|
|
.get_link = ethtool_op_get_link,
|
|
|
|
};
|
|
|
|
|
2008-11-20 08:53:47 +03:00
|
|
|
static const struct net_device_ops vlan_netdev_ops = {
|
|
|
|
.ndo_change_mtu = vlan_dev_change_mtu,
|
|
|
|
.ndo_init = vlan_dev_init,
|
|
|
|
.ndo_uninit = vlan_dev_uninit,
|
|
|
|
.ndo_open = vlan_dev_open,
|
|
|
|
.ndo_stop = vlan_dev_stop,
|
2010-03-23 17:41:45 +03:00
|
|
|
.ndo_start_xmit = vlan_dev_hard_start_xmit,
|
|
|
|
.ndo_validate_addr = eth_validate_addr,
|
|
|
|
.ndo_set_mac_address = vlan_dev_set_mac_address,
|
|
|
|
.ndo_set_rx_mode = vlan_dev_set_rx_mode,
|
|
|
|
.ndo_change_rx_flags = vlan_dev_change_rx_flags,
|
|
|
|
.ndo_do_ioctl = vlan_dev_ioctl,
|
|
|
|
.ndo_neigh_setup = vlan_dev_neigh_setup,
|
2010-06-24 04:55:06 +04:00
|
|
|
.ndo_get_stats64 = vlan_dev_get_stats64,
|
2012-10-29 21:22:28 +04:00
|
|
|
#if IS_ENABLED(CONFIG_FCOE)
|
2010-03-23 17:41:45 +03:00
|
|
|
.ndo_fcoe_ddp_setup = vlan_dev_fcoe_ddp_setup,
|
|
|
|
.ndo_fcoe_ddp_done = vlan_dev_fcoe_ddp_done,
|
|
|
|
.ndo_fcoe_enable = vlan_dev_fcoe_enable,
|
|
|
|
.ndo_fcoe_disable = vlan_dev_fcoe_disable,
|
|
|
|
.ndo_fcoe_get_wwn = vlan_dev_fcoe_get_wwn,
|
2011-02-01 10:22:11 +03:00
|
|
|
.ndo_fcoe_ddp_target = vlan_dev_fcoe_ddp_target,
|
2011-12-08 10:20:49 +04:00
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
|
|
.ndo_poll_controller = vlan_dev_poll_controller,
|
|
|
|
.ndo_netpoll_setup = vlan_dev_netpoll_setup,
|
|
|
|
.ndo_netpoll_cleanup = vlan_dev_netpoll_cleanup,
|
2010-03-23 17:41:45 +03:00
|
|
|
#endif
|
2011-04-03 09:49:12 +04:00
|
|
|
.ndo_fix_features = vlan_dev_fix_features,
|
2010-03-23 17:41:45 +03:00
|
|
|
};
|
|
|
|
|
2008-01-21 11:22:11 +03:00
|
|
|
void vlan_setup(struct net_device *dev)
|
|
|
|
{
|
|
|
|
ether_setup(dev);
|
|
|
|
|
|
|
|
dev->priv_flags |= IFF_802_1Q_VLAN;
|
2011-07-26 10:05:38 +04:00
|
|
|
dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE | IFF_TX_SKB_SHARING);
|
2008-01-21 11:22:11 +03:00
|
|
|
dev->tx_queue_len = 0;
|
|
|
|
|
2008-11-20 08:53:47 +03:00
|
|
|
dev->netdev_ops = &vlan_netdev_ops;
|
2008-01-21 11:22:11 +03:00
|
|
|
dev->destructor = free_netdev;
|
2008-07-08 14:22:42 +04:00
|
|
|
dev->ethtool_ops = &vlan_ethtool_ops;
|
2008-01-21 11:22:11 +03:00
|
|
|
|
|
|
|
memset(dev->broadcast, 0, ETH_ALEN);
|
|
|
|
}
|