From patchwork Mon Aug 7 13:53:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 132157 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1524636vqr; Mon, 7 Aug 2023 08:22:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGt0e9fZ5E9NfGLut01l8pKzIzopCL+IDAx6i54HpqGSs8GcbPjQp62NwvffCnAxjCT6OGh X-Received: by 2002:a05:6a00:804:b0:686:bd88:605e with SMTP id m4-20020a056a00080400b00686bd88605emr9296247pfk.11.1691421750660; Mon, 07 Aug 2023 08:22:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691421750; cv=none; d=google.com; s=arc-20160816; b=SIuUQdxdP7VanpRlxKRRBDCyGgorjVeIWRGaqn9oMNa+WIZUtHZcwzmNR9F7zDLQ1i LJsPWhx9P12LShId7EguxWAsumVe5p7jhOJYjuk1BR/nebAZnMJXf2QByRrNhFw8e1EZ hmIc4N9MPs+jHMQBSqxBDCnZJhmKYL1+chSE4mRuDUqNre465XPZ9eVmnBr8s1rU7jTT sx0IvcovDv3C+eYuU85PWcmgpv16X4kzklCJcBpNIQY2oXYviMzdN5yzuTTJQ7rtmzv2 hTTotEtFhgqiuPiO6B87i1uWuSweMMJFlxlZqYFOAIMBBphRM4mF7h7AD0VvbVpEaFIy Xf3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=AfQzecPadC51W0+MsVlK3HeQl1U7zVudClCfarez7gY=; fh=/92WVKYrcN3rA268QXyKzVtm/UtxHeI2lnbU295XDiQ=; b=HWxb1Q5u1Z18x8IH/3qE6NiZ4MTxLzuypFs3mYq0vu+1X5hJReyUIp2tNcG/4/OHDL z7C4kC8v5Hf8KOhBhAUQcOi0YCC48o5uuhUvrAwjbHGaDOFqqJGKnm3scOpY8ismzR62 sp+7xXybhBIAkWmZjq94p84t55061QwuTX0cYKPldvHA4YkNnA7cKtzamG14XHd8iGGf 6NJwj7pYd4tM+Z7jQ0zkfQoNpN9XlMO3eYkv0xWUS2GFZEHqTveDi87Kb6RpxpOOtbMl gfdjb3bJyjyLydQy+04demdkqtfVr2sKq//MM4pSiRPqAxO6/vB+XGTwkwYiDbfeFCUJ gVYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=o3DfM5U0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=IDoTbYof; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f12-20020a056a001acc00b00686da99493bsi5922535pfv.221.2023.08.07.08.22.17; Mon, 07 Aug 2023 08:22:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=o3DfM5U0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=IDoTbYof; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234679AbjHGN4P (ORCPT + 99 others); Mon, 7 Aug 2023 09:56:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234575AbjHGNze (ORCPT ); Mon, 7 Aug 2023 09:55:34 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 251532719 for ; Mon, 7 Aug 2023 06:53:48 -0700 (PDT) Message-ID: <20230807135028.800668666@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691416424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=AfQzecPadC51W0+MsVlK3HeQl1U7zVudClCfarez7gY=; b=o3DfM5U0t2/heXbjNrpNe+8MgvT4QU3LQfgTHRXocTWlyqrnHGZNM70YEC67f6seJ6oYyC fxveX/aTf8tLgHbBB0UQEMmtkGmC1U7BmWy2D85o3o5rU3I4N/RcTLLb4q9xTyddK4z0jn Z+vX5Cm/t18OeSXWodBOBacNzfaytosgpaNoejFmDnFwmG0Uda10M1rfZHc2umSzSU/VdL gcJ4nNBgc8R/3EOwSgWxgoh4eTWpRospBv3KlZ0AlFUv92Frqerr4e0BYNHGBaTzTXn8la ipk5LpKdJpA+f1XJXXy8So30LuuXvNG0XnL1jIlXWviUvsMlfy9TzB929UMSLw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691416424; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=AfQzecPadC51W0+MsVlK3HeQl1U7zVudClCfarez7gY=; b=IDoTbYofzNkQBexjtr281rhNB0OHaOZL+AMofq4QKR4XiiVdvkCJjeRknNnfvs6D2zO3LR aNw5JcxvNd3IaFCA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Tom Lendacky , Andrew Cooper , Arjan van de Ven , Huang Rui , Juergen Gross , Dimitri Sivanich , Michael Kelley , Sohil Mehta , K Prateek Nayak , Kan Liang , Zhang Rui , "Paul E. McKenney" , Feng Tang , Andy Shevchenko Subject: [patch 45/53] x86/cpu/topology: Simplify cpu_mark_primary_thread() References: <20230807130108.853357011@linutronix.de> MIME-Version: 1.0 Date: Mon, 7 Aug 2023 15:53:44 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773584253610547349 X-GMAIL-MSGID: 1773584253610547349 No point in creating a mask via fls(). smp_num_siblings is guaranteed to be a power of 2. So just using (smp_num_siblings - 1) has the same effect. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/topology.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) --- a/arch/x86/kernel/cpu/topology.c +++ b/arch/x86/kernel/cpu/topology.c @@ -86,10 +86,7 @@ bool arch_match_cpu_phys_id(int cpu, u64 #ifdef CONFIG_SMP static void cpu_mark_primary_thread(unsigned int cpu, unsigned int apicid) { - /* Isolate the SMT bit(s) in the APICID and check for 0 */ - u32 mask = (1U << (fls(smp_num_siblings) - 1)) - 1; - - if (smp_num_siblings == 1 || !(apicid & mask)) + if (!(apicid & (smp_num_siblings - 1))) cpumask_set_cpu(cpu, &__cpu_primary_thread_mask); } #else