Skip to content

Commit e131a56

Browse files
Alexander Lobakindavem330
authored andcommitted
net: dsa: add GRO support via gro_cells
gro_cells lib is used by different encapsulating netdevices, such as geneve, macsec, vxlan etc. to speed up decapsulated traffic processing. CPU tag is a sort of "encapsulation", and we can use the same mechs to greatly improve overall DSA performance. skbs are passed to the GRO layer after removing CPU tags, so we don't need any new packet offload types as it was firstly proposed by me in the first GRO-over-DSA variant [1]. The size of struct gro_cells is sizeof(void *), so hot struct dsa_slave_priv becomes only 4/8 bytes bigger, and all critical fields remain in one 32-byte cacheline. The other positive side effect is that drivers for network devices that can be shipped as CPU ports of DSA-driven switches can now use napi_gro_frags() to pass skbs to kernel. Packets built that way are completely non-linear and are likely being dropped without GRO. This was tested on to-be-mainlined-soon Ethernet driver that uses napi_gro_frags(), and the overall performance was on par with the variant from [1], sometimes even better due to minimal overhead. net.core.gro_normal_batch tuning may help to push it to the limit on particular setups and platforms. iperf3 IPoE VLAN NAT TCP forwarding (port1.218 -> port0) setup on 1.2 GHz MIPS board: 5.7-rc2 baseline: [ID] Interval Transfer Bitrate Retr [ 5] 0.00-120.01 sec 9.00 GBytes 644 Mbits/sec 413 sender [ 5] 0.00-120.00 sec 8.99 GBytes 644 Mbits/sec receiver Iface RX packets TX packets eth0 7097731 7097702 port0 426050 6671829 port1 6671681 425862 port1.218 6671677 425851 With this patch: [ID] Interval Transfer Bitrate Retr [ 5] 0.00-120.01 sec 12.2 GBytes 870 Mbits/sec 122 sender [ 5] 0.00-120.00 sec 12.2 GBytes 870 Mbits/sec receiver Iface RX packets TX packets eth0 9474792 9474777 port0 455200 353288 port1 9019592 455035 port1.218 353144 455024 v2: - Add some performance examples in the commit message; - No functional changes. [1] https://lore.kernel.org/netdev/20191230143028.27313-1-alobakin@dlink.ru/ Signed-off-by: Alexander Lobakin <bloodyreaper@yandex.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent b75326c commit e131a56

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

net/dsa/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ menuconfig NET_DSA
99
tristate "Distributed Switch Architecture"
1010
depends on HAVE_NET_DSA
1111
depends on BRIDGE || BRIDGE=n
12+
select GRO_CELLS
1213
select NET_SWITCHDEV
1314
select PHYLINK
1415
select NET_DEVLINK

net/dsa/dsa.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
234234
if (dsa_skb_defer_rx_timestamp(p, skb))
235235
return 0;
236236

237-
netif_receive_skb(skb);
237+
gro_cells_receive(&p->gcells, skb);
238238

239239
return 0;
240240
}

net/dsa/dsa_priv.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <linux/netdevice.h>
1212
#include <linux/netpoll.h>
1313
#include <net/dsa.h>
14+
#include <net/gro_cells.h>
1415

1516
enum {
1617
DSA_NOTIFIER_AGEING_TIME,
@@ -77,6 +78,8 @@ struct dsa_slave_priv {
7778

7879
struct pcpu_sw_netstats *stats64;
7980

81+
struct gro_cells gcells;
82+
8083
/* DSA port data, such as switch, port index, etc. */
8184
struct dsa_port *dp;
8285

net/dsa/slave.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1762,6 +1762,11 @@ int dsa_slave_create(struct dsa_port *port)
17621762
free_netdev(slave_dev);
17631763
return -ENOMEM;
17641764
}
1765+
1766+
ret = gro_cells_init(&p->gcells, slave_dev);
1767+
if (ret)
1768+
goto out_free;
1769+
17651770
p->dp = port;
17661771
INIT_LIST_HEAD(&p->mall_tc_list);
17671772
p->xmit = cpu_dp->tag_ops->xmit;
@@ -1781,7 +1786,7 @@ int dsa_slave_create(struct dsa_port *port)
17811786
ret = dsa_slave_phy_setup(slave_dev);
17821787
if (ret) {
17831788
netdev_err(master, "error %d setting up slave phy\n", ret);
1784-
goto out_free;
1789+
goto out_gcells;
17851790
}
17861791

17871792
dsa_slave_notify(slave_dev, DSA_PORT_REGISTER);
@@ -1800,6 +1805,8 @@ int dsa_slave_create(struct dsa_port *port)
18001805
phylink_disconnect_phy(p->dp->pl);
18011806
rtnl_unlock();
18021807
phylink_destroy(p->dp->pl);
1808+
out_gcells:
1809+
gro_cells_destroy(&p->gcells);
18031810
out_free:
18041811
free_percpu(p->stats64);
18051812
free_netdev(slave_dev);
@@ -1820,6 +1827,7 @@ void dsa_slave_destroy(struct net_device *slave_dev)
18201827
dsa_slave_notify(slave_dev, DSA_PORT_UNREGISTER);
18211828
unregister_netdev(slave_dev);
18221829
phylink_destroy(dp->pl);
1830+
gro_cells_destroy(&p->gcells);
18231831
free_percpu(p->stats64);
18241832
free_netdev(slave_dev);
18251833
}

0 commit comments

Comments
 (0)