* [PATCH 1/2] af-packet: Hold reference to bound network devices.
@ 2011-06-01 17:18 greearb
2011-06-01 17:18 ` [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets greearb
2011-06-05 21:16 ` [PATCH 1/2] af-packet: Hold reference to bound network devices David Miller
0 siblings, 2 replies; 4+ messages in thread
From: greearb @ 2011-06-01 17:18 UTC (permalink / raw)
To: netdev; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
Old code was probably safe, but with this change we
can actually use the netdev object, not just compare
the pointer values.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
:100644 100644 f7250d5... 614d659... M net/packet/af_packet.c
net/packet/af_packet.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index f7250d5..614d659 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1377,6 +1377,10 @@ static int packet_release(struct socket *sock)
__dev_remove_pack(&po->prot_hook);
__sock_put(sk);
}
+ if (po->prot_hook.dev) {
+ dev_put(po->prot_hook.dev);
+ po->prot_hook.dev = NULL;
+ }
spin_unlock(&po->bind_lock);
packet_flush_mclist(sk);
@@ -1430,6 +1434,8 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc
po->num = protocol;
po->prot_hook.type = protocol;
+ if (po->prot_hook.dev)
+ dev_put(po->prot_hook.dev);
po->prot_hook.dev = dev;
po->ifindex = dev ? dev->ifindex : 0;
@@ -1474,10 +1480,8 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
strlcpy(name, uaddr->sa_data, sizeof(name));
dev = dev_get_by_name(sock_net(sk), name);
- if (dev) {
+ if (dev)
err = packet_do_bind(sk, dev, pkt_sk(sk)->num);
- dev_put(dev);
- }
return err;
}
@@ -1505,8 +1509,6 @@ static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len
goto out;
}
err = packet_do_bind(sk, dev, sll->sll_protocol ? : pkt_sk(sk)->num);
- if (dev)
- dev_put(dev);
out:
return err;
@@ -2275,6 +2277,8 @@ static int packet_notifier(struct notifier_block *this, unsigned long msg, void
}
if (msg == NETDEV_UNREGISTER) {
po->ifindex = -1;
+ if (po->prot_hook.dev)
+ dev_put(po->prot_hook.dev);
po->prot_hook.dev = NULL;
}
spin_unlock(&po->bind_lock);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets.
2011-06-01 17:18 [PATCH 1/2] af-packet: Hold reference to bound network devices greearb
@ 2011-06-01 17:18 ` greearb
2011-06-05 21:16 ` David Miller
2011-06-05 21:16 ` [PATCH 1/2] af-packet: Hold reference to bound network devices David Miller
1 sibling, 1 reply; 4+ messages in thread
From: greearb @ 2011-06-01 17:18 UTC (permalink / raw)
To: netdev; +Cc: Ben Greear
From: Ben Greear <greearb@candelatech.com>
This saves a network device lookup on each packet transmitted,
for sockets that are bound to a network device.
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
v3: No changes since last time, but previous patch to hold
prot_hook.dev should fix locking problems with this patch.
:100644 100644 614d659... c1c5f33... M net/packet/af_packet.c
net/packet/af_packet.c | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 614d659..c1c5f33 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -994,7 +994,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
struct sk_buff *skb;
struct net_device *dev;
__be16 proto;
- int ifindex, err, reserve = 0;
+ bool need_rls_dev = false;
+ int err, reserve = 0;
void *ph;
struct sockaddr_ll *saddr = (struct sockaddr_ll *)msg->msg_name;
int tp_len, size_max;
@@ -1006,7 +1007,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
err = -EBUSY;
if (saddr == NULL) {
- ifindex = po->ifindex;
+ dev = po->prot_hook.dev;
proto = po->num;
addr = NULL;
} else {
@@ -1017,12 +1018,12 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
+ offsetof(struct sockaddr_ll,
sll_addr)))
goto out;
- ifindex = saddr->sll_ifindex;
proto = saddr->sll_protocol;
addr = saddr->sll_addr;
+ dev = dev_get_by_index(sock_net(&po->sk), saddr->sll_ifindex);
+ need_rls_dev = true;
}
- dev = dev_get_by_index(sock_net(&po->sk), ifindex);
err = -ENXIO;
if (unlikely(dev == NULL))
goto out;
@@ -1108,7 +1109,8 @@ out_status:
__packet_set_status(po, ph, status);
kfree_skb(skb);
out_put:
- dev_put(dev);
+ if (need_rls_dev)
+ dev_put(dev);
out:
mutex_unlock(&po->pg_vec_lock);
return err;
@@ -1146,8 +1148,9 @@ static int packet_snd(struct socket *sock,
struct sk_buff *skb;
struct net_device *dev;
__be16 proto;
+ bool need_rls_dev = false;
unsigned char *addr;
- int ifindex, err, reserve = 0;
+ int err, reserve = 0;
struct virtio_net_hdr vnet_hdr = { 0 };
int offset = 0;
int vnet_hdr_len;
@@ -1165,7 +1168,7 @@ static int packet_snd(struct socket *sock,
*/
if (saddr == NULL) {
- ifindex = po->ifindex;
+ dev = po->prot_hook.dev;
proto = po->num;
addr = NULL;
} else {
@@ -1174,13 +1177,12 @@ static int packet_snd(struct socket *sock,
goto out;
if (msg->msg_namelen < (saddr->sll_halen + offsetof(struct sockaddr_ll, sll_addr)))
goto out;
- ifindex = saddr->sll_ifindex;
proto = saddr->sll_protocol;
addr = saddr->sll_addr;
+ dev = dev_get_by_index(sock_net(sk), saddr->sll_ifindex);
+ need_rls_dev = true;
}
-
- dev = dev_get_by_index(sock_net(sk), ifindex);
err = -ENXIO;
if (dev == NULL)
goto out_unlock;
@@ -1320,14 +1322,15 @@ static int packet_snd(struct socket *sock,
if (err > 0 && (err = net_xmit_errno(err)) != 0)
goto out_unlock;
- dev_put(dev);
+ if (need_rls_dev)
+ dev_put(dev);
return len;
out_free:
kfree_skb(skb);
out_unlock:
- if (dev)
+ if (dev && need_rls_dev)
dev_put(dev);
out:
return err;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] af-packet: Hold reference to bound network devices.
2011-06-01 17:18 [PATCH 1/2] af-packet: Hold reference to bound network devices greearb
2011-06-01 17:18 ` [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets greearb
@ 2011-06-05 21:16 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: David Miller @ 2011-06-05 21:16 UTC (permalink / raw)
To: greearb; +Cc: netdev
From: greearb@candelatech.com
Date: Wed, 1 Jun 2011 10:18:52 -0700
> From: Ben Greear <greearb@candelatech.com>
>
> Old code was probably safe, but with this change we
> can actually use the netdev object, not just compare
> the pointer values.
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets.
2011-06-01 17:18 ` [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets greearb
@ 2011-06-05 21:16 ` David Miller
0 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2011-06-05 21:16 UTC (permalink / raw)
To: greearb; +Cc: netdev
From: greearb@candelatech.com
Date: Wed, 1 Jun 2011 10:18:53 -0700
> From: Ben Greear <greearb@candelatech.com>
>
> This saves a network device lookup on each packet transmitted,
> for sockets that are bound to a network device.
>
> Signed-off-by: Ben Greear <greearb@candelatech.com>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-06-05 21:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-01 17:18 [PATCH 1/2] af-packet: Hold reference to bound network devices greearb
2011-06-01 17:18 ` [PATCH 2/2 v3] af-packet: Use existing netdev reference for bound sockets greearb
2011-06-05 21:16 ` David Miller
2011-06-05 21:16 ` [PATCH 1/2] af-packet: Hold reference to bound network devices David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).