From patchwork Thu Oct 3 15:52:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 175094 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp518435ill; Thu, 3 Oct 2019 09:02:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqyX2WBQ9CLbu9HyOjyxDBYyJWvh37cI+nTTH0jQQrhSC7PhmvmvsXR8RxeGvDlrm0aQ63v4 X-Received: by 2002:adf:f348:: with SMTP id e8mr1073069wrp.237.1570118570297; Thu, 03 Oct 2019 09:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570118570; cv=none; d=google.com; s=arc-20160816; b=Es+QJC3EButMSp+yfy7zukLNpaJHWbZMcvLGs/qLyZcwAUvIhq8TgjSalLm/UpxqFb ErKQ8f3y8LFyMi1pk/PCSjvhV93gvv4smv02T7IRqE6RH0+31li7MECKdvN/tKNl9qrx j2/BFc1tdt+uhL4MWOp+eifvE6vF2vr0zjXwFrBGg+2K7IP/ePeJmU/wDlQck0/Zbb5j 6Zv4HGKusDHYeLgOyOzVsw02wb1K7Afeod6pj2ZhjsM+iNFzyyFMAtiwsirfb/CBnbI5 gfaSZ83SnLb0kctA5TR91nfSk4S9f9N9pmlGBlhuehEroaNM13jFycb1SJKnM+K6AH27 PpkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GzA6Ae3D43HVaBXATxrXu1zbEy7noB/ly59f08OnrfE=; b=BpAQuTFCgXqsTiSkB2ejDqKI/OBTyPVJ28NH+LNlhwtuMIHC9I6gpoxXZije/ekCD1 DaMxNFsDH8u4KSS1tJ8FwgOmAN0hsAkqcumdhx4eaBiG27g2Ux/RXY5Uvj3gKbkN4tbv KOFTSsgM1X30ISthiRa5web8UM9o/xkDSg46joVET7e3xqR01GWaut4r0DZRMzvb2qQv BjpOlvbl6T/H8ih85JLMOPe/j38pCQ0AeehADt4v9Q3KFJ/YG5bXLOXqEY7ScVB/04Pz YHbthbUDOJXMxc9Tp1LNhH61oBOG6YtlGwbMBIWSFcr0nVueToltx4JobU3eGGdssRYp RWRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yflUYnyT; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w2si1829515edc.386.2019.10.03.09.02.20; Thu, 03 Oct 2019 09:02:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yflUYnyT; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730342AbfJCQCS (ORCPT + 14 others); Thu, 3 Oct 2019 12:02:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:47100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731980AbfJCQCR (ORCPT ); Thu, 3 Oct 2019 12:02:17 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CC68D21A4C; Thu, 3 Oct 2019 16:02:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118537; bh=GvRqM0aQvpD+M+nkcgd7HWYCA8o19fhJZkvaV1up1PQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yflUYnyTgqnGa/Ogj8x+h6+3XsjiHsis9DeWeevIyUcpKtWTIxZzPZzlFaIgm5Kt4 re6HPxIwCZybWhlVIo0DdR2ccEMRS5Xo45BPhxYN4BdwAgh5Zv2YKd7ob0cGiJbBXo OnTHOgBXYQuQio5z9Jdx7qmDWtWZ1RgFiGMOXoz4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vincent Guittot , "Peter Zijlstra (Intel)" , Linus Torvalds , Thomas Gleixner , Ingo Molnar , Sasha Levin Subject: [PATCH 4.9 047/129] sched/fair: Fix imbalance due to CPU affinity Date: Thu, 3 Oct 2019 17:52:50 +0200 Message-Id: <20191003154338.849946971@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154318.081116689@linuxfoundation.org> References: <20191003154318.081116689@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincent Guittot [ Upstream commit f6cad8df6b30a5d2bbbd2e698f74b4cafb9fb82b ] The load_balance() has a dedicated mecanism to detect when an imbalance is due to CPU affinity and must be handled at parent level. In this case, the imbalance field of the parent's sched_group is set. The description of sg_imbalanced() gives a typical example of two groups of 4 CPUs each and 4 tasks each with a cpumask covering 1 CPU of the first group and 3 CPUs of the second group. Something like: { 0 1 2 3 } { 4 5 6 7 } * * * * But the load_balance fails to fix this UC on my octo cores system made of 2 clusters of quad cores. Whereas the load_balance is able to detect that the imbalanced is due to CPU affinity, it fails to fix it because the imbalance field is cleared before letting parent level a chance to run. In fact, when the imbalance is detected, the load_balance reruns without the CPU with pinned tasks. But there is no other running tasks in the situation described above and everything looks balanced this time so the imbalance field is immediately cleared. The imbalance field should not be cleared if there is no other task to move when the imbalance is detected. Signed-off-by: Vincent Guittot Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: https://lkml.kernel.org/r/1561996022-28829-1-git-send-email-vincent.guittot@linaro.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/sched/fair.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b314feaf91f46..d8afae1bd5c5e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -7929,9 +7929,10 @@ static int load_balance(int this_cpu, struct rq *this_rq, out_balanced: /* * We reach balance although we may have faced some affinity - * constraints. Clear the imbalance flag if it was set. + * constraints. Clear the imbalance flag only if other tasks got + * a chance to move and fix the imbalance. */ - if (sd_parent) { + if (sd_parent && !(env.flags & LBF_ALL_PINNED)) { int *group_imbalance = &sd_parent->groups->sgc->imbalance; if (*group_imbalance)