Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase
PATCH 1/1 Re-define PKT_PROT_LEN to be big enough to handle maximal IPv4 and TCP options and phrase
Signed-off-by Paul Durrant <[email protected]>
--- drivers/xen/netback/netback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/xen/netback/netback.c +1 -1
@@ -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
PATCH 1/1 Make sure we only bump rx_packets when we're definitely going to call netif_rx_ni().
Signed-off-by Paul Durrant <[email protected]>
--- drivers/xen/netback/netback.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/xen/netback/netback.c +3 -3
@@ -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
PATCH 1/1 Remove the 500ms timeout to restart the netif queue. It is generally unhelpful as it results in
Signed-off-by Paul Durrant <[email protected]>
--- drivers/xen/netback/netback.c | 20 +------------------- 1 files changed, 1 insertions(+), 19 deletions(-)
drivers/xen/netback/netback.c +1 -19
@@ -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
PATCH 1/1 Add a missing test to tx_work_todo so that, when netback is using worker threads, net_tx_action()
Signed-off-by Paul Durrant <[email protected]>
--- drivers/xen/netback/netback.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/xen/netback/netback.c +4 -0
@@ -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
PATCH 1/1 There is no need for processing of the pending_inuse list to be within the dealloc_prod/cons
Signed-off-by Paul Durrant <[email protected]>
--- drivers/xen/netback/netback.c | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-)
drivers/xen/netback/netback.c +14 -12
@@ -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