Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp2405245ybt; Tue, 16 Jun 2020 05:25:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzryJ/I1rYe36GeTp0kFBJEXWNwecIceFQFt1EXK4qDt16kpS0WM4SJESRAtC7NoV6te74U X-Received: by 2002:a17:906:ca0e:: with SMTP id jt14mr2408402ejb.325.1592310302072; Tue, 16 Jun 2020 05:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592310302; cv=none; d=google.com; s=arc-20160816; b=iK6odnwaVAPUO8zstCgqY5uNdIuFa0TELaoU64vJCCFFIq1dljnHr5SPWJeVtgYkf/ cvyqyLZ1x0H6D9VDGJLqmZhteIRTSbaC19JNEb9dMVhOPQmGuV7R81DkxrwgHMTXs9Tq pC+uICxW6MhJrVvJNRAl+CCLoMM1Falh6H7IbMhN1yGmRjStZtRThKx+qkVDcMxk0OTl 7Ey4qEfbPsJnRQjC+ehOvtAkAplwgW8kh3D2Cn2aFroe3Xe6dcgCWVnfhdZ7543CqNnS +iXg8rPKU7KG9VWvi6WsoiT1D6OSi5Ma7eNNJu72StH0cnrkBuGMjURxMHaHTdnKOltQ JRxg== 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 :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=UX/eLMahmR6J3xA6NxWf58FFf6FgU4/LFNOYltC5lWI=; b=wKG5fMY+WwHNQo/dNd/k07e1fJzXoqBBscG7eOZIuhjP+0lQjqI8V4e2ySiJ6qY20k KBsUCz/WLolItjJtsNkKYAJ5yVuiU7kNW/9qoJ4fXBoVZSfoC2RXlW993ax5Eni2yZYC BU4Th42wkvIeK+613n3FBl5+hTPuhCXi7miXsoB+RrFftYQswR68zD18hAsolrPqjmL6 JkVeQBVx8k9Z6xDP0xpE9s/HYYxCO+9FIyGfbbAX/uBiH/Ao3x6EzB+QpNsI/cJT7qlT xBvAjnZHlOqCXYIgHuc6dtqcSgPCEMJFGfBJLIyvE1bKaOTPL8scjTe5sQJf2YKtb4BP IT6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p13si10922885ejf.178.2020.06.16.05.24.39; Tue, 16 Jun 2020 05:25:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729149AbgFPMW3 (ORCPT + 99 others); Tue, 16 Jun 2020 08:22:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728917AbgFPMWF (ORCPT ); Tue, 16 Jun 2020 08:22:05 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1ECB6C08C5C6; Tue, 16 Jun 2020 05:22:04 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jlAbI-0004gu-OD; Tue, 16 Jun 2020 14:22:00 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id EC80B1C0837; Tue, 16 Jun 2020 14:21:52 +0200 (CEST) Date: Tue, 16 Jun 2020 12:21:52 -0000 From: "tip-bot2 for Peng Liu" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched: correct SD_flags returned by tl->sd_flags() Cc: Peng Liu , "Peter Zijlstra (Intel)" , Vincent Guittot , Valentin Schneider , x86 , LKML In-Reply-To: <20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ> References: <20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ> MIME-Version: 1.0 Message-ID: <159231011270.16989.15647375607443324340.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 9b1b234bb86bcdcdb142e900d39b599185465dbb Gitweb: https://git.kernel.org/tip/9b1b234bb86bcdcdb142e900d39b599185465dbb Author: Peng Liu AuthorDate: Tue, 09 Jun 2020 23:09:36 +08:00 Committer: Peter Zijlstra CommitterDate: Mon, 15 Jun 2020 14:10:04 +02:00 sched: correct SD_flags returned by tl->sd_flags() During sched domain init, we check whether non-topological SD_flags are returned by tl->sd_flags(), if found, fire a waning and correct the violation, but the code failed to correct the violation. Correct this. Fixes: 143e1e28cb40 ("sched: Rework sched_domain topology definition") Signed-off-by: Peng Liu Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Vincent Guittot Reviewed-by: Valentin Schneider Link: https://lkml.kernel.org/r/20200609150936.GA13060@iZj6chx1xj0e0buvshuecpZ --- kernel/sched/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index ba81187..9079d86 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1328,7 +1328,7 @@ sd_init(struct sched_domain_topology_level *tl, sd_flags = (*tl->sd_flags)(); if (WARN_ONCE(sd_flags & ~TOPOLOGY_SD_FLAGS, "wrong sd_flags in topology description\n")) - sd_flags &= ~TOPOLOGY_SD_FLAGS; + sd_flags &= TOPOLOGY_SD_FLAGS; /* Apply detected topology flags */ sd_flags |= dflags;