| Message ID | alpine.DEB.1.00.1010071304240.4792@pokey.mtv.corp.google.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Le jeudi 07 octobre 2010 à 13:09 -0700, Tom Herbert a écrit : > The rx->count reference is used to track reference counts to the > number of rx-queue kobjects created for the device. This patch > eliminates initialization of the counter in netif_alloc_rx_queues > and instead increments the counter each time a kobject is created. > This is now symmetric with the decrement that is done when an object is > released. > > Signed-off-by: Tom Herbert <therbert@google.com> > --- > diff --git a/net/core/dev.c b/net/core/dev.c > index 7d14955..58b31d1 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -5026,7 +5026,6 @@ static int netif_alloc_rx_queues(struct net_device *dev) > return -ENOMEM; > } > dev->_rx = rx; > - atomic_set(&rx->count, count); > > /* > * Set a pointer to first element in the array which holds the > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index fa81fd0..b143173 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -726,6 +726,7 @@ static struct kobj_type rx_queue_ktype = { > static int rx_queue_add_kobject(struct net_device *net, int index) > { > struct netdev_rx_queue *queue = net->_rx + index; > + struct netdev_rx_queue *first = queue->first; > struct kobject *kobj = &queue->kobj; > int error = 0; > > @@ -738,6 +739,7 @@ static int rx_queue_add_kobject(struct net_device *net, int index) > } > > kobject_uevent(kobj, KOBJ_ADD); > + atomic_inc(&first->count); > > return error; > } Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- 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
Le jeudi 07 octobre 2010 à 13:09 -0700, Tom Herbert a écrit : > The rx->count reference is used to track reference counts to the > number of rx-queue kobjects created for the device. This patch > eliminates initialization of the counter in netif_alloc_rx_queues > and instead increments the counter each time a kobject is created. > This is now symmetric with the decrement that is done when an object is > released. > > Signed-off-by: Tom Herbert <therbert@google.com> > --- > diff --git a/net/core/dev.c b/net/core/dev.c > index 7d14955..58b31d1 100644 > --- a/net/core/dev.c > +++ b/net/core/dev.c > @@ -5026,7 +5026,6 @@ static int netif_alloc_rx_queues(struct net_device *dev) > return -ENOMEM; > } > dev->_rx = rx; > - atomic_set(&rx->count, count); > > /* > * Set a pointer to first element in the array which holds the > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index fa81fd0..b143173 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -726,6 +726,7 @@ static struct kobj_type rx_queue_ktype = { > static int rx_queue_add_kobject(struct net_device *net, int index) > { > struct netdev_rx_queue *queue = net->_rx + index; > + struct netdev_rx_queue *first = queue->first; > struct kobject *kobj = &queue->kobj; > int error = 0; > > @@ -738,6 +739,7 @@ static int rx_queue_add_kobject(struct net_device *net, int index) > } > > kobject_uevent(kobj, KOBJ_ADD); > + atomic_inc(&first->count); > > return error; > } Acked-by: Eric Dumazet <eric.dumazet@gmail.com> -- 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
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Thu, 07 Oct 2010 22:59:09 +0200 > Le jeudi 07 octobre 2010 à 13:09 -0700, Tom Herbert a écrit : >> The rx->count reference is used to track reference counts to the >> number of rx-queue kobjects created for the device. This patch >> eliminates initialization of the counter in netif_alloc_rx_queues >> and instead increments the counter each time a kobject is created. >> This is now symmetric with the decrement that is done when an object is >> released. >> >> Signed-off-by: Tom Herbert <therbert@google.com> ... > Acked-by: Eric Dumazet <eric.dumazet@gmail.com> Applied, thanks. -- 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 --git a/net/core/dev.c b/net/core/dev.c index 7d14955..58b31d1 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5026,7 +5026,6 @@ static int netif_alloc_rx_queues(struct net_device *dev) return -ENOMEM; } dev->_rx = rx; - atomic_set(&rx->count, count); /* * Set a pointer to first element in the array which holds the diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index fa81fd0..b143173 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -726,6 +726,7 @@ static struct kobj_type rx_queue_ktype = { static int rx_queue_add_kobject(struct net_device *net, int index) { struct netdev_rx_queue *queue = net->_rx + index; + struct netdev_rx_queue *first = queue->first; struct kobject *kobj = &queue->kobj; int error = 0; @@ -738,6 +739,7 @@ static int rx_queue_add_kobject(struct net_device *net, int index) } kobject_uevent(kobj, KOBJ_ADD); + atomic_inc(&first->count); return error; }
The rx->count reference is used to track reference counts to the number of rx-queue kobjects created for the device. This patch eliminates initialization of the counter in netif_alloc_rx_queues and instead increments the counter each time a kobject is created. This is now symmetric with the decrement that is done when an object is released. Signed-off-by: Tom Herbert <therbert@google.com> --- -- 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