| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <EA929A9653AAE14F841771FB1DE5A136602807B460@rrsmsx501.amr.corp.intel.com>
Date: Wed, 27 Oct 2010 16:35:11 -0600
From: "Tantilov, Emil S" <emil.s.tantilov@...el.com>
To: Eric Dumazet <eric.dumazet@...il.com>,
David Miller <davem@...emloft.net>,
"Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@...el.com>,
"Kirsher, Jeffrey T" <jeffrey.t.kirsher@...el.com>,
"Brattain, Ross B" <ross.b.brattain@...el.com>
CC: netdev <netdev@...r.kernel.org>
Subject: RE: [PATCH net-next] ixgbe: fix stats handling
>-----Original Message-----
>From: Eric Dumazet [mailto:eric.dumazet@...il.com]
>Sent: Monday, October 11, 2010 5:17 AM
>To: David Miller; Waskiewicz Jr, Peter P; Tantilov, Emil S; Kirsher,
>Jeffrey T
>Cc: netdev
>Subject: [PATCH net-next] ixgbe: fix stats handling
>
>Hi
>
>I am sending this patch for Intel people review/test and acknowledge.
>
>Thanks !
>
>[PATCH net-next] ixgbe: fix stats handling
>
>Current ixgbe stats have following problems :
>
>- Not 64 bit safe (on 32bit arches)
>
>- Not safe in ixgbe_clean_rx_irq() :
> All cpus dirty a common location (netdev->stats.rx_bytes &
>netdev->stats.rx_packets) without proper synchronization.
> This slow down a bit multiqueue operations, and possibly miss some
>updates.
>
>Fixes :
>
>Implement ndo_get_stats64() method to provide accurate 64bit rx|tx
>bytes/packets counters, using 64bit safe infrastructure.
>
>ixgbe_get_ethtool_stats() also use this infrastructure to provide 64bit
>safe counters.
>
>Signed-off-by: Eric Dumazet <eric.dumazet@...il.com>
>CC: Peter Waskiewicz <peter.p.waskiewicz.jr@...el.com>
>CC: Emil Tantilov <emil.s.tantilov@...el.com>
>CC: Jeff Kirsher <jeffrey.t.kirsher@...el.com>
>---
> drivers/net/ixgbe/ixgbe.h | 3 +-
> drivers/net/ixgbe/ixgbe_ethtool.c | 29 +++++++++++---------
> drivers/net/ixgbe/ixgbe_main.c | 40 +++++++++++++++++++++++++---
> 3 files changed, 56 insertions(+), 16 deletions(-)
>
>diff --git a/drivers/net/ixgbe/ixgbe.h b/drivers/net/ixgbe/ixgbe.h
>index a8c47b0..944d9e2 100644
>--- a/drivers/net/ixgbe/ixgbe.h
>+++ b/drivers/net/ixgbe/ixgbe.h
>@@ -180,8 +180,9 @@ struct ixgbe_ring {
> */
>
> struct ixgbe_queue_stats stats;
>- unsigned long reinit_state;
>+ struct u64_stats_sync syncp;
> int numa_node;
>+ unsigned long reinit_state;
> u64 rsc_count; /* stat for coalesced packets */
> u64 rsc_flush; /* stats for flushed packets */
> u32 restart_queue; /* track tx queue restarts */
>diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c
>b/drivers/net/ixgbe/ixgbe_ethtool.c
>index d4ac943..3c7f15d 100644
>--- a/drivers/net/ixgbe/ixgbe_ethtool.c
>+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
>@@ -999,12 +999,11 @@ static void ixgbe_get_ethtool_stats(struct net_device
>*netdev,
> struct ethtool_stats *stats, u64
>*data)
> {
> struct ixgbe_adapter *adapter = netdev_priv(netdev);
>- u64 *queue_stat;
>- int stat_count = sizeof(struct ixgbe_queue_stats) / sizeof(u64);
> struct rtnl_link_stats64 temp;
> const struct rtnl_link_stats64 *net_stats;
>- int j, k;
>- int i;
>+ unsigned int start;
>+ struct ixgbe_ring *ring;
>+ int i, j;
> char *p = NULL;
>
> ixgbe_update_stats(adapter);
>@@ -1025,16 +1024,22 @@ static void ixgbe_get_ethtool_stats(struct
>net_device *netdev,
> sizeof(u64)) ? *(u64 *)p : *(u32 *)p;
> }
> for (j = 0; j < adapter->num_tx_queues; j++) {
>- queue_stat = (u64 *)&adapter->tx_ring[j]->stats;
>- for (k = 0; k < stat_count; k++)
>- data[i + k] = queue_stat[k];
>- i += k;
>+ ring = adapter->tx_ring[j];
>+ do {
>+ start = u64_stats_fetch_begin_bh(&ring->syncp);
>+ data[i] = ring->stats.packets;
>+ data[i+1] = ring->stats.bytes;
>+ } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
>+ i += 2;
> }
> for (j = 0; j < adapter->num_rx_queues; j++) {
>- queue_stat = (u64 *)&adapter->rx_ring[j]->stats;
>- for (k = 0; k < stat_count; k++)
>- data[i + k] = queue_stat[k];
>- i += k;
>+ ring = adapter->rx_ring[j];
>+ do {
>+ start = u64_stats_fetch_begin_bh(&ring->syncp);
>+ data[i] = ring->stats.packets;
>+ data[i+1] = ring->stats.bytes;
>+ } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
>+ i += 2;
> }
> if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
> for (j = 0; j < MAX_TX_PACKET_BUFFERS; j++) {
>diff --git a/drivers/net/ixgbe/ixgbe_main.c
>b/drivers/net/ixgbe/ixgbe_main.c
>index 95dbf60..1efbcde 100644
>--- a/drivers/net/ixgbe/ixgbe_main.c
>+++ b/drivers/net/ixgbe/ixgbe_main.c
>@@ -824,8 +824,10 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector
>*q_vector,
>
> tx_ring->total_bytes += total_bytes;
> tx_ring->total_packets += total_packets;
>+ u64_stats_update_begin(&tx_ring->syncp);
> tx_ring->stats.packets += total_packets;
> tx_ring->stats.bytes += total_bytes;
>+ u64_stats_update_end(&tx_ring->syncp);
> return count < tx_ring->work_limit;
> }
>
>@@ -1172,7 +1174,6 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector
>*q_vector,
> int *work_done, int work_to_do)
> {
> struct ixgbe_adapter *adapter = q_vector->adapter;
>- struct net_device *netdev = adapter->netdev;
> struct pci_dev *pdev = adapter->pdev;
> union ixgbe_adv_rx_desc *rx_desc, *next_rxd;
> struct ixgbe_rx_buffer *rx_buffer_info, *next_buffer;
>@@ -1298,8 +1299,10 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector
>*q_vector,
> rx_ring->rsc_count++;
> rx_ring->rsc_flush++;
> }
>+ u64_stats_update_begin(&rx_ring->syncp);
> rx_ring->stats.packets++;
> rx_ring->stats.bytes += skb->len;
>+ u64_stats_update_end(&rx_ring->syncp);
> } else {
> if (rx_ring->flags & IXGBE_RING_RX_PS_ENABLED) {
> rx_buffer_info->skb = next_buffer->skb;
>@@ -1375,8 +1378,6 @@ next_desc:
>
> rx_ring->total_packets += total_rx_packets;
> rx_ring->total_bytes += total_rx_bytes;
>- netdev->stats.rx_bytes += total_rx_bytes;
>- netdev->stats.rx_packets += total_rx_packets;
>
> return cleaned;
> }
>@@ -6559,6 +6560,38 @@ static void ixgbe_netpoll(struct net_device *netdev)
> }
> #endif
>
>+static struct rtnl_link_stats64 *ixgbe_get_stats64(struct net_device
>*netdev,
>+ struct rtnl_link_stats64 *stats)
>+{
>+ struct ixgbe_adapter *adapter = netdev_priv(netdev);
>+ int i;
>+
>+ /* accurate rx/tx bytes/packets stats */
>+ dev_txq_stats_fold(netdev, stats);
>+ for (i = 0; i < adapter->num_rx_queues; i++) {
>+ struct ixgbe_ring *ring = adapter->rx_ring[i];
>+ u64 bytes, packets;
>+ unsigned int start;
>+
>+ do {
>+ start = u64_stats_fetch_begin_bh(&ring->syncp);
>+ packets = ring->stats.packets;
>+ bytes = ring->stats.bytes;
>+ } while (u64_stats_fetch_retry_bh(&ring->syncp, start));
>+ stats->rx_packets += packets;
>+ stats->rx_bytes += bytes;
>+ }
>+
>+ /* following stats updated by ixgbe_watchdog_task() */
>+ stats->multicast = netdev->stats.multicast;
>+ stats->rx_errors = netdev->stats.rx_errors;
>+ stats->rx_length_errors = netdev->stats.rx_length_errors;
>+ stats->rx_crc_errors = netdev->stats.rx_crc_errors;
>+ stats->rx_missed_errors = netdev->stats.rx_missed_errors;
>+ return stats;
>+}
>+
>+
> static const struct net_device_ops ixgbe_netdev_ops = {
> .ndo_open = ixgbe_open,
> .ndo_stop = ixgbe_close,
>@@ -6578,6 +6611,7 @@ static const struct net_device_ops ixgbe_netdev_ops =
>{
> .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan,
> .ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw,
> .ndo_get_vf_config = ixgbe_ndo_get_vf_config,
>+ .ndo_get_stats64 = ixgbe_get_stats64,
> #ifdef CONFIG_NET_POLL_CONTROLLER
> .ndo_poll_controller = ixgbe_netpoll,
> #endif
>
Eric,
We are seeing intermittent hangs on ia32 arch which seem to point to this patch:
BUG: unable to handle kernel NULL pointer dereference at 00000040
IP: [<f7f6b537>] ixgbe_get_stats64+0x47/0x120 [ixgbe]
*pdpt = 000000002dc83001 *pde = 000000032d7e5067
Oops: 0000 [#2] SMP
last sysfs file: /sys/devices/system/cpu/cpu23/cache/index2/shared_cpu_map
Modules linked in: act_skbedit cls_u32 sch_multiq ixgbe mdio netconsole configfs autofs4 8021q garp stp llc sunrpc ipv6 e
xt3 jbd dm_mirror dm_region_hash dm_log dm_round_robin dm_multipath power_meter hwmon sg ses enclosure dcdbas pcspkr serio_raw iTCO_wdt iTCO_vendor_support io
atdma dca i7core_edac edac_core bnx2 ext4 mbcache jbd2 sr_mod cdrom sd_mod crc_t10dif pata_acpi ata_generic ata_piix megaraid_sas dm_mod [last unloaded: mperf
]
Pid: 1939, comm: irqbalance Tainted: G D W 2.6.36-rc7-upstream-net-next-2.6-ixgbe-queue-i386-g55e1a84 #1 09CGW2/Po
werEdge T610
EIP: 0060:[<f7f6b537>] EFLAGS: 00010206 CPU: 0
EIP is at ixgbe_get_stats64+0x47/0x120 [ixgbe]
EAX: 00000000 EBX: ecc45e4c ECX: ebea0400 EDX: 00000000
ESI: ebea0000 EDI: 00000018 EBP: f7f846a0 ESP: ecc45d88
DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068
Process irqbalance (pid: 1939, ti=ecc44000 task=efc63a50 task.ti=ecc44000)
Stack:
ecc45e4c 00000000 ebea0400 ebea0000 ecc45e4c ebea0000 ecc45f04 f7f846a0
<0> c0750593 ebea0000 edfec340 ebea0000 000002b5 c075063a edfec340 c0993eec
<0> ebe78000 0000021c 00000000 00000009 00000000 00000000 00000000 00000000
Call Trace:
[<c0750593>] ? dev_get_stats+0x33/0xc0
[<c075063a>] ? dev_seq_printf_stats+0x1a/0x180
[<c07507aa>] ? dev_seq_show+0xa/0x20
[<c052398f>] ? seq_read+0x22f/0x3d0
[<c0523760>] ? seq_read+0x0/0x3d0
[<c054fdde>] ? proc_reg_read+0x5e/0x90
[<c054fd80>] ? proc_reg_read+0x0/0x90
[<c050a1dd>] ? vfs_read+0x9d/0x160
[<c049d4ef>] ? audit_syscall_entry+0x20f/0x230
[<c050a971>] ? sys_read+0x41/0x70
[<c0409cdf>] ? sysenter_do_call+0x12/0x28
Code: 60 4f 7e c8 8b 44 24 08 8b b8 20 06 00 00 85 ff 7e 63 c7 44 24 04 00 00 00 00 66 90 8b 54 24 04 8b 4c 24 08 8b 84 9
1 00 05 00 00 <8b> 50 40 eb 06 8d 74 26 00 89 ca f6 c2 01 0f 85 ae 00 00 00 8b
EIP: [<f7f6b537>] ixgbe_get_stats64+0x47/0x120 [ixgbe] SS:ESP 0068:ecc45d88
CR2: 0000000000000040
---[ end trace 51ea89f4e57f54f1 ]---
Emil
Powered by blists - more mailing lists