public inbox for stable@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Rik van Riel <riel@redhat.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Prarit Bhargava <prarit@redhat.com>,
	John Stultz <john.stultz@linaro.org>
Subject: [ 41/63] hrtimer: Add expiry time overflow check in hrtimer_interrupt
Date: Mon,  6 May 2013 15:56:19 -0700	[thread overview]
Message-ID: <20130506225324.881084474@linuxfoundation.org> (raw)
In-Reply-To: <20130506225314.802167948@linuxfoundation.org>

3.4-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Prarit Bhargava <prarit@redhat.com>

commit 8f294b5a139ee4b75e890ad5b443c93d1e558a8b upstream.

The settimeofday01 test in the LTP testsuite effectively does

        gettimeofday(current time);
        settimeofday(Jan 1, 1970 + 100 seconds);
        settimeofday(current time);

This test causes a stack trace to be displayed on the console during the
setting of timeofday to Jan 1, 1970 + 100 seconds:

[  131.066751] ------------[ cut here ]------------
[  131.096448] WARNING: at kernel/time/clockevents.c:209 clockevents_program_event+0x135/0x140()
[  131.104935] Hardware name: Dinar
[  131.108150] Modules linked in: sg nfsv3 nfs_acl nfsv4 auth_rpcgss nfs dns_resolver fscache lockd sunrpc nf_conntrack_netbios_ns nf_conntrack_broadcast ipt_MASQUERADE ip6table_mangle ip6t_REJECT nf_conntrack_ipv6 nf_defrag_ipv6 iptable_nat nf_nat_ipv4 nf_nat iptable_mangle ipt_REJECT nf_conntrack_ipv4 nf_defrag_ipv4 xt_conntrack nf_conntrack ebtable_filter ebtables ip6table_filter ip6_tables iptable_filter ip_tables kvm_amd kvm sp5100_tco bnx2 i2c_piix4 crc32c_intel k10temp fam15h_power ghash_clmulni_intel amd64_edac_mod pcspkr serio_raw edac_mce_amd edac_core microcode xfs libcrc32c sr_mod sd_mod cdrom ata_generic crc_t10dif pata_acpi radeon i2c_algo_bit drm_kms_helper ttm drm ahci pata_atiixp libahci libata usb_storage i2c_core dm_mirror dm_region_hash dm_log dm_mod
[  131.176784] Pid: 0, comm: swapper/28 Not tainted 3.8.0+ #6
[  131.182248] Call Trace:
[  131.184684]  <IRQ>  [<ffffffff810612af>] warn_slowpath_common+0x7f/0xc0
[  131.191312]  [<ffffffff8106130a>] warn_slowpath_null+0x1a/0x20
[  131.197131]  [<ffffffff810b9fd5>] clockevents_program_event+0x135/0x140
[  131.203721]  [<ffffffff810bb584>] tick_program_event+0x24/0x30
[  131.209534]  [<ffffffff81089ab1>] hrtimer_interrupt+0x131/0x230
[  131.215437]  [<ffffffff814b9600>] ? cpufreq_p4_target+0x130/0x130
[  131.221509]  [<ffffffff81619119>] smp_apic_timer_interrupt+0x69/0x99
[  131.227839]  [<ffffffff8161805d>] apic_timer_interrupt+0x6d/0x80
[  131.233816]  <EOI>  [<ffffffff81099745>] ? sched_clock_cpu+0xc5/0x120
[  131.240267]  [<ffffffff814b9ff0>] ? cpuidle_wrap_enter+0x50/0xa0
[  131.246252]  [<ffffffff814b9fe9>] ? cpuidle_wrap_enter+0x49/0xa0
[  131.252238]  [<ffffffff814ba050>] cpuidle_enter_tk+0x10/0x20
[  131.257877]  [<ffffffff814b9c89>] cpuidle_idle_call+0xa9/0x260
[  131.263692]  [<ffffffff8101c42f>] cpu_idle+0xaf/0x120
[  131.268727]  [<ffffffff815f8971>] start_secondary+0x255/0x257
[  131.274449] ---[ end trace 1151a50552231615 ]---

When we change the system time to a low value like this, the value of
timekeeper->offs_real will be a negative value.

It seems that the WARN occurs because an hrtimer has been started in the time
between the releasing of the timekeeper lock and the IPI call (via a call to
on_each_cpu) in clock_was_set() in the do_settimeofday() code.  The end result
is that a REALTIME_CLOCK timer has been added with softexpires = expires =
KTIME_MAX.  The hrtimer_interrupt() fires/is called and the loop at
kernel/hrtimer.c:1289 is executed.  In this loop the code subtracts the
clock base's offset (which was set to timekeeper->offs_real in
do_settimeofday()) from the current hrtimer_cpu_base->expiry value (which
was KTIME_MAX):

	KTIME_MAX - (a negative value) = overflow

A simple check for an overflow can resolve this problem.  Using KTIME_MAX
instead of the overflow value will result in the hrtimer function being run,
and the reprogramming of the timer after that.

Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
[jstultz: Tweaked commit subject]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 kernel/hrtimer.c |    2 ++
 1 file changed, 2 insertions(+)

--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -1312,6 +1312,8 @@ retry:
 
 				expires = ktime_sub(hrtimer_get_expires(timer),
 						    base->offset);
+				if (expires.tv64 < 0)
+					expires.tv64 = KTIME_MAX;
 				if (expires.tv64 < expires_next.tv64)
 					expires_next = expires;
 				break;



  parent reply	other threads:[~2013-05-06 22:56 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-06 22:55 [ 00/63] 3.4.44-stable review Greg Kroah-Hartman
2013-05-06 22:55 ` [ 01/63] USB: serial: option: Added support Olivetti Olicard 145 Greg Kroah-Hartman
2013-05-06 22:55 ` [ 02/63] USB: option: add a D-Link DWM-156 variant Greg Kroah-Hartman
2013-05-06 22:55 ` [ 03/63] ARM: at91: Fix typo in restart code panic message Greg Kroah-Hartman
2013-05-06 22:55 ` [ 04/63] powerpc: Add isync to copy_and_flush Greg Kroah-Hartman
2013-05-06 22:55 ` [ 05/63] powerpc/spufs: Initialise inode->i_ino in spufs_new_inode() Greg Kroah-Hartman
2013-05-06 22:55 ` [ 06/63] mwifiex: Use pci_release_region() instead of a pci_release_regions() Greg Kroah-Hartman
2013-05-06 22:55 ` [ 07/63] mwifiex: Call pci_release_region after calling pci_disable_device Greg Kroah-Hartman
2013-05-06 22:55 ` [ 08/63] usb/misc/appledisplay: Add 24" LED Cinema display Greg Kroah-Hartman
2013-05-06 22:55 ` [ 09/63] USB: add ftdi_sio USB ID for GDM Boost V1.x Greg Kroah-Hartman
2013-05-06 22:55 ` [ 10/63] USB: ftdi_sio: correct ST Micro Connect Lite PIDs Greg Kroah-Hartman
2013-05-06 22:55 ` [ 11/63] usbfs: Always allow ctrl requests with USB_RECIP_ENDPOINT on the ctrl ep Greg Kroah-Hartman
2013-05-06 22:55 ` [ 12/63] usb-storage: CY7C68300A chips do not support Cypress ATACB Greg Kroah-Hartman
2013-05-06 22:55 ` [ 13/63] s390/memory hotplug: prevent offline of active memory increments Greg Kroah-Hartman
2013-05-06 22:55 ` [ 14/63] xen/time: Fix kasprintf splat when allocating timer%d IRQ line Greg Kroah-Hartman
2013-05-06 22:55 ` [ 15/63] serial_core.c: add put_device() after device_find_child() Greg Kroah-Hartman
2013-05-06 22:55 ` [ 16/63] arm: set the page table freeing ceiling to TASK_SIZE Greg Kroah-Hartman
2013-05-06 22:55 ` [ 17/63] gianfar: do not advertise any alarm capability Greg Kroah-Hartman
2013-05-06 22:55 ` [ 18/63] tty: fix up atime/mtime mess, take three Greg Kroah-Hartman
2013-05-06 22:55 ` [ 19/63] fbcon: when font is freed, clear also vc_font.data Greg Kroah-Hartman
2013-05-06 22:55 ` [ 20/63] tracing: Use stack of calling function for stack tracer Greg Kroah-Hartman
2013-05-06 22:55 ` [ 21/63] tracing: Fix stack tracer with fentry use Greg Kroah-Hartman
2013-05-06 22:56 ` [ 22/63] tracing: Remove most or all of stack tracer stack size from stack_max_size Greg Kroah-Hartman
2013-05-06 22:56 ` [ 23/63] tracing: Fix off-by-one on allocating stat->pages Greg Kroah-Hartman
2013-05-06 22:56 ` [ 24/63] tracing: Check return value of tracing_init_dentry() Greg Kroah-Hartman
2013-05-06 22:56 ` [ 25/63] tracing: Reset ftrace_graph_filter_enabled if count is zero Greg Kroah-Hartman
2013-05-06 22:56 ` [ 26/63] i2c: xiic: must always write 16-bit words to TX_FIFO Greg Kroah-Hartman
2013-05-06 22:56 ` [ 27/63] sysfs: fix use after free in case of concurrent read/write and readdir Greg Kroah-Hartman
2013-05-06 22:56 ` [ 28/63] Fix initialization of CMCI/CMCP interrupts Greg Kroah-Hartman
2013-05-06 22:56 ` [ 29/63] PCI / ACPI: Dont query OSC support with all possible controls Greg Kroah-Hartman
2013-05-06 22:56 ` [ 30/63] PCI/PM: Fix fallback to PCI_D0 in pci_platform_power_transition() Greg Kroah-Hartman
2013-05-06 22:56 ` [ 31/63] Wrong asm register contraints in the futex implementation Greg Kroah-Hartman
2013-05-06 22:56 ` [ 32/63] Wrong asm register contraints in the kvm implementation Greg Kroah-Hartman
2013-05-06 22:56 ` [ 33/63] fs/fscache/stats.c: fix memory leak Greg Kroah-Hartman
2013-05-06 22:56 ` [ 34/63] mm: allow arch code to control the user page table ceiling Greg Kroah-Hartman
2013-05-06 22:56 ` [ 35/63] ALSA: snd-usb: try harder to find USB_DT_CS_ENDPOINT Greg Kroah-Hartman
2013-05-06 22:56 ` [ 36/63] ALSA: usb-audio: disable autopm for MIDI devices Greg Kroah-Hartman
2013-05-06 22:56 ` [ 37/63] ALSA: usb-audio: Fix autopm error during probing Greg Kroah-Hartman
2013-05-06 22:56 ` [ 38/63] ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE Greg Kroah-Hartman
2013-05-06 22:56 ` [ 39/63] ASoC: max98088: Fix logging of hardware revision Greg Kroah-Hartman
2013-05-06 22:56 ` [ 40/63] hrtimer: Fix ktime_add_ns() overflow on 32bit architectures Greg Kroah-Hartman
2013-05-06 22:56 ` Greg Kroah-Hartman [this message]
2013-05-06 22:56 ` [ 42/63] drivers/rtc/rtc-cmos.c: dont disable hpet emulation on suspend Greg Kroah-Hartman
2013-05-06 22:56 ` [ 43/63] cgroup: fix an off-by-one bug which may trigger BUG_ON() Greg Kroah-Hartman
2013-05-06 22:56 ` [ 44/63] clockevents: Set dummy handler on CPU_DEAD shutdown Greg Kroah-Hartman
2013-05-06 22:56 ` [ 45/63] fs/dcache.c: add cond_resched() to shrink_dcache_parent() Greg Kroah-Hartman
2013-05-06 22:56 ` [ 46/63] LOCKD: Ensure that nlmclnt_block resets block->b_status after a server reboot Greg Kroah-Hartman
2013-05-06 22:56 ` [ 47/63] md: bad block list should default to disabled Greg Kroah-Hartman
2013-05-06 22:56 ` [ 48/63] NFSv4: Handle NFS4ERR_DELAY and NFS4ERR_GRACE in nfs4_open_delegation_recall Greg Kroah-Hartman
2013-05-06 22:56 ` [ 49/63] nfsd4: dont close read-write opens too soon Greg Kroah-Hartman
2013-05-06 22:56 ` [ 50/63] nfsd: Decode and send 64bit time values Greg Kroah-Hartman
2013-05-06 22:56 ` [ 51/63] wireless: regulatory: fix channel disabling race condition Greg Kroah-Hartman
2013-05-06 22:56 ` [ 52/63] ipc: sysv shared memory limited to 8TiB Greg Kroah-Hartman
2013-05-06 22:56 ` [ 53/63] ixgbe: fix EICR write in ixgbe_msix_other Greg Kroah-Hartman
2013-05-06 22:56 ` [ 54/63] jbd2: fix race between jbd2_journal_remove_checkpoint and ->j_commit_callback Greg Kroah-Hartman
2013-05-06 22:56 ` [ 55/63] ext4: fix journal callback list traversal Greg Kroah-Hartman
2013-05-06 22:56 ` [ 56/63] ext4: fix online resizing for ext3-compat file systems Greg Kroah-Hartman
2013-05-06 22:56 ` [ 57/63] ext4: fix Kconfig documentation for CONFIG_EXT4_DEBUG Greg Kroah-Hartman
2013-05-06 22:56 ` [ 58/63] mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload Greg Kroah-Hartman
2013-05-06 22:56 ` [ 59/63] KVM: X86 emulator: fix source operand decoding for 8bit mov[zs]x instructions Greg Kroah-Hartman
2013-05-06 22:56 ` [ 60/63] x86: Eliminate irq_mis_count counted in arch_irq_stat Greg Kroah-Hartman
2013-05-06 22:56 ` [ 61/63] mmc: core: Fix bit width test failing on old eMMC cards Greg Kroah-Hartman
2013-05-06 22:56 ` [ 62/63] mmc: atmel-mci: pio hang on block errors Greg Kroah-Hartman
2013-05-06 22:56 ` [ 63/63] mfd: adp5520: Restore mode bits on resume Greg Kroah-Hartman
     [not found] ` <CAKocOOOxtJMoqWVgPLcrCJZ0kJuJ-QF0vQEU6Vk70n4J=+9ttw@mail.gmail.com>
2013-05-07 19:20   ` [ 00/63] 3.4.44-stable review Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130506225324.881084474@linuxfoundation.org \
    --to=gregkh@linuxfoundation.org \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=prarit@redhat.com \
    --cc=riel@redhat.com \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox