Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5491e7c6 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

macsec: enable GRO and RPS on macsec devices 



Use gro_gells to trigger GRO and allow RPS on macsec traffic
after decryption.
Also, be sure to avoid clearing software offload features in
macsec_fix_features().
Overall this increase TCP tput by 30% on recent h/w.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f652bb2

drivers/net/macsec.c

+25 −7
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/rtnetlink.h>

#include <linux/rtnetlink.h>

#include <net/genetlink.h>

#include <net/genetlink.h>

#include <net/sock.h>

#include <net/sock.h>

#include <net/gro_cells.h>





#include <uapi/linux/if_macsec.h>

#include <uapi/linux/if_macsec.h>
@@ -268,6 +269,7 @@ struct macsec_dev { 
	struct net_device *real_dev;

	struct net_device *real_dev;

	struct pcpu_secy_stats __percpu *stats;

	struct pcpu_secy_stats __percpu *stats;

	struct list_head secys;

	struct list_head secys;

	struct gro_cells gro_cells;

};

};





/**

/**
@@ -879,7 +881,7 @@ static void macsec_decrypt_done(struct crypto_async_request *base, int err) 
	macsec_reset_skb(skb, macsec->secy.netdev);

	macsec_reset_skb(skb, macsec->secy.netdev);





	len = skb->len;

	len = skb->len;

	ret = netif_rx(skb);

	ret = gro_cells_receive(&macsec->gro_cells, skb);

	if (ret == NET_RX_SUCCESS)

	if (ret == NET_RX_SUCCESS)

		count_rx(dev, len);

		count_rx(dev, len);

	else

	else
@@ -1052,6 +1054,7 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 
	struct pcpu_rx_sc_stats *rxsc_stats;

	struct pcpu_rx_sc_stats *rxsc_stats;

	struct pcpu_secy_stats *secy_stats;

	struct pcpu_secy_stats *secy_stats;

	bool pulled_sci;

	bool pulled_sci;

	int ret;





	if (skb_headroom(skb) < ETH_HLEN)

	if (skb_headroom(skb) < ETH_HLEN)

		goto drop_direct;

		goto drop_direct;
@@ -1193,12 +1196,17 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 




	if (rx_sa)

	if (rx_sa)

		macsec_rxsa_put(rx_sa);

		macsec_rxsa_put(rx_sa);



	ret = gro_cells_receive(&macsec->gro_cells, skb);

	if (ret == NET_RX_SUCCESS)

		count_rx(dev, skb->len);

		count_rx(dev, skb->len);

	else

		macsec->secy.netdev->stats.rx_dropped++;





	rcu_read_unlock();

	rcu_read_unlock();





	*pskb = skb;

	*pskb = NULL;

	return RX_HANDLER_ANOTHER;

	return RX_HANDLER_CONSUMED;





drop:

drop:

	macsec_rxsa_put(rx_sa);

	macsec_rxsa_put(rx_sa);
@@ -1218,7 +1226,6 @@ static rx_handler_result_t macsec_handle_frame(struct sk_buff **pskb) 




	list_for_each_entry_rcu(macsec, &rxd->secys, secys) {

	list_for_each_entry_rcu(macsec, &rxd->secys, secys) {

		struct sk_buff *nskb;

		struct sk_buff *nskb;

		int ret;





		secy_stats = this_cpu_ptr(macsec->stats);

		secy_stats = this_cpu_ptr(macsec->stats);
@@ -2675,11 +2682,18 @@ static int macsec_dev_init(struct net_device *dev) 
{

{

	struct macsec_dev *macsec = macsec_priv(dev);

	struct macsec_dev *macsec = macsec_priv(dev);

	struct net_device *real_dev = macsec->real_dev;

	struct net_device *real_dev = macsec->real_dev;

	int err;





	dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);

	dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);

	if (!dev->tstats)

	if (!dev->tstats)

		return -ENOMEM;

		return -ENOMEM;





	err = gro_cells_init(&macsec->gro_cells, dev);

	if (err) {

		free_percpu(dev->tstats);

		return err;

	}



	dev->features = real_dev->features & MACSEC_FEATURES;

	dev->features = real_dev->features & MACSEC_FEATURES;

	dev->features |= NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE;

	dev->features |= NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE;
@@ -2698,6 +2712,9 @@ static int macsec_dev_init(struct net_device *dev) 




static void macsec_dev_uninit(struct net_device *dev)

static void macsec_dev_uninit(struct net_device *dev)

{

{

	struct macsec_dev *macsec = macsec_priv(dev);



	gro_cells_destroy(&macsec->gro_cells);

	free_percpu(dev->tstats);

	free_percpu(dev->tstats);

}

}
@@ -2707,8 +2724,9 @@ static netdev_features_t macsec_fix_features(struct net_device *dev, 
	struct macsec_dev *macsec = macsec_priv(dev);

	struct macsec_dev *macsec = macsec_priv(dev);

	struct net_device *real_dev = macsec->real_dev;

	struct net_device *real_dev = macsec->real_dev;





	features &= real_dev->features & MACSEC_FEATURES;

	features &= (real_dev->features & MACSEC_FEATURES) |

	features |= NETIF_F_LLTX | NETIF_F_GSO_SOFTWARE;

		    NETIF_F_GSO_SOFTWARE | NETIF_F_SOFT_FEATURES;

	features |= NETIF_F_LLTX;





	return features;

	return features;

}

}