From: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
To: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: [GIT PULL for-4.9 15/48] sched/fair: Update rq clock before changing a task's CPU affinity
Date: Wed, 11 Oct 2017 00:45:22 +0000 [thread overview]
Message-ID: <20171011004512.7949-16-alexander.levin@verizon.com> (raw)
In-Reply-To: <20171011004512.7949-1-alexander.levin@verizon.com>
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>
---
kernel/sched/core.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 2098954c690f..d271a1c387eb 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1141,6 +1141,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
int ret = 0;
rq = task_rq_lock(p, &rf);
+ update_rq_clock(rq);
if (p->flags & PF_KTHREAD) {
/*
--
2.11.0
next prev parent reply other threads:[~2017-10-11 1:09 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-11 0:45 [GIT PULL for-4.9 00/48] Commits for v4.9 LTS Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 01/48] xen-netback: Use GFP_ATOMIC to allocate hash Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 02/48] locking/lockdep: Add nest_lock integrity test Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 04/48] irqchip/crossbar: Fix incorrect type of local variables Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 03/48] watchdog: kempld: fix gcc-4.3 build Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 05/48] initramfs: finish fput() before accessing any binary from initramfs Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 06/48] mac80211_hwsim: check HWSIM_ATTR_RADIO_NAME length Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 07/48] ALSA: hda: Add Geminilake HDMI codec ID Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 09/48] mac80211: fix power saving clients handling in iwlwifi Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 10/48] net/mlx4_en: fix overflow in mlx4_en_init_timestamp() Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 08/48] qed: Don't use attention PTT for configuring BW Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 11/48] staging: vchiq_2835_arm: Make cache-line-size a required DT property Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 12/48] netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 13/48] iio: adc: xilinx: Fix error handling Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 14/48] f2fs: do SSR for data when there is enough free space Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` Levin, Alexander (Sasha Levin) [this message]
2017-10-11 0:45 ` [GIT PULL for-4.9 19/48] sparc64: Migrate hvcons irq to panicked cpu Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 17/48] f2fs: do not wait for writeback in write_begin Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 18/48] md/linear: shutup lockdep warnning Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 16/48] Btrfs: send, fix failure to rename top level inode due to name collision Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 20/48] net/mlx4_core: Fix VF overwrite of module param which disables DMFS on new probed PFs Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 21/48] crypto: xts - Add ECB dependency Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 22/48] mm/memory_hotplug: set magic number to page->freelist instead of page->lru.next Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 26/48] ASoC: mediatek: add I2C dependency for CS42XX8 Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 25/48] scsi: scsi_dh_emc: return success in clariion_std_inquiry() Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 24/48] slub: do not merge cache if slub_debug contains a never-merge flag Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 23/48] ocfs2/dlmglue: prepare tracking logic to avoid recursive cluster lock Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 29/48] qede: Prevent index problems in loopback test Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 30/48] qed: Reserve doorbell BAR space for present CPUs Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 27/48] drm/amdgpu: refuse to reserve io mem for split VRAM buffers Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 28/48] net: mvpp2: release reference to txq_cpu[] entry after unmapping Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 33/48] ceph: don't update_dentry_lease unless we actually got one Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 31/48] qed: Read queue state before releasing buffer Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 34/48] ceph: fix bogus endianness change in ceph_ioctl_set_layout Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 32/48] i2c: at91: ensure state is restored after suspending Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 35/48] ceph: clean up unsafe d_parent accesses in build_dentry_path Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 38/48] IB/hfi1: Use static CTLE with Preset 6 for integrated HFIs Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 36/48] uapi: fix linux/rds.h userspace compilation errors Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 37/48] uapi: fix linux/mroute6.h " Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 43/48] powerpc/perf: Add restrictions to PMC5 in power9 DD1 Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 40/48] target/iscsi: Fix unsolicited data seq_end_offset calculation Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 41/48] hrtimer: Catch invalid clockids again Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 39/48] IB/hfi1: Allocate context data on memory node Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 42/48] nfsd/callback: Cleanup callback cred on shutdown Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 47/48] EDAC, mce_amd: Print IPID and Syndrome on a separate line Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 44/48] drm/nouveau/gr/gf100-: fix ccache error logging Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 46/48] btmrvl: avoid double-disable_irq() race Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 45/48] regulator: core: Resolve supplies before disabling unused regulators Levin, Alexander (Sasha Levin)
2017-10-11 0:45 ` [GIT PULL for-4.9 48/48] cpufreq: CPPC: add ACPI_PROCESSOR dependency Levin, Alexander (Sasha Levin)
2017-10-19 13:13 ` [GIT PULL for-4.9 00/48] Commits for v4.9 LTS gregkh
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=20171011004512.7949-16-alexander.levin@verizon.com \
--to=alexander.levin@verizon.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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
all inboxes | Powered by JetHome®