diff options
author | John Fastabend <john.r.fastabend@intel.com> | 2010-11-16 01:31:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-17 15:27:46 -0500 |
commit | 9ea19481db31d614f729f346bdcf28e4e60ff14a (patch) | |
tree | d92a2c8984a7538cdd05694b02fd5028ffaed0b0 | |
parent | 5811662b15db018c740c57d037523683fd3e6123 (diff) |
net: zero kobject in rx_queue_release
netif_set_real_num_rx_queues() can decrement and increment
the number of rx queues. For example ixgbe does this as
features and offloads are toggled. Presumably this could
also happen across down/up on most devices if the available
resources changed (cpu offlined).
The kobject needs to be zero'd in this case so that the
state is not preserved across kobject_put()/kobject_init_and_add().
This resolves the following error report.
ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX
kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong.
Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169
Call Trace:
[<ffffffff8121c940>] kobject_init+0x3a/0x83
[<ffffffff8121cf77>] kobject_init_and_add+0x23/0x57
[<ffffffff8107b800>] ? mark_lock+0x21/0x267
[<ffffffff813c6d11>] net_rx_queue_update_kobjects+0x63/0xc6
[<ffffffff813b5e0e>] netif_set_real_num_rx_queues+0x5f/0x78
[<ffffffffa0261d49>] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe]
[<ffffffffa0262509>] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe]
[<ffffffffa0274596>] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe]
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/net-sysfs.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 3ba526b56fe3..7abeb7ceaa4c 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c | |||
@@ -711,13 +711,18 @@ static void rx_queue_release(struct kobject *kobj) | |||
711 | 711 | ||
712 | 712 | ||
713 | map = rcu_dereference_raw(queue->rps_map); | 713 | map = rcu_dereference_raw(queue->rps_map); |
714 | if (map) | 714 | if (map) { |
715 | RCU_INIT_POINTER(queue->rps_map, NULL); | ||
715 | call_rcu(&map->rcu, rps_map_release); | 716 | call_rcu(&map->rcu, rps_map_release); |
717 | } | ||
716 | 718 | ||
717 | flow_table = rcu_dereference_raw(queue->rps_flow_table); | 719 | flow_table = rcu_dereference_raw(queue->rps_flow_table); |
718 | if (flow_table) | 720 | if (flow_table) { |
721 | RCU_INIT_POINTER(queue->rps_flow_table, NULL); | ||
719 | call_rcu(&flow_table->rcu, rps_dev_flow_table_release); | 722 | call_rcu(&flow_table->rcu, rps_dev_flow_table_release); |
723 | } | ||
720 | 724 | ||
725 | memset(kobj, 0, sizeof(*kobj)); | ||
721 | dev_put(queue->dev); | 726 | dev_put(queue->dev); |
722 | } | 727 | } |
723 | 728 | ||