From patchwork Wed Aug 12 12:52:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentin Schneider X-Patchwork-Id: 11710763 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02E3213A4 for ; Wed, 12 Aug 2020 12:56:04 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3D9D204FD for ; Wed, 12 Aug 2020 12:56:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="IsW/GPQh"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="kySC+DOy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B3D9D204FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=h/N2TzpLF5s6U0MZ2VGJpic4IzcGbZ3HszGciHJSGq0=; b=IsW/GPQhD7qnQ0x18EDrptU8M 6OFgjKHuQrQrzVTIpdYKUEexdMmqZPRpTwInfCxQHI47hpK59KBiVAVc+HopBCLYQys9osCcbuLqY b1iqW9W5TtOonv+37xrKEY4piLCAPfBHUjnFHRZ8XOWTjJQluSBjXROuPqJNecnCz50B2QDCoaabj 0T2TqV4GK21L8KAMPvytqi1YwUnX3uagT/t3BG+geAntEyphHvPqWHTO1xOvYOeXJ5SnsPBskb0qm E/qs7UmRMfiCGTTOJ1leEOwKrgOmjdyKap26+j0eMRuGRrrSRN473F1sxkdrRfC5nNBtSHfnw0N/r rQLGWWcGw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k5qID-0005DN-Ib; Wed, 12 Aug 2020 12:55:45 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k5qGK-00048l-IT for linux-arm-kernel@merlin.infradead.org; Wed, 12 Aug 2020 12:53:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=RLtQpo5Ul11yv/ODqJ3+IMh84xCtGsToutQQgmtjzaM=; b=kySC+DOyA0KZDTq9hOTpqmKpWH oO/3/GHLDwdzooYoy0jhF+URWuaA/s8aizJj0zPI3+8Ktrb7sTqfU7+LnC++WIj36yqJk/Ijbf+y1 WqjbP3MXqk2zKNfLbk/RH0XFDO00qQ+tg/CJ5i29LyWL/U/eb30pZ63VvYwhnZjGxIbjyhzb1gJZK r9agbjZDhPm53GqwP1jrHhzr28tVAbC1dfQx6eJTp7Pe3DjEQT98cHeVmocbfrk+W+er5J1cqhVIa C4w4oSfaTO5rIgBNJ4RVTix9jfmhClMIcQFKkpy7M6cyVi+cW9uqIihIlxzgHP6p+pXSe/hiYkW9O vEIqW9Cg==; Received: from foss.arm.com ([217.140.110.172]) by casper.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k5qG5-0006Et-2d for linux-arm-kernel@lists.infradead.org; Wed, 12 Aug 2020 12:53:47 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E4B2D142F; Wed, 12 Aug 2020 05:53:25 -0700 (PDT) Received: from e113632-lin.cambridge.arm.com (e113632-lin.cambridge.arm.com [10.1.194.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A7D493F70D; Wed, 12 Aug 2020 05:53:24 -0700 (PDT) From: Valentin Schneider To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 09/17] sched/topology: Remove SD_SERIALIZE degeneration special case Date: Wed, 12 Aug 2020 13:52:52 +0100 Message-Id: <20200812125300.11889-10-valentin.schneider@arm.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200812125300.11889-1-valentin.schneider@arm.com> References: <20200812125300.11889-1-valentin.schneider@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200812_135335_687138_C3259B33 X-CRM114-Status: GOOD ( 11.02 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-4.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [217.140.110.172 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mingo@kernel.org, vincent.guittot@linaro.org, Quentin Perret , Peter Zijlstra , morten.rasmussen@arm.com, Dietmar Eggemann Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If there is only a single NUMA node in the system, the only NUMA topology level that will be generated will be NODE (identity distance), which doesn't have SD_SERIALIZE. This means we don't need this special case in sd_parent_degenerate(), as having the NODE level "naturally" covers it. Thus, remove it. Suggested-by: Peter Zijlstra Reviewed-by: Dietmar Eggemann Signed-off-by: Valentin Schneider --- kernel/sched/topology.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/sched/topology.c b/kernel/sched/topology.c index 5f2bc99ff659..00ad7cef2ec1 100644 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@ -183,11 +183,9 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent) return 0; /* Flags needing groups don't count if only 1 group in parent */ - if (parent->groups == parent->groups->next) { + if (parent->groups == parent->groups->next) pflags &= ~(SD_DEGENERATE_GROUPS_MASK | SD_PREFER_SIBLING); - if (nr_node_ids == 1) - pflags &= ~SD_SERIALIZE; - } + if (~cflags & pflags) return 0;