Commit 5c3c6081 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-ufo-remove' 



David S. Miller says:

====================
net: Remove UDP Fragmentation Offload support

This is a patch series, based upon some discussions with various
developers, that removes UFO offloading.

Very few devices support this operation, it's usefullness is
quesitonable at best, and it adds a non-trivial amount of
complexity to our data paths.

v2: Delete more code thanks to feedback from Willem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6093ec2d d9d30adf

drivers/net/dummy.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void dummy_setup(struct net_device *dev) 
	dev->flags &= ~IFF_MULTICAST;

	dev->priv_flags |= IFF_LIVE_ADDR_CHANGE | IFF_NO_QUEUE;

	dev->features	|= NETIF_F_SG | NETIF_F_FRAGLIST;

	dev->features	|= NETIF_F_ALL_TSO | NETIF_F_UFO;

	dev->features	|= NETIF_F_ALL_TSO;

	dev->features	|= NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_LLTX;

	dev->features	|= NETIF_F_GSO_ENCAP_ALL;

	dev->hw_features |= dev->features;

drivers/net/ethernet/cadence/macb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 
#define GEM_MAX_TX_LEN		((unsigned int)((1 << GEM_TX_FRMLEN_SIZE) - 1) & ~((unsigned int)(MACB_TX_LEN_ALIGN - 1)))



#define GEM_MTU_MIN_SIZE	ETH_MIN_MTU

#define MACB_NETIF_LSO		(NETIF_F_TSO | NETIF_F_UFO)

#define MACB_NETIF_LSO		NETIF_F_TSO



#define MACB_WOL_HAS_MAGIC_PACKET	(0x1 << 0)

#define MACB_WOL_ENABLED		(0x1 << 1)

drivers/net/ethernet/neterion/s2io.c

+0 −45
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
 *     aggregated as a single large packet

 * napi: This parameter used to enable/disable NAPI (polling Rx)

 *     Possible values '1' for enable and '0' for disable. Default is '1'

 * ufo: This parameter used to enable/disable UDP Fragmentation Offload(UFO)

 *      Possible values '1' for enable and '0' for disable. Default is '0'

 * vlan_tag_strip: This can be used to enable or disable vlan stripping.

 *                 Possible values '1' for enable , '0' for disable.

 *                 Default is '2' - which means disable in promisc mode
@@ -453,7 +451,6 @@ S2IO_PARM_INT(lro_max_pkts, 0xFFFF); 
S2IO_PARM_INT(indicate_max_pkts, 0);



S2IO_PARM_INT(napi, 1);

S2IO_PARM_INT(ufo, 0);

S2IO_PARM_INT(vlan_tag_strip, NO_STRIP_IN_PROMISC);



static unsigned int tx_fifo_len[MAX_TX_FIFOS] =
@@ -4128,32 +4125,6 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) 
	}



	frg_len = skb_headlen(skb);

	if (offload_type == SKB_GSO_UDP) {

		int ufo_size;



		ufo_size = s2io_udp_mss(skb);

		ufo_size &= ~7;

		txdp->Control_1 |= TXD_UFO_EN;

		txdp->Control_1 |= TXD_UFO_MSS(ufo_size);

		txdp->Control_1 |= TXD_BUFFER0_SIZE(8);

#ifdef __BIG_ENDIAN

		/* both variants do cpu_to_be64(be32_to_cpu(...)) */

		fifo->ufo_in_band_v[put_off] =

			(__force u64)skb_shinfo(skb)->ip6_frag_id;

#else

		fifo->ufo_in_band_v[put_off] =

			(__force u64)skb_shinfo(skb)->ip6_frag_id << 32;

#endif

		txdp->Host_Control = (unsigned long)fifo->ufo_in_band_v;

		txdp->Buffer_Pointer = pci_map_single(sp->pdev,

						      fifo->ufo_in_band_v,

						      sizeof(u64),

						      PCI_DMA_TODEVICE);

		if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))

			goto pci_map_failed;

		txdp++;

	}



	txdp->Buffer_Pointer = pci_map_single(sp->pdev, skb->data,

					      frg_len, PCI_DMA_TODEVICE);

	if (pci_dma_mapping_error(sp->pdev, txdp->Buffer_Pointer))
@@ -4161,8 +4132,6 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) 


	txdp->Host_Control = (unsigned long)skb;

	txdp->Control_1 |= TXD_BUFFER0_SIZE(frg_len);

	if (offload_type == SKB_GSO_UDP)

		txdp->Control_1 |= TXD_UFO_EN;



	frg_cnt = skb_shinfo(skb)->nr_frags;

	/* For fragmented SKB. */
@@ -4177,14 +4146,9 @@ static netdev_tx_t s2io_xmit(struct sk_buff *skb, struct net_device *dev) 
							     skb_frag_size(frag),

							     DMA_TO_DEVICE);

		txdp->Control_1 = TXD_BUFFER0_SIZE(skb_frag_size(frag));

		if (offload_type == SKB_GSO_UDP)

			txdp->Control_1 |= TXD_UFO_EN;

	}

	txdp->Control_1 |= TXD_GATHER_CODE_LAST;



	if (offload_type == SKB_GSO_UDP)

		frg_cnt++; /* as Txd0 was used for inband header */



	tx_fifo = mac_control->tx_FIFO_start[queue];

	val64 = fifo->list_info[put_off].list_phy_addr;

	writeq(val64, &tx_fifo->TxDL_Pointer);
@@ -7910,11 +7874,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 
		NETIF_F_RXCSUM | NETIF_F_LRO;

	dev->features |= dev->hw_features |

		NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX;

	if (sp->device_type & XFRAME_II_DEVICE) {

		dev->hw_features |= NETIF_F_UFO;

		if (ufo)

			dev->features |= NETIF_F_UFO;

	}

	if (sp->high_dma_flag == true)

		dev->features |= NETIF_F_HIGHDMA;

	dev->watchdog_timeo = WATCH_DOG_TIMEOUT;
@@ -8147,10 +8106,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) 


	DBG_PRINT(ERR_DBG, "%s: Large receive offload enabled\n",

		  dev->name);

	if (ufo)

		DBG_PRINT(ERR_DBG,

			  "%s: UDP Fragmentation Offload(UFO) enabled\n",

			  dev->name);

	/* Initialize device name */

	snprintf(sp->name, sizeof(sp->name), "%s Neterion %s", dev->name,

		 sp->product_name);

drivers/net/ipvlan/ipvlan_main.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static void ipvlan_port_destroy(struct net_device *dev) 


#define IPVLAN_FEATURES \

	(NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_UFO | NETIF_F_GSO_ROBUST | \

	 NETIF_F_GSO | NETIF_F_TSO | NETIF_F_GSO_ROBUST | \

	 NETIF_F_TSO_ECN | NETIF_F_TSO6 | NETIF_F_GRO | NETIF_F_RXCSUM | \

	 NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_HW_VLAN_STAG_FILTER)

drivers/net/ipvlan/ipvtap.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/virtio_net.h>



#define TUN_OFFLOADS (NETIF_F_HW_CSUM | NETIF_F_TSO_ECN | NETIF_F_TSO | \

		      NETIF_F_TSO6 | NETIF_F_UFO)

		      NETIF_F_TSO6)



static dev_t ipvtap_major;

static struct cdev ipvtap_cdev;

CRA Git | Maintained and supported by SUSTech CRA and CCSE