From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752469AbbCMHqN (ORCPT ); Fri, 13 Mar 2015 03:46:13 -0400 Received: from mga11.intel.com ([192.55.52.93]:25160 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752412AbbCMHqK (ORCPT ); Fri, 13 Mar 2015 03:46:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,393,1422950400"; d="scan'208";a="679548019" From: Wanpeng Li To: Ingo Molnar , Peter Zijlstra Cc: Juri Lelli , linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH RESEND v2] sched/deadline: fix rt runtime corrupt when dl refuse a smaller bandwidth Date: Fri, 13 Mar 2015 15:28:00 +0800 Message-Id: <1426231680-12056-1-git-send-email-wanpeng.li@linux.intel.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dl class will refuse the bandwidth being set to some value smaller than the currently allocated bandwidth in any of the root_domains through sched_rt_runtime_us and sched_rt_period_us. RT runtime will be set according to sched_rt_runtime_us before dl class verify if the new bandwidth is suitable in the case of !CONFIG_RT_GROUP_SCHED. However, rt runtime will be corrupt if dl refuse the new bandwidth since there is no undo to reset the rt runtime to the old value. This patch fix it by verifying new bandwidth for deadline in advance. Acked-by: Juri Lelli Signed-off-by: Wanpeng Li --- kernel/sched/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 97fe79c..e884909 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -7815,7 +7815,7 @@ static int sched_rt_global_constraints(void) } #endif /* CONFIG_RT_GROUP_SCHED */ -static int sched_dl_global_constraints(void) +static int sched_dl_global_validate(void) { u64 runtime = global_rt_runtime(); u64 period = global_rt_period(); @@ -7916,11 +7916,11 @@ int sched_rt_handler(struct ctl_table *table, int write, if (ret) goto undo; - ret = sched_rt_global_constraints(); + ret = sched_dl_global_validate(); if (ret) goto undo; - ret = sched_dl_global_constraints(); + ret = sched_rt_global_constraints(); if (ret) goto undo; -- 1.9.1