From patchwork Wed Aug 9 20:36:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 133529 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6358:9d8d:b0:139:fa0d:b2d with SMTP id d13csp151696rwo; Wed, 9 Aug 2023 14:21:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzyQzvoX5woW6xkXmy+LlcyC3fc7FqqcDD43eh5knV2c6Ef//+vu+IvI0gk0QUO3p7viNE X-Received: by 2002:a17:902:ce84:b0:1b8:a389:4410 with SMTP id f4-20020a170902ce8400b001b8a3894410mr545098plg.0.1691616118920; Wed, 09 Aug 2023 14:21:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691616118; cv=none; d=google.com; s=arc-20160816; b=kwQG+40mkv6f6enx+jGVdvjS0oHsbFF3HbevTrYmRE9pRNRqfsZAPonbNjIIH/fXnZ DP0F2IUGE+YDtk4UWXa+Q4TgrWLt68xk/fYGBfkUigAIML0OIQYOV4WJvDUwe2WU7DWv 7vFsQRKYd9/g5nOMynzHslM2vjVSB61XhI76EeXqvMjBPMhkhk3K89S3h6GUQBlfFcCa IlR6sNKfnbD90Q32nnnOrQ9uMkhh2s25u9GQH9064boqAvyrinwItBGP7Yg+e3T6Emdy infZeWu2k98M7+3lM+Q2Vkh/hw6dUqikeJOSPK4reZ7uUHWCnIWjYBdE0Ha4kuxTrhSi 1pIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=gbfovm7t+L/Eo0VwcoT9iGKKbR3xdHooKhE+maHJWao=; fh=jBwjuriIPWA1lnCf5oMMiNAPpgGE0iGPmBzZMsd85oQ=; b=lqDbnp0PyRXgBP4qXEOGjlBwqn8ToHKW/OWfB4cTpyxQ1Rcp4T7757FF92jZ1Ppf5b kRZde223rdV+QvTT/awQUnHhGs85JNYZBxWpjdUUmesTcLx52mcjdBhc0CE3TXdo1Hpy /SXwuRDcEFORAJD9B1X2ygWOUg2W6s7kKDNfMFhNNIfUCyXQaR0Orc9KB8K36eJ1r3ai Cf90ckxrSuMeBnhKxpH6vW+dJ2Wc0HVKWGh1lZpiIqNob16218/ifqPp9oSlLBrCF+14 u1TGaZAcnaLTRtBV/hiFnzp+rWVSXIE1DpaVv0DxDIbOW9De/bFT9IVxbZeDI0B+NZMk 143A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=iWhCeyZN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=dCaqSWGB; 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 p11-20020a170902e74b00b001b8a70ee029si10519823plf.449.2023.08.09.14.21.45; Wed, 09 Aug 2023 14:21:58 -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=iWhCeyZN; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=dCaqSWGB; 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 S234703AbjHIUgx (ORCPT + 99 others); Wed, 9 Aug 2023 16:36:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234591AbjHIUgT (ORCPT ); Wed, 9 Aug 2023 16:36:19 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF13213B; Wed, 9 Aug 2023 13:36:13 -0700 (PDT) Date: Wed, 09 Aug 2023 20:36:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691613372; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbfovm7t+L/Eo0VwcoT9iGKKbR3xdHooKhE+maHJWao=; b=iWhCeyZNZWwRkzMJR10TA8uwEcgO9IdC89rz11tYkD16+VPPvTBCWe5DAYXdQOBsjcII47 ngCQ9xwnWdPi+5bdyNU6IhdTNrrJWlXJqvzNeVySLtnU9t/hf63eVB/mwCEGTqEFLpkRkR /frjt5dwGMAMC+Xuz8so/K1m+fdKZ7n4x09Q3tItq9B4mYwCzP1onS2fBvvPMJTF7umxSQ n/zbMFWDmSiQ8B1yoGwuIQOA3HTmsFAgYCwcyfiK1LIpNUku5OUaV/sreiZwaGBxLZErjE 2FVqucWQFg97q8J39Xxzvj8EZqv8wvHDKJfF/qTySJJiMYdMHrnkDPpC+7wyZg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691613372; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gbfovm7t+L/Eo0VwcoT9iGKKbR3xdHooKhE+maHJWao=; b=dCaqSWGBplYzOaShK4erUkSwBKCEkdIjNS9pxXtf65GGWwe6/FOnEqyeQHfPZJik1sYIbu exCo5qZJ9DFkVBAw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic: Simplify X2APIC ID validation Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , Michael Kelley , Sohil Mehta , Juergen Gross , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169161337185.27769.2452854020127752295.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails 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,URIBL_BLOCKED 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: 1773788063710571558 X-GMAIL-MSGID: 1773788063710571558 The following commit has been merged into the x86/apic branch of tip: Commit-ID: a9d608c22aeecaa6cd34717a8576318ae2295379 Gitweb: https://git.kernel.org/tip/a9d608c22aeecaa6cd34717a8576318ae2295379 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:10 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 11:58:31 -07:00 x86/apic: Simplify X2APIC ID validation Currently, x2apic_max_apicid==0 means that there is no max APIC id limit. But, this means that 0 needs to be special-cased. Designate UINT_MAX to mean unlimited so that a plain old less than or equal compare works and there is no special-casing. Replace the 0 initialization with UINT_MAX. [ dhansen: muck with changelog ] Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) Tested-by: Michael Kelley Tested-by: Sohil Mehta Tested-by: Juergen Gross # Xen PV (dom0 and unpriv. guest) --- arch/x86/kernel/apic/x2apic_phys.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c index d6495ac..d292ec3 100644 --- a/arch/x86/kernel/apic/x2apic_phys.c +++ b/arch/x86/kernel/apic/x2apic_phys.c @@ -8,7 +8,7 @@ int x2apic_phys; static struct apic apic_x2apic_phys; -static u32 x2apic_max_apicid __ro_after_init; +static u32 x2apic_max_apicid __ro_after_init = UINT_MAX; void __init x2apic_set_max_apicid(u32 apicid) { @@ -125,10 +125,7 @@ static int x2apic_phys_probe(void) /* Common x2apic functions, also used by x2apic_cluster */ int x2apic_apic_id_valid(u32 apicid) { - if (x2apic_max_apicid && apicid > x2apic_max_apicid) - return 0; - - return 1; + return apicid <= x2apic_max_apicid; } unsigned int x2apic_get_apic_id(unsigned long id)