diff mbox

[RFC,net-next] arp: Do not perturb drop profiles with ignored ARP packets

Message ID 20140925175528.8DFF329004BA@tardy
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Rick Jones Sept. 25, 2014, 5:55 p.m. UTC 
From: Rick Jones <rick.jones2@hp.com>

We do not wish to disturb dropwatch or perf drop profiles with an ARP
we will ignore.

Signed-off-by: Rick Jones <rick.jones2@hp.com>

---

Compile tested only after seeing arp_rcv in a perf top -G -e skb:kfree_skb

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

David Miller Sept. 28, 2014, 9:31 p.m. UTC | #1 
From: raj@tardy.usa.hp.com (Rick Jones)
Date: Thu, 25 Sep 2014 10:55:28 -0700 (PDT)

> 
> From: Rick Jones <rick.jones2@hp.com>
> 
> We do not wish to disturb dropwatch or perf drop profiles with an ARP
> we will ignore.
> 
> Signed-off-by: Rick Jones <rick.jones2@hp.com>

This is fine, applied, thanks Rick.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 1a9b99e..16acb59 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -953,10 +953,11 @@  static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
 {
 	const struct arphdr *arp;
 
+	/* do not tweak dropwatch on an ARP we will ignore */
 	if (dev->flags & IFF_NOARP ||
 	    skb->pkt_type == PACKET_OTHERHOST ||
 	    skb->pkt_type == PACKET_LOOPBACK)
-		goto freeskb;
+		goto consumeskb;
 
 	skb = skb_share_check(skb, GFP_ATOMIC);
 	if (!skb)
@@ -974,6 +975,9 @@  static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
 
 	return NF_HOOK(NFPROTO_ARP, NF_ARP_IN, skb, dev, NULL, arp_process);
 
+consumeskb:
+	consume_skb(skb);
+	return 0;
 freeskb:
 	kfree_skb(skb);
 out_of_mem: