From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932089AbWDYDIE (ORCPT ); Mon, 24 Apr 2006 23:08:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932095AbWDYDIE (ORCPT ); Mon, 24 Apr 2006 23:08:04 -0400 Received: from omta03ps.mx.bigpond.com ([144.140.82.155]:29048 "EHLO omta03ps.mx.bigpond.com") by vger.kernel.org with ESMTP id S932089AbWDYDID (ORCPT ); Mon, 24 Apr 2006 23:08:03 -0400 Message-ID: <444D9290.6070706@bigpond.net.au> Date: Tue, 25 Apr 2006 13:08:00 +1000 From: Peter Williams User-Agent: Thunderbird 1.5 (X11/20060313) MIME-Version: 1.0 To: Andrew Morton CC: "Chen, Kenneth W" , Con Kolivas , Ingo Molnar , Linux Kernel Mailing List , Mike Galbraith , Nick Piggin , "Siddha, Suresh B" Subject: [PATCH] sched: fix evaluation of skip_for_load in move_tasks() Content-Type: multipart/mixed; boundary="------------010301060601030904030609" X-Authentication-Info: Submitted using SMTP AUTH PLAIN at omta03ps.mx.bigpond.com from [147.10.133.38] using ID pwil3058@bigpond.net.au at Tue, 25 Apr 2006 03:08:00 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------010301060601030904030609 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Problem: In the patch sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks.patch I got a the sense of a boolean expression wrong when assigning a value to skip_for_load. The expression should have been negated before being assigned. Additionally, busiest_best_prio_seen is being set when tasks are moved instead of when they are skipped which will cause problems when the current task does not have prio=busiest_best_prio. Solution: Negate the expression and apply de Marcos rule to simplify it and move the setting of busiest_best_prio_seen. This patch is on top of sched-avoid-unnecessarily-moving-highest-priority-task-move_tasks.patch Signed-off-by: Peter Williams -- Peter Williams pwil3058@bigpond.net.au "Learning, n. The kind of ignorance distinguishing the studious." -- Ambrose Bierce --------------010301060601030904030609 Content-Type: text/plain; name="smpnice-fix-busiest_best_prio_seen" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="smpnice-fix-busiest_best_prio_seen" Index: MM-2.6.17-rc1-mm3/kernel/sched.c =================================================================== --- MM-2.6.17-rc1-mm3.orig/kernel/sched.c 2006-04-25 12:53:39.000000000 +1000 +++ MM-2.6.17-rc1-mm3/kernel/sched.c 2006-04-25 12:56:14.000000000 +1000 @@ -2059,7 +2059,10 @@ static int move_tasks(runqueue_t *this_r busiest_best_prio = rq_best_prio(busiest); /* * Enable handling of the case where there is more than one task - * with the best priority. + * with the best priority. If the current running task is one + * of those with prio==busiest_best_prio we know it won't be moved + * and therefore it's safe to override the skip (based on load) of + * any task we find with that prio. */ busiest_best_prio_seen = busiest_best_prio == busiest->curr->prio; @@ -2108,9 +2111,10 @@ skip_queue: */ skip_for_load = tmp->load_weight > rem_load_move; if (skip_for_load && idx < this_best_prio) - skip_for_load = busiest_best_prio_seen || idx != busiest_best_prio; + skip_for_load = !busiest_best_prio_seen && idx == busiest_best_prio; if (skip_for_load || !can_migrate_task(tmp, busiest, this_cpu, sd, idle, &pinned)) { + busiest_best_prio_seen |= idx == busiest_best_prio; if (curr != head) goto skip_queue; idx++; @@ -2133,8 +2137,6 @@ skip_queue: if (pulled < max_nr_move && rem_load_move > 0) { if (idx < this_best_prio) this_best_prio = idx; - if (idx == busiest_best_prio) - busiest_best_prio_seen = 1; if (curr != head) goto skip_queue; idx++; --------------010301060601030904030609--