Skip to contentSkip to conversation

xen-netfront: remove dead code

PATCH Applied Jeremy Fitzhardinge 2 participants 6 messages Aug 7, 2007 – Aug 14, 2007

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xen-netfront: remove dead code

This patch removes some residual dead code left over from removing the "flip" receive mode. This patch doesn't change the generated output at all, since gcc already realized it was dead.

This resolves the "regression" reported by Adrian.

Cc Adrian Bunk <[email protected]>
Cc Michal Piotrowski <[email protected]>
---
 drivers/net/xen-netfront.c |   37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

===================================================================

drivers/net/xen-netfront.c +2 -35
@@ -209,11 +209,9 @@ static void xennet_alloc_rx_buffers(stru
 	struct page *page;
 	int i, batch_target, notify;
 	RING_IDX req_prod = np->rx.req_prod_pvt;
-	struct xen_memory_reservation reservation;
 	grant_ref_t ref;
 	unsigned long pfn;
 	void *vaddr;
-	int nr_flips;
 	struct xen_netif_rx_request *req;
 
 	if (unlikely(!netif_carrier_ok(dev)))
@@ -263,7 +261,7 @@ no_skb:
 		np->rx_target = np->rx_max_target;
 
  refill:
-	for (nr_flips = i = 0; ; i++) {
+	for (i = 0; ; i++) {
 		skb = __skb_dequeue(&np->rx_batch);
 		if (skb == NULL)
 			break;
@@ -292,38 +290,7 @@ no_skb:
 		req->gref = ref;
 	}
 
-	if (nr_flips != 0) {
-		reservation.extent_start = np->rx_pfn_array;
-		reservation.nr_extents   = nr_flips;
-		reservation.extent_order = 0;
-		reservation.address_bits = 0;
-		reservation.domid        = DOMID_SELF;
-
-		if (!xen_feature(XENFEAT_auto_translated_physmap)) {
-			/* After all PTEs have been zapped, flush the TLB. */
-			np->rx_mcl[i-1].args[MULTI_UVMFLAGS_INDEX] =
-				UVMF_TLB_FLUSH|UVMF_ALL;
-
-			/* Give away a batch of pages. */
-			np->rx_mcl[i].op = __HYPERVISOR_memory_op;
-			np->rx_mcl[i].args[0] = XENMEM_decrease_reservation;
-			np->rx_mcl[i].args[1] = (unsigned long)&reservation;
-
-			/* Zap PTEs and give away pages in one big
-			 * multicall. */
-			(void)HYPERVISOR_multicall(np->rx_mcl, i+1);
-
-			/* Check return status of HYPERVISOR_memory_op(). */
-			if (unlikely(np->rx_mcl[i].result != i))
-				panic("Unable to reduce memory reservation\n");
-		} else {
-			if (HYPERVISOR_memory_op(XENMEM_decrease_reservation,
-						 &reservation) != i)
-				panic("Unable to reduce memory reservation\n");
-		}
-	} else {
-		wmb();		/* barrier so backend seens requests */
-	}
+	wmb();		/* barrier so backend seens requests */
 
 	/* Above is a suitable barrier to ensure backend will see requests. */
 	np->rx.req_prod_pvt = req_prod + i;
#1 lore raw
Quoted 6 lines · Jeremy Fitzhardinge

This patch removes some residual dead code left over from removing the "flip" receive mode. This patch doesn't change the generated output at all, since gcc already realized it was dead.

This resolves the "regression" reported by Adrian.

Quoted 7 lines
Cc Adrian Bunk <[email protected]>
Cc Michal Piotrowski <[email protected]>
---
 drivers/net/xen-netfront.c |   37 ++-----------------------------------
 1 file changed, 2 insertions(+), 35 deletions(-)

Please send drivers/net/* through me and netdev...

Jeff

#2 lore raw
Quoted 1 line · Jeff Garzik

Please send drivers/net/* through me and netdev...

Sure. Did you pick this patch up?

Thanks,
J

#3 lore raw
Quoted 4 lines · Jeremy Fitzhardinge
Quoted 1 line · Jeff Garzik

Please send drivers/net/* through me and netdev...

Sure. Did you pick this patch up?

Yes. It's in my pending-for-2.6.24 folder, since it's not a bug fix.

Jeff

#4 lore raw
Quoted 1 line · Jeff Garzik

Yes. It's in my pending-for-2.6.24 folder, since it's not a bug fix.

Great, thanks.

J