From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936617AbcHJTtA (ORCPT ); Wed, 10 Aug 2016 15:49:00 -0400 Received: from terminus.zytor.com ([198.137.202.10]:57926 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934268AbcHJSp2 (ORCPT ); Wed, 10 Aug 2016 14:45:28 -0400 Date: Wed, 10 Aug 2016 11:00:04 -0700 From: tip-bot for Tommaso Cucinotta Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, tommaso.cucinotta@sssup.it, peterz@infradead.org, torvalds@linux-foundation.org, luca.abeni@unitn.it, juri.lelli@gmail.com, mingo@kernel.org, juri.lelli@arm.com, tglx@linutronix.de Reply-To: linux-kernel@vger.kernel.org, peterz@infradead.org, tommaso.cucinotta@sssup.it, hpa@zytor.com, torvalds@linux-foundation.org, luca.abeni@unitn.it, juri.lelli@gmail.com, mingo@kernel.org, juri.lelli@arm.com, tglx@linutronix.de In-Reply-To: <1468921493-10054-2-git-send-email-tommaso.cucinotta@sssup.it> References: <1468921493-10054-2-git-send-email-tommaso.cucinotta@sssup.it> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched/deadline: Fix wrap-around in DL heap Git-Commit-ID: a23eadfae2fd45536a355b785d5a1533e1955c22 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a23eadfae2fd45536a355b785d5a1533e1955c22 Gitweb: http://git.kernel.org/tip/a23eadfae2fd45536a355b785d5a1533e1955c22 Author: Tommaso Cucinotta AuthorDate: Tue, 19 Jul 2016 11:44:50 +0200 Committer: Ingo Molnar CommitDate: Wed, 10 Aug 2016 13:32:55 +0200 sched/deadline: Fix wrap-around in DL heap Current code in cpudeadline.c has a bug in re-heapifying when adding a new element at the end of the heap, because a deadline value of 0 is temporarily set in the new elem, then cpudl_change_key() is called with the actual elem deadline as param. However, the function compares the new deadline to set with the one previously in the elem, which is 0. So, if current absolute deadlines grew so much to have negative values as s64, the comparison in cpudl_change_key() makes the wrong decision. Instead, as from dl_time_before(), the kernel should handle correctly abs deadlines wrap-arounds. This patch fixes the problem with a minimally invasive change that forces cpudl_change_key() to heapify up in this case. Signed-off-by: Tommaso Cucinotta Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Luca Abeni Cc: Juri Lelli Cc: Juri Lelli Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1468921493-10054-2-git-send-email-tommaso.cucinotta@sssup.it Signed-off-by: Ingo Molnar --- kernel/sched/cpudeadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index 5be5882..d418449 100644 --- a/kernel/sched/cpudeadline.c +++ b/kernel/sched/cpudeadline.c @@ -168,7 +168,7 @@ void cpudl_set(struct cpudl *cp, int cpu, u64 dl, int is_valid) if (old_idx == IDX_INVALID) { cp->size++; - cp->elements[cp->size - 1].dl = 0; + cp->elements[cp->size - 1].dl = dl; cp->elements[cp->size - 1].cpu = cpu; cp->elements[cpu].idx = cp->size - 1; cpudl_change_key(cp, cp->size - 1, dl);