aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/656-skb_reduce_truesize-helper.patch
blob: b326a8b727894bbdd3fa332ead5fd341da5ba4fc (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From 4593a806e31119c5bd3faa00c7210ad862d515af Mon Sep 17 00:00:00 2001
From: Dave Taht <dave.taht@bufferbloat.net>
Date: Mon, 31 Dec 2012 10:02:21 -0800
Subject: [PATCH 3/7] skb_reduce_truesize: helper function for shrinking skbs
 whenever needed

On embedded devices in particular, large queues of small packets from the rx
path with a large truesize can exist. Reducing their size can reduce
memory pressure. skb_reduce_truesize is a helper function for doing this,
when needed.
---
 include/linux/skbuff.h |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2068,6 +2068,24 @@ static inline void pskb_trim_unique(stru
 	BUG_ON(err);
 }
 
+/*
+ * Caller wants to reduce memory needs before queueing skb
+ * The (expensive) copy should not be be done in fast path.
+ */
+static inline struct sk_buff *skb_reduce_truesize(struct sk_buff *skb)
+{
+	if (skb->truesize > 2 * SKB_TRUESIZE(skb->len)) {
+		struct sk_buff *nskb;
+		nskb = skb_copy_expand(skb, skb_headroom(skb), 0,
+			GFP_ATOMIC | __GFP_NOWARN);
+		if (nskb) {
+			__kfree_skb(skb);
+			skb = nskb;
+		}
+	}
+	return skb;
+}
+
 /**
  *	skb_orphan - orphan a buffer
  *	@skb: buffer to orphan
background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
TODO: take care of additional PHYs through the PHY abstraction layer

--- a/arch/arm/mach-ixp4xx/include/mach/platform.h
+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
@@ -74,7 +74,7 @@ extern unsigned long ixp4xx_exp_bus_size
 /*
  * Clock Speed Definitions.
  */
-#define IXP4XX_PERIPHERAL_BUS_CLOCK 	(66) /* 66Mhzi APB BUS   */ 
+#define IXP4XX_PERIPHERAL_BUS_CLOCK 	(66) /* 66Mhzi APB BUS   */
 #define IXP4XX_UART_XTAL        	14745600
 
 /*
@@ -95,12 +95,23 @@ struct ixp4xx_pata_data {
 #define IXP4XX_ETH_NPEB		0x10
 #define IXP4XX_ETH_NPEC		0x20
 
+#define IXP4XX_ETH_PHY_MAX_ADDR	32
+
 /* Information about built-in Ethernet MAC interfaces */
 struct eth_plat_info {
 	u8 phy;		/* MII PHY ID, 0 - 31 */
 	u8 rxq;		/* configurable, currently 0 - 31 only */
 	u8 txreadyq;
 	u8 hwaddr[6];
+
+	u32 phy_mask;
+#if 0
+	int speed;
+	int duplex;
+#else
+	int speed_10;
+	int half_duplex;
+#endif
 };
 
 /* Information about built-in HSS (synchronous serial) interfaces */
--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
+++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
@@ -610,6 +610,37 @@ static int ixp4xx_phy_connect(struct net
 	struct eth_plat_info *plat = port->plat;
 	char phy_id[MII_BUS_ID_SIZE + 3];
 
+	if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) {
+#if 0
+		switch (plat->speed) {
+		case SPEED_10:
+		case SPEED_100:
+			break;
+		default:
+			printk(KERN_ERR "%s: invalid speed (%d)\n",
+					dev->name, plat->speed);
+			return -EINVAL;
+		}
+
+		switch (plat->duplex) {
+		case DUPLEX_HALF:
+		case DUPLEX_FULL:
+			break;
+		default:
+			printk(KERN_ERR "%s: invalid duplex mode (%d)\n",
+					dev->name, plat->duplex);
+			return -EINVAL;
+		}
+		port->speed = plat->speed;
+		port->duplex = plat->duplex;
+#else
+		port->speed = plat->speed_10 ? SPEED_10 : SPEED_100;
+		port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL;
+#endif
+
+		return 0;
+	}
+
 	snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
 		mdio_bus->id, plat->phy);
 	port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
@@ -632,21 +663,32 @@ static void ixp4xx_phy_disconnect(struct
 {
 	struct port *port = netdev_priv(dev);
 
-	phy_disconnect(port->phydev);
+	if (port->phydev)
+		phy_disconnect(port->phydev);
 }
 
 static void ixp4xx_phy_start(struct net_device *dev)
 {
 	struct port *port = netdev_priv(dev);
 
-	phy_start(port->phydev);
+	if (port->phydev) {
+		phy_start(port->phydev);
+	} else {
+		port->link = 1;
+		ixp4xx_update_link(dev);
+	}
 }
 
 static void ixp4xx_phy_stop(struct net_device *dev)
 {
 	struct port *port = netdev_priv(dev);
 
-	phy_stop(port->phydev);
+	if (port->phydev) {
+		phy_stop(port->phydev);
+	} else {
+		port->link = 0;
+		ixp4xx_update_link(dev);
+	}
 }
 
 static inline void debug_pkt(struct net_device *dev, const char *func,
@@ -1048,6 +1090,9 @@ static int eth_ioctl(struct net_device *
 			return hwtstamp_get(dev, req);
 	}
 
+	if (!port->phydev)
+		return -EOPNOTSUPP;
+
 	return phy_mii_ioctl(port->phydev, req, cmd);
 }
 
@@ -1068,18 +1113,30 @@ static void ixp4xx_get_drvinfo(struct ne
 static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
 	struct port *port = netdev_priv(dev);
+
+	if (!port->phydev)
+		return -EOPNOTSUPP;
+
 	return phy_ethtool_gset(port->phydev, cmd);
 }
 
 static int ixp4xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
 	struct port *port = netdev_priv(dev);
+
+	if (!port->phydev)
+		return -EOPNOTSUPP;
+
 	return phy_ethtool_sset(port->phydev, cmd);
 }
 
 static int ixp4xx_nway_reset(struct net_device *dev)
 {
 	struct port *port = netdev_priv(dev);
+
+	if (!port->phydev)
+		return -EOPNOTSUPP;
+
 	return phy_start_aneg(port->phydev);
 }