Skip to contentSkip to conversation

patch fix-PKT_PROT_LEN

PATCH New Paul Durrant 3 participants 11 messages Dec 14, 2010 – Dec 16, 2010 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 patch fix-PKT_PROT_LEN

---
 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 patch fix-rx-packets-accounting

---
 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 patch remove-timeout

---
 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 patch fix-tx-work-todo

---
 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 patch move-pending-tx-copy

---
 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] patch remove-timeout

In reply to Paul Durrant

On Tue, Dec 14, 2010 at 05:38:01PM +0000, Paul Durrant wrote:

Why? ooh wait your next email gives a truncated answer..

I will wait until you get your git send-mail-fu sorted out.

Quoted 51 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] patch fix-rx-packets-accounting

In reply to Paul Durrant

On Tue, Dec 14, 2010 at 05:38:00PM +0000, Paul Durrant wrote:

Shouldn't there also be a patch to move the tx_bytes?

Quoted 36 lines
---
 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 · 7 lines
1.5.6.5


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

RE: [PATCH] patch fix-rx-packets-accounting

I think tx_packets and tx_bytes accounting is ok. Do you think they are wrong?

Paul

Quoted 51 lines

-----Original Message-----
From: Konrad Rzeszutek Wilk [mailto:[email protected]]
Sent: 15 December 2010 15:45
To: Paul Durrant
Cc: [email protected]
Subject: Re: [Xen-devel] [PATCH] patch fix-rx-packets-accounting

On Tue, Dec 14, 2010 at 05:38:00PM +0000, Paul Durrant wrote:

Shouldn't there also be a patch to move the tx_bytes?

Review

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

b/drivers/xen/netback/netback.c

drivers/xen/netback/netback.c static void net_tx_submit(struct xen_netbk

Quoted 4 lines

index 1a4a20e..066d140 100644

drivers/xen/netback/netback.c +0 -0
@@ -1519,9 +1519,6 @@ static void net_tx_submit(struct xen_netbk

*netbk)

drivers/xen/netback/netback.c static void net_tx_submit(struct xen_netbk *netbk)

Quoted 9 lines
drivers/xen/netback/netback.c +0 -3
 		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");

drivers/xen/netback/netback.c static void net_tx_submit(struct xen_netbk

Quoted 1 line
drivers/xen/netback/netback.c +0 -0
@@ -1537,6 +1534,9 @@ static void net_tx_submit(struct xen_netbk

*netbk)

Quoted 17 lines
drivers/xen/netback/netback.c +3 -1
 			continue;
 		}
 
+		netif->stats.rx_bytes += skb->len;
+		netif->stats.rx_packets++;
+
 		netif_rx_ni(skb);
 		netif->dev->last_rx = jiffies;
 	}
--

1.5.6.5

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

#8 lore raw

RE: [PATCH] patch fix-rx-packets-accounting

Quoted 1 line · Paul Durrant

I think tx_packets and tx_bytes accounting is ok. Do you think they are wrong?

I wonder if it might be more correct to only increment them if status == NETIF_RSP_OK?

Ian.

#9 lore raw

RE: [PATCH] patch fix-rx-packets-accounting

No, I don't think so. The stats should be bumped on data ingress to the shared ring. After all, if this were ethernet, you generally have no way of knowing whether the packet you send ever makes it to its destination.

Paul

Quoted 8 lines

-----Original Message-----
From: Ian Campbell
Sent: 16 December 2010 11:45
To: Paul Durrant
Cc: Konrad Rzeszutek Wilk; [email protected]
Subject: RE: [Xen-devel] [PATCH] patch fix-rx-packets-accounting

On Thu, 2010-12-16 at 11:37 +0000, Paul Durrant wrote:

Quoted 9 lines
Quoted 1 line

I think tx_packets and tx_bytes accounting is ok. Do you think

they are wrong?

I wonder if it might be more correct to only increment them if status ==
NETIF_RSP_OK?

Ian.

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

#10 lore raw

Re: [PATCH] patch fix-rx-packets-accounting

Quoted 2 lines · Paul Durrant

No, I don't think so. The stats should be bumped on data ingress to the shared ring. After all, if this were ethernet, you generally have no way of knowing whether the packet you send ever makes it to its destination.

OK. Thanks.

Quoted 20 lines

Paul

Quoted 17 lines

-----Original Message-----
From: Ian Campbell
Sent: 16 December 2010 11:45
To: Paul Durrant
Cc: Konrad Rzeszutek Wilk; [email protected]
Subject: RE: [Xen-devel] [PATCH] patch fix-rx-packets-accounting

Quoted 1 line · Paul Durrant

I think tx_packets and tx_bytes accounting is ok. Do you think

they are wrong?

I wonder if it might be more correct to only increment them if status ==
NETIF_RSP_OK?

Ian.