From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Wanpeng Li <wanpeng.li@hotmail.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Matt Fleming <matt@codeblueprint.co.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
Mike Galbraith <efault@gmx.de>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
Sasha Levin <alexander.levin@verizon.com>
Subject: [PATCH 4.9 17/51] sched/fair: Update rq clock before changing a tasks CPU affinity
Date: Thu, 19 Oct 2017 15:48:38 +0200 [thread overview]
Message-ID: <20171019134842.367975188@linuxfoundation.org> (raw)
In-Reply-To: <20171019134841.383925150@linuxfoundation.org>
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Wanpeng Li <wanpeng.li@hotmail.com>
[ Upstream commit a499c3ead88ccf147fc50689e85a530ad923ce36 ]
This is triggered during boot when CONFIG_SCHED_DEBUG is enabled:
------------[ cut here ]------------
WARNING: CPU: 6 PID: 81 at kernel/sched/sched.h:812 set_next_entity+0x11d/0x380
rq->clock_update_flags < RQCF_ACT_SKIP
CPU: 6 PID: 81 Comm: torture_shuffle Not tainted 4.10.0+ #1
Hardware name: LENOVO ThinkCentre M8500t-N000/SHARKBAY, BIOS FBKTC1AUS 02/16/2016
Call Trace:
dump_stack+0x85/0xc2
__warn+0xcb/0xf0
warn_slowpath_fmt+0x5f/0x80
set_next_entity+0x11d/0x380
set_curr_task_fair+0x2b/0x60
do_set_cpus_allowed+0x139/0x180
__set_cpus_allowed_ptr+0x113/0x260
set_cpus_allowed_ptr+0x10/0x20
torture_shuffle+0xfd/0x180
kthread+0x10f/0x150
? torture_shutdown_init+0x60/0x60
? kthread_create_on_node+0x60/0x60
ret_from_fork+0x31/0x40
---[ end trace dd94d92344cea9c6 ]---
The task is running && !queued, so there is no rq clock update before calling
set_curr_task().
This patch fixes it by updating rq clock after holding rq->lock/pi_lock
just as what other dequeue + put_prev + enqueue + set_curr story does.
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1487749975-5994-1-git-send-email-wanpeng.li@hotmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
kernel/sched/core.c | 1 +
1 file changed, 1 insertion(+)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1141,6 +1141,7 @@ static int __set_cpus_allowed_ptr(struct
int ret = 0;
rq = task_rq_lock(p, &rf);
+ update_rq_clock(rq);
if (p->flags & PF_KTHREAD) {
/*
next prev parent reply other threads:[~2017-10-19 13:49 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-19 13:48 [PATCH 4.9 00/51] 4.9.58-stable review Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 01/51] MIPS: Fix minimum alignment requirement of IRQ stack Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 02/51] Revert "bsg-lib: dont free job in bsg_prepare_job" Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 03/51] xen-netback: Use GFP_ATOMIC to allocate hash Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 05/51] watchdog: kempld: fix gcc-4.3 build Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 06/51] irqchip/crossbar: Fix incorrect type of local variables Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 07/51] initramfs: finish fput() before accessing any binary from initramfs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 08/51] mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 09/51] ALSA: hda: Add Geminilake HDMI codec ID Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 10/51] qed: Dont use attention PTT for configuring BW Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 11/51] mac80211: fix power saving clients handling in iwlwifi Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 12/51] net/mlx4_en: fix overflow in mlx4_en_init_timestamp() Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 13/51] staging: vchiq_2835_arm: Make cache-line-size a required DT property Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 14/51] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 15/51] iio: adc: xilinx: Fix error handling Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 16/51] f2fs: do SSR for data when there is enough free space Greg Kroah-Hartman
2017-10-19 13:48 ` Greg Kroah-Hartman [this message]
2017-10-19 13:48 ` [PATCH 4.9 18/51] Btrfs: send, fix failure to rename top level inode due to name collision Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 19/51] f2fs: do not wait for writeback in write_begin Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 20/51] md/linear: shutup lockdep warnning Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 21/51] sparc64: Migrate hvcons irq to panicked cpu Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 22/51] net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 23/51] crypto: xts - Add ECB dependency Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 24/51] mm/memory_hotplug: set magic number to page->freelist instead of page->lru.next Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 25/51] ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 26/51] slub: do not merge cache if slub_debug contains a never-merge flag Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 27/51] scsi: scsi_dh_emc: return success in clariion_std_inquiry() Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 28/51] ASoC: mediatek: add I2C dependency for CS42XX8 Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 30/51] net: mvpp2: release reference to txq_cpu[] entry after unmapping Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 31/51] qede: Prevent index problems in loopback test Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 32/51] qed: Reserve doorbell BAR space for present CPUs Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 33/51] qed: Read queue state before releasing buffer Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 34/51] i2c: at91: ensure state is restored after suspending Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 35/51] ceph: dont update_dentry_lease unless we actually got one Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 36/51] ceph: fix bogus endianness change in ceph_ioctl_set_layout Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 37/51] ceph: clean up unsafe d_parent accesses in build_dentry_path Greg Kroah-Hartman
2017-10-19 13:48 ` [PATCH 4.9 38/51] uapi: fix linux/rds.h userspace compilation errors Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 39/51] uapi: fix linux/mroute6.h " Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 40/51] IB/hfi1: Use static CTLE with Preset 6 for integrated HFIs Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 41/51] IB/hfi1: Allocate context data on memory node Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 42/51] target/iscsi: Fix unsolicited data seq_end_offset calculation Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 43/51] hrtimer: Catch invalid clockids again Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 44/51] nfsd/callback: Cleanup callback cred on shutdown Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 45/51] powerpc/perf: Add restrictions to PMC5 in power9 DD1 Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 46/51] drm/nouveau/gr/gf100-: fix ccache error logging Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 47/51] regulator: core: Resolve supplies before disabling unused regulators Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 48/51] btmrvl: avoid double-disable_irq() race Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 49/51] EDAC, mce_amd: Print IPID and Syndrome on a separate line Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 50/51] cpufreq: CPPC: add ACPI_PROCESSOR dependency Greg Kroah-Hartman
2017-10-19 13:49 ` [PATCH 4.9 51/51] usb: dwc3: gadget: Correct ISOC DATA PIDs for short packets Greg Kroah-Hartman
2017-10-19 22:18 ` [PATCH 4.9 00/51] 4.9.58-stable review Tom Gall
2017-10-20 6:28 ` Greg Kroah-Hartman
2017-10-20 13:12 ` Guenter Roeck
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=20171019134842.367975188@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=alexander.levin@verizon.com \
--cc=efault@gmx.de \
--cc=linux-kernel@vger.kernel.org \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=wanpeng.li@hotmail.com \
/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;
as well as URLs for NNTP newsgroup(s).