Skip to contentSkip to conversation

sunvnet: allow admin to set sunvnet MTU

PATCH In review David L Stevens 2 participants 3 messages Sep 29, 2014

Subsystems (3)
Networking Network drivers SPARC + UltraSPARC (sparc/sparc64)
lore
Share & tools
lore

David L Stevens

author
#0 lore raw

PATCH 3/4 sunvnet: allow admin to set sunvnet MTU

This patch allows an admin to set the MTU on a sunvnet device to arbitrary values between the minimum (68) and maximum (65535) IPv4 packet sizes.

Signed-off-by David L Stevens <[email protected]>
---
 arch/sparc/kernel/ldc.c            |    2 +-
 drivers/net/ethernet/sun/sunvnet.c |    7 +++++--
 drivers/net/ethernet/sun/sunvnet.h |    6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)
arch/sparc/kernel/ldc.c +1 -1
index 66dacd5..0af28b9 100644
@@ -2159,7 +2159,7 @@ int ldc_map_single(struct ldc_channel *lp,
 	state.pte_idx = (base - iommu->page_table);
 	state.nc = 0;
 	fill_cookies(&state, (pa & PAGE_MASK), (pa & ~PAGE_MASK), len);
-	BUG_ON(state.nc != 1);
+	BUG_ON(state.nc > ncookies);
  	return state.nc;
 }
drivers/net/ethernet/sun/sunvnet.c +4 -2
index f3a3fc1..1a7dce0 100644
@@ -884,6 +884,9 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
  	skb = vnet_skb_shape(skb, &start, &nlen);
 +	if (skb->len > port->rmtu)
+		goto out_dropped;
+
 	spin_lock_irqsave(&port->vio.lock, flags);
  	dr = &port->vio.drings[VIO_DRIVER_TX_RING];

@@ -914,7 +917,7 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	port->tx_bufs[txi].skb = skb;
  	err = ldc_map_single(port->vio.lp, start, nlen,
-			     port->tx_bufs[txi].cookies, 2,
+			     port->tx_bufs[txi].cookies, VNET_MAXCOOKIES,
 			     (LDC_MAP_SHADOW | LDC_MAP_DIRECT | LDC_MAP_RW));
 	if (err < 0) {
 		netdev_info(dev, "tx buffer map error %d\n", err);

@@ -1143,7 +1146,7 @@ static void vnet_set_rx_mode(struct net_device *dev)
  static int vnet_change_mtu(struct net_device *dev, int new_mtu)
 {
-	if (new_mtu != ETH_DATA_LEN)
+	if (new_mtu < 68 || new_mtu > 65535)
 		return -EINVAL;
  	dev->mtu = new_mtu;
drivers/net/ethernet/sun/sunvnet.h +1 -0
index f18409b..ead9001 100644
@@ -11,7 +11,7 @@
  */
 #define VNET_TX_TIMEOUT			(5 * HZ)
 -#define VNET_MAXPACKET			1518ULL /* ETH_FRAMELEN + VLAN_HDR */
+#define VNET_MAXPACKET			(65535ULL + ETH_HLEN + VLAN_HLEN)
 #define VNET_TX_RING_SIZE		512
 #define VNET_TX_WAKEUP_THRESH(dr)	((dr)->pending / 4)
 @@ -21,10 +21,12 @@

*/
#define VNET_PACKET_SKIP 6
+#define VNET_MAXCOOKIES (VNET_MAXPACKET/PAGE_SIZE + 1)
+
struct vnet_tx_entry {
struct sk_buff *skb;
unsigned int ncookies;
- struct ldc_trans_cookie cookies[2];
+ struct ldc_trans_cookie cookies[VNET_MAXCOOKIES];
};
struct vnet;

Signature · 1 line
1.7.1
maintainer
#1 lore raw

From: David L Stevens <[email protected]>
Date: Mon, 29 Sep 2014 13:17:01 -0400

drivers/net/ethernet/sun/sunvnet.c static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev) · line 888

Quoted 6 lines
drivers/net/ethernet/sun/sunvnet.c +2 -0
@@ -884,6 +884,9 @@ static int vnet_start_xmit(struct sk_buff *skb, struct net_device *dev)
  	skb = vnet_skb_shape(skb, &start, &nlen);
 +	if (skb->len > port->rmtu)
+		goto out_dropped;
+
 	spin_lock_irqsave(&port->vio.lock, flags);

More patch corruption.

author
#2 lore raw
Quoted 3 lines · David Miller

More patch corruption.

Yes, sorry about that. I lost my .gitconfig in a crash and the backup wasn't quite right; fixed, and the ones with subject "PATCHv7" I believe are correct.

						+-DLS