net: stmmac: selftests: Add selftest for VLAN TX Offload
Add 2 new selftests for VLAN Insertion offloading. Tests are for inner and outer VLAN offloading. Signed-off-by: Jose Abreu <joabreu@synopsys.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
30d932279d
commit
94e1838200
|
@ -296,7 +296,9 @@ static int __stmmac_test_loopback(struct stmmac_priv *priv,
|
|||
tpriv->pt.dev = priv->dev;
|
||||
tpriv->pt.af_packet_priv = tpriv;
|
||||
tpriv->packet = attr;
|
||||
dev_add_pack(&tpriv->pt);
|
||||
|
||||
if (!attr->dont_wait)
|
||||
dev_add_pack(&tpriv->pt);
|
||||
|
||||
skb = stmmac_test_get_udp_skb(priv, attr);
|
||||
if (!skb) {
|
||||
|
@ -319,7 +321,8 @@ static int __stmmac_test_loopback(struct stmmac_priv *priv,
|
|||
ret = !tpriv->ok;
|
||||
|
||||
cleanup:
|
||||
dev_remove_pack(&tpriv->pt);
|
||||
if (!attr->dont_wait)
|
||||
dev_remove_pack(&tpriv->pt);
|
||||
kfree(tpriv);
|
||||
return ret;
|
||||
}
|
||||
|
@ -731,6 +734,9 @@ static int stmmac_test_vlan_validate(struct sk_buff *skb,
|
|||
struct ethhdr *ehdr;
|
||||
struct udphdr *uhdr;
|
||||
struct iphdr *ihdr;
|
||||
u16 proto;
|
||||
|
||||
proto = tpriv->double_vlan ? ETH_P_8021AD : ETH_P_8021Q;
|
||||
|
||||
skb = skb_unshare(skb, GFP_ATOMIC);
|
||||
if (!skb)
|
||||
|
@ -740,6 +746,12 @@ static int stmmac_test_vlan_validate(struct sk_buff *skb,
|
|||
goto out;
|
||||
if (skb_headlen(skb) < (STMMAC_TEST_PKT_SIZE - ETH_HLEN))
|
||||
goto out;
|
||||
if (tpriv->vlan_id) {
|
||||
if (skb->vlan_proto != htons(proto))
|
||||
goto out;
|
||||
if (skb->vlan_tci != tpriv->vlan_id)
|
||||
goto out;
|
||||
}
|
||||
|
||||
ehdr = (struct ethhdr *)skb_mac_header(skb);
|
||||
if (!ether_addr_equal(ehdr->h_dest, tpriv->packet->dst))
|
||||
|
@ -1084,6 +1096,78 @@ static int stmmac_test_reg_sar(struct stmmac_priv *priv)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int stmmac_test_vlanoff_common(struct stmmac_priv *priv, bool svlan)
|
||||
{
|
||||
struct stmmac_packet_attrs attr = { };
|
||||
struct stmmac_test_priv *tpriv;
|
||||
struct sk_buff *skb = NULL;
|
||||
int ret = 0;
|
||||
u16 proto;
|
||||
|
||||
if (!priv->dma_cap.vlins)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
tpriv = kzalloc(sizeof(*tpriv), GFP_KERNEL);
|
||||
if (!tpriv)
|
||||
return -ENOMEM;
|
||||
|
||||
proto = svlan ? ETH_P_8021AD : ETH_P_8021Q;
|
||||
|
||||
tpriv->ok = false;
|
||||
tpriv->double_vlan = svlan;
|
||||
init_completion(&tpriv->comp);
|
||||
|
||||
tpriv->pt.type = svlan ? htons(ETH_P_8021Q) : htons(ETH_P_IP);
|
||||
tpriv->pt.func = stmmac_test_vlan_validate;
|
||||
tpriv->pt.dev = priv->dev;
|
||||
tpriv->pt.af_packet_priv = tpriv;
|
||||
tpriv->packet = &attr;
|
||||
tpriv->vlan_id = 0x123;
|
||||
dev_add_pack(&tpriv->pt);
|
||||
|
||||
ret = vlan_vid_add(priv->dev, htons(proto), tpriv->vlan_id);
|
||||
if (ret)
|
||||
goto cleanup;
|
||||
|
||||
attr.dst = priv->dev->dev_addr;
|
||||
|
||||
skb = stmmac_test_get_udp_skb(priv, &attr);
|
||||
if (!skb) {
|
||||
ret = -ENOMEM;
|
||||
goto vlan_del;
|
||||
}
|
||||
|
||||
__vlan_hwaccel_put_tag(skb, htons(proto), tpriv->vlan_id);
|
||||
skb->protocol = htons(proto);
|
||||
|
||||
skb_set_queue_mapping(skb, 0);
|
||||
ret = dev_queue_xmit(skb);
|
||||
if (ret)
|
||||
goto vlan_del;
|
||||
|
||||
wait_for_completion_timeout(&tpriv->comp, STMMAC_LB_TIMEOUT);
|
||||
ret = tpriv->ok ? 0 : -ETIMEDOUT;
|
||||
|
||||
vlan_del:
|
||||
vlan_vid_del(priv->dev, htons(proto), tpriv->vlan_id);
|
||||
cleanup:
|
||||
dev_remove_pack(&tpriv->pt);
|
||||
kfree(tpriv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int stmmac_test_vlanoff(struct stmmac_priv *priv)
|
||||
{
|
||||
return stmmac_test_vlanoff_common(priv, false);
|
||||
}
|
||||
|
||||
static int stmmac_test_svlanoff(struct stmmac_priv *priv)
|
||||
{
|
||||
if (!priv->dma_cap.dvlan)
|
||||
return -EOPNOTSUPP;
|
||||
return stmmac_test_vlanoff_common(priv, true);
|
||||
}
|
||||
|
||||
#define STMMAC_LOOPBACK_NONE 0
|
||||
#define STMMAC_LOOPBACK_MAC 1
|
||||
#define STMMAC_LOOPBACK_PHY 2
|
||||
|
@ -1161,6 +1245,14 @@ static const struct stmmac_test {
|
|||
.name = "SA Replacement (reg)",
|
||||
.lb = STMMAC_LOOPBACK_PHY,
|
||||
.fn = stmmac_test_reg_sar,
|
||||
}, {
|
||||
.name = "VLAN TX Insertion ",
|
||||
.lb = STMMAC_LOOPBACK_PHY,
|
||||
.fn = stmmac_test_vlanoff,
|
||||
}, {
|
||||
.name = "SVLAN TX Insertion ",
|
||||
.lb = STMMAC_LOOPBACK_PHY,
|
||||
.fn = stmmac_test_svlanoff,
|
||||
},
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue