openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: create a helper for locating EtherType DSA headers on TX 

Create a similar helper for locating the offset to the DSA header
relative to skb->data, and make the existing EtherType header taggers to
use it.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2021-08-10 16:13:56 +03:00 committed by David S. Miller
parent 5d928ff486
commit a72808b658
7 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/dsa/dsa_priv.h
View File

@ -521,6 +521,15 @@ static inline void *dsa_etype_header_pos_rx(struct sk_buff *skb)
return skb->data - 2; return skb->data - 2;
} }
/* On TX, skb->data points to skb_mac_header(skb), which means that EtherType
* header taggers start exactly where the EtherType is (the EtherType is
* treated as part of the DSA header).
*/
static inline void *dsa_etype_header_pos_tx(struct sk_buff *skb)
{
return skb->data + 2 * ETH_ALEN;
}
/* switch.c */ /* switch.c */
int dsa_switch_register_notifier(struct dsa_switch *ds); int dsa_switch_register_notifier(struct dsa_switch *ds);
void dsa_switch_unregister_notifier(struct dsa_switch *ds); void dsa_switch_unregister_notifier(struct dsa_switch *ds);

6
net/dsa/tag_dsa.c
View File

@ -170,7 +170,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev,
} }
/* Construct tagged DSA tag from 802.1Q tag. */ /* Construct tagged DSA tag from 802.1Q tag. */
dsa_header = skb->data + 2 * ETH_ALEN + extra; dsa_header = dsa_etype_header_pos_tx(skb) + extra;
dsa_header[0] = (cmd << 6) | 0x20 | tag_dev; dsa_header[0] = (cmd << 6) | 0x20 | tag_dev;
dsa_header[1] = tag_port << 3; dsa_header[1] = tag_port << 3;
@ -184,7 +184,7 @@ static struct sk_buff *dsa_xmit_ll(struct sk_buff *skb, struct net_device *dev,
dsa_alloc_etype_header(skb, DSA_HLEN + extra); dsa_alloc_etype_header(skb, DSA_HLEN + extra);
/* Construct untagged DSA tag. */ /* Construct untagged DSA tag. */
dsa_header = skb->data + 2 * ETH_ALEN + extra; dsa_header = dsa_etype_header_pos_tx(skb) + extra;
dsa_header[0] = (cmd << 6) | tag_dev; dsa_header[0] = (cmd << 6) | tag_dev;
dsa_header[1] = tag_port << 3; dsa_header[1] = tag_port << 3;
@ -360,7 +360,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
if (!skb) if (!skb)
return NULL; return NULL;
edsa_header = skb->data + 2 * ETH_ALEN; edsa_header = dsa_etype_header_pos_tx(skb);
edsa_header[0] = (ETH_P_EDSA >> 8) & 0xff; edsa_header[0] = (ETH_P_EDSA >> 8) & 0xff;
edsa_header[1] = ETH_P_EDSA & 0xff; edsa_header[1] = ETH_P_EDSA & 0xff;
edsa_header[2] = 0x00; edsa_header[2] = 0x00;

3
net/dsa/tag_lan9303.c
View File

@ -64,7 +64,8 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
/* make room between MACs and Ether-Type */ /* make room between MACs and Ether-Type */
dsa_alloc_etype_header(skb, LAN9303_TAG_LEN); dsa_alloc_etype_header(skb, LAN9303_TAG_LEN);
lan9303_tag = (__be16 *)(skb->data + 2 * ETH_ALEN); lan9303_tag = dsa_etype_header_pos_tx(skb);
tag = lan9303_xmit_use_arl(dp, skb->data) ? tag = lan9303_xmit_use_arl(dp, skb->data) ?
LAN9303_TAG_TX_USE_ALR : LAN9303_TAG_TX_USE_ALR :
dp->index | LAN9303_TAG_TX_STP_OVERRIDE; dp->index | LAN9303_TAG_TX_STP_OVERRIDE;

2
net/dsa/tag_mtk.c
View File

@ -44,7 +44,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
dsa_alloc_etype_header(skb, MTK_HDR_LEN); dsa_alloc_etype_header(skb, MTK_HDR_LEN);
} }
mtk_tag = skb->data + 2 * ETH_ALEN; mtk_tag = dsa_etype_header_pos_tx(skb);
/* Mark tag attribute on special tag insertion to notify hardware /* Mark tag attribute on special tag insertion to notify hardware
* whether that's a combined special tag with 802.1Q header. * whether that's a combined special tag with 802.1Q header.

2
net/dsa/tag_qca.c
View File

@ -37,7 +37,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
skb_push(skb, QCA_HDR_LEN); skb_push(skb, QCA_HDR_LEN);
dsa_alloc_etype_header(skb, QCA_HDR_LEN); dsa_alloc_etype_header(skb, QCA_HDR_LEN);
phdr = (__be16 *)(skb->data + 2 * ETH_ALEN); phdr = dsa_etype_header_pos_tx(skb);
/* Set the version field, and set destination port information */ /* Set the version field, and set destination port information */
hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S | hdr = QCA_HDR_VERSION << QCA_HDR_XMIT_VERSION_S |

2
net/dsa/tag_rtl4_a.c
View File

@ -48,7 +48,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb,
skb_push(skb, RTL4_A_HDR_LEN); skb_push(skb, RTL4_A_HDR_LEN);
dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN); dsa_alloc_etype_header(skb, RTL4_A_HDR_LEN);
tag = skb->data + 2 * ETH_ALEN; tag = dsa_etype_header_pos_tx(skb);
/* Set Ethertype */ /* Set Ethertype */
p = (__be16 *)tag; p = (__be16 *)tag;

16
net/dsa/tag_sja1105.c
View File

@ -188,7 +188,6 @@ static struct sk_buff *sja1110_xmit(struct sk_buff *skb,
u16 tx_vid = dsa_8021q_tx_vid(dp->ds, dp->index); u16 tx_vid = dsa_8021q_tx_vid(dp->ds, dp->index);
u16 queue_mapping = skb_get_queue_mapping(skb); u16 queue_mapping = skb_get_queue_mapping(skb);
u8 pcp = netdev_txq_to_tc(netdev, queue_mapping); u8 pcp = netdev_txq_to_tc(netdev, queue_mapping);
struct ethhdr *eth_hdr;
__be32 *tx_trailer; __be32 *tx_trailer;
__be16 *tx_header; __be16 *tx_header;
int trailer_pos; int trailer_pos;
@ -210,23 +209,20 @@ static struct sk_buff *sja1110_xmit(struct sk_buff *skb,
trailer_pos = skb->len; trailer_pos = skb->len;
/* On TX, skb->data points to skb_mac_header(skb) */ tx_header = dsa_etype_header_pos_tx(skb);
eth_hdr = (struct ethhdr *)skb->data;
tx_header = (__be16 *)(eth_hdr + 1);
tx_trailer = skb_put(skb, SJA1110_TX_TRAILER_LEN); tx_trailer = skb_put(skb, SJA1110_TX_TRAILER_LEN);
eth_hdr->h_proto = htons(ETH_P_SJA1110); tx_header[0] = htons(ETH_P_SJA1110);
tx_header[1] = htons(SJA1110_HEADER_HOST_TO_SWITCH |
*tx_header = htons(SJA1110_HEADER_HOST_TO_SWITCH | SJA1110_TX_HEADER_HAS_TRAILER |
SJA1110_TX_HEADER_HAS_TRAILER | SJA1110_TX_HEADER_TRAILER_POS(trailer_pos));
SJA1110_TX_HEADER_TRAILER_POS(trailer_pos));
*tx_trailer = cpu_to_be32(SJA1110_TX_TRAILER_PRIO(pcp) | *tx_trailer = cpu_to_be32(SJA1110_TX_TRAILER_PRIO(pcp) |
SJA1110_TX_TRAILER_SWITCHID(dp->ds->index) | SJA1110_TX_TRAILER_SWITCHID(dp->ds->index) |
SJA1110_TX_TRAILER_DESTPORTS(BIT(dp->index))); SJA1110_TX_TRAILER_DESTPORTS(BIT(dp->index)));
if (clone) { if (clone) {
u8 ts_id = SJA1105_SKB_CB(clone)->ts_id; u8 ts_id = SJA1105_SKB_CB(clone)->ts_id;
*tx_header |= htons(SJA1110_TX_HEADER_TAKE_TS); tx_header[1] |= htons(SJA1110_TX_HEADER_TAKE_TS);
*tx_trailer |= cpu_to_be32(SJA1110_TX_TRAILER_TSTAMP_ID(ts_id)); *tx_trailer |= cpu_to_be32(SJA1110_TX_TRAILER_TSTAMP_ID(ts_id));
} }