da0732ef2a
[ Upstream commit b454abfab52543c44b581afc807b9f97fc1e7a3a ]
The Felix DSA driver presents unique challenges that make the simplistic
ocelot PTP TX timestamping procedure unreliable: any transmitted packet
may be lost in hardware before it ever leaves our local system.
This may happen because there is congestion on the DSA conduit, the
switch CPU port or even user port (Qdiscs like taprio may delay packets
indefinitely by design).
The technical problem is that the kernel, i.e. ocelot_port_add_txtstamp_skb(),
runs out of timestamp IDs eventually, because it never detects that
packets are lost, and keeps the IDs of the lost packets on hold
indefinitely. The manifestation of the issue once the entire timestamp
ID range becomes busy looks like this in dmesg:
mscc_felix 0000:00:00.5: port 0 delivering skb without TX timestamp
mscc_felix 0000:00:00.5: port 1 delivering skb without TX timestamp
At the surface level, we need a timeout timer so that the kernel knows a
timestamp ID is available again. But there is a deeper problem with the
implementation, which is the monotonically increasing ocelot_port->ts_id.
In the presence of packet loss, it will be impossible to detect that and
reuse one of the holes created in the range of free timestamp IDs.
What we actually need is a bitmap of 63 timestamp IDs tracking which one
is available. That is able to use up holes caused by packet loss, but
also gives us a unique opportunity to not implement an actual timer_list
for the timeout timer (very complicated in terms of locking).
We could only declare a timestamp ID stale on demand (lazily), aka when
there's no other timestamp ID available. There are pros and cons to this
approach: the implementation is much more simple than per-packet timers
would be, but most of the stale packets would be quasi-leaked - not
really leaked, but blocked in driver memory, since this algorithm sees
no reason to free them.
An improved technique would be to check for stale timestamp IDs every
time we allocate a new one. Assuming a constant flux of PTP packets,
this avoids stale packets being blocked in memory, but of course,
packets lost at the end of the flux are still blocked until the flux
resumes (nobody left to kick them out).
Since implementing per-packet timers is way too complicated, this should
be good enough.
Testing procedure:
Persistently block traffic class 5 and try to run PTP on it:
$ tc qdisc replace dev swp3 parent root taprio num_tc 8 \
map 0 1 2 3 4 5 6 7 queues 1@0 1@1 1@2 1@3 1@4 1@5 1@6 1@7 \
base-time 0 sched-entry S 0xdf 100000 flags 0x2
[ 126.948141] mscc_felix 0000:00:00.5: port 3 tc 5 min gate length 0 ns not enough for max frame size 1526 at 1000 Mbps, dropping frames over 1 octets including FCS
$ ptp4l -i swp3 -2 -P -m --socket_priority 5 --fault_reset_interval ASAP --logSyncInterval -3
ptp4l[70.351]: port 1 (swp3): INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[70.354]: port 0 (/var/run/ptp4l): INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[70.358]: port 0 (/var/run/ptp4lro): INITIALIZING to LISTENING on INIT_COMPLETE
[ 70.394583] mscc_felix 0000:00:00.5: port 3 timestamp id 0
ptp4l[70.406]: timed out while polling for tx timestamp
ptp4l[70.406]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[70.406]: port 1 (swp3): send peer delay response failed
ptp4l[70.407]: port 1 (swp3): clearing fault immediately
ptp4l[70.952]: port 1 (swp3): new foreign master d858d7.fffe.00ca6d-1
[ 71.394858] mscc_felix 0000:00:00.5: port 3 timestamp id 1
ptp4l[71.400]: timed out while polling for tx timestamp
ptp4l[71.400]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[71.401]: port 1 (swp3): send peer delay response failed
ptp4l[71.401]: port 1 (swp3): clearing fault immediately
[ 72.393616] mscc_felix 0000:00:00.5: port 3 timestamp id 2
ptp4l[72.401]: timed out while polling for tx timestamp
ptp4l[72.402]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[72.402]: port 1 (swp3): send peer delay response failed
ptp4l[72.402]: port 1 (swp3): clearing fault immediately
ptp4l[72.952]: port 1 (swp3): new foreign master d858d7.fffe.00ca6d-1
[ 73.395291] mscc_felix 0000:00:00.5: port 3 timestamp id 3
ptp4l[73.400]: timed out while polling for tx timestamp
ptp4l[73.400]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[73.400]: port 1 (swp3): send peer delay response failed
ptp4l[73.400]: port 1 (swp3): clearing fault immediately
[ 74.394282] mscc_felix 0000:00:00.5: port 3 timestamp id 4
ptp4l[74.400]: timed out while polling for tx timestamp
ptp4l[74.401]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[74.401]: port 1 (swp3): send peer delay response failed
ptp4l[74.401]: port 1 (swp3): clearing fault immediately
ptp4l[74.953]: port 1 (swp3): new foreign master d858d7.fffe.00ca6d-1
[ 75.396830] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 0 which seems lost
[ 75.405760] mscc_felix 0000:00:00.5: port 3 timestamp id 0
ptp4l[75.410]: timed out while polling for tx timestamp
ptp4l[75.411]: increasing tx_timestamp_timeout or increasing kworker priority may correct this issue, but a driver bug likely causes it
ptp4l[75.411]: port 1 (swp3): send peer delay response failed
ptp4l[75.411]: port 1 (swp3): clearing fault immediately
(...)
Remove the blocking condition and see that the port recovers:
$ same tc command as above, but use "sched-entry S 0xff" instead
$ same ptp4l command as above
ptp4l[99.489]: port 1 (swp3): INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[99.490]: port 0 (/var/run/ptp4l): INITIALIZING to LISTENING on INIT_COMPLETE
ptp4l[99.492]: port 0 (/var/run/ptp4lro): INITIALIZING to LISTENING on INIT_COMPLETE
[ 100.403768] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 0 which seems lost
[ 100.412545] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 1 which seems lost
[ 100.421283] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 2 which seems lost
[ 100.430015] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 3 which seems lost
[ 100.438744] mscc_felix 0000:00:00.5: port 3 invalidating stale timestamp ID 4 which seems lost
[ 100.447470] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 100.505919] mscc_felix 0000:00:00.5: port 3 timestamp id 0
ptp4l[100.963]: port 1 (swp3): new foreign master d858d7.fffe.00ca6d-1
[ 101.405077] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 101.507953] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 102.405405] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 102.509391] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 103.406003] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 103.510011] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 104.405601] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 104.510624] mscc_felix 0000:00:00.5: port 3 timestamp id 0
ptp4l[104.965]: selected best master clock d858d7.fffe.00ca6d
ptp4l[104.966]: port 1 (swp3): assuming the grand master role
ptp4l[104.967]: port 1 (swp3): LISTENING to GRAND_MASTER on RS_GRAND_MASTER
[ 105.106201] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.232420] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.359001] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.405500] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.485356] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.511220] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.610938] mscc_felix 0000:00:00.5: port 3 timestamp id 0
[ 105.737237] mscc_felix 0000:00:00.5: port 3 timestamp id 0
(...)
Notice that in this new usage pattern, a non-congested port should
basically use timestamp ID 0 all the time, progressing to higher numbers
only if there are unacknowledged timestamps in flight. Compare this to
the old usage, where the timestamp ID used to monotonically increase
modulo OCELOT_MAX_PTP_ID.
In terms of implementation, this simplifies the bookkeeping of the
ocelot_port :: ts_id and ptp_skbs_in_flight. Since we need to traverse
the list of two-step timestampable skbs for each new packet anyway, the
information can already be computed and does not need to be stored.
Also, ocelot_port->tx_skbs is always accessed under the switch-wide
ocelot->ts_id_lock IRQ-unsafe spinlock, so we don't need the skb queue's
lock and can use the unlocked primitives safely.
This problem was actually detected using the tc-taprio offload, and is
causing trouble in TSN scenarios, which Felix (NXP LS1028A / VSC9959)
supports but Ocelot (VSC7514) does not. Thus, I've selected the commit
to blame as the one adding initial timestamping support for the Felix
switch.
Fixes: c0bcf53766 ("net: dsa: ocelot: add hardware timestamping support for Felix")
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Link: https://patch.msgid.link/20241205145519.1236778-5-vladimir.oltean@nxp.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
325 lines
13 KiB
C
325 lines
13 KiB
C
/* SPDX-License-Identifier: GPL-2.0
|
|
* Copyright 2019-2021 NXP
|
|
*/
|
|
|
|
#ifndef _NET_DSA_TAG_OCELOT_H
|
|
#define _NET_DSA_TAG_OCELOT_H
|
|
|
|
#include <linux/if_bridge.h>
|
|
#include <linux/if_vlan.h>
|
|
#include <linux/kthread.h>
|
|
#include <linux/packing.h>
|
|
#include <linux/skbuff.h>
|
|
#include <net/dsa.h>
|
|
|
|
struct ocelot_skb_cb {
|
|
struct sk_buff *clone;
|
|
unsigned int ptp_class; /* valid only for clones */
|
|
unsigned long ptp_tx_time; /* valid only for clones */
|
|
u32 tstamp_lo;
|
|
u8 ptp_cmd;
|
|
u8 ts_id;
|
|
};
|
|
|
|
#define OCELOT_SKB_CB(skb) \
|
|
((struct ocelot_skb_cb *)((skb)->cb))
|
|
|
|
#define IFH_TAG_TYPE_C 0
|
|
#define IFH_TAG_TYPE_S 1
|
|
|
|
#define IFH_REW_OP_NOOP 0x0
|
|
#define IFH_REW_OP_DSCP 0x1
|
|
#define IFH_REW_OP_ONE_STEP_PTP 0x2
|
|
#define IFH_REW_OP_TWO_STEP_PTP 0x3
|
|
#define IFH_REW_OP_ORIGIN_PTP 0x5
|
|
|
|
#define OCELOT_TAG_LEN 16
|
|
#define OCELOT_SHORT_PREFIX_LEN 4
|
|
#define OCELOT_LONG_PREFIX_LEN 16
|
|
#define OCELOT_TOTAL_TAG_LEN (OCELOT_SHORT_PREFIX_LEN + OCELOT_TAG_LEN)
|
|
|
|
/* The CPU injection header and the CPU extraction header can have 3 types of
|
|
* prefixes: long, short and no prefix. The format of the header itself is the
|
|
* same in all 3 cases.
|
|
*
|
|
* Extraction with long prefix:
|
|
*
|
|
* +-------------------+-------------------+------+------+------------+-------+
|
|
* | ff:ff:ff:ff:ff:ff | fe:ff:ff:ff:ff:ff | 8880 | 000a | extraction | frame |
|
|
* | | | | | header | |
|
|
* +-------------------+-------------------+------+------+------------+-------+
|
|
* 48 bits 48 bits 16 bits 16 bits 128 bits
|
|
*
|
|
* Extraction with short prefix:
|
|
*
|
|
* +------+------+------------+-------+
|
|
* | 8880 | 000a | extraction | frame |
|
|
* | | | header | |
|
|
* +------+------+------------+-------+
|
|
* 16 bits 16 bits 128 bits
|
|
*
|
|
* Extraction with no prefix:
|
|
*
|
|
* +------------+-------+
|
|
* | extraction | frame |
|
|
* | header | |
|
|
* +------------+-------+
|
|
* 128 bits
|
|
*
|
|
*
|
|
* Injection with long prefix:
|
|
*
|
|
* +-------------------+-------------------+------+------+------------+-------+
|
|
* | any dmac | any smac | 8880 | 000a | injection | frame |
|
|
* | | | | | header | |
|
|
* +-------------------+-------------------+------+------+------------+-------+
|
|
* 48 bits 48 bits 16 bits 16 bits 128 bits
|
|
*
|
|
* Injection with short prefix:
|
|
*
|
|
* +------+------+------------+-------+
|
|
* | 8880 | 000a | injection | frame |
|
|
* | | | header | |
|
|
* +------+------+------------+-------+
|
|
* 16 bits 16 bits 128 bits
|
|
*
|
|
* Injection with no prefix:
|
|
*
|
|
* +------------+-------+
|
|
* | injection | frame |
|
|
* | header | |
|
|
* +------------+-------+
|
|
* 128 bits
|
|
*
|
|
* The injection header looks like this (network byte order, bit 127
|
|
* is part of lowest address byte in memory, bit 0 is part of highest
|
|
* address byte):
|
|
*
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 127:120 |BYPASS| MASQ | MASQ_PORT |REW_OP|REW_OP|
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 119:112 | REW_OP |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 111:104 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 103: 96 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 95: 88 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 87: 80 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 79: 72 | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 71: 64 | RSV | DEST |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 63: 56 | DEST |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 55: 48 | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 47: 40 | RSV | SRC_PORT | RSV |TFRM_TIMER|
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 39: 32 | TFRM_TIMER | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 31: 24 | RSV | DP | POP_CNT | CPUQ |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 23: 16 | CPUQ | QOS_CLASS |TAG_TYPE|
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 15: 8 | PCP | DEI | VID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 7: 0 | VID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
*
|
|
* And the extraction header looks like this:
|
|
*
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 127:120 | RSV | REW_OP |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 119:112 | REW_OP | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 111:104 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 103: 96 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 95: 88 | REW_VAL |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 87: 80 | REW_VAL | LLEN |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 79: 72 | LLEN | WLEN |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 71: 64 | WLEN | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 63: 56 | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 55: 48 | RSV |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 47: 40 | RSV | SRC_PORT | ACL_ID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 39: 32 | ACL_ID | RSV | SFLOW_ID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 31: 24 |ACL_HIT| DP | LRN_FLAGS | CPUQ |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 23: 16 | CPUQ | QOS_CLASS |TAG_TYPE|
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 15: 8 | PCP | DEI | VID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
* 7: 0 | VID |
|
|
* +------+------+------+------+------+------+------+------+
|
|
*/
|
|
|
|
struct felix_deferred_xmit_work {
|
|
struct dsa_port *dp;
|
|
struct sk_buff *skb;
|
|
struct kthread_work work;
|
|
};
|
|
|
|
struct ocelot_8021q_tagger_data {
|
|
void (*xmit_work_fn)(struct kthread_work *work);
|
|
};
|
|
|
|
static inline struct ocelot_8021q_tagger_data *
|
|
ocelot_8021q_tagger_data(struct dsa_switch *ds)
|
|
{
|
|
BUG_ON(ds->dst->tag_ops->proto != DSA_TAG_PROTO_OCELOT_8021Q);
|
|
|
|
return ds->tagger_data;
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_rew_val(void *extraction, u64 *rew_val)
|
|
{
|
|
packing(extraction, rew_val, 116, 85, OCELOT_TAG_LEN, UNPACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_len(void *extraction, u64 *len)
|
|
{
|
|
u64 llen, wlen;
|
|
|
|
packing(extraction, &llen, 84, 79, OCELOT_TAG_LEN, UNPACK, 0);
|
|
packing(extraction, &wlen, 78, 71, OCELOT_TAG_LEN, UNPACK, 0);
|
|
|
|
*len = 60 * wlen + llen - 80;
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_src_port(void *extraction, u64 *src_port)
|
|
{
|
|
packing(extraction, src_port, 46, 43, OCELOT_TAG_LEN, UNPACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_qos_class(void *extraction, u64 *qos_class)
|
|
{
|
|
packing(extraction, qos_class, 19, 17, OCELOT_TAG_LEN, UNPACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_tag_type(void *extraction, u64 *tag_type)
|
|
{
|
|
packing(extraction, tag_type, 16, 16, OCELOT_TAG_LEN, UNPACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_xfh_get_vlan_tci(void *extraction, u64 *vlan_tci)
|
|
{
|
|
packing(extraction, vlan_tci, 15, 0, OCELOT_TAG_LEN, UNPACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_bypass(void *injection, u64 bypass)
|
|
{
|
|
packing(injection, &bypass, 127, 127, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_rew_op(void *injection, u64 rew_op)
|
|
{
|
|
packing(injection, &rew_op, 125, 117, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_dest(void *injection, u64 dest)
|
|
{
|
|
packing(injection, &dest, 67, 56, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_qos_class(void *injection, u64 qos_class)
|
|
{
|
|
packing(injection, &qos_class, 19, 17, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void seville_ifh_set_dest(void *injection, u64 dest)
|
|
{
|
|
packing(injection, &dest, 67, 57, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_src(void *injection, u64 src)
|
|
{
|
|
packing(injection, &src, 46, 43, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_tag_type(void *injection, u64 tag_type)
|
|
{
|
|
packing(injection, &tag_type, 16, 16, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
static inline void ocelot_ifh_set_vlan_tci(void *injection, u64 vlan_tci)
|
|
{
|
|
packing(injection, &vlan_tci, 15, 0, OCELOT_TAG_LEN, PACK, 0);
|
|
}
|
|
|
|
/* Determine the PTP REW_OP to use for injecting the given skb */
|
|
static inline u32 ocelot_ptp_rew_op(struct sk_buff *skb)
|
|
{
|
|
struct sk_buff *clone = OCELOT_SKB_CB(skb)->clone;
|
|
u8 ptp_cmd = OCELOT_SKB_CB(skb)->ptp_cmd;
|
|
u32 rew_op = 0;
|
|
|
|
if (ptp_cmd == IFH_REW_OP_TWO_STEP_PTP && clone) {
|
|
rew_op = ptp_cmd;
|
|
rew_op |= OCELOT_SKB_CB(clone)->ts_id << 3;
|
|
} else if (ptp_cmd == IFH_REW_OP_ORIGIN_PTP) {
|
|
rew_op = ptp_cmd;
|
|
}
|
|
|
|
return rew_op;
|
|
}
|
|
|
|
/**
|
|
* ocelot_xmit_get_vlan_info: Determine VLAN_TCI and TAG_TYPE for injected frame
|
|
* @skb: Pointer to socket buffer
|
|
* @br: Pointer to bridge device that the port is under, if any
|
|
* @vlan_tci:
|
|
* @tag_type:
|
|
*
|
|
* If the port is under a VLAN-aware bridge, remove the VLAN header from the
|
|
* payload and move it into the DSA tag, which will make the switch classify
|
|
* the packet to the bridge VLAN. Otherwise, leave the classified VLAN at zero,
|
|
* which is the pvid of standalone ports (OCELOT_STANDALONE_PVID), although not
|
|
* of VLAN-unaware bridge ports (that would be ocelot_vlan_unaware_pvid()).
|
|
* Anyway, VID 0 is fine because it is stripped on egress for these port modes,
|
|
* and source address learning is not performed for packets injected from the
|
|
* CPU anyway, so it doesn't matter that the VID is "wrong".
|
|
*/
|
|
static inline void ocelot_xmit_get_vlan_info(struct sk_buff *skb,
|
|
struct net_device *br,
|
|
u64 *vlan_tci, u64 *tag_type)
|
|
{
|
|
struct vlan_ethhdr *hdr;
|
|
u16 proto, tci;
|
|
|
|
if (!br || !br_vlan_enabled(br)) {
|
|
*vlan_tci = 0;
|
|
*tag_type = IFH_TAG_TYPE_C;
|
|
return;
|
|
}
|
|
|
|
hdr = (struct vlan_ethhdr *)skb_mac_header(skb);
|
|
br_vlan_get_proto(br, &proto);
|
|
|
|
if (ntohs(hdr->h_vlan_proto) == proto) {
|
|
vlan_remove_tag(skb, &tci);
|
|
*vlan_tci = tci;
|
|
} else {
|
|
rcu_read_lock();
|
|
br_vlan_get_pvid_rcu(br, &tci);
|
|
rcu_read_unlock();
|
|
*vlan_tci = tci;
|
|
}
|
|
|
|
*tag_type = (proto != ETH_P_8021Q) ? IFH_TAG_TYPE_S : IFH_TAG_TYPE_C;
|
|
}
|
|
|
|
#endif
|