Skip to contentSkip to conversation

Re-define PKT_PROT_LEN to be bigger.

PATCH In review Paul Durrant 4 participants 11 messages Dec 14, 2010 – Dec 20, 2010 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Re-define PKT_PROT_LEN to be bigger.

Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase the definition so that it's reasonably obvious that's what it's for.

---
 drivers/xen/netback/netback.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/netback/netback.c +1 -1
index c448675..1a4a20e 100644
@@ -128,7 +128,7 @@ static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi
  * packet processing on them (netfilter, routing, etc). 72 is enough
  * to cover TCP+IP headers including options.
  */
-#define PKT_PROT_LEN 72
+#define PKT_PROT_LEN    (ETH_HLEN + 4 + (15 * 4) + (15 * 4))
 
 static inline pending_ring_idx_t pending_index(unsigned i)
 {
Signature · 1 line
1.5.6.5
#1 lore raw

PATCH 1/1 Don't count packets we don't actually receive.

Make sure we only bump rx_packets when we're definitely going to call netif_rx_ni().

---
 drivers/xen/netback/netback.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/xen/netback/netback.c +3 -3
index 1a4a20e..066d140 100644
@@ -1519,9 +1519,6 @@ static void net_tx_submit(struct xen_netbk *netbk)
 		skb->dev      = netif->dev;
 		skb->protocol = eth_type_trans(skb, skb->dev);
 
-		netif->stats.rx_bytes += skb->len;
-		netif->stats.rx_packets++;
-
 		if (skb->ip_summed == CHECKSUM_PARTIAL) {
 			if (skb_checksum_setup(skb)) {
 				DPRINTK("Can't setup checksum in net_tx_action\n");
@@ -1537,6 +1534,9 @@ static void net_tx_submit(struct xen_netbk *netbk)
 			continue;
 		}
 
+		netif->stats.rx_bytes += skb->len;
+		netif->stats.rx_packets++;
+
 		netif_rx_ni(skb);
 		netif->dev->last_rx = jiffies;
 	}
Signature · 1 line
1.5.6.5
#2 lore raw

PATCH 1/1 Remove the 500ms timeout to restart the netif queue.

It is generally unhelpful as it results in a massive tail-drop should a guest become unresponsive for a relatively short period of time and no back-pressure (other than that caused by a higher layer protocol) is applied to the sender.

---
 drivers/xen/netback/netback.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
drivers/xen/netback/netback.c +1 -19
index 066d140..87a2cd4 100644
@@ -271,13 +271,6 @@ static inline int netbk_queue_full(struct xen_netif *netif)
 	       ((netif->rx.rsp_prod_pvt + NET_RX_RING_SIZE - peek) < needed);
 }
 
-static void tx_queue_callback(unsigned long data)
-{
-	struct xen_netif *netif = (struct xen_netif *)data;
-	if (netif_schedulable(netif))
-		netif_wake_queue(netif->dev);
-}
-
 /* Figure out how many ring slots we're going to need to send @skb to
    the guest. */
 static unsigned count_skb_slots(struct sk_buff *skb, struct xen_netif *netif)
@@ -360,19 +353,8 @@ int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		netif->rx.sring->req_event = netif->rx_req_cons_peek +
 			netbk_max_required_rx_slots(netif);
 		mb(); /* request notification /then/ check & stop the queue */
-		if (netbk_queue_full(netif)) {
+		if (netbk_queue_full(netif))
 			netif_stop_queue(dev);
-			/*
-			 * Schedule 500ms timeout to restart the queue, thus
-			 * ensuring that an inactive queue will be drained.
-			 * Packets will be immediately be dropped until more
-			 * receive buffers become available (see
-			 * netbk_queue_full() check above).
-			 */
-			netif->tx_queue_timeout.data = (unsigned long)netif;
-			netif->tx_queue_timeout.function = tx_queue_callback;
-			mod_timer(&netif->tx_queue_timeout, jiffies + HZ/2);
-		}
 	}
 	skb_queue_tail(&netbk->rx_queue, skb);
 
Signature · 1 line
1.5.6.5
#3 lore raw

PATCH 1/1 Add a missing test to tx_work_todo.

Adda test so that, when netback is using worker threads, net_tx_action() gets called in a timely manner when the pending_inuse list is populated.

---
 drivers/xen/netback/netback.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/xen/netback/netback.c +4 -0
index 87a2cd4..eca61a9 100644
@@ -1712,6 +1712,10 @@ static inline int tx_work_todo(struct xen_netbk *netbk)
 	if (netbk->dealloc_cons != netbk->dealloc_prod)
 		return 1;
 
+	if (netbk_copy_skb_mode == NETBK_DELAYED_COPY_SKB &&
+	    !list_empty(&netbk->pending_inuse_head))
+		return 1;
+
 	if (((nr_pending_reqs(netbk) + MAX_SKB_FRAGS) < MAX_PENDING_REQS) &&
 			!list_empty(&netbk->net_schedule_list))
 		return 1;
Signature · 1 line
1.5.6.5
#4 lore raw

PATCH 1/1 Re-factor net_tx_action_dealloc() slightly.

There is no need for processing of the pending_inuse list to be within the dealloc_prod/cons loop.

---
 drivers/xen/netback/netback.c |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)
drivers/xen/netback/netback.c +14 -12
index eca61a9..25adbf4 100644
@@ -913,11 +913,20 @@ static inline void net_tx_action_dealloc(struct xen_netbk *netbk)
 			gop++;
 		}
 
-		if (netbk_copy_skb_mode != NETBK_DELAYED_COPY_SKB ||
-		    list_empty(&netbk->pending_inuse_head))
-			break;
+	} while (dp != netbk->dealloc_prod);
+
+	netbk->dealloc_cons = dc;
 
-		/* Copy any entries that have been pending for too long. */
+	ret = HYPERVISOR_grant_table_op(
+		GNTTABOP_unmap_grant_ref, netbk->tx_unmap_ops,
+		gop - netbk->tx_unmap_ops);
+	BUG_ON(ret);
+
+	/*
+	 * Copy any entries that have been pending for too long
+	 */
+	if (netbk_copy_skb_mode == NETBK_DELAYED_COPY_SKB &&
+	    !list_empty(&netbk->pending_inuse_head)) {
 		list_for_each_entry_safe(inuse, n,
 				&netbk->pending_inuse_head, list) {
 			struct pending_tx_info *pending_tx_info;
@@ -943,14 +952,7 @@ static inline void net_tx_action_dealloc(struct xen_netbk *netbk)
 
 			break;
 		}
-	} while (dp != netbk->dealloc_prod);
-
-	netbk->dealloc_cons = dc;
-
-	ret = HYPERVISOR_grant_table_op(
-		GNTTABOP_unmap_grant_ref, netbk->tx_unmap_ops,
-		gop - netbk->tx_unmap_ops);
-	BUG_ON(ret);
+	}
 
 	list_for_each_entry_safe(inuse, n, &list, list) {
 		struct pending_tx_info *pending_tx_info;
Signature · 1 line
1.5.6.5
#5 lore raw

Re: [PATCH] Remove the 500ms timeout to restart the netif queue.

In reply to Paul Durrant
Quoted 3 lines · Paul Durrant

It is generally unhelpful as it results in a massive tail-drop should a guest become unresponsive for a relatively short period of time and no back-pressure (other than that caused by a higher layer protocol) is applied to the sender.

The patch just removes the timeout, so the queue will be considered unavailable.. So will the queue be restarted via the net_rx_action logic?

Quoted 53 lines
---
 drivers/xen/netback/netback.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
drivers/xen/netback/netback.c +1 -19
index 066d140..87a2cd4 100644
@@ -271,13 +271,6 @@ static inline int netbk_queue_full(struct xen_netif *netif)
 	       ((netif->rx.rsp_prod_pvt + NET_RX_RING_SIZE - peek) < needed);
 }
 
-static void tx_queue_callback(unsigned long data)
-{
-	struct xen_netif *netif = (struct xen_netif *)data;
-	if (netif_schedulable(netif))
-		netif_wake_queue(netif->dev);
-}
-
 /* Figure out how many ring slots we're going to need to send @skb to
    the guest. */
 static unsigned count_skb_slots(struct sk_buff *skb, struct xen_netif *netif)
@@ -360,19 +353,8 @@ int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		netif->rx.sring->req_event = netif->rx_req_cons_peek +
 			netbk_max_required_rx_slots(netif);
 		mb(); /* request notification /then/ check & stop the queue */
-		if (netbk_queue_full(netif)) {
+		if (netbk_queue_full(netif))
 			netif_stop_queue(dev);
-			/*
-			 * Schedule 500ms timeout to restart the queue, thus
-			 * ensuring that an inactive queue will be drained.
-			 * Packets will be immediately be dropped until more
-			 * receive buffers become available (see
-			 * netbk_queue_full() check above).
-			 */
-			netif->tx_queue_timeout.data = (unsigned long)netif;
-			netif->tx_queue_timeout.function = tx_queue_callback;
-			mod_timer(&netif->tx_queue_timeout, jiffies + HZ/2);
-		}
 	}
 	skb_queue_tail(&netbk->rx_queue, skb);
 
Signature · 7 lines
1.5.6.5


_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
#6 lore raw

RE: [PATCH] Remove the 500ms timeout to restart the netif queue.

Yes, the code to restart the queue when space becomes available in the shared ring is already there. Removal of the timeout simply means that the queue will not be restarted until that code runs.

Paul

Quoted 85 lines

-----Original Message-----
From: Konrad Rzeszutek Wilk [mailto:[email protected]]
Sent: 15 December 2010 15:59
To: Paul Durrant
Cc: [email protected]
Subject: Re: [Xen-devel] [PATCH] Remove the 500ms timeout to restart the netif queue.

Quoted 1 line · Paul Durrant

It is generally unhelpful as it results in a massive tail-drop

should a guest become

Quoted 1 line

unresponsive for a relatively short period of time and no back-

pressure (other than

Quoted 1 line

that caused by a higher layer protocol) is applied to the sender.

The patch just removes the timeout, so the queue will be considered unavailable..
So will the queue be restarted via the net_rx_action logic?

Review

Quoted 7 lines
---
 drivers/xen/netback/netback.c |   20 +-------------------
 1 files changed, 1 insertions(+), 19 deletions(-)
(quoted diff) +0 -0

b/drivers/xen/netback/netback.c

drivers/xen/netback/netback.c static inline int netbk_queue_full(struct

Quoted 4 lines

index 066d140..87a2cd4 100644

drivers/xen/netback/netback.c +0 -0
@@ -271,13 +271,6 @@ static inline int netbk_queue_full(struct

xen_netif *netif)

drivers/xen/netback/netback.c static inline int netbk_queue_full(struct · line 271

Quoted 1 line
drivers/xen/netback/netback.c +0 -0
 	       ((netif->rx.rsp_prod_pvt + NET_RX_RING_SIZE - peek) <

needed);

drivers/xen/netback/netback.c static inline int netbk_queue_full(struct xen_netif *netif)

Quoted 10 lines
drivers/xen/netback/netback.c +0 -7
 }
 
-static void tx_queue_callback(unsigned long data)
-{
-	struct xen_netif *netif = (struct xen_netif *)data;
-	if (netif_schedulable(netif))
-		netif_wake_queue(netif->dev);
-}
-
 /* Figure out how many ring slots we're going to need to send

@skb to

drivers/xen/netback/netback.c static inline int netbk_queue_full(struct · line 276

Quoted 2 lines
drivers/xen/netback/netback.c +0 -0
    the guest. */
 static unsigned count_skb_slots(struct sk_buff *skb, struct

xen_netif *netif)

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb,

Quoted 1 line
drivers/xen/netback/netback.c +0 -0
@@ -360,19 +353,8 @@ int netif_be_start_xmit(struct sk_buff *skb,

struct net_device *dev)

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)

Quoted 3 lines
drivers/xen/netback/netback.c +0 -0
 		netif->rx.sring->req_event = netif->rx_req_cons_peek +
 			netbk_max_required_rx_slots(netif);
 		mb(); /* request notification /then/ check & stop the

queue */

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)

Quoted 5 lines
drivers/xen/netback/netback.c +1 -3
-		if (netbk_queue_full(netif)) {
+		if (netbk_queue_full(netif))
 			netif_stop_queue(dev);
-			/*
-			 * Schedule 500ms timeout to restart the queue,

thus

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, · line 367

Quoted 1 line
drivers/xen/netback/netback.c +0 -1
-			 * ensuring that an inactive queue will be

drained.

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, · line 368

Quoted 1 line
drivers/xen/netback/netback.c +0 -1
-			 * Packets will be immediately be dropped until

more

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, struct net_device *dev)

Quoted 4 lines
drivers/xen/netback/netback.c +0 -4
-			 * receive buffers become available (see
-			 * netbk_queue_full() check above).
-			 */
-			netif->tx_queue_timeout.data = (unsigned

long)netif;

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, · line 373

Quoted 1 line
drivers/xen/netback/netback.c +0 -1
-			netif->tx_queue_timeout.function =

tx_queue_callback;

drivers/xen/netback/netback.c int netif_be_start_xmit(struct sk_buff *skb, · line 374

Quoted 1 line
drivers/xen/netback/netback.c +0 -1
-			mod_timer(&netif->tx_queue_timeout, jiffies +

HZ/2);

Quoted 12 lines
drivers/xen/netback/netback.c +0 -2
-		}
 	}
 	skb_queue_tail(&netbk->rx_queue, skb);
 
--

1.5.6.5

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#7 lore raw
In reply to Paul Durrant
Quoted 2 lines · Paul Durrant

Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase the definition so that it's reasonably obvious that's what it's for.

Which kernel are these for?

Thanks,
J

Quoted 18 lines
---
 drivers/xen/netback/netback.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/netback/netback.c +1 -1
index c448675..1a4a20e 100644
@@ -128,7 +128,7 @@ static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi
  * packet processing on them (netfilter, routing, etc). 72 is enough
  * to cover TCP+IP headers including options.
  */
-#define PKT_PROT_LEN 72
+#define PKT_PROT_LEN    (ETH_HLEN + 4 + (15 * 4) + (15 * 4))
 
 static inline pending_ring_idx_t pending_index(unsigned i)
 {
#8 lore raw

Sorry, should have said... These are patches against the pvops xen/stable-2.6.32.x branch.

Cheers,

Paul

Quoted 40 lines

-----Original Message-----
From: Jeremy Fitzhardinge [mailto:[email protected]]
Sent: 14 December 2010 22:17
To: Paul Durrant
Cc: [email protected]
Subject: Re: [Xen-devel] [PATCH] Re-define PKT_PROT_LEN to be bigger.

Quoted 1 line · Paul Durrant

Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and

TCP options and phrase

Quoted 1 line

the definition so that it's reasonably obvious that's what it's

for.

Which kernel are these for?

Thanks,
J

Review

Quoted 6 lines
---
 drivers/xen/netback/netback.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
(quoted diff) +0 -0

b/drivers/xen/netback/netback.c

drivers/xen/netback/netback.c static inline int netif_get_page_ext(struct

Quoted 4 lines

index c448675..1a4a20e 100644

drivers/xen/netback/netback.c +0 -0
@@ -128,7 +128,7 @@ static inline int netif_get_page_ext(struct

page *pg, unsigned int *_group, unsi

drivers/xen/netback/netback.c static inline int netif_get_page_ext(struct · line 128

Quoted 1 line
drivers/xen/netback/netback.c +0 -0
  * packet processing on them (netfilter, routing, etc). 72 is

enough

Quoted 7 lines
drivers/xen/netback/netback.c +1 -1
  * to cover TCP+IP headers including options.
  */
-#define PKT_PROT_LEN 72
+#define PKT_PROT_LEN    (ETH_HLEN + 4 + (15 * 4) + (15 * 4))
 
 static inline pending_ring_idx_t pending_index(unsigned i)
 {
#9 lore raw
In reply to Paul Durrant
Quoted 13 lines · Paul Durrant

Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase the definition so that it's reasonably obvious that's what it's for.

---
 drivers/xen/netback/netback.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/netback/netback.c +0 -0
index c448675..1a4a20e 100644

drivers/xen/netback/netback.c static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi · line 128

Quoted 1 line
drivers/xen/netback/netback.c +0 -0
@@ -128,7 +128,7 @@ static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi
  * packet processing on them (netfilter, routing, etc). 72 is enough

Missed this comment.

drivers/xen/netback/netback.c static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi · line 131

Quoted 4 lines
drivers/xen/netback/netback.c +1 -1
  * to cover TCP+IP headers including options.
  */
-#define PKT_PROT_LEN 72
+#define PKT_PROT_LEN    (ETH_HLEN + 4 + (15 * 4) + (15 * 4))

Clearer as:

#define ETH_HLEN_VLAN_HLEN + \
	MAX_IPOPTLEN + sizeof(struct iphdr) + \
	MAX_TCP_OPTION_SPACE + sizeof(struct tcphdr)

?

#10 lore raw
In reply to Paul Durrant

I applied these 5 patches (replacing this first one with the repost from <[email protected]>) to my WIP branch for upstreaming. Not sure if they also want to go into the next-2.6.32 branch.

Ian.

Quoted 21 lines · Paul Durrant

Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase the definition so that it's reasonably obvious that's what it's for.

---
 drivers/xen/netback/netback.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/netback/netback.c +1 -1
index c448675..1a4a20e 100644
@@ -128,7 +128,7 @@ static inline int netif_get_page_ext(struct page *pg, unsigned int *_group, unsi
  * packet processing on them (netfilter, routing, etc). 72 is enough
  * to cover TCP+IP headers including options.
  */
-#define PKT_PROT_LEN 72
+#define PKT_PROT_LEN    (ETH_HLEN + 4 + (15 * 4) + (15 * 4))
 
 static inline pending_ring_idx_t pending_index(unsigned i)
 {