From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E91AC433DF for ; Sat, 8 Aug 2020 23:47:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 629BB206B5 for ; Sat, 8 Aug 2020 23:47:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596930479; bh=TKxSJQ7vNumH47O7qPfVFf/C+OEWYUJDGaHXT7FsDWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x7b75gjox7sXBiUqPVUJIF6Rne936pu0bWVvOtGOHEjgDo8hEY+zGBCaz0w6fbYuA jNjS13PN17oilVm3zP7qi/zTnNjaV4SQ0+HJWdL+PpW5UZ12auGXOOcF/XfZjqeeKe gQV6OzWgw+05RZu7EJNjAA5JSt4TZ0IXssfh8P3Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728034AbgHHXhi (ORCPT ); Sat, 8 Aug 2020 19:37:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:50676 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728001AbgHHXhe (ORCPT ); Sat, 8 Aug 2020 19:37:34 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E701F20716; Sat, 8 Aug 2020 23:37:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596929853; bh=TKxSJQ7vNumH47O7qPfVFf/C+OEWYUJDGaHXT7FsDWo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TMZakzWaXqIDd70lf8xAG56df/cTz8WDOXJZKYvSg64A+0qjyS9yDqzCVJ4aTfSSH F4p+5wGvKvmRMTuQiBLp5JemLl+HpEH+P5gpkdRCyCzBWBjDwQSgWsSWY20kgWxH5/ 89qCf1LRRw3vX8+Znu28GGG2u4CgfhJ43dYZx86c= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peng Liu , Peter Zijlstra , Vincent Guittot , Valentin Schneider , Sasha Levin Subject: [PATCH AUTOSEL 5.7 07/58] sched: correct SD_flags returned by tl->sd_flags() Date: Sat, 8 Aug 2020 19:36:33 -0400 Message-Id: <20200808233724.3618168-7-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200808233724.3618168-1-sashal@kernel.org> References: <20200808233724.3618168-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Liu [ Upstream commit 9b1b234bb86bcdcdb142e900d39b599185465dbb ] 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 Signed-off-by: Sasha Levin --- 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 8344757bba6e6..160178d6eb20e 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -1338,7 +1338,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; -- 2.25.1