From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636371699; cv=pass; d=zohomail.com; s=zohoarc; b=SLQKWIqlwCsJhRCJUaPFQqXms1cw69oD1VMDiaDa5zjh1vJL7G0DJQ8xIzaoVqAJEWNuHdcPkDrd4ey8C0HfO8i8UMWUJADR8B/tPWPFOYG0lAmDEweTKqaNWWoseZ1eTH/CYSTxlbqHgm9K5cpdpHU0YZbdrD7NWL3njK1OcDM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636371699; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3Je3ZuwZHXVzWG6CFZQALmUn2ZcQA7SOnGDosdRm7aM=; b=NTjbzbbwnv9RdvJVGfA0ImMF5LvFGyVC6oLzU+nu0jtlTE2kGfsKg5CrhzeZHU6NO/zwF3PCS5xb0el/5dhtC+0JzWUspCAdbqOJpHazJYPHR2FGLvlRdkzDYh2ot8JzE2VKFyO/EmwLVWVu6biW9r8ZWjzoVID5wBjRLsOADHY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 163637169923019.89738628907105; Mon, 8 Nov 2021 03:41:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.223310.385969 (Exim 4.92) (envelope-from ) id 1mk31T-0004IQ-Bi; Mon, 08 Nov 2021 11:41:11 +0000 Received: by outflank-mailman (output) from mailman id 223310.385969; Mon, 08 Nov 2021 11:41:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mk31T-0004IJ-8r; Mon, 08 Nov 2021 11:41:11 +0000 Received: by outflank-mailman (input) for mailman id 223310; Mon, 08 Nov 2021 11:41:10 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mk31S-0004ID-5S for xen-devel@lists.xenproject.org; Mon, 08 Nov 2021 11:41:10 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c0d226bf-4088-11ec-a9d2-d9f7a1cc8784; Mon, 08 Nov 2021 12:41:03 +0100 (CET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2106.outbound.protection.outlook.com [104.47.17.106]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-19-N2Uxjqz9O4G22Et3yls_cg-1; Mon, 08 Nov 2021 12:41:02 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0401MB2333.eurprd04.prod.outlook.com (2603:10a6:800:28::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Mon, 8 Nov 2021 11:41:00 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4669.016; Mon, 8 Nov 2021 11:41:00 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR04CA0026.eurprd04.prod.outlook.com (2603:10a6:206:1::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Mon, 8 Nov 2021 11:41:00 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c0d226bf-4088-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636371663; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3Je3ZuwZHXVzWG6CFZQALmUn2ZcQA7SOnGDosdRm7aM=; b=arYeOU+pIiUQetWmWU54WIFzmC/WzeEf23dzIJiCJUvLCJEThfHzQxUQoKhDMnCm2O4mSk m37v/VsVVi68mNLVzaDaCQ0Nnsdtfq5zzvCgSwd+4aqwyZEf6UWAModhPqCw+YpN78QXNP RBX20Epk7gspJXuPVwCZNeDcMQZGoaM= X-MC-Unique: N2Uxjqz9O4G22Et3yls_cg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j+dlogZdqE0E9IuhklLBKixSextERHqwAF69C5ypVIe51up8rMf3dFexIJQ61PkdpyoKJO9almCejM8+KNX2Wa9lOPM3LoG/ofgSjoDHDCwhRnL1OOL/AK5Lrwo3TAkT8Zs/ibQ73hYUuNSuvQpB9Gn7FK5RIDVKvts0c9Hn5xA425cdTuT1VTYxtasjv4VucCv44L00WzxXAdJci1ebekPChslaGrq8Y0q+waB35P1vOViCDZBMV9tj3tCVG+GfygplKwQb2cKiXaGdHD3FZi91qDLC4zuyw0A+SEGs0CoiSC/LR4U9NfVwSuMlP3sru9lTKqb0VQkHNqs8jnRs6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3Je3ZuwZHXVzWG6CFZQALmUn2ZcQA7SOnGDosdRm7aM=; b=LPsTvARuhT9KJdbdHyonfuuAzmcG1Jr5jmDeRal/XEsu/tSHQBjZid9opm33FMiAJokNpZS2BTYLJmDa3K5zxCZiGZ9pKLsbxbiVSdsq9mRYRUeTF0zT4f9tMBlYDMJ/5+el4tXqDMIbEWkp95elWgLXMVl4GZSeQcAaY02IuoB06BvrYMH5X0Xtht5+XXCQFNVwDiSK+wX3ptmhtq1wKX9UBkinHBlupaEIKc9TLNv+GXwsTKIxi7EBugkqtXRunqX/M32xgK/UmLKWF1adbIVWEP9jUgPnd8ViXFdqLhKCnhgXsJHuQdSUk9mEYrbj1InziS+pIgOpOpH2FwoQMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <0c006378-964b-3e48-4fe0-4df88e3131e5@suse.com> Date: Mon, 8 Nov 2021 12:40:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 From: Jan Beulich Subject: [PATCH v2.1 1/6][4.16?] x86/x2APIC: defer probe until after IOMMU ACPI table parsing To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Ian Jackson , Paul Durrant References: Content-Language: en-US In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM5PR04CA0026.eurprd04.prod.outlook.com (2603:10a6:206:1::39) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fe329fe9-0a49-4a65-df51-08d9a2aca319 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2333: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GvRM6oevltFVv6R8GjGH8wjanx4b8sGOmwbZQtWYNLW9w6TCyLmB4xY9c+q2zUONOPyKycaWotwVd7QIaZK0zUJecZKQGCDAYTWMWrUPJt93Ze2OwxNRfW0JID9LhcCOKVMIjIjtkxgLO6AaOiCKypCO5oJRo80IlVh7niDhm1mHV1roxvm1JyHWREataB4gDuFHH3WovwHBLEhWR+YcM9zsR6JxO9ppaxXesRN8tTY0nBrD1vKRURuLVSxQFOwiK5B5YY0I/YAo4uBcNzloMd3eioeIcZndDvypqsflcLkZAK/gvcYel//T5nqGWtApuVz4Ds386d7mcW4NvEnATBPctC3MLlqQKyKeb4dRcfLMBmDK4xoS/d4daxrQx3F56JElfk49QY2kS9a1qzhb4pQuo7S2Ai396jdhS9VxNoNe2GqqIs79xAJFKVmMEAjXNomAazVNwXjedUWOd5mThI3sgBPIY3FtL31MtwK6lmMENaDCM+KeMyHwQia0Qn/nJgRLqqsgrhmclIBIXChiM/MfrANg9u1Z9ovyVEqO5h9iPRu0MrYXr6mFsS8yNeRBx6lS2GmU5oaO2iqbOuARw/AtoRL5R9EwoaaV1gNM1iQC2ij/wsIV4DWRTiykqziIKceZr3/eCqAGetaRBidqFF/SE981gw+DbqWoMrqlu7gGL4epdK5jox1KYTSXcwdRtSZjfDL1K9WNix3XFhskikT43OmZVCqsiry8gjrtvvsGD1sIwH7T929VXblO1xK4 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(36756003)(26005)(38100700002)(66946007)(186003)(2906002)(31696002)(16576012)(316002)(83380400001)(6486002)(54906003)(4326008)(86362001)(8936002)(6916009)(8676002)(508600001)(31686004)(5660300002)(2616005)(956004)(66556008)(66476007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OC9NWUtSSStIb2kzVHpkd3pWM25nc2R3cytTRktYOEJTMm5DSnFGTWRXZDdM?= =?utf-8?B?MXpEbkppTzBERkdZQ3BHNHVXMnhNZHZVcTFyU21XdVMvOGhpY0pCSzFFaXdO?= =?utf-8?B?WVlmWFozaUU2cXhGZkFrU0FjbVZ3L3haeXFHZ0hpMGowVlBFRmY5WmNaUXdY?= =?utf-8?B?ZDhZT1JGRkJGS0tQNElMZnBvVkhkSEJ0Qmc1bURmQ2k1QnluL2FMTFlSOUxr?= =?utf-8?B?NDBUMHR3TVVoSGphSTZHampLVkkwTzcra3NoUVBpTlNFcDJPMUtEOFdXSjFn?= =?utf-8?B?aDFwbWtKQzRFK3QzUCtMSHJqVUF6ZEpNSU0zTmR0VStOWWFHTjBZdzhtZlhB?= =?utf-8?B?WktRVGJ0SVZaZGM2WTFVWHJia1hhN0JjVlhxYXdaREwzbGtmVG5Fc0RsU2x5?= =?utf-8?B?OEZPWFpmTm53TS9abjZTUE5GSHljblppdis0M3R2enYwUVR2OC9EcTVSUTJo?= =?utf-8?B?NzMzbHNGd0ZmTE9OM2ZuWldXR1E3MmVIK0ZBVHQ3cHRKaFJ1dUpQLzUvaS9v?= =?utf-8?B?UU9jVm9RTXEzUW1JRGxkdEdVdXdFREsreHQ2cXp5Mi9MWmVvbGVYL0lnTDIz?= =?utf-8?B?SjJaTHZyMTZ6WVBFeHhzaXZudjBvTldWVTY2aFZYYWpGZnY1bEY5RWg3bnZz?= =?utf-8?B?ZUJQN2VVQnlqRUZybUtmUUlyQnIvRDRCZ2FBMGtwMjhyYngvc0V1S3hiTEpx?= =?utf-8?B?QXFORHlxTDd2c2RnS3NYNldlUit3YlJQS1FBNk00SGpSWVAzZFNiaDBjbE5X?= =?utf-8?B?YzNLNVAxM2hOenVmK1RENGxpSVpEWWdLTFNIOHYzbXRlSzZzbW16dnpHRjF2?= =?utf-8?B?eGRrRnR3VlcyWnZHeFI0YU9YOHp1eFdMSTd5dDVlTXZqYXlXcHNpS25BSnM5?= =?utf-8?B?UTJQcjRaZ2tBUy9NazdGcFFsS3BlemY2VWZtK0NISFlCcnRlU3BNMlUvanNC?= =?utf-8?B?Y3pXajJQWUlvQXlGekNEUWw1OFRkd2UzTGFJeXdQVk5PN2JaaGk5aWsrWVlv?= =?utf-8?B?dlVjTW9yeThYR2RMNHRpSWlLMEpQa2FqYU1zampqbHYxOXdCSS9GVUFNQmU0?= =?utf-8?B?eFJiWktzZXpoQ0ZBeEVENzFDaXhuZVlQYitWY0tnaHJ4dnJUYjl5YlFzSjda?= =?utf-8?B?WUREMDNrUTRtWEYyeTBjaUlPRXIzSzZrUzBQY1NHbjN6VWg1RzcyWndTZjhG?= =?utf-8?B?S0RGRWM4SGMxeWtSdTdLN0V0WHdUMDYweWcwbHEyYml1eVpKZzBiN203TWt6?= =?utf-8?B?R0RSeUxtWFJVcTIySHlaOUx2dFpPTXZTM0IvdGdSdkppaEU2VU9LWDIyVEY5?= =?utf-8?B?WU5DY21JNnA2U2plOWFmdURJN01TckFpUmRFN2kwa0JhcVNjS1d1VXk1ejFL?= =?utf-8?B?NVRoQ2RWN3piS1hibXpETDBPM1l4eTk3bDVHZFFJek5BcEpOTVJaK25SaFNH?= =?utf-8?B?RGZSWHlUSEhjdkl1bFo2eWNMbWdLbE5tUVNxMG9sclRzRnQxbTYxaWNsUXpY?= =?utf-8?B?dkd5WU9aRXhTZFpYOEpBTHZvMFVBVGRTS0xWY2lXdzg0YVdrSlc4em5LTjhn?= =?utf-8?B?QVhOTFB6REs4RWRBMm8xdVNMR0paRC9nYTZDYisvL2FnSzRwenNObnZPOE9L?= =?utf-8?B?ellxWnRsWUdNbElzSWhuUmVFeTRYZUJkZ0JabDlEcXZBUmhpYTVPM05zMXhC?= =?utf-8?B?c2FRTE1nV3J5UGpSaEZnUjVjU29RL0F2RFA0WnRvaUhrQWVKbG53aVJVYnpn?= =?utf-8?B?Y29nMmo1eFNlejF1TjRZWE1scjcyZ1hLSDBnWG5DcnRhZ1ovbjE3enhJTFk3?= =?utf-8?B?TkNlc2ZRK0hZSkthS0FZeU9rdXlJclh0RS9zaVp4VkhtYTZjOVdSN3lnNkh5?= =?utf-8?B?S3ZwaS9KS24vM3kwcE9wcGhacDV1OFU4a3ZrdGh6RTdiWCtnMFBxSlVSdXFJ?= =?utf-8?B?WXltVExTemI0U0VYWUdYTmhwTElpREs0KzZOSWJGMEx6a1dYU0FtNEc5ZE93?= =?utf-8?B?VkxFK2tTQ1QyQmJKZEZOUEVpRkNkSkpnSzJwd29HSEtOR0Z1SUlGTVRMSW9S?= =?utf-8?B?dHgzb1BGVmdSMXFXamZuOHNhbDV6MDA2NkRHcm5SSk1DK1hCK0cvd1pmSEdt?= =?utf-8?B?dzRCQjhYSEsveXE4S053dGlJVVIvZXBXUkE5QzQ1bksvSFlWamtIV21waU9l?= =?utf-8?Q?6Mnph9oJz94bZxIXYj2cN60=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fe329fe9-0a49-4a65-df51-08d9a2aca319 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Nov 2021 11:41:00.4961 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: sQyb/6jzK1Eowe1GrrTpQJqTn9juWDwCokWB+/QgiJX2MXNQ1yGCBLhqOLDhxwyZJfnQtYPQqPKi+Sf3/4Ojgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2333 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636371700490100001 Content-Type: text/plain; charset="utf-8" While commit 46c4061cd2bf ("x86/IOMMU: mark IOMMU / intremap not in use when ACPI tables are missing") deals with apic_x2apic_probe() as called from x2apic_bsp_setup(), the check_x2apic_preenabled() path is similarly affected: The call needs to occur after acpi_iommu_init(), such that iommu_intremap getting disabled there can be properly taken into account by apic_x2apic_probe(). Note that, for the time being (further cleanup patches following), reversing the order of the calls to generic_apic_probe() and acpi_boot_init() is not an option: - acpi_process_madt() calls clustered_apic_check() and hence relies on genapic to have got filled before, - generic_bigsmp_probe() (called from acpi_process_madt()) needs to occur after generic_apic_probe(), - acpi_parse_madt() (called from acpi_process_madt()) calls acpi_madt_oem_check(), which wants to be after generic_apic_probe(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- Based on code inspection only - I have no affected system and hence no way to actually test the case. --- v2.1: Respect acpi_disabled in acpi_iommu_init(). v2: Don't move generic_apic_probe() invocation, instead pull out acpi_iommu_init() from acpi_boot_init(). --- 4.16: While investigating the issue addressed by the referenced commit, a variant of that problem was identified when firmware pre-enables x2APIC mode. Whether that's something sane firmware would do when at the same time IOMMU(s) is/are disabled is unclear, so this may be a purely academical consideration. Working around the problem also ought to be as simple as passing "iommu=3Dno-intremap" on the command line. Considering the fragility of the code (as further demonstrated by v1 having been completely wrong), it may therefore be advisable to defer this change until after branching. Nevertheless it will then be a backporting candidate, so considering to take it right away can't simply be put off. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -759,8 +759,6 @@ int __init acpi_boot_init(void) =20 acpi_mmcfg_init(); =20 - acpi_iommu_init(); - erst_init(); =20 acpi_hest_init(); --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1666,6 +1666,13 @@ void __init noreturn __start_xen(unsigne =20 dmi_scan_machine(); =20 + /* + * IOMMU-related ACPI table parsing has to happen before APIC probing,= for + * check_x2apic_preenabled() to be able to observe respective findings= , in + * particular iommu_intremap having got turned off. + */ + acpi_iommu_init(); + generic_apic_probe(); =20 mmio_ro_ranges =3D rangeset_new(NULL, "r/o mmio ranges", --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -44,14 +44,17 @@ bool __read_mostly iommu_intpost; =20 void __init acpi_iommu_init(void) { - int ret; + int ret =3D -ENODEV; =20 if ( !iommu_enable && !iommu_intremap ) return; =20 - ret =3D acpi_dmar_init(); - if ( ret =3D=3D -ENODEV ) - ret =3D acpi_ivrs_init(); + if ( !acpi_disabled ) + { + ret =3D acpi_dmar_init(); + if ( ret =3D=3D -ENODEV ) + ret =3D acpi_ivrs_init(); + } =20 if ( ret ) { From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115565; cv=pass; d=zohomail.com; s=zohoarc; b=N2aiBJjXDUvrvO5tnU8DBr8aF4UY7lUu4zjn5AXQ73KJ57PhZpoRLmqbIYCfIg5j6zILFYQ2WRDtsOSvWOhT/kzlQEpRQ69YI3Ksoj7clEqe8NQVJa6YG3/9VWp6y8n4VkHmX1Ic24m6Dr4iE2oIbzx3Bimhh5Bqa0NORzQcBYE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115565; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eD3TE16l92CP4qd/opwvhY7rtYk3soAjAnhlGWqnci8=; b=LC/ov1P4tuMcugr0IpeY7ceZOQlmT1KUHRA6rIH/fSwyNMxwG41gun8VdP7cpZM+S+4xx4/xtMpJ+/rhZdUwgkubRSIjD84Kns0SEw10oELVllCZ9UekPd/4Oh8Tln3+6mbx9SvxuEM9qkKETLT9TgalhfLYarJ/PIkPz+BXsCY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115565954451.05105661778475; Fri, 5 Nov 2021 05:32:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222264.384354 (Exim 4.92) (envelope-from ) id 1miyOO-0000n3-LJ; Fri, 05 Nov 2021 12:32:24 +0000 Received: by outflank-mailman (output) from mailman id 222264.384354; Fri, 05 Nov 2021 12:32:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyOO-0000mw-IC; Fri, 05 Nov 2021 12:32:24 +0000 Received: by outflank-mailman (input) for mailman id 222264; Fri, 05 Nov 2021 12:32:23 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyON-0000mo-Gv for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:32:23 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6c83d156-3e34-11ec-9787-a32c541c8605; Fri, 05 Nov 2021 13:32:22 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-19-lSjUHJ7rPrmeIepn1VvHJg-1; Fri, 05 Nov 2021 13:32:21 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB4848.eurprd04.prod.outlook.com (2603:10a6:803:55::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15; Fri, 5 Nov 2021 12:32:20 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:32:20 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS8PR04CA0161.eurprd04.prod.outlook.com (2603:10a6:20b:331::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 12:32:19 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6c83d156-3e34-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115542; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eD3TE16l92CP4qd/opwvhY7rtYk3soAjAnhlGWqnci8=; b=QktXnAJlDVVkZKtenrzLDsHWX6DSuED/Hx7o7GgZl43734u+IH2aCPgZswJcRD7mwuZ411 6+O2sex/hnyuW9LUk8HXFBDFVM6jBSve8cMyI2+yRCXPb+xqnI+Yix1tg0qIZQxBIexzLY N92yFarQpXS7Ev/6mF7+ADnOzTyvybs= X-MC-Unique: lSjUHJ7rPrmeIepn1VvHJg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z6evdVd8b0/2GuxJZRcgSrT3jvoS3bVEdrh75B/I2OgHQnBTa+8o2djW+awmjNd546V4cxHSk6ILPTcK+kIyfnCWt4vs8e/CJjfnJmJY3pBudEhNUAmgrInKK5Ncql/mfgpwSpiJ7jKHsgZzqucF/j4RFnLa+/WeQ2oqd+bL0Ld8wiBXpk5TYgvq7gRmQ+ICTdFDAcE3ilJ3ql5+A0XMj/4TfrBMglq8o8a4G6KStHPFl4eKUrFaQBxrdqi45b5VRNa8YpRhlFD5bhtxWlfaxuSeKVlcrzttuQyYoBPSy3km2xGQmDObBVZ6Wum7AJuj7OUPxfldnLYvQ1CHzC74CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eD3TE16l92CP4qd/opwvhY7rtYk3soAjAnhlGWqnci8=; b=A+TVSN2Dttn7XP5CmPVy2ZeIfb+W8Ulo6DTDcLeJ5ySuZkosvRMjmelSqXosLnIef4r38q27kDs5vWE4X0IJxfzdGVLnWWpzaiIu5bo5zb0M4t+VoMsf54v3ojIOmFsizxP4DbCya8kJ92W6aMPacAsCWllL7sVoGOnQCMgf0TojxzzbpgfieDWYd+drT1DnXFzV3M3D/XwyPbWtnst4ppLGy+WIuMbpCkMgOwFoEG8C/IOq5BvcIk1Hejx+bF2z52S1gVsrVYi164QxVUZo1wMkxIhniy+D2+/brw6xfYskwBJVFmuswq1xvepcq9s04TiX+4QG1A+WyYOMqRLA3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <43d8cc88-aae0-5a82-7b4b-756dd54dd223@suse.com> Date: Fri, 5 Nov 2021 13:32:18 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 1/6][4.16?] x86/x2APIC: defer probe until after IOMMU ACPI table parsing Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Ian Jackson References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS8PR04CA0161.eurprd04.prod.outlook.com (2603:10a6:20b:331::16) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b873c24-d10c-4b83-bc46-08d9a0584f83 X-MS-TrafficTypeDiagnostic: VI1PR04MB4848: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lCRgs9ToYOeIyJ6z/18rDA0igNGeweNkzniOVaaOMVHXrzNs4wpLGsxzhv6lqfJ1kja/R34s8agGIyX9tmW74esPxHDqbsGz5CRUUiSSbaQD0TaHm1uVSPWgM06lNApf8+t0nIBk8S7DiGbmfU0ficGN3JIVJaol5MwDuZBnZT3frlVW8Zo5noMyqyzPaajAt0gh5naUOjBfS0OHO3dE2C7A1p7lomnL651OOFgErIfe7RK1WguPG22s5ZPiZdKzZUjCHGobv2hp5/pwYr9lBVaxEIEB+OB3BTDtb4u0bRe57i+ThJ7HMGAZEPJomDfp2Y9IBRxn/BTLs958anmHR1C1c90qesT54VaxZeIKAbYPFt5v3poHGBS/mrecfdJQkycscx6tz00SqvucR+EHI2/ZdeCk3yDXLG+H4SEtShRReQCKLnu4TO5NMJe48hmPcsDcKeseHl+pcTz4UjuNvdIWRPUSOm50iL0pct3AiWnNteH09lLFnNw7TqZ+0MmRBL4SqW7e5aUfZSY7bfNL7iWxsmmBMZN8vjX0twFmfwlnuvW1RW6DQormUmpz+Sj53ANJKFQsOcmyAW8K4Lo5oWmNKuOmUDEFHz0MNNXLo6BJDuOk0Qj5qJjs5vV8wO4LiBwQmTBSSTzcqRcms0DmPeXUPo/8nt/7mSmp2zG6XFq18mbeVlr1kBPlbhEneF1fiLDaLPqvOdR3Vtbzk8VgcMaad7LmcEqed19NPjiYBzg1/Tgq641bAovVPAKqwi0m X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(186003)(6486002)(36756003)(66556008)(4326008)(38100700002)(31696002)(26005)(5660300002)(66476007)(66946007)(8936002)(86362001)(83380400001)(16576012)(316002)(31686004)(54906003)(8676002)(956004)(2616005)(6916009)(2906002)(508600001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M3d6YkpPU3FEdnIwWFZBRFVudk1EQXIxOVJNVEpzTE1YZzdpUjhnNmtvR1I5?= =?utf-8?B?Qm9nTWw3TjlWMEZxczBHUzhXb0VJeXN6WXU3K0ZUUGlnWEdhVXZCek5DWSt4?= =?utf-8?B?M1N6SzAzeVFQVnhLaSs3a09UUXlZc0lmWTBXV1dTNDBXTGtPVVZMMks3enZH?= =?utf-8?B?Q09SYjE1bzNrRUxGRlg1cmR5L0g5T0xVaHhwOEtpTXM0RmVMSG53OGFXNEF2?= =?utf-8?B?OXRDbTc4djNHMWFrUHl0Tll3cnRwb25MNVdJOWxYTEt1WnVUbzNxUHcvUjAx?= =?utf-8?B?M1lVbm9UY2tCUVhTMzVwaFkzc0ZDeFlpbzRpT01ueG82Rk1QOTJaY05pbTFo?= =?utf-8?B?VUcxVFdlaCtzRDJXVWhjRXlTY0g5OWwxTHBDZktIaVNwWEpKZDdwMkxld1BC?= =?utf-8?B?ckF5YStNMEo3aHdYcGJZNXFEekhuOGYvbXFKb0dpQ3g3NDBIMUlFYVk1Qm9R?= =?utf-8?B?M0lLQ2crZTYvaHpjeThOSjZvS29HeG1pM3VtVjRYQ29Pdmh3dXN4czVZc29D?= =?utf-8?B?Q2NvZ0RVK2cyWjhiai80N1AvbzY4VVhwYlE2NmNpbmV0K2RpdEttUTlJUjl5?= =?utf-8?B?dG1LRlRiVTgxVUFxQzd1N3FBckhuSHYreldhQW4vYXdJS3RWWVhjS0lhNnBj?= =?utf-8?B?aERodFcvMnZEVTNrOUhuT1NNdThRNHhXVyt3bUY5S2xiNFJSRi9Ebi85WE5I?= =?utf-8?B?cXRuQ1hRTmtXM2pBQVZVTk45RlJaNXNPYzAxMWRPd1FwRHRGR3JlcjhNSUtB?= =?utf-8?B?ckRhWndJK0VUMzZNdFZlYVZuVmNkOG95djVweEtlbXFEWDFqNlRFRUhzRjMv?= =?utf-8?B?ZVpxenQxcGU4VkdLSTZEZkNRT3grY1pneFVqa1lqT3hwQUxmL2hYcnJZeDBM?= =?utf-8?B?MFRhL3pXb3VtRmpucEJJTmtWandYbEJQcXFSaWlHOTJXTFlaUU50OHhDeXRp?= =?utf-8?B?OTc5WGlEeFRQUXpoZk51OWZDaFNhNmRKcnNUY0dDTExrY3diQkp1eW4wNDVU?= =?utf-8?B?UWZQS0w4NUJPcnZzbUE3MFZHQkZXTWZWVmZOK2R3K1J3YmQzQlJ1RHAzS0Qv?= =?utf-8?B?cElDTlpCSXIzcmU4dUI1OGJySjdEMUZTY2FuK3MyYWt6M1NFTG52OGF2WmZL?= =?utf-8?B?RnMwYnZZT0ZFL1VkV0pKNmxoSU83VllPNVdhQVh3c1RYTkJBR0NFUnMyelJm?= =?utf-8?B?RlZJNHVweFVNV0RjQzJvMld4Ky9VRVJyRU9KcUxwbFpnRXIrTFRrNGdhNWFz?= =?utf-8?B?WCtQcDEyYmVWZm1wVVpvK29VU05qRGpZdXZaTUhTTU5GaGcxcTB4ZmFTNXl4?= =?utf-8?B?c1FOcnZ6L2c5ZUYxc09sVnBHL2dCTCt3Q04xUlJ5NUlwakdCRWVhZXRtbnNS?= =?utf-8?B?UkpNdHZRY2RLWC9ZWHc4SFVPbWxiN2dvVngxNmJYclJ0a1JVRWdYTjd2bnBG?= =?utf-8?B?SHBsdXFmSldYY05wZFBkeUhKQ0xIZ3BRd3AzSmZldkljN3ZGQkRua2JrTG5B?= =?utf-8?B?MDNEa0JkUmRyZnBmTWl4T0RIQXNnZ2Z3MXVDalpvbjdPS0dtZDZrNlFDRFJk?= =?utf-8?B?WUhmWkI3T204WWRwM2hVbFZOSjNpSGc5TmNZS2svS1Rab2JhU1pRR1VtT3Z3?= =?utf-8?B?MDFIVTlNSmdzNTZzeVludW82dHB0Qk9aUFZHK1dUL2dhM3gwSE9EMmNETFdV?= =?utf-8?B?RDJQMFE0U25DWXExK2FsbTBvMEQvSnF6M0lYdlVNSE51dnNZUlZjK0I0ZEVy?= =?utf-8?B?YmVaZmhpZmgxbWNYNFZQUERCSGpkZFRLeXVyd1Vmd0tENmExQmY1U3hqM0tz?= =?utf-8?B?anZnam5KMVk5dUc3cWRIV0VWM1NkQVFoa2R4eUVDQUpHQnJ4Zm9QU1krU2Vh?= =?utf-8?B?UE90c3JKa05WVXpsVTBFTC9tenUzcWpVdDkrN3hmanFORXhxTFhDY3kyRVZP?= =?utf-8?B?SldQTjFDay9ob084aUhKMFZjWmZPSG9HQWxVcTFsa3hjd2FJNjFVQUcvWXZk?= =?utf-8?B?dTQ4cGJ0aElTOUVhR09vTVR3eG1jRGtiY1V2MjZhcFZ0WTdMKzRiMmpsY2hX?= =?utf-8?B?Wm50WlJHaVROY1BnNWROQTM3czNjU2VPcEk4RDhFVnE0Y0pFMTY5UEdvZFc2?= =?utf-8?B?VTZFWWtoK3ZZaXJmTGp0TFVqUnIzUTJMaE5mUTkwb01hY3l6Smlwc1kwZHZt?= =?utf-8?Q?tKLRkWV8fdAyt17U5iPkTgI=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b873c24-d10c-4b83-bc46-08d9a0584f83 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:32:20.2394 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: w4H0iw0fLFKKcTCqwIEOUP7SzwULCOOO2khwePjCMSzrVUs2shQS67PBtUq/toNtxbm4+eBaOXp1+0sf5Gfdvg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4848 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115566984100001 Content-Type: text/plain; charset="utf-8" While commit 46c4061cd2bf ("x86/IOMMU: mark IOMMU / intremap not in use when ACPI tables are missing") deals with apic_x2apic_probe() as called from x2apic_bsp_setup(), the check_x2apic_preenabled() path is similarly affected: The call needs to occur after acpi_iommu_init(), such that iommu_intremap getting disabled there can be properly taken into account by apic_x2apic_probe(). Note that, for the time being (further cleanup patches following), reversing the order of the calls to generic_apic_probe() and acpi_boot_init() is not an option: - acpi_process_madt() calls clustered_apic_check() and hence relies on genapic to have got filled before, - generic_bigsmp_probe() (called from acpi_process_madt()) needs to occur after generic_apic_probe(), - acpi_parse_madt() (called from acpi_process_madt()) calls acpi_madt_oem_check(), which wants to be after generic_apic_probe(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- Based on code inspection only - I have no affected system and hence no way to actually test the case. --- v2: Don't move generic_apic_probe() invocation, instead pull out acpi_iommu_init() from acpi_boot_init(). --- 4.16: While investigating the issue addressed by the referenced commit, a variant of that problem was identified when firmware pre-enables x2APIC mode. Whether that's something sane firmware would do when at the same time IOMMU(s) is/are disabled is unclear, so this may be a purely academical consideration. Working around the problem also ought to be as simple as passing "iommu=3Dno-intremap" on the command line. Considering the fragility of the code (as further demonstrated by v1 having been completely wrong), it may therefore be advisable to defer this change until after branching. Nevertheless it will then be a backporting candidate, so considering to take it right away can't simply be put off. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -757,8 +757,6 @@ int __init acpi_boot_init(void) =20 acpi_mmcfg_init(); =20 - acpi_iommu_init(); - erst_init(); =20 acpi_hest_init(); --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1699,6 +1699,13 @@ void __init noreturn __start_xen(unsigne =20 dmi_scan_machine(); =20 + /* + * IOMMU-related ACPI table parsing has to happen before APIC probing,= for + * check_x2apic_preenabled() to be able to observe respective findings= , in + * particular iommu_intremap having got turned off. + */ + acpi_iommu_init(); + generic_apic_probe(); =20 mmio_ro_ranges =3D rangeset_new(NULL, "r/o mmio ranges", From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636986739; cv=pass; d=zohomail.com; s=zohoarc; b=F+YK/pUA0AyhOtOTM+tox9eZhW0x/4foX40vw0/xj1c9KbJi3xttDxeD2DrkqW85lymBJWIFBMKPKGF4UbSuAytqt0YIYl+Yi9JSxAoUhB3fx0ShCY8nMlzrxwBmzgiX67wvyPoS48hzTt8NLOxZp0l/ehg4uZFAs3P0rxTLqGg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636986739; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ine1KUir3OUHo3fP4t5NdeCpmkGsNbT1SwSgaiuSkCs=; b=gZwdshd1vY84AaldtbefKspkC5MexwSQHqtDc2bnqoAvnklVTX2XiHiRiZJWzPD+9wUOJLd/21XM8+TftC8xkmVq1WZvW0ZfIjBt9NLOKkI4/0ButanWvdHGA7TNKGeqPCcMT5yQjnpxvln/PqaFoCYRjCDr1wkf5ucPaBMo2CU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636986739115858.0430483572503; Mon, 15 Nov 2021 06:32:19 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.225953.390318 (Exim 4.92) (envelope-from ) id 1mmd1O-00032u-IR; Mon, 15 Nov 2021 14:31:46 +0000 Received: by outflank-mailman (output) from mailman id 225953.390318; Mon, 15 Nov 2021 14:31:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mmd1O-00032n-FM; Mon, 15 Nov 2021 14:31:46 +0000 Received: by outflank-mailman (input) for mailman id 225953; Mon, 15 Nov 2021 14:31:44 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mmd1M-00032h-Pr for xen-devel@lists.xenproject.org; Mon, 15 Nov 2021 14:31:44 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id c0f5e891-4620-11ec-9787-a32c541c8605; Mon, 15 Nov 2021 15:31:43 +0100 (CET) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04lp2058.outbound.protection.outlook.com [104.47.12.58]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-36-JceHiDKyMuWuQXLK2WTLPg-1; Mon, 15 Nov 2021 15:31:42 +0100 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) by AM0PR0402MB3459.eurprd04.prod.outlook.com (2603:10a6:208:1b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.27; Mon, 15 Nov 2021 14:31:40 +0000 Received: from AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::387b:e76e:f981:f670]) by AM0PR04MB5587.eurprd04.prod.outlook.com ([fe80::387b:e76e:f981:f670%7]) with mapi id 15.20.4690.027; Mon, 15 Nov 2021 14:31:40 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR04CA0023.eurprd04.prod.outlook.com (2603:10a6:206:1::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.25 via Frontend Transport; Mon, 15 Nov 2021 14:31:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c0f5e891-4620-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636986703; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ine1KUir3OUHo3fP4t5NdeCpmkGsNbT1SwSgaiuSkCs=; b=XMaEw9ZLcIZQDo5peNKoJ5LqYI7UoWLrszmtZ5VjiX06UhC5lgC5LIDDdH3Wr05ORvsstZ GMV1VIrBkoHxks5a3999kxhhJOm6LGpgFhfiz9bzbJWo3HQWngKXAGRxQBM9nJqjJwVEgJ p6SLiKnfvg35ckG/8V/oeOATM56nl4k= X-MC-Unique: JceHiDKyMuWuQXLK2WTLPg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c7wZhrRiijNmykD2AXZ5XqH2dnBnYlvA0pASTzun795SRMSsHNOp4Jws0/yWQyzkE2hc4aQc90NzzogECEbtKf7900scBfeSMAJDLrNdVPdnCLTE2wLQGe+ldTJ5vwe+B9RgXxOs9t9xzhIM3JOIisMtEj8AVrw7vXWilX575F7LTC3TVJlawabZ5Tee9S4QMqFlUtwcSX9MGe9esQdMVBwPRzmaNAS1Xkts+/YsCzSZmqh/S0aF2SE3X2od4D6SLdnZXFVi81uf9PRCe3MwXVFgLax7h/jyj5Kv5o4h5UIsG96DEJi1HWyJYICLmwiptp5MXWMcpWg+zMkdDQNmbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ine1KUir3OUHo3fP4t5NdeCpmkGsNbT1SwSgaiuSkCs=; b=JUR8bAfp1Cd3l2Rwy9hdciSW43OOMJYI17DUJExywDF5/Sg+ImCIC87fZVfjL0BDdZqaUa+ld/OIluScXYWNslLjjZY3+orNfzZjc/cpR2T6mjg4edBWje5s/vrk0AGhE3imz1ZMN0rOvLq5uRXe46aKMkrSAE9jbw+mE8g2s6F2HjyCmmU4atgzHfqTuEIRLo44oA4K9Yebi1wrPHzGgxRgOuWjXzME0yINfXNMoLQSGtX9rGWz8sZRUUx11Lrvbsy1nkjGt+vM7KkD319FTSIA4Ijdh5EH+K9Sv0iWCs9zuhIrxuKGrHhcwokcziZu1BcVM8tVZyEzR0/Esv83Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: Date: Mon, 15 Nov 2021 15:31:39 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 From: Jan Beulich Subject: [PATCH v2.2 1/6][4.16?] x86/x2APIC: defer probe until after IOMMU ACPI table parsing To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= , Ian Jackson , Paul Durrant References: Content-Language: en-US In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM5PR04CA0023.eurprd04.prod.outlook.com (2603:10a6:206:1::36) To AM0PR04MB5587.eurprd04.prod.outlook.com (2603:10a6:208:125::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 796fc401-d501-4c51-c4b6-08d9a844a389 X-MS-TrafficTypeDiagnostic: AM0PR0402MB3459: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /bBt/QujRj8aBpquLU6I6D2MAUaO5Rmmkl7hMBlAXYp3RQfwxxHLIcZmMHOAEO1wy7PSVI1cGDpR9O4e7rpPMVO/LgmexE2cb9rBAdjG2d+C7XJyjHTq9BfJcnYT89MqH/6pM1vti26g6KL8/X+RRUsnIo5zfMQYiSADPPhF9JVTyBzNWxO2v4kMjeqmovYOoigRopH54RlkxjlEN0hZoSkytMdRKuyFIhgoQ8YXFXzdyXGK3hrFFE3uj8tRm0Fnkp6wHoB1tGSLWs9TfIb0tCqOkQ6t5ivhRuW4bKsgwI/mWOgA5aBqb/l7byBVc3rbUU3v7h++WbyOrmRaEqooUjheKhvOptV9WpQUFKPkOvR3Q3OOu3n+dBQ3HXIhmGEUdxjfu3DWJdXD721X+J9G7L3Cu2ynoBCmeIc8mWfq7VEa8mZmukbnuB0Ucb3Hu976oydSS1fk06ZKLbTLOoDzYsjim1Ta8lqeG9zY64b0V4S5bk1vv49HQkK1sQBXbL41i5OmWY45Znbh3eEoYUKlvcojV6xQfMXMjMLghTqEIE+BWSbEYvi19zKtjgiN9KOVOvG42eh+mdAMTzn/6qI2pDFPMYi/bg6bWDxGIya6orzSB4rWylQvKKGGo4H+1PEQ5acAKaubgnSoFCLH3LvHMNao/CJAeEaEHbIvVucwMhBWG7LM54hj9EM58YrlWtip5UdB8NZewExxTpdvzJ1ory5zY6l5Tflz1wnN/QNFuko= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM0PR04MB5587.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(5660300002)(16576012)(38100700002)(31696002)(6486002)(186003)(508600001)(83380400001)(66946007)(66476007)(26005)(8936002)(86362001)(4326008)(31686004)(8676002)(2616005)(956004)(66556008)(36756003)(6916009)(316002)(54906003)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S2tJK3ZPWGVaNlNkZjY4cDhVS0d3dU1PdndHZzRBQnM0a1JrcnN6VlpELzB3?= =?utf-8?B?S2cvSmhTN2xYZ2pyUEtSbGFyZDZLRDNvTUltU0hhVGV5WTdTS3YvM2pvRGFv?= =?utf-8?B?WWN0WTJ0c1MzR3pTMVViOC9FcjdFL0F3em9qMFFKUDE3SWRQeDltNXhuK0NL?= =?utf-8?B?UTJHSUVTREtXNkNSSWlBakRwc1pYYTFqcFJwU3JCMkR4UGE4cjFXVE9qQ0Uy?= =?utf-8?B?cDYvYWdEZTFFUm9FZFFpVjJjS0FaWGxZc0U4clhpc0xwdEtWbmM5aHduc1J0?= =?utf-8?B?c0N1dWZ3TWF4eTBxeUhwWXp4YlhYM080RHpma0dPZ2NuVmZyYjhNREtDc3c2?= =?utf-8?B?aHZTM2FXUjBMUXVUMzMvc2k0ZU5tQ3A0ZVRPMzVtU29BY1J4RmpLQ3lWa3FO?= =?utf-8?B?VGdwNUw3YTNMVnFrb3RPTXNsbjVvUmxaM0dReFArbDNUcnpyUGxEUitMU29r?= =?utf-8?B?b3lDeURmY3ZTeVl4OGlMdkMzaDd4OWp5Z0dTQVlGa1kvUG4vME1XZHZFV2Vp?= =?utf-8?B?aEVnZnlOUnRTNGpRUHZmSkszdXhkbXRZK3ZLYnBUU0NHWVhvWEVSVkdjMTRO?= =?utf-8?B?QVN0RnFrNEJWWjJyK2IrMzlBNDMwZXgzK1krU1hNZmRqMlB5YlpzQ2tNNE4z?= =?utf-8?B?MVRSRnNuR3kyaHdqNEVTY0UvbGtvcFI2VDFBNlBMTTB0bGR2elNISmtQRTQw?= =?utf-8?B?dEQ3eExXRUVhUUFLU0RVUHBZWHo1K1hheXVSWm1LeUp6YUluYjJ0TEplNzVH?= =?utf-8?B?T1hoT0dMQVV3YTM3U1grRlJheDJweUROT05zeU5URUJEbThubERhQUNob29l?= =?utf-8?B?Z1Nrd2lZZS9QN1FsZjkwRkc4VCtUUzdGMDlEa0tVRE9VL21TNFZ2RmdYZ3B5?= =?utf-8?B?Mk1Wb2ZQcG1EWGNlZEl0TjR1cVgyeHo4STc1R292K05odHQwUG15SDV6Zzh2?= =?utf-8?B?OWEvTDF3UlpKZEJha08rdTB4a1lodHBoOHJFRzBCdjVxTUY2VEJ5d1MrQnJB?= =?utf-8?B?enRMNlFRMi9oRHdTbThCYklMckQ1UkgwKzVCVDNyUDNKRUJqR25oaGFTUm8v?= =?utf-8?B?bzliTHRBWVZZQk9nL2tHb2ZhTW5DUWs5NmRKbDBES01GdVFlQUN5Wm0xMjBl?= =?utf-8?B?ZlVGV2E1bUVEbVA0d3FDQUkyamphaUhwdlpoL3ZTL05haUtTMXlYaSt5WmNN?= =?utf-8?B?ZEU5Q2oremc1NWdtR0s0SkJLTHo1SGMvQkIwM296WmRVcUJhMWI5TnowTTdj?= =?utf-8?B?VENTZlFWaVV6TDlqU09zS0lEMzUzNzd4QUxkNEFoem95UFhlVUJnc1ROblBp?= =?utf-8?B?d2kydklERjNGNjNTZmExMmRtSUFGb3g5MDRwMGdsODZUV3ZqSGk1dVdDQ2lG?= =?utf-8?B?RGd2ekI1Ui9wcUtzc3gzWXhJS3pKNTRrTW9SdmRBUDN0d0t5UTJ1WUk4UWpp?= =?utf-8?B?dlhGTERYZ0FGMXpsTmVheGpicGQrZUg5Q0dGeDZsK1NLZzVHNzY4M0lvdXNB?= =?utf-8?B?VWtuTmxMV3MzT244U1FiTCtZSStLZGd0L2dTRFR0bDNNSzhqTEEyQ3F2Z0FZ?= =?utf-8?B?U01CVzRhSGNOVzVkRVRYd3BQQlNQa3J0UnZFeDJsLzZOUndsZFMzdUlsQk53?= =?utf-8?B?RWxiUkpRNXc3enROZEtPaDhPejF0Z3N0UUNTSjhpNW9sREpyQ1FjWTd3cFRR?= =?utf-8?B?SlRCY1JaalhHMmUwV0FZRE9IemFGMEQyUkYxbHFub09xanFieEMydkZna29z?= =?utf-8?B?YnBSR1RvKzhjL2d6K1FMNm9MTEJkb2VkZzdVV0ozVm1MODZPekY0Tm5Tb1lN?= =?utf-8?B?Q3JMc0t5MTVPVVZRVVdFenVoMWh3N1I4QS9YL1VsSVhHaWg3Yi8xMEFOTGdC?= =?utf-8?B?aTcrMVRLSUtQV3pPVzRsR3JWcURFVXVHVGNvY3R3WkRlYitUWHpZdTZ5OEhD?= =?utf-8?B?QTFVekJ1cWpzZmV2S1lDcmFYQUtkWVU5OSthSXF2NTRNU3Zlc2hhNVlsemkx?= =?utf-8?B?L2czcHU1VEhSL1B4bE1wNThma25pb21nNkhNNExBYkNpMVJlYlNGUlJpTnIy?= =?utf-8?B?WFlIeVB0Rm9mZW1PUXZrS2dTSUpPa3FRclBMYWFMWDNFa0JkZWdVSWZzWGcv?= =?utf-8?B?c1BuYnJvOHJxRjFrWGxnU1ZLeUU0NndSZ200QTdjQUVvNDVIUEpBVEpzV2V1?= =?utf-8?Q?xZh/nWWn7Y7GrrPCyyaM2XM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 796fc401-d501-4c51-c4b6-08d9a844a389 X-MS-Exchange-CrossTenant-AuthSource: AM0PR04MB5587.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2021 14:31:40.5712 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JwSqGXOoUpldQ39zGHoamlbJJjYpK9m3WAArZZWzEXWvigKuPkRQw6ZFXGsG7pssN/n6FpgqSG4U1jgiwP4WZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0402MB3459 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636986786539100003 Content-Type: text/plain; charset="utf-8" While commit 46c4061cd2bf ("x86/IOMMU: mark IOMMU / intremap not in use when ACPI tables are missing") deals with apic_x2apic_probe() as called from x2apic_bsp_setup(), the check_x2apic_preenabled() path is similarly affected: The call needs to occur after acpi_iommu_init(), such that iommu_intremap getting disabled there can be properly taken into account by apic_x2apic_probe(). Note that, for the time being (further cleanup patches following), reversing the order of the calls to generic_apic_probe() and acpi_boot_init() is not an option: - acpi_process_madt() calls clustered_apic_check() and hence relies on genapic to have got filled before, - generic_bigsmp_probe() (called from acpi_process_madt()) needs to occur after generic_apic_probe(), - acpi_parse_madt() (called from acpi_process_madt()) calls acpi_madt_oem_check(), which wants to be after generic_apic_probe(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Roger Pau Monn=C3=A9 --- Based on code inspection only - I have no affected system and hence no way to actually test the case. --- v2.2: Move generic_apic_probe() again, but only past acpi_iommu_init(). v2.1: Respect acpi_disabled in acpi_iommu_init(). v2: Don't move generic_apic_probe() invocation, instead pull out acpi_iommu_init() from acpi_boot_init(). --- 4.16: While investigating the issue addressed by the referenced commit, a variant of that problem was identified when firmware pre-enables x2APIC mode. Whether that's something sane firmware would do when at the same time IOMMU(s) is/are disabled is unclear, so this may be a purely academical consideration. Working around the problem also ought to be as simple as passing "iommu=3Dno-intremap" on the command line. Considering the fragility of the code (as further demonstrated by v1 having been completely wrong), it may therefore be advisable to defer this change until after branching. Nevertheless it will then be a backporting candidate, so considering to take it right away can't simply be put off. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -757,8 +757,6 @@ int __init acpi_boot_init(void) =20 acpi_mmcfg_init(); =20 - acpi_iommu_init(); - erst_init(); =20 acpi_hest_init(); --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1700,15 +1700,30 @@ void __init noreturn __start_xen(unsigne =20 dmi_scan_machine(); =20 - generic_apic_probe(); - mmio_ro_ranges =3D rangeset_new(NULL, "r/o mmio ranges", RANGESETF_prettyprint_hex); =20 xsm_multiboot_init(module_map, mbi); =20 + /* + * IOMMU-related ACPI table parsing may require some of the system dom= ains + * to be usable. + */ setup_system_domains(); =20 + /* + * IOMMU-related ACPI table parsing has to happen before APIC probing,= for + * check_x2apic_preenabled() to be able to observe respective findings= , in + * particular iommu_intremap having got turned off. + */ + acpi_iommu_init(); + + /* + * APIC probing needs to happen before general ACPI table parsing, as = e.g. + * generic_bigsmp_probe() may occur only afterwards. + */ + generic_apic_probe(); + acpi_boot_init(); =20 if ( smp_found_config ) --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -43,14 +43,17 @@ bool __read_mostly iommu_intpost; =20 void __init acpi_iommu_init(void) { - int ret; + int ret =3D -ENODEV; =20 if ( !iommu_enable && !iommu_intremap ) return; =20 - ret =3D acpi_dmar_init(); - if ( ret =3D=3D -ENODEV ) - ret =3D acpi_ivrs_init(); + if ( !acpi_disabled ) + { + ret =3D acpi_dmar_init(); + if ( ret =3D=3D -ENODEV ) + ret =3D acpi_ivrs_init(); + } =20 if ( ret ) { From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115687; cv=pass; d=zohomail.com; s=zohoarc; b=IiYVyuX6ejkU4i511/ZPgq16LD0bjypHQDQfY9BphN3Cj1DXMjpHrw9HnLwSDCyToap5GuA+u7fbP/KVIxEw1pv/Nh5V1BVLHBi/xUVMZ4Xu68DyvtQKRqcmxTtwF8804q/JTNFqI1odzgLcII0HfeIHxIIHjIsVnCmN1dBbVJ8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115687; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IY3+tB01KnV66hCC8nS+KXB316mGWF0nPKRUL2Nl/rc=; b=YvHStn3sjePmDygp6BA+6D16T7F5DRfSUeE/vOohQvJE/gyX5RIL29n2/T70p0XoI8MZNnbE5L4TTqTMknO5MlDzf4L55Ym/iUwosX760qgZfAcPJbrLOUFYK6rmJBnpmyDky4fp4Z65Ph1bikGZwSm5txdWojSpU+PmXU7IWZg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115687793492.74313620126475; Fri, 5 Nov 2021 05:34:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222270.384365 (Exim 4.92) (envelope-from ) id 1miyQG-0001P9-2F; Fri, 05 Nov 2021 12:34:20 +0000 Received: by outflank-mailman (output) from mailman id 222270.384365; Fri, 05 Nov 2021 12:34:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQF-0001P2-VF; Fri, 05 Nov 2021 12:34:19 +0000 Received: by outflank-mailman (input) for mailman id 222270; Fri, 05 Nov 2021 12:34:18 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQE-0001Ou-NV for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:34:18 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id b13866cb-3e34-11ec-a9d2-d9f7a1cc8784; Fri, 05 Nov 2021 13:34:17 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2052.outbound.protection.outlook.com [104.47.4.52]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-3-frPjDaL1OYuAG_gX1lUW4Q-1; Fri, 05 Nov 2021 13:34:16 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB7037.eurprd04.prod.outlook.com (2603:10a6:800:125::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 12:34:14 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:34:14 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM6PR10CA0072.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 12:34:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b13866cb-3e34-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115657; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IY3+tB01KnV66hCC8nS+KXB316mGWF0nPKRUL2Nl/rc=; b=JHZV9vd4QanvznIidaewjTOCLPmkAy0CFKMMKcc8WdrO8ojU0s605YfWu29OK2znO1xubU JuztvimRVQ44zRFFI6K8vWuDmj6axQvjTIQyBAsnkU2tE4XqQlZUumKl2APq4jtxx3MXcX Ayeoboug37PvS/yv0UawYhmacTAdbPg= X-MC-Unique: frPjDaL1OYuAG_gX1lUW4Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V7R0Xv5Ld6OuRQ8hsDlU6coEom2JxV+rXvxmRQyOrn+6sSbPn75u6j+skmdQWmpA+gXr7m9YkaLzIlEAekFgMrgjnHrhNPbgNZy1bWPvK/Qjo4AtbwRd7KAwOoWZq9fiBLeZdw2LoBTHYRuiDqQtNc/LrczF1dNP4piPpc2+YfcChOG1wUtgeTLd9KZA+OZsDUVGCmPRwznOe0x191UZVdEzzPIyl+rF68wqbWjvvTgvtAu0c13E+k6ruvOEgPipFErHMNwpxonsa8XhxKWcEc5H4MljYiF/pDj+6Y5tmzql3goe9XvtRv14K7vOjONIFzLZB+FSSfe4icj+8kBizg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IY3+tB01KnV66hCC8nS+KXB316mGWF0nPKRUL2Nl/rc=; b=DNn8Xj0XWZDD5nZlAkWwnPQKMx9AdVqYACinAi+XmQ2zQ7dVzHvRx3ogUThBHRo9OVkLDjpeMU4GiB+0NB/QyGTLaViQ6rqTCuXPLBZCRa3xVpZEnqO/bdRvbBSwQRNN3Zde4fFf7esaOpgwry6W7WbOi7d/DDf7h6wycQUlc5Q65En2F6XYcJlkeXns8/5/vneDmEWnLsU/lTmC9G1i+r511V6GSVxqUYzOyNG9SWH3XjA5iqsBBdUBbGYG9tPZJ8OHsDMBzVC6fuV/AVYLZdpReYUqw/8gVdHd3TMd8LU0HNy1IXT0qu20+4TgwJ1RzVRDPMrxRfSDy9mHyk4kxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <7e2c8dd5-e20d-5678-1fad-1b79fd8e06e4@suse.com> Date: Fri, 5 Nov 2021 13:34:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 2/6] x86/APIC: drop clustered_apic_check() hook Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6PR10CA0072.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::49) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f39bf716-1ebc-4d9e-055a-08d9a0589385 X-MS-TrafficTypeDiagnostic: VI1PR04MB7037: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BppUMrcG47H8MYWFscXO+Tdf4+NdVnj6bOSBHoZh7tOZMSb8fVXcyA7yqm/4O3U5IwCFnovlFtp886kYt92IixW4fQ1acW8R+6fYiycOUp70+xpScQ1uxZU2u+9oFjbbJ2u0qrnA7wyvQf/dy0g3WTptMl30oM+HFLrHdJxe7jMr7hTgFREkFyGthzlvIHC5Gb10exrwSA+fjhH+VRY6WIWOwVLPll/9yt9mfS6UCjI11Pbh2ybTsnczcbMCGlbORzRUnPKiBjN8EqOYK9oQZDsHLJoFflyQTh1MLn2NYGmZE5q6ClkIIJ3YD5Yi+PLbpTrBXvtaOBy3EetbYKmEvOUuCCeXt2fk5wYdE1f6D2ZFhSz95o6Q5RxKqjWkkNkz7640ZlO6fuwhKc1xJMe+3AGBblhwGQgR1n70awPTeRBdqdB6Weh+Fr7/gkPcMgOgKINBXQBKgqzL4lzDG0sE2LmI94XrGCe/diIbiHM2Sl/G4EZVf92wNnB8HefGim2NHoQxAWeQPm+lCS8w5mmEi8ZNaMjcIT4/rdtfT5AHwArv/Wgwbkwbb71/eGj4+NJUK7UCwhoqGcL64QQwT0sz9AhiOnsZFvRaleFTXcVmJi7MCTcyGCRPSSUN9a6VTb781cG4atRVtF9jmMPt2UfMX2pcrnwgt5kJARg3CIRTHgxJ2MrlyVosis4OrQauhTp9EtEVTWYoWNfSIl4ZG0Iy9GG80aBbBBb1Cl1xWKuNiS9M625cRRu6zPMhRm3hgKN6 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8936002)(26005)(8676002)(956004)(66476007)(186003)(38100700002)(6916009)(36756003)(86362001)(31696002)(31686004)(83380400001)(4326008)(316002)(2616005)(6486002)(5660300002)(508600001)(54906003)(16576012)(66556008)(66946007)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aVg5TE56NW1yQ20veHdWbmhYQ2dnL2xiS1RQSFU5M2VKYVdnMjBqMEFHNWI4?= =?utf-8?B?V1lUQ0dMaGg1dlZ2YUY5Q1h2TUlTTXNmUFhQSk54cXlSa2ZyaUltKzI5N0Y4?= =?utf-8?B?dU83Mys1QVM2RzR6aEkrS002aGlxZjNaQmFuRk9xaUNQY3MzSnFHY3RnWEdi?= =?utf-8?B?S2VISVJhemFWS0U1SFJBK2REcEhjQmIwS2tNSSszSFRmalZTdDRXbVBZdklO?= =?utf-8?B?T2I5akF1Q3Q3eDVRWGM1YldNUHRUcU5KSTY2N25Fby95THNmK3NzWEZuVWtw?= =?utf-8?B?NG1QMDcwMU1ONThYcGhTMVpxMEduYmhIb0RBUVRSTjVJRFBHN3FXRE5xRWV6?= =?utf-8?B?TFc2ZFNFS3oxRUZVZzVaeE1QMnpDczBmaUdwYS9YcWVoMDhONDlmMk96RDBT?= =?utf-8?B?MUdyVm9mSHhFbUpQN3ZkY3JiSFZIdFdCdzN1MG84SkVpcS9DK3RWSXZMWmJw?= =?utf-8?B?cThqdFlJOHM5eHZ6YThLQ3hhanV2RFp3WjN1V1lkVTJRc3FLWXArSkpiVzU4?= =?utf-8?B?ZWIrVzlYZ2tEdCtVU2l6SDNxcXZqTm4vRFUveGZ5ekhlR0loZFlIWDEyU1FS?= =?utf-8?B?OHRiRXdyUWoxS3ZEUFpiOVh0TW93dC96Z3IrbGhYUTBycy95aUpuZ2tUUFZa?= =?utf-8?B?L1RGMEU3TWczRHZzakRjMWRUZVJHbmJWOFlNWEJCZzBNMzVMQUFNUmtJZEcw?= =?utf-8?B?czYwUldqMHRZOEIxTzkzeVRUc0JkS2RPcDZCVmRmaDRPdzRWemJ1c3QxekVy?= =?utf-8?B?dG1QaE5FSXluUWY5UlZjV1h2N2NTT3FlUVgweUdvQUdzVmZOUnVpTGpkOUtC?= =?utf-8?B?cEFBVmI4WTl5RHhQMjlIRDZrVmwzYzJSS1NaM2FOZ2JZMllHL3YzbDkrUU45?= =?utf-8?B?eVNLc01BNUFBcFA3TkhQNTZjWmdmMFhnRkZRZWVJMU10a0tQUGhmbm4zSHNP?= =?utf-8?B?ajROYmdsUGZoNkZrYkxPdGtlT0VLZjFBTG9UdGNqQVVjY1dRUGYra0VTdXdD?= =?utf-8?B?ZGJSM0txUzEvK21vMllOcUhkNmxXL3dNTnVxWkFPUHpCSDF4S3pKbzVRV3J2?= =?utf-8?B?a0s4dHZBWnIxbmtwTXVBdWtOblRzRzdyWUJEQ2ZQV3V4VHVuamMrcDdoTWNN?= =?utf-8?B?TTZzK082dEgyOHNRZ2ZNUXJJOFExZTJqM05rMUVtV3I3YTNyVG04dUxLM21G?= =?utf-8?B?aG5HRmI0SGRnUzhXekhjZUlLcHo4VWN5cHZBbUxTVWtQUGhQbWxJRVF1MWhl?= =?utf-8?B?amdNWUozczFhZ29FRzVYMzJsRVdmcUZEMEtvak9UbENPMFlZR3MxZklMbUtG?= =?utf-8?B?eTJWcVlGY1hLWXVPOHJzTXpUY1l5bktKd0YzY1F1d3dTYlBHanFLbmp2TDdD?= =?utf-8?B?bkp5Ny9WV1R5QnFiMklPQjZydm11RFJOeHh5WjlJdElRc1pFM1RUYlVhL3FK?= =?utf-8?B?cXFHR0h5bVQ5b3pmd1p2eW40YVJZTnlVT1VBeFZXMkNMbzhqYU9YRGk0MnRD?= =?utf-8?B?UDN1YytHQTA3SVpRVFpDWFlHbDNsS2k0Um5yR0xCSUkrby9TZjJTVnJqVmcr?= =?utf-8?B?TFpLS2ZkTklVZUwzQjZBRVZMNCt2dmVRZVY4UG1icDF5ZXdiTmtPNWlmQmZI?= =?utf-8?B?M2hka1dtTFhRZjJCVWkreFRiOHlRaEhqQnc2eUZkaC9FRnhOc0ttMllBYzV5?= =?utf-8?B?UHVBb2ZPbHI3SjZhRUxFcjU5Nm52S2d5SFRYc2owOG0rQi8xQzNzbjdNVkkw?= =?utf-8?B?aEIrRWFFSVFFc2EwQUZDaGZPRzBlWGs5eG92ZktKU3dCNGJtaGFWc0UyVG1q?= =?utf-8?B?U0ZtQm9mSVQwUm9wM2tQQlMvbmxjOElraUovUHhTZkRMUVBsZjhTWHVuTFpJ?= =?utf-8?B?VkQwSmJuNzJvejcxZzJZN3dnSDh3T0dyRUdxZXh5clgvUWswOG9UdTU4bmdH?= =?utf-8?B?M21nQXltbmV6TXRvczJZNVQ5M2VzVEJXRHprY1FWOEhJaW9XQktweGN4aG5K?= =?utf-8?B?Z3c1Um5TZHRycGNobVNJZ2w3UFlpNE5GOStaVjN0U2tBUnJMS1NlM3c3VHlD?= =?utf-8?B?Vm9mZEJaZi9SbFB3QU5aS0FnWWpicEpDL05wRndqUG9tVDZsZWlud1ZKMmx2?= =?utf-8?B?ejBmcXI4ZDVwREl2a1dxdEwwaDBhcm5MOWp0S2kvV0dpWXdCZW9zZDJzVTRL?= =?utf-8?Q?yjFErOq//qdgkeHIsfZt9cU=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f39bf716-1ebc-4d9e-055a-08d9a0589385 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:34:14.3539 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Oo6VaNffHIC7lPi6AuBdRTjs9KbdJjoIDwPujLA9mGeAKOeNDG/ABRbhC5swhSRXjnuxroQxuFtaqqGc94l/Qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7037 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115688568100001 Content-Type: text/plain; charset="utf-8" The hook functions have been empty forever (x2APIC) or issuing merely a printk() for a long time (xAPIC). Since that printk() is (a) generally useful (i.e. also in the x2APIC case) and (b) would better only be issued once the final APIC driver to use was determined, move (and generalize) it into connect_bsp_APIC(). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper Reviewed-by: Roger Pau Monn=C3=A9 --- v2: New. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -674,9 +674,7 @@ static void __init acpi_process_madt(voi error =3D acpi_parse_madt_ioapic_entries(); if (!error) { acpi_ioapic =3D true; - smp_found_config =3D true; - clustered_apic_check(); } } if (error =3D=3D -EINVAL) { --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -243,6 +243,12 @@ void __init connect_bsp_APIC(void) outb(0x70, 0x22); outb(0x01, 0x23); } + + printk("Enabling APIC mode: %s. Using %d I/O APICs\n", + !INT_DEST_MODE ? "Physical" + : init_apic_ldr =3D=3D init_apic_ldr_flat ? "Fla= t" + : "Cluster= ed", + nr_ioapics); enable_apic_mode(); } =20 --- a/xen/arch/x86/genapic/delivery.c +++ b/xen/arch/x86/genapic/delivery.c @@ -19,11 +19,6 @@ void init_apic_ldr_flat(void) apic_write(APIC_LDR, val); } =20 -void __init clustered_apic_check_flat(void) -{ - printk("Enabling APIC mode: Flat. Using %d I/O APICs\n", nr_ioapics); -} - const cpumask_t *vector_allocation_cpumask_flat(int cpu) { return &cpu_online_map; @@ -43,11 +38,6 @@ void init_apic_ldr_phys(void) /* We only deliver in phys mode - no setup needed. */ } =20 -void __init clustered_apic_check_phys(void) -{ - printk("Enabling APIC mode: Phys. Using %d I/O APICs\n", nr_ioapics); -} - const cpumask_t *vector_allocation_cpumask_phys(int cpu) { return cpumask_of(cpu); --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -75,10 +75,6 @@ static void init_apic_ldr_x2apic_cluster cpumask_set_cpu(this_cpu, per_cpu(cluster_cpus, this_cpu)); } =20 -static void __init clustered_apic_check_x2apic(void) -{ -} - static const cpumask_t *vector_allocation_cpumask_x2apic_cluster(int cpu) { return per_cpu(cluster_cpus, cpu); @@ -175,7 +171,6 @@ static const struct genapic __initconstr .int_delivery_mode =3D dest_Fixed, .int_dest_mode =3D 0 /* physical delivery */, .init_apic_ldr =3D init_apic_ldr_phys, - .clustered_apic_check =3D clustered_apic_check_x2apic, .vector_allocation_cpumask =3D vector_allocation_cpumask_phys, .cpu_mask_to_apicid =3D cpu_mask_to_apicid_phys, .send_IPI_mask =3D send_IPI_mask_x2apic_phys, @@ -187,7 +182,6 @@ static const struct genapic __initconstr .int_delivery_mode =3D dest_LowestPrio, .int_dest_mode =3D 1 /* logical delivery */, .init_apic_ldr =3D init_apic_ldr_x2apic_cluster, - .clustered_apic_check =3D clustered_apic_check_x2apic, .vector_allocation_cpumask =3D vector_allocation_cpumask_x2apic_cluste= r, .cpu_mask_to_apicid =3D cpu_mask_to_apicid_x2apic_cluster, .send_IPI_mask =3D send_IPI_mask_x2apic_cluster, --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -410,7 +410,6 @@ static int __init smp_read_mpc(struct mp } } } - clustered_apic_check(); if (!num_processors) printk(KERN_ERR "SMP mptable: no processors registered!\n"); return num_processors; --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -32,7 +32,6 @@ struct genapic { int int_delivery_mode; int int_dest_mode; void (*init_apic_ldr)(void); - void (*clustered_apic_check)(void); const cpumask_t *(*vector_allocation_cpumask)(int cpu); unsigned int (*cpu_mask_to_apicid)(const cpumask_t *cpumask); void (*send_IPI_mask)(const cpumask_t *mask, int vector); @@ -54,7 +53,6 @@ extern const struct genapic apic_bigsmp; void send_IPI_self_legacy(uint8_t vector); =20 void init_apic_ldr_flat(void); -void clustered_apic_check_flat(void); unsigned int cpu_mask_to_apicid_flat(const cpumask_t *cpumask); void send_IPI_mask_flat(const cpumask_t *mask, int vector); const cpumask_t *vector_allocation_cpumask_flat(int cpu); @@ -62,14 +60,12 @@ const cpumask_t *vector_allocation_cpuma .int_delivery_mode =3D dest_LowestPrio, \ .int_dest_mode =3D 1 /* logical delivery */, \ .init_apic_ldr =3D init_apic_ldr_flat, \ - .clustered_apic_check =3D clustered_apic_check_flat, \ .vector_allocation_cpumask =3D vector_allocation_cpumask_flat, \ .cpu_mask_to_apicid =3D cpu_mask_to_apicid_flat, \ .send_IPI_mask =3D send_IPI_mask_flat, \ .send_IPI_self =3D send_IPI_self_legacy =20 void init_apic_ldr_phys(void); -void clustered_apic_check_phys(void); unsigned int cpu_mask_to_apicid_phys(const cpumask_t *cpumask); void send_IPI_mask_phys(const cpumask_t *mask, int vector); const cpumask_t *vector_allocation_cpumask_phys(int cpu); @@ -77,7 +73,6 @@ const cpumask_t *vector_allocation_cpuma .int_delivery_mode =3D dest_Fixed, \ .int_dest_mode =3D 0 /* physical delivery */, \ .init_apic_ldr =3D init_apic_ldr_phys, \ - .clustered_apic_check =3D clustered_apic_check_phys, \ .vector_allocation_cpumask =3D vector_allocation_cpumask_phys, \ .cpu_mask_to_apicid =3D cpu_mask_to_apicid_phys, \ .send_IPI_mask =3D send_IPI_mask_phys, \ --- a/xen/include/asm-x86/mach-generic/mach_apic.h +++ b/xen/include/asm-x86/mach-generic/mach_apic.h @@ -14,7 +14,6 @@ #define INT_DEST_MODE (genapic.int_dest_mode) #define TARGET_CPUS ((const typeof(cpu_online_map) *)&cpu_online_map) #define init_apic_ldr (genapic.init_apic_ldr) -#define clustered_apic_check (genapic.clustered_apic_check) #define cpu_mask_to_apicid(mask) ({ \ /* \ * There are a number of places where the address of a local variable \ From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115710; cv=pass; d=zohomail.com; s=zohoarc; b=AIaj1LNwK4UUMdqOHBiVW4HgNuuAxGm9ND5wIXf/zbvj7xTTSS2bY1/7GIDD+II45hYAqxdRc6fSqO8XbbzqrboH/9oqFKJpiZrJyIiuCTa/XngEtonHi4PvDUF8UWlmTDX9hi2zPTUTdf8Rkb3XMNihDwSkLmY6HYiYI/2xMp0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115710; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vpyFyOIyYBFgdujGQvciBKudkZZ0UUaeJu4HvGRPCY4=; b=hJg1piH73oOx2HT0/uC43LAYnNeUx3CofjOv5KV5Xtg0ZezwkWkgOWbMhHGEO+zJgLHfe8PkFQ7nW3VHPogGpLCOSdY1UZ/ZbxSnHVjOrRa4HS+0u+e52eYF7q79jRZTpJJHn1PSKhiTgFhgBALC/AfehICfFJyundrF2/h6i5w= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115710885853.9106706942954; Fri, 5 Nov 2021 05:35:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222273.384376 (Exim 4.92) (envelope-from ) id 1miyQe-0001v2-Fo; Fri, 05 Nov 2021 12:34:44 +0000 Received: by outflank-mailman (output) from mailman id 222273.384376; Fri, 05 Nov 2021 12:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQe-0001ut-By; Fri, 05 Nov 2021 12:34:44 +0000 Received: by outflank-mailman (input) for mailman id 222273; Fri, 05 Nov 2021 12:34:42 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQc-0001oS-FF for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:34:42 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bf862ca3-3e34-11ec-9787-a32c541c8605; Fri, 05 Nov 2021 13:34:41 +0100 (CET) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2059.outbound.protection.outlook.com [104.47.4.59]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-25-BJeZGZFQPaWWITxkYE6xIA-1; Fri, 05 Nov 2021 13:34:40 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB7037.eurprd04.prod.outlook.com (2603:10a6:800:125::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 12:34:39 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:34:39 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM6PR10CA0062.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 5 Nov 2021 12:34:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bf862ca3-3e34-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115681; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vpyFyOIyYBFgdujGQvciBKudkZZ0UUaeJu4HvGRPCY4=; b=GlIgAY4FXa5x/j3KGJ1OmcI7+CNSWJyiQX9d1U5HGY99GxeO4N1EfQP/abojeCR3cd9432 IU00hpJqhqpatGfTfVLdN/pTbNxHbOggCcNsS3AdZpOTM+wqEl6dNdeYkRXKxAcIpomic6 QawNgm1MZsa3yaQ+FyCFg/dE31MnW9M= X-MC-Unique: BJeZGZFQPaWWITxkYE6xIA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ANtaR4RXqBt0ME6t3m/xTHzDNRdEn7OxEow/A4vfMN813rS1j4l85Xij0vUAlRiYYh5mFdKsiAYRiNrowET8WobzKz1Pq5v8Ej1q9u+sizaFRFq20bJ0HJlIvPfLNfdq4mVUaJjQltwPM6ZJQtCjMp2/j+iAqkS49+rri8a5wHk9acSo9eLv0vQI1CDQw5vLpfWZUt/YH+wM+JBIizs+vjFUvDLMDpCw8Zfy7RtGaU8D0zIh3x6QCvUK3OkfM/fRznxwctLJjg1XpbeVXyaENol49j0QI4bo/hg1obFc7O9OLfC48iu21C1sxNtwCxx3i2fp5qIT0Nez1D0bz8/dOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vpyFyOIyYBFgdujGQvciBKudkZZ0UUaeJu4HvGRPCY4=; b=fJNLe0gp5zWk4gO+5wwiOhC3Q319uAbHYuDwDAsoMwztQ6jPnQeOy9F5XqqEHvUlVNtYD0ofD5sCM7fbNY9Hl/YwHdPrduN5MCY4U+SVjdq8s/lHCt3x6KkpKQOaBPsXB/JCyQQeBAu1ErdS8i0QUoIogkaXYqnFdO/LuR/cj7CMsa6Hn4nCbrXJM7nV/6atckyLWPYyrBIQl1hl/7bNUNje5BPDn/DfCzo0dd8kcdvv5gvM9Yt+3cQer9KpyyvkFFT8pwU5H5rbFMSPvsQ7BeiiRl2w2mUa39vLj5TjeLLKWU9lHJm+xYDxy2MjI4KbNZeOhtMfCvYANl9pCxrcAQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <777dd74c-37a0-20b8-72b4-fe52890aa9e0@suse.com> Date: Fri, 5 Nov 2021 13:34:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 3/6] x86/APIC: drop {acpi_madt,mps}_oem_check() hooks Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM6PR10CA0062.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::39) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ca4ca57-430a-4d23-4661-08d9a058a267 X-MS-TrafficTypeDiagnostic: VI1PR04MB7037: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OiwxTodr6iCtBxTOwgEIV3/Yx65J3jKARHm12A+PU0OX66vLwv/jPrDGUIDcX4axnc5Tfn1QN3EDjjODUtdDCsdyO5qBLmlfqXZAcl/Gec3gkdotdprHb6u9Dg7xc6mmzs6g2/RvVUCvFYCtDXFaEshQcabQlSk7fq/wIgw1FocPhZUyMwkQKEbCd2GIqPt5MpGIgLyVZ5VQ9sJbkb6Rnq04OfrAkqx9Q/7Y5V704gAK5ZTz8mB9BbMuAAHbJmv/nASXjx7ROFRtB/LjzpBD/E6JdWPHPma14UEZDgKyw4+C4JCgTSrRet+b4Tg1Y++Z1hg5ksoVTbmooJf6GzDBsiw0QcXkW8kZISsOKvUCiRIsJTMSt5Mn9W+ooj87+qXjfCYzdNW+QJuQf+czsNZLC4uuftKynL7F356DUdWA2nsUyMTdVFDqrDfHr/5Mb881kBiAOwvTxxPXbxPgcU190x373Ez5xw/hUoPGmgbnzSZpJUktm2bXgyCdRQJ9aUZHOWod2NmWlbNoZTnmncGY/Y0QR7NF2w143Iann8G+/apEAfIxzf+vto8GbuGAt2qtlM6N4mY24o3ga21seSLGtrVXwRxWGQ/NvTt6fMmiKcmE4V3msUTRqTUG3XdE51owdE10MtnfyJidqBPGjnfV4SWd8DKozxtyPjHE2VVWkM3Ite/R+sgcFO5FHG7AqI0ndaXgi+Mgb7q954Ji92W3OoMPWUuuf3ERQdfGKRxEoGY= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8936002)(26005)(8676002)(956004)(66476007)(186003)(38100700002)(6916009)(36756003)(86362001)(31696002)(31686004)(4326008)(316002)(2616005)(6486002)(5660300002)(508600001)(54906003)(16576012)(66556008)(66946007)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VnpPRUI1OHg4SkJqVW14bXplc0QzWHFwUXpZTjJmUHFBeWZlTlgrQmxocmR4?= =?utf-8?B?NktSOG9FblpYTVg3VkxwQXhVbkt1UTNLTjN1VUJhVm0vVXVzK2pDNGVRNlpv?= =?utf-8?B?QUlEeXYrVWhIRFYydzJaMjZxZFRBMFFPdElUUHorODZrTTkrVzVKa1pkZWpG?= =?utf-8?B?NUhheGd5ak51M3V0R01pS0xGOGZia0RlaWpKOXN5bytqaFJjK1VNOTRIYnps?= =?utf-8?B?bHorR3BsU0hZRkRGbnlHTjFKSm52bVNJOEdIandNMklwQ0dPK25acytjRjlL?= =?utf-8?B?ZXYzSFlvQW5ocVBESjhUZHdRMS8rU0tpQVZuRHk4WTJwK2pWdlJ4M0JOSmJO?= =?utf-8?B?STRkQm5qS0VpRGs2MUtaTWdnUzhrQXpGSnVaOWdLY0UxM3hUNEtXb3lqZXg5?= =?utf-8?B?TllEdEg0V1lwMWFyQVhJRjltaE9tRzVXeEp1bFVKb3BRMmYxZTF1QU5wdjBo?= =?utf-8?B?UDlXWmkzUFBQbDhPOEQ1Yy92cXI0VHNxNE1zT3NwUVhQVnE1akVaV1psVnFV?= =?utf-8?B?ZTFhbWZaVFNhSEJVQi9VU0R1bGhnbnp1TU1pajRWZ3A4RE02cDR2cGxQeE9X?= =?utf-8?B?WFVrMVJ2V3ZoM1cydUJ1SGVibjE1c3VtTlpTUm5NS0V6Z3BOK1FHN2FuMHVV?= =?utf-8?B?MnNGSkFWQncrajdGTEVVK2tINUwyT1NEZUJSZnNPU1JsTVRCM0xnaDNIL3pn?= =?utf-8?B?eHphVmVnY3pRNnM0bTlrTFFIUHF3V1V5OU9uQlRaMGxtQUhoSjRMU0JIZGZZ?= =?utf-8?B?emxtTXdSdWtiaGpERXVxMGNHMDBOM1I3eDNaWTRuVFhUOFFoS0xXNk9waU1x?= =?utf-8?B?TXF5YXhSUXV2VTNUc0lMWEF3UmVTclQxL2dQRUo1dXJnaXI4SkNnSUtEMkl3?= =?utf-8?B?L2t1bkJKQ2xzOUFkdU9zZG5NRnh2STNWWHJRTXY1U2FaNk5uVXN0Unlzb0pW?= =?utf-8?B?Sk9MZHFqaTRCQjhaekVjaHQwNHFEdWNEZnhZOG4wc1ZKd1ZzZThJYlZUMWU1?= =?utf-8?B?di9XRkx6N3VEZWhMclZ5Q2g0T0ZxM0trcVlwYnBnZkFhMXZ1VjJXclgxOXpz?= =?utf-8?B?THBBS0RFRHYzSzFtS1J2MFd3Tm1NRHloSUV0eUdOTldYZG0ydzhEK2VDNGd1?= =?utf-8?B?UXdGZUY3dmNDWTJBR0ExNEkxUVZUMDdMS1dJamdlekpBM1J5N3VQdDBmdmpZ?= =?utf-8?B?TVV2MDl0VkpuOFdsRzhhenFvTDJ5ajVGektlc21BcXIvbm1QQ1RvRUwxNU11?= =?utf-8?B?dXN5TUJ5d1dsaWFTWWFEb09oQWNuTG9hRG9oWTczOXcxRHpPVFVBZ25jaVVl?= =?utf-8?B?enNMTlZQemNEWllkaXY3NGpNM3dpNjJIUnllL0tLeWZHUDFzM1IwWG1Rek1S?= =?utf-8?B?LzBodnRIeXVtYlhrTlk1S3Vuem1HQVgwamF3amZjK2FaM1l5MmlSSHplbUVz?= =?utf-8?B?UU5pTmZQQUJ0RnBqWnU5amdNdXRZditZNVZPNmdHWlA3cFNqQmhhSTM2RjNY?= =?utf-8?B?Zk5VeFRIalFZV1FuZ0tYbklNOENHb0x2RXowbngvZlFyWEhVcU9tNTVVMEh3?= =?utf-8?B?dE5WdFB6ZVdpbmYrMm9qN1NpblVab05RL0psK2NTQTgrYyt6N2RHai9oVjRu?= =?utf-8?B?dnQ1ekJOTFNsb1UwOHJJQ0s0ZWI2WDVJOWxEQ1I4TWxvdWV2WlAwYWVmOW1E?= =?utf-8?B?MTM4UldINThqdEJHYkZ6RTlSOGJHR0krak9lZFZsMVg3a0FOdDZFZVdGTVpU?= =?utf-8?B?enVzdjE5SzU3K2U1aFpVZWN2ZHhCM2FOa2N3Tjd4Ymc5a2wzOVNJVmtBQUlw?= =?utf-8?B?OFA5Ky9TV1ZBMzBoNFIyWFdSUFdpaFZ0bXlzR3hjamFxMUdURE5JdUZvWGhL?= =?utf-8?B?L3ZoQmVDeXgxd0d1NktTc2JOUXFUVmRBbmw2ZVZWR1ludnkvYmtHYXRQU3Vh?= =?utf-8?B?UXNRam9tWmU4aUtjV0tXeGVnT0F6Y0NlcVl3RGQ1QlhJVWpFOEw4aFA3THZ2?= =?utf-8?B?d3pPUFZUay9VczYxdFJKaGprTlp3dGw0NXdLUXhVSldicXh5NXhwaEx1a2sw?= =?utf-8?B?dk5OS0FlV0x5WVJPanhxWFU2UVNTRDRzcy9QOWFvV3k5OHBTZEdCUGNtaEEr?= =?utf-8?B?S0pBampweWVRUHpXcWFWbGU0V3dOWndTRk5tL0pjVmdJOHlxejFTakZtK01J?= =?utf-8?Q?LIHjeWqyBRrNtUfd7KDmGjw=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ca4ca57-430a-4d23-4661-08d9a058a267 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:34:39.3038 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: m6CwI0N3/xQtc3a2lPLc8N1fYueJp3tEDjuUdOz/s7iGaOtdquSw2oxfukZg/eyDpeSGm6wefCYBQB62P+Ntdw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7037 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115712432100001 Content-Type: text/plain; charset="utf-8" The hook functions have been empty for a very long time, if not (according to git history) forever. Ditch them alongside the then empty mach_mpparse.h instances and the then unused APICFUNC() macro. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -39,7 +39,6 @@ #include #include /* for hpet_address */ #include -#include =20 #define PREFIX "ACPI: " =20 @@ -75,8 +74,6 @@ static int __init acpi_parse_madt(struct madt->address); } =20 - acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); - return 0; } =20 --- a/xen/arch/x86/genapic/bigsmp.c +++ b/xen/arch/x86/genapic/bigsmp.c @@ -8,7 +8,6 @@ #include #include #include -#include #include =20 static __init int force_bigsmp(const struct dmi_system_id *d) --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -12,7 +12,6 @@ #include #include #include -#include =20 /* should be called last. */ static __init int probe_default(void) --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -78,39 +78,3 @@ void __init generic_apic_probe(void) =20 printk(KERN_INFO "Using APIC driver %s\n", genapic.name); }=20 - -/* These functions can switch the APIC even after the initial ->probe() */ - -int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *pro= ductid) -{=20 - int i; - for (i =3D 0; apic_probe[i]; ++i) {=20 - if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) {=20 - if (!cmdline_apic && - genapic.name !=3D apic_probe[i]->name) { - genapic =3D *apic_probe[i]; - printk(KERN_INFO "Switched to APIC driver `%s'.\n",=20 - genapic.name); - } - return 1; - }=20 - }=20 - return 0; -}=20 - -int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) -{ - int i; - for (i =3D 0; apic_probe[i]; ++i) {=20 - if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) {=20 - if (!cmdline_apic && - genapic.name !=3D apic_probe[i]->name) { - genapic =3D *apic_probe[i]; - printk(KERN_INFO "Switched to APIC driver `%s'.\n",=20 - genapic.name); - } - return 1; - }=20 - }=20 - return 0;=09 -} --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -27,7 +27,6 @@ #include #include #include -#include =20 static DEFINE_PER_CPU_READ_MOSTLY(u32, cpu_2_logical_apicid); static DEFINE_PER_CPU_READ_MOSTLY(cpumask_t *, cluster_cpus); --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -30,7 +30,6 @@ #include =20 #include -#include #include =20 /* Have we found an MP table */ @@ -326,8 +325,6 @@ static int __init smp_read_mpc(struct mp str[12]=3D0; printk("Product ID: %s ",str); =20 - mps_oem_check(mpc, oem, str); - printk("APIC at: %#x\n", mpc->mpc_lapic); =20 /*=20 --- a/xen/arch/x86/x86_64/acpi_mmcfg.c +++ b/xen/arch/x86/x86_64/acpi_mmcfg.c @@ -38,7 +38,6 @@ #include #include #include -#include =20 #include "mmconfig.h" =20 --- a/xen/include/asm-x86/genapic.h +++ b/xen/include/asm-x86/genapic.h @@ -21,13 +21,6 @@ struct genapic { const char *name; int (*probe)(void); =20 - /* When one of the next two hooks returns 1 the genapic - is switched to this. Essentially they are additional probe=20 - functions. */ - int (*mps_oem_check)(struct mp_config_table *mpc, char *oem,=20 - char *productid); - int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); - /* Interrupt delivery parameters ('physical' vs. 'logical flat'). */ int int_delivery_mode; int int_dest_mode; @@ -38,13 +31,9 @@ struct genapic { void (*send_IPI_self)(uint8_t vector); }; =20 -#define APICFUNC(x) .x =3D x - #define APIC_INIT(aname, aprobe) \ .name =3D aname, \ - .probe =3D aprobe, \ - APICFUNC(mps_oem_check), \ - APICFUNC(acpi_madt_oem_check) + .probe =3D aprobe =20 extern struct genapic genapic; extern const struct genapic apic_default; --- a/xen/include/asm-x86/mach-default/mach_mpparse.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __ASM_MACH_MPPARSE_H -#define __ASM_MACH_MPPARSE_H - -static inline int __init mps_oem_check(struct mp_config_table *mpc, char *= oem, - char *productid) -{ - return 0; -} - -/* Hook from generic ACPI tables.c */ -static inline int __init acpi_madt_oem_check(char *oem_id, char *oem_table= _id) -{ - return 0; -} - - -#endif /* __ASM_MACH_MPPARSE_H */ --- a/xen/include/asm-x86/mach-generic/mach_mpparse.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef _MACH_MPPARSE_H -#define _MACH_MPPARSE_H 1 - -int mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid); -int acpi_madt_oem_check(char *oem_id, char *oem_table_id); - -#endif From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115733; cv=pass; d=zohomail.com; s=zohoarc; b=i7bgSTO+CQcc121joTCgnWgC+aG++LBZlqUdUGsxoXnl/sauZQOupLxDrduLKXgN1V7EY2P2eAbw/CShwO5IY1mzFpl/nSRFckOxOL7+Qci5Xpzg1LEnWYMmgrkHPixiPO5ITt+M9bjnVR3wXdR921Ogc4ISTbk4qVdxNpaSe7o= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115733; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eRkmeCDY9qmOnl/LgdTXyOV/AKSNeWTq/aTjmmt073o=; b=isI2NT22ILopCs1VbhUSXNGPxOFIEQ3xA15JJMYCGhYkBMj7kfV8R60njyfxUN97rBUc1Y80MENdbnB3Gr6t7wTKFFeL2B9pbwZ6OwFamfFAORXUpN+rY1F9yqVa4GZuHB9t7fvnXFJa3j+kXPdBMIDhtYTZS2KUHvtmDVkF1Is= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115733038351.0193452110882; Fri, 5 Nov 2021 05:35:33 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222277.384387 (Exim 4.92) (envelope-from ) id 1miyQy-0002UB-Pg; Fri, 05 Nov 2021 12:35:04 +0000 Received: by outflank-mailman (output) from mailman id 222277.384387; Fri, 05 Nov 2021 12:35:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQy-0002U4-Ln; Fri, 05 Nov 2021 12:35:04 +0000 Received: by outflank-mailman (input) for mailman id 222277; Fri, 05 Nov 2021 12:35:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyQx-0001oS-PY for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:35:03 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id cb4327ec-3e34-11ec-9787-a32c541c8605; Fri, 05 Nov 2021 13:35:01 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2169.outbound.protection.outlook.com [104.47.17.169]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-38-XtlarPb2OJSLhouHKRnBTA-1; Fri, 05 Nov 2021 13:34:59 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB7037.eurprd04.prod.outlook.com (2603:10a6:800:125::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 12:34:59 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:34:59 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR0301CA0004.eurprd03.prod.outlook.com (2603:10a6:206:14::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.19 via Frontend Transport; Fri, 5 Nov 2021 12:34:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: cb4327ec-3e34-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115701; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eRkmeCDY9qmOnl/LgdTXyOV/AKSNeWTq/aTjmmt073o=; b=kg9DXIdJQQoYnk66qxpCWctoxYbcjGpCwuXUHu2RTgxBHJ1i8Epjpz5vW17w8At79Ott0x T4uc3TbBOdzC2XzKqDy8NawWbRPPbnGC4ySYyRd7SvY2q7mO8R+id9DLo/QW2gRoautObP VtHR/4RIiBsXLIWYwezRC+XtRq5rJB0= X-MC-Unique: XtlarPb2OJSLhouHKRnBTA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hLYriAh8JmamKWYSHB8x6DaO9zEd2sXtCa1j/cErARPRS9i1MIL1KOyWzIHWLgwhGLll4mwUPSBdHfer0vWL87mYifkd6ypdMmObMtyQIXAAtZKFhopGBG5iNI9+aDOD4m9rU6UqF6JcXzCgQZDfuUhNdpb0NqLTBLdK/3BX3zL5lKUbXv5T1du1k8A2J1bikJ6iWccekJpwYgrQ4bLvX3uxNDZDwa98DXn7Ej332JXeZDoi0YsxBbIFg7CYNwYjiDXHwxs7rPd1pE2ceT/4wrNonjXT5tNTzQZCplU7VrCO1narfUudz09WeAYHNcU59C2VtmnTACNP7EiZ9xjZ2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eRkmeCDY9qmOnl/LgdTXyOV/AKSNeWTq/aTjmmt073o=; b=KfU1I9KEEihNtulQuXPDwfjE2CYQf3caDD7gtsAVMnXQZ729Pr5WuydNGaXnBYrRnnEekXfELpCY01uoC4Ac/MMqNe4UDHVZ6iAgIpBVdD1CAjAnHCjRY2JScFRT3eTGxXHZmJnwvrVFr1mttTSRCozCHLj2rw8vgGWj4piO4ic6HOXR/FL3tdHUbGPs0kpjAFPxBwiAlGmzKdr4IRD+3QCP4tpiZ7V5YQqEBk9KJdH54OPwZKkBvG1kWEnUj391cwynqPMyT7JAH/eZ41+i4ZQrJJ3kHob+tC6JO8XmNJk0E2n2CTLvNd1PKL+ESwBU8bybA/+BxHMB5XEr069A/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <38e0ef5b-0cef-9fd3-ea5d-8cf76005c689@suse.com> Date: Fri, 5 Nov 2021 13:34:57 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 4/6] x86/APIC: drop probe_default() Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM5PR0301CA0004.eurprd03.prod.outlook.com (2603:10a6:206:14::17) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 09bd1a6f-b8b6-4ee2-b3ea-08d9a058ae3e X-MS-TrafficTypeDiagnostic: VI1PR04MB7037: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TAeIZ0doTKpMEknzpKYkr6OaIIeXsI6sCNwY/iLeF5qnYgbkvRYCcF+K4ySlRQEQaytUv2Tw95okM3sPjqbRDDruuL32Wrcvc4yuT02ZwRS1S6QHtZ7jwGX4ON+e/aEvD4epWqYasQJrkY7yj59TbU4HzjGmlKWblkVGXFtLrX91O6i2LZ/la9ymjKwc7JxGZEnnm1oAMIhchCmL2rHeIvJ77e6tiMBAYcOVPxJQRXGQEp1A01KrKah5e3UCCE09mtjjWFCzHIVqH5yaWvWAjItm2yK2Zyu7+1iHzStyG0WrjFIP35v42mYNmdgstuJEqLkyfcSnZVdwhJjcURDrcltiCy0+cdi6t2duxl2iSarminO3RdQreXS5s42UedPPsb1UjczAQeyAxsya15IuBF/Vh2bF4/leYzte7sPZtC4rAykUflqEj03CLb7ZluUqvA2B8gVSgvoJl/DElw2suur6CT03XZH+28zh7xAUqFckYvtS2LCPeqUwD5txf7QqP3TFrwKuFsZPIJkROGN2ft2Bma8nzC+DlHa3M4Y9w582dH5k3CYhfFZaFdk2V3kca1pqERepr/CcXUA4kjDq+Umw7C4IyGWYeau01Jwl/XD06pcsALSYcfdCGsHy8ktTf5gGF6GRlV98y6J5oG6sIF+IS9uU4JERFNbbKBUPhS2i3IeimTwRsAezQNnFnVLao33x1l/R8uya1Ud8ryVflgRF+ke/9Ga3kAqpoUu30eR0rTxgYQD7hS/fiillhd/yGvvtqlF8MbIbwBxDjfBp6A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8936002)(26005)(8676002)(956004)(66476007)(186003)(38100700002)(6916009)(36756003)(86362001)(31696002)(31686004)(83380400001)(4326008)(316002)(2616005)(6486002)(5660300002)(508600001)(54906003)(16576012)(66556008)(66946007)(2906002)(43740500002)(45980500001)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VVg4aGNxbTZkSDZCRDhudlg5M3NVWlNnOXNBaFlRNHdQcGNERUZtRTJLd2pr?= =?utf-8?B?Um5USnQ0c01BcGJrVWlTWHRXaVVJa2xsV2MvZzN0Y3UrMGdIQXZIN0wxL2ZQ?= =?utf-8?B?ayttdkRBZG5Xd3VLTFdHejM1bjQ4aldhRjdUOVVRaU5Ec1JtSFdtYWFJM00r?= =?utf-8?B?Vm1oYzFyMWR0enRjekVzZldYWkZEeFlNblVCMTdwTDFOTEE5STQrVjJDcE8x?= =?utf-8?B?b3pVYXAyMHlRQjRLQk1ibHZtTGdCSkRWTEpwQ293RS90ZlVlYkwwUGNnZk8x?= =?utf-8?B?QjFoQ0pPb2tBSDNENWV6Z1h1dmdLYklmczhEZExFK0ZMMzd6blVmdTdoaUtU?= =?utf-8?B?QXpxVTNPM21oR24vVWJYYlJuQ1hxd25sek5vR20vd254TjhlSW1zK0lySTlr?= =?utf-8?B?YWZRVFA5b2dWWDFlU1IyU0hBVmdZKzFEcEc2MldhamR3TUVsdnU0RXF1VjlK?= =?utf-8?B?d1Y3S1hKRjZqS1NTdHZzYTAzdFBhR0w1Vk1oVzVwNnZsVWRUY1NzN1BCMklp?= =?utf-8?B?aEFlUGRGM2NGcFdMd1hyUXlybzlOU0ZDMzEzWjE1UWkwWCtHUkhRbEtLcHFJ?= =?utf-8?B?N1hqSEFMRUY5cTdQZXd0SHBKWXprWjBNNXgvMmJ0UUJLTVYwZkFiWjAxWk1P?= =?utf-8?B?MGxPdS9KVVVKeGdYbXZEanpmd2JCK1YxUUxQRUxuNG5NSnNrVml0Y2tYKzlz?= =?utf-8?B?cmFKeU1XanBoQjk1aUUwM2RoZjJhdnY0eU9jUGVTYkR5aTlRelZKMU1FcVdt?= =?utf-8?B?TEZSVUxyaWZubUc5LzNhakU3RGpON1FjN2dIdkwwTHVaQ2JjWVE1M2RSRVZz?= =?utf-8?B?WEdMVDQ3RTcvNHdyQytXblFmUWEyWi9vU01kdy9TR2x4clY1RG9qbTRSbDN6?= =?utf-8?B?MFJ3YjJLd05IajRxOVB4MlBiNWM3WFlvNVZ2UkNOWis3UVdXY3BIMlF3ejVU?= =?utf-8?B?bjhtWVEyNndXWUpsTXREcVZhOGlsZVFjTXdOL3FSQ0FsWWRhMGRZeThCK0Va?= =?utf-8?B?RnV3Rzc3Y0VJREM1aEVwemVqa3BUUXFlU2lpeEhjdHJSRmlmVDd0UHAzTE9B?= =?utf-8?B?dmoyRTNVNmZranh0RXRPSmViYnJZbkJ2dUE5UE9sOXpDcEFKNzgxMTRBMVNu?= =?utf-8?B?MTlMaW1tMGNtYXUxTEcveUlDL2VtZ2NiVmIyL05ENEpwdGlwVWhxUmRhNUJi?= =?utf-8?B?Y0pBa0pMNFh1Q3BKaisyU0p0ZmR5RWZLL3k2UlQ1RFFRRlZBNVo2elZkdkZI?= =?utf-8?B?VHNmcDVwbmVFSW1BUE4xdmVVZ3VidVJCUTJka2tDeXZBRjR5ZVZMRzN2akNt?= =?utf-8?B?cVhBTGwvcks4MFUwamhWay9Gb2JXMVpCb3k5NlYyMHBWUHFuRVdnaVB5Y3RX?= =?utf-8?B?Tk1CZGZEaUMyNzRVckRSZ0JCSzY4bkdHUVAzb28vd0ZlQm8yVDdLeVJKR0dx?= =?utf-8?B?RU8yU05NS3NJOFNUN0xWenVLWUFHM25rbzM5SzFaQXRqRlVML1RlWUpIMTI2?= =?utf-8?B?ZGxuclRCUWE3Y0R1OWJwZ1BuRy9ZNGpDc1NmUzgweWpOa2dzb3NCMG8wcUxl?= =?utf-8?B?ZUlEWEJiVk50SmZNbFVHNWxySnZXV3k5azM0LzAycWFYRjBZMWQxeTZkdzBj?= =?utf-8?B?Ylo5RlVMeEFaSzNncENiUlJraktPMHpZWHEwcHA4ak1iK3g0a0c2cE1saitl?= =?utf-8?B?V2RhM2tWcEx5cmVSR1ViYXZMTkR6UDhJMk1Icm1EYzdsa3JQb3d1TDYwLzJi?= =?utf-8?B?c2E5Zm9iODFrOUxIZkszT2JBclBOcFRhYU8wS3FVUUZkN3FpVVhGZzkrQzhz?= =?utf-8?B?VFN4RTUwcFJnTk1MeEFNZDF5ZkhBUnk0ekdobitkT3QrK2pEK1hiU0Rlc3hU?= =?utf-8?B?STBvVlVFUlpXVnFIdU5aRjVpN3Z6b1dnUkllY3hqZkF4cVc3UnV1M1l4WXVZ?= =?utf-8?B?VDFQVDR6R2dQZytUVHZBY0ozMXFOUlNKWmV1dktnQWppOS9aS0puOWtDbFNT?= =?utf-8?B?T2FRdVVJZDJIeVIvcUo3dHUzVHgycGdHL0VZRmY3RVczVVloYURFdmI4ZUtU?= =?utf-8?B?NGtyK3hSN24yeTk3NWExRC8xYm5Fa1RmeGVrNFFZLy9RL29keFA2VnNYSnA3?= =?utf-8?B?SFAyOFhUQW1BM3dpM0g1Zml0ZHNEVkhFc1NjUkhFVENCNnFzVUx0bnRFR0k4?= =?utf-8?Q?3Zc817f5O+vQ2A+MduKPvYY=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09bd1a6f-b8b6-4ee2-b3ea-08d9a058ae3e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:34:59.1706 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wPdCG/r2kVeBvLubSL2s27IN2tE4329x3G56+0z6pg9PjMpii2l6NRhYQO89oFMUY9x2J9Kzj+bzoL2B+xaK9g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7037 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115734624100003 Content-Type: text/plain; charset="utf-8" The function does nothing but return success. Simply treat absence of a probe hook to mean just this. This then eliminates the (purely theoretical at this point) risk of trying to call through apic_x2apic_{cluster,phys}'s respective NULL pointers. While doing this also eliminate generic_apic_probe()'s "changed" variable: apic_probe[]'s default entry will now be used unconditionally in yet more obvious a way, such that separately setting genapic from apic_default is (hopefully) no longer justified. Yet that was the main purpose of the variable. To help prove that apic_default's probe() hook doesn't get used elsewhere, further make apic_probe[] static at this occasion. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/arch/x86/genapic/default.c +++ b/xen/arch/x86/genapic/default.c @@ -14,12 +14,7 @@ #include =20 /* should be called last. */ -static __init int probe_default(void) -{=20 - return 1; -}=20 - const struct genapic __initconstrel apic_default =3D { - APIC_INIT("default", probe_default), + APIC_INIT("default", NULL), GENAPIC_FLAT }; --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -18,7 +18,7 @@ =20 struct genapic __read_mostly genapic; =20 -const struct genapic *const __initconstrel apic_probe[] =3D { +static const struct genapic *const __initconstrel apic_probe[] =3D { &apic_bigsmp,=20 &apic_default, /* must be last */ NULL, @@ -59,22 +59,20 @@ custom_param("apic", genapic_apic_force) =20 void __init generic_apic_probe(void)=20 {=20 - bool changed; int i; =20 record_boot_APIC_mode(); =20 check_x2apic_preenabled(); - cmdline_apic =3D changed =3D !!genapic.name; =20 - for (i =3D 0; !changed && apic_probe[i]; i++) {=20 - if (apic_probe[i]->probe()) { - changed =3D 1; + cmdline_apic =3D genapic.name; + + for (i =3D 0; !genapic.name && apic_probe[i]; i++) { + if (!apic_probe[i]->probe || apic_probe[i]->probe()) genapic =3D *apic_probe[i]; - }=20 } - if (!changed)=20 - genapic =3D apic_default; + + BUG_ON(!genapic.name); =20 printk(KERN_INFO "Using APIC driver %s\n", genapic.name); }=20 From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115757; cv=pass; d=zohomail.com; s=zohoarc; b=GK1EDW8wGVJJBLtGZrTX9Yn/1v4GlgR5tHKlbMvPqvVa4HlLdlgT4oqzC4l4RuaRQyrfgI3tX44+pgAuaa9KjRNkFLc4zYrwqTyQon77HJb6+yOz3nTACpbtRWCcs6pyR3PgVFl/zkbc8Bjd0K5XnJvYl2ktnPUQHiavTSV0wuE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jpgB95rPSSAEva6eQRre47O5y0IXJlpRfMop3oBtTjw=; b=QL6Fti2uTcYP6oq4WkLkjftz5nYwm0ihG3473J80KzwxHa2eB5UYDzLdJgkgvmSE3IbW838eQSE5cMVYMJjKoo2MQ/USWOzwQaFxstZy0RLwxDYJFrHJa3nJXORuf5mFyU++cfI5OEVcrknbFBk97Ji8mCZOZ7YwEu/zvPupIQs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115757892352.6451354323593; Fri, 5 Nov 2021 05:35:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222281.384398 (Exim 4.92) (envelope-from ) id 1miyRM-00035H-3L; Fri, 05 Nov 2021 12:35:28 +0000 Received: by outflank-mailman (output) from mailman id 222281.384398; Fri, 05 Nov 2021 12:35:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyRL-000355-UG; Fri, 05 Nov 2021 12:35:27 +0000 Received: by outflank-mailman (input) for mailman id 222281; Fri, 05 Nov 2021 12:35:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyRK-0001oS-7k for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:35:26 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d9acb659-3e34-11ec-9787-a32c541c8605; Fri, 05 Nov 2021 13:35:25 +0100 (CET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2175.outbound.protection.outlook.com [104.47.17.175]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-10-jbdLz5vAMKSydrRXpgynYg-1; Fri, 05 Nov 2021 13:35:24 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR04MB7037.eurprd04.prod.outlook.com (2603:10a6:800:125::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 12:35:23 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:35:23 +0000 Received: from [10.156.60.236] (37.24.206.209) by AS9PR04CA0055.eurprd04.prod.outlook.com (2603:10a6:20b:46a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Fri, 5 Nov 2021 12:35:23 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d9acb659-3e34-11ec-9787-a32c541c8605 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115725; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jpgB95rPSSAEva6eQRre47O5y0IXJlpRfMop3oBtTjw=; b=NkUu9GpjOKtHG3sYYFGoqlVBBCdphX92aGWWfJhDZocWL4JFkwI8LHL/REja96N4ilkhh1 PwMuGUd9bfEQ7/HWbSSvCRqqBXhzcTbylOo/PYKp42GhqLJT2+1NWmY/vN/FHPzKcQvLmz eEm2fWI1eMsXLq5FOOiu2jVE0bn240I= X-MC-Unique: jbdLz5vAMKSydrRXpgynYg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OURxSrgnDpDhlt3I3/9o2pRy4GJ9mP8A7XVoTfx1rlglU52SGz5Et6h+VZlg+/VxjOsjZW2i5yuZ4C++BMyRupvT/BASEeQKo7GuDiM+jhgRTq2Av9LcxjM//a+DMbLZT3NdfJTeko28QRkFOotiq8smtgxN5JtwyW9sCaV83pcM9rDzgfyP0jIE7c3wNLlkXqv5SJLo7t6AjoqDcFLxb+i4ZYC4uJi3TdEkPNk7BMKdc0eaVVM6j38dSykneKbD7Fhnz4AftaA3wRavbkCI+MRfFG+FiHV3GHjT3+6RJ9pO/jbPYZH2nyT6i84OtEZrBv4naxAoSaCK6RLVHuWDKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jpgB95rPSSAEva6eQRre47O5y0IXJlpRfMop3oBtTjw=; b=X9g98COVJ+0Drr2P+8iBKGdhYrXSYZK2JncT9e/NK2fiAgRUHxFkg/MPhhZ2+FCL2kAS645Bk+sgsu6S/FQY8eI16Z5i7F5U4GW3fvp5oVJ82s8GqdssE+EHRXmo8YYg3iuCFoFFj0gLJhlc/TDhDzWYBPosVgPR7GbBnlbLl39fJE2QNbjPkuk/lDLOQTrt8zwE4QM7GrbipREn1luSxJP5aSVcLKBo3KJ81x4QwARkBjEUZ/kk/WXt4zUIgZBQBumSnXwSxei53oJ6t231PU95Xe4DPPdC7jARZlAxbcySX2mDyDF1XnTs8dVlVJ6mL8u9UYfOPKqimWUCivKWmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <4b578ac1-f39f-5bb3-d53c-731ab94cbb6b@suse.com> Date: Fri, 5 Nov 2021 13:35:21 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 5/6] x86/APIC: rename cmdline_apic Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AS9PR04CA0055.eurprd04.prod.outlook.com (2603:10a6:20b:46a::11) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c048b62-34a2-4874-1213-08d9a058bcb4 X-MS-TrafficTypeDiagnostic: VI1PR04MB7037: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NIbny2zryNYkN1wzf4e5L4K2RjiYPjrd1NPDy1U1qzxSKcIYmljFVVQ+W6rxDzHAPV1P62oBxfm8e12XUnSskGJAFqApNegyttlN0V6ceAR0NJZ2LcSJdDMNlTROEdtcM9b4EklvNPPBDrpeLYX1naEAYixVIQ7E0OFRz4hPmNs03tp43QJ+WEuqnW1kX7YUN3F+6buEVwPV9wtxkQbfYfz1wvh2c+3m70TE9tTrssMRGmSJrCDHqvvZ6bNd34kU7dXwlQxflT9wlyTVhRQFcgiXtdEEII6R4xefs3i5BpeqBbieklATSlE73R4r4dX4+TIgvT17mUiXKJ005wWjKYtPxhwbvcK95uEl97nmp4ammR/lxKZc8NEz4ZW0URWpYxCOyEB+sVifsOVef6mzvWFpxqXF77HLEvDss3BRL4tY72W3lIEFeDxvtDJxI9tPKkNgtkgz5hB94/wux3blT1048C2Eba5hN9ImcWELA46EcfB19zxgU6AujdO7IhjT4lqAMyAQxUdDTWm36KZftKN4VpRlYXak3thrXkQfOO3brvlFPFtvcU8Ixajvfs6/pjDbrAaCqtdGLayRblye5WOximEAKFfqMMU4SM6gKMfa/gZCuq/1AWxkTlUaD4oLEt5LZorwtkGzqKtDPufkKJoSaqhDeDg8eZYGVdGF29UaypFVvjXkiyA/ztx1k0NOTjlfAhwDRROP8C/YjuWSqZ3ly9B9H68YYMXpUcuWLEw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(8936002)(26005)(8676002)(956004)(66476007)(186003)(38100700002)(6916009)(36756003)(86362001)(31696002)(31686004)(4326008)(316002)(2616005)(6486002)(5660300002)(508600001)(54906003)(16576012)(66556008)(66946007)(2906002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?b2R5bjNsR09HbWErQjNIeUNkUVgzMm14dTZJTUFGcDhXTDNBdmhuV2hwS3R2?= =?utf-8?B?ZUJQcHpUcXlNUkdmc0p2RDVkWXBWc1F3dzlyYnQvZkNHZjk1d2xpUWdSNVdZ?= =?utf-8?B?OTFzREJFb0tiTURURUNZUUdaRUNDd2NTa2JxbWhQd3kybjdLR3pEVlc0alM4?= =?utf-8?B?dDJRd2d1bU9FRk14anVFUytTVkNMbCtoTG9sRDU0T3JsVTllRGtlWjVoYVh3?= =?utf-8?B?WUppbjBSRVRPZmtaZ2R2TzVkZHU5L0NpWTd3R2Y2NDVDcDRYV3VNd0VMNm4r?= =?utf-8?B?MlhoUHpONmVCUXg4S1BHTXdQWTVzMVFKeUN4RXpRdDJ1ZEo5U0p3LzQzREdx?= =?utf-8?B?dURLOXcwRmVvTzAvY01iSnhhVFVma2o5Vnh6L2IzRVFmSlhjaDVUZTJ1QTBr?= =?utf-8?B?NllibTdoZStXa0tGY2JHd1Z1LzFldjJJQkN3bnZzYStma0ZEMnRuVktMZkp0?= =?utf-8?B?OUpYMis3THdYWU82K0dRQzF2OHp6VFJPQXBmQ0Rrblp0WTR6bTdVQUk2dHVZ?= =?utf-8?B?VXJ5WDJ6b253L1ovN253U0pmYnI0VWFuUit0N0t0ajdhNUZKQ1UxdW82eVkx?= =?utf-8?B?cGEzZWI1cktQWTB0MW1mZ0ZCTk4xLy9MV01mWUxZYjNFbFAxSDd5WFNlTnBE?= =?utf-8?B?YzhBb3g0aWFMSEVPcVUwd2tyNlJYR1BBWndNSTBMSjBrRS9oWER3NnhBMzRP?= =?utf-8?B?Q2tBMnBqM1JLTjAwSzFBc1pUSEV1NkZVUkVkOFloa1R0QWc3ZWhFc2hONnYy?= =?utf-8?B?NUxPeG11L00zN2ZiRUFFNi9FTTFaMEw2OVh4a05lTkhIVG5rTWo0UC9FMmxW?= =?utf-8?B?bGNzSHFpRXlJTkE3L29WUE5zcFU3eGNtOWQzTEROeWhWZzNlQklxcjRiRXdY?= =?utf-8?B?UGRJZ3dyTTR2UmZKSXZJYUhseDlyUnB4RTU4N3VLYmdyM25HbVFIbndlQjdJ?= =?utf-8?B?L0htbU1VZzcrdEJxRlZ2Y2JDRHZUa1hCQnVTL0pPR2pSeWIyNGh4Y0JsQ2tn?= =?utf-8?B?S2ZZWXExeGtmS2lMMWd6SDFrWnhzcmd2MlRreXJoTnYwRnljdVNmRXc0am1D?= =?utf-8?B?ZUdIaVl3czdiRjNUZUtXK1RzSFhFS2drOVNFVHZlYUNUdVFqQTlNbElONXhr?= =?utf-8?B?UXhWTldGUlJNUEJhbU9IbWdFbU5ZSUFCbEtzbW42QUxWNTVCb3FQSWtxZDJy?= =?utf-8?B?a1lSSTdZMjFZWU96eTllSXJqWnl2Zm1aZ1BINVdCR0YzMjEzNUVLZklaT0lF?= =?utf-8?B?MUZKeXVQdHhYM25GN0k3ZkYreG1FSkoyVkh4SG9NSVN0QUZoejgzNEQ4L3dE?= =?utf-8?B?ejJXWWJMV0hkRmJvdG1qOUpZbndBdTBKdHk1S09ZeHVBN3J2OEdFVGdGV3Mr?= =?utf-8?B?RDV2bmpMN2dUU0pQazB0U0pFK3laZkl2K2pJYjJLVkFlUFBxaUMycHRWc3Vr?= =?utf-8?B?RjRLTitUUW4yNThvTUZIRXZFWGZLNGVrbTJpT0pXWGdIa2RHQytSRVg5eFZt?= =?utf-8?B?QitVWllybGNaUGg0S29rUmE0NHl4TEJmM0plRUZsZXdFSGc5WGZ4NjNXcm5B?= =?utf-8?B?bGtZRE9BVDJsNlZjWkdmMlpCdU1nSkdXWXdXd3VQbnVRWkJmMU5WNnRZWFVl?= =?utf-8?B?MHNOY1JoRit4dWhlLzJpcXpHZTBMTTFJQ0lwNzh4MXBLTmZ1ZS9WMVVJOHZ1?= =?utf-8?B?dVdkQUFNYUdXcUJKNFVQbEN5a0IwUXA5SzEwNFF4MHFTWmQzbzVXbTM0RnVw?= =?utf-8?B?U0tPbEJuRDVjd0tCa0xmOVlQcDVDbnB4c3g5WHdqV1k4WDNRMnhPTWZFSEFp?= =?utf-8?B?N2txK09KbTgyY2RYWit3R1BpREVURGZENCtxeVliSjRBaW5UQmFua3YyQmlC?= =?utf-8?B?UldORkltZGZTaFk0NE8yWVVIMzlxeVprS3llREl0UnZRM1Zqb1VGV3RxUDRZ?= =?utf-8?B?M1k4YjVkVnVOeTdvRlFKa20vbloyZGx5YnZweG1lVitFOFVBeHIvaDJobmpq?= =?utf-8?B?STZpSDJMeXc1dmxseU5Qb0JwanN2SjVnSXdMOHZrbTZ5ejdycWhHR2pSVU9h?= =?utf-8?B?V09ZUG8rZlJBRUdQeXMxS2JmRW9kMkxnbzRuYS9iMVN6ZGwrb2pITTgwNjEv?= =?utf-8?B?RmNwZDA3bjJEaDg2Y1dGUTcrbTBiSVZxZ2gvU1h3aEhvSzVpbmFUcjAwSFRv?= =?utf-8?Q?WW9Xk0XF82nnMZts3mwbJZM=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c048b62-34a2-4874-1213-08d9a058bcb4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:35:23.4758 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8Hx57Z7QS8/Hf323yim0NeO/c8axoMiugtLlOerUaN4CSzBzjg3fjuN5Gqvr3evK1kOnh8VDo2fb3pTSVJMzWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB7037 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115758477100001 Content-Type: text/plain; charset="utf-8" The name hasn't been appropriate for a long time: It covers not only command line overrides, but also x2APIC pre-enabled state. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/arch/x86/genapic/probe.c +++ b/xen/arch/x86/genapic/probe.c @@ -24,7 +24,7 @@ static const struct genapic *const __ini NULL, }; =20 -static bool_t __initdata cmdline_apic; +static bool __initdata forced_apic; =20 void __init generic_bigsmp_probe(void) { @@ -35,7 +35,7 @@ void __init generic_bigsmp_probe(void) * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support */ =20 - if (!cmdline_apic && genapic.name =3D=3D apic_default.name) + if (!forced_apic && genapic.name =3D=3D apic_default.name) if (apic_bigsmp.probe()) { genapic =3D apic_bigsmp; printk(KERN_INFO "Overriding APIC driver with %s\n", @@ -65,7 +65,7 @@ void __init generic_apic_probe(void) =20 check_x2apic_preenabled(); =20 - cmdline_apic =3D genapic.name; + forced_apic =3D genapic.name; =20 for (i =3D 0; !genapic.name && apic_probe[i]; i++) { if (!apic_probe[i]->probe || apic_probe[i]->probe()) From nobody Fri May 3 08:45:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=2; a=rsa-sha256; t=1636115780; cv=pass; d=zohomail.com; s=zohoarc; b=oBiX2OickvylLrbXy/8C/m3tmE/Gnhey7V/Pa+osjEwYl32fRjfstREjUm7A5Sp7ua4h56B2X4bag6Cd44azDY3IdmAC6fD2vu+lAHGW1t9WDkWVw44QpBepnuY5nA/LPCgutEL3cc4kDyU/s8+VDaTy3q5C7jydoiSWqU4h0Uo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1636115780; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GaKPFWGowONl59x/p9INNuBefQFrOkbIUigpYW5UB78=; b=WW9hLhMc5S7jsRXoASvEYxkUJRnp+xfkRCrXgxbUbuiYMfyFEPrOIN4NwZJhcIk+551TGxxQDgGt8y+bYe7gA1rTKTJNshQt3lB7N9UIlajsIcyUCqHsv/p7SvdbJhrHpEyZjqd/yJ804OdLvB+1DPSwKoQxJdcIYl4mq6Pu3hI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; arc=pass (i=1 dmarc=pass fromdomain=suse.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1636115780112292.98316166854033; Fri, 5 Nov 2021 05:36:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.222284.384409 (Exim 4.92) (envelope-from ) id 1miyRn-0003ja-Di; Fri, 05 Nov 2021 12:35:55 +0000 Received: by outflank-mailman (output) from mailman id 222284.384409; Fri, 05 Nov 2021 12:35:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyRn-0003jT-AS; Fri, 05 Nov 2021 12:35:55 +0000 Received: by outflank-mailman (input) for mailman id 222284; Fri, 05 Nov 2021 12:35:53 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1miyRl-0002QJ-ED for xen-devel@lists.xenproject.org; Fri, 05 Nov 2021 12:35:53 +0000 Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e9f5122a-3e34-11ec-a9d2-d9f7a1cc8784; Fri, 05 Nov 2021 13:35:52 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04lp2054.outbound.protection.outlook.com [104.47.13.54]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-31-sK78T82QPKu0O40-FE22LQ-1; Fri, 05 Nov 2021 13:35:51 +0100 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) by VI1PR0402MB3935.eurprd04.prod.outlook.com (2603:10a6:803:1f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.18; Fri, 5 Nov 2021 12:35:48 +0000 Received: from VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898]) by VI1PR04MB5600.eurprd04.prod.outlook.com ([fe80::8062:d7cb:ca45:1898%3]) with mapi id 15.20.4649.022; Fri, 5 Nov 2021 12:35:48 +0000 Received: from [10.156.60.236] (37.24.206.209) by AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Fri, 5 Nov 2021 12:35:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e9f5122a-3e34-11ec-a9d2-d9f7a1cc8784 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1636115752; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GaKPFWGowONl59x/p9INNuBefQFrOkbIUigpYW5UB78=; b=jpDv+1t9V6au1XkzNCNxEWsx0uQD2mFWvA4ALnNkWA6Eg431sPyib5m2EcqkkJ3NRjVjzT W5iZ2McdmRLA5xXKdgT9pSvuFvZSwJZZ0Mk9+jGHySRfywl09ZeJZXpgkDJYMnGaLCKtPk KhA8rvGTYZzzzsYNvTZuY+M41uZ7Owg= X-MC-Unique: sK78T82QPKu0O40-FE22LQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bT3g1O2fjo3w8l5wh/07F87aPjFggzh5gYjJXRk7PgzOS0Dz1un/TunethOuQlWtPl0o6tELzta21QFCv58eQP/TEzm45+EkGHJWCwL/cYK51QA2aUdBXSgYPmGb05zACJlmfYFh7QQg5SaoWI0SuREHnA60fvhkHUqme89zR/rtX6NmZvxXO7jDAtg1AzYr3d4dL18t7+6hAnn/KJYrlyphRSoZq8LuoniZJm7s7wg4QM1ttDe+P+6WDlfMGnT90bIzlIPIMgn8HgpQWgZai8u2GFrmqi9gO40XRToZPjb2CetQTJ6qtNprfEmaOKpvSLaf4twSMSerjaEkQLvbNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GaKPFWGowONl59x/p9INNuBefQFrOkbIUigpYW5UB78=; b=FFDhcp2ltYwTcaetsNR3PrymCj21o3jdsoZb2XI+Gv4gwce9pMXz8dzYxZFJU2ll1Y0h9+AuUE5NoFKQtnLIlNqOdFoMX9WYpU8ARJfT6WTyUEUiyP8o324BgwthL5ZxruZ4AvIX1VfxRY+lkwrXdiykPyr0vvayw7O9CQZO6I6bxwZIe7yhg2v0aczYu5LcjfjmvRUrzZ3Mlj6PJk6TogI+Nd+Q+qyIQRX9Zd8aeJu1NIwDRKZ/37baK3heSsyhYDz55vTmq4pXmAaQS0renYmLulcuU03ArjjqVVAs9uyOlUKypa657tpSPeZk5d2H6tZZ0ohLQgAdo8mAId5SjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Message-ID: <45034389-b5d7-4679-7874-9bdd6aeeb100@suse.com> Date: Fri, 5 Nov 2021 13:35:46 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: [PATCH v2 6/6] x86/ACPI: drop dead interpreter-related code Content-Language: en-US From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= References: In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM5PR1001CA0039.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:206:15::16) To VI1PR04MB5600.eurprd04.prod.outlook.com (2603:10a6:803:e7::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bbcf815f-05c6-4daa-a991-08d9a058cb9b X-MS-TrafficTypeDiagnostic: VI1PR0402MB3935: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e/K3/w+7I4iNhEGIZi5ZbGpTopqz4C36hivas3uU7R6j371MmCK9C+kl9So0QUTZ8R45FQWWRuDksq2vbnYy6UHcB3xsWkZKG1xY3PYEPznz5UjEppug4PyuShYqFpijoZWEA+eOGT0Hqmrk+n6pZ2ftwMoZJOZe/NEO9FMROUrDN9eHQFR773ryWVdOaxv1PWe8VOjywELm0UaP3dPnZ9c8ZLOzn4mvf1H3uRXNI7/y+ze3v2X9qlmJxnZ6ygOgWabfO11tyt2kOE/7Mwrjg/Iz9U4VWri8bgNpB2cP7+dfn34op4JT5qGlljCfB5iMFcCyJAIepbwKUzDSWLjPasNMX4m0t+tdnJKNTdsd5ugfv9h6+Fs3olEscZnUCjDMRjGn/Zk4b6U7TIOXuejYi2VxIwpKHVYiHu0UjrIqpRPEXbGOuRzevd1oWHrI1XSaTMdyMPBIzOf/AlH2cDaC84JYd0Mh6qdi5rPdQ5mMtgTCj4t0rnx7Gy0vouWHetG0kf+hByZhO4t7m0hqotVm+ud8ijNmEMQjlh2obTStoMvnYw/jFecZbgSWrnXzlCpaoV5sZHlrCL7jrEQUuc1pAlmJpRPFW3z84cPfij9lW2WUmWEVuLEeZ1c9nGnud59vxYmABFhcyPtPnk2iUDoBM1V9fREP/GzauZouy9PsHlmZyOO/bb7iKEdGh8jb9fixg8uLSfT6f7HLmS2/6VLzyOw+Ke9WnVM2xhIXpk4ETUM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5600.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(508600001)(2616005)(5660300002)(83380400001)(8936002)(6486002)(4744005)(956004)(186003)(36756003)(54906003)(31686004)(26005)(8676002)(66946007)(86362001)(6916009)(38100700002)(2906002)(316002)(66476007)(16576012)(31696002)(4326008)(66556008)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cU53MGVkMG9TLzFTQ0xWcDBNa3RueW16NUhUcEIvbUJoZ1VBSE1uR2pSOXd6?= =?utf-8?B?VWFCVG8rZy94cllnOEtKNzNDU3VjbHk1UXpOTStuT3hIeGxrTUR2aUxENHZz?= =?utf-8?B?RFFwZWdYcXpJOExsdnJKcW50VVVnZTZyOHNUSzlJSFIyVERWdjlaSmk4a3E5?= =?utf-8?B?R1gyV2h3c2ZIRWtKbmVNRGNsSUQ3VkVKdzRrbWYyYnJZUEY2Q0tld1VLaWF4?= =?utf-8?B?VkRXMTFTdUVLbjFaTDM5L1ExdXNoWFBieExSdFJGWTlTNFhFblBHZzFTUm9C?= =?utf-8?B?dWtTQk1nWWZVU3U1Y1l6djR0M1g0K085ODZxaDFCbWtkai9KRTV2dDB1azhL?= =?utf-8?B?N0xkSngrWHp0RzdOWFhZOEJkYmdJb3hGN2Y3MUJpcTlaWkZ0ZmlLby9GVU1P?= =?utf-8?B?WkhRejgrc0dhQnIzRnhnazgvV1N1Y0hnb2x2SktBRnkvT0cwcCtGVWJxSUxS?= =?utf-8?B?Yzh5b2xveHhTODhUZDNuT20xdXBBMHZXOUdLQktBMHBkOFp5dFlpT0JxQ2po?= =?utf-8?B?cVk1YkJEL0kzbXdJOGc0Yk1UZlU3TllKL1pMT3N0c0hQaFZvN0NFQjczOSth?= =?utf-8?B?WmFHOG1jZlFyQ1F3RzhJQ2FVZ3Zsajl1ZnhneVFYbnc2OHZzVkVFY2s5ckxw?= =?utf-8?B?a1ZVT29GLzNWbmtnVTFJV0JkMzF4VDZKbzEvZnNWUTREaS9sc1MrOFhsUTJJ?= =?utf-8?B?K05lTHJkcjBDYkk3d0FRT2xYWjBNdjFNYjMwMkp4ek9DL0F0ZkE4cDJPSG5E?= =?utf-8?B?VC9tN0tseHFKYUlYNkd5SC8vN3J3YWdMS3ZTdHVWUUJ4eDZpNkcvYmtCdkVL?= =?utf-8?B?ZXFoVjBJU0JhRUx4WHpEYnJxT0N0R3ZNb0FSYnhTRkw2TnhiZ0s5OGdCZkJN?= =?utf-8?B?bkgzZXBuQ1RCTFQ1VWdjSzk3RUhmK1N1N0hyZ0F0VnR5d2NGbWJiMGxUNmI5?= =?utf-8?B?VG1ZQTJPckN2dTFFd3lrbktxRXY1dkNmdHlvSDZjYm9NYnN4ZzZCMm1uY1NT?= =?utf-8?B?NnVYcm1rajg5QkJuRmEyRERhN0VkSEl4aUJBZk5kN3EvU21SOWRkYnFJa2NI?= =?utf-8?B?eHQzbWFHa0kyVWY0Y3BPbmxnbEh4Ri9ZTzVEZnlTcHBROW9IQ292TEZobFE1?= =?utf-8?B?ZEpvSTY4RjV5em9jYVVRbW9UTzZVUkZSUG9VOVRZUk9uOTcrMGxaTVR4a2U2?= =?utf-8?B?R1dxMkRUd2txLzZUcXdDMnJLVzJtcU54cTFxSWQ1UGtvazlzV1h4SHNNYmJr?= =?utf-8?B?Nlo2eW5wbk1rRzExeE5JU2JXckdjb2k3eUljYzI5Wit0U2ZabGtLUjQ0aWIr?= =?utf-8?B?MmdaNjJ6UDhZdnh0ZEZsNmNSN3Z0WnA5N1Y0WFUyRkhJUGxuRXV3SUxhSEhS?= =?utf-8?B?ME5oOXg4QnZXektxSGhNYU54OFYyVmJLRDNrWUM4b0dTR3lFdGlDUWNVbk9z?= =?utf-8?B?UXdHZExnREhxUXE3WVQrbVZ3MStlTFZoNFpncXBPcngvdFk0MUhVdDBzUUdC?= =?utf-8?B?K1BPT0pyM0ZOOTR5ZzZGbGhrb1F6OEdIdmovQ0hDL2QzWXUzeWIzQXI2UC8x?= =?utf-8?B?WURqazFwMmZxY0hncGZaTnJUeUxvSmNyb1A3RFBDdXRFYjVJZ3prMXQ1bGI4?= =?utf-8?B?RzhZZHk1RG5lT1Bwd29MSzl6cUVtMWp3ZURLQTVtMlhQOUhiZmN2SFV6ejhB?= =?utf-8?B?eDFFKzVDNnZwR0VwZ09BUTQ1N0hudU81QVROaHZJSFN5eURLUktyUnlIUVhQ?= =?utf-8?B?S01hbGFqcjlVZlQrQmlCSi9LcTNlakxnT1JMR1U1a3YzSVdBaDhNSDAxaFo5?= =?utf-8?B?NFd0ZUdGRFZscTZkNi81TklJN2xEaDN4VXFzWm13b2R0MUFXOWRmeXI4UG1o?= =?utf-8?B?WUR1Rng4cDhBcDJPSG5idzBWSVUxK3A4TXZzYTZrYWVyZVR3NFNNSElvbG5j?= =?utf-8?B?K1F2VVg0M3NUdzh1dSszQ1JTWXRFQVNQbVd4R3A3eXFwRVNHd2xobVl4cXJL?= =?utf-8?B?OWY1eUF5MzdhT3JiMFM2bWdsc3M3RXl3aHFObE1PRjgvcEttUkpaemVQWGhQ?= =?utf-8?B?TngzSnR4Tk56VWhuY3Bmd0RvcE1TRElhUnpuKzIwak5vN3krMkpwZFZTMEtL?= =?utf-8?B?NjVyWUlFSjJXSDVPUE1taEorZUJBNmE1T3pOTzRiaEh3RHovU2dwenVCN29a?= =?utf-8?Q?9AkN7A+z9I8ClB//yYTYM2o=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bbcf815f-05c6-4daa-a991-08d9a058cb9b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5600.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2021 12:35:48.4317 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: y7rchkhi7sRSe5kpm8nw5Pihx0R7322KDZ9gBBNcpY+oC7MlR9/tHlZMjBS8BRUwLW+gyqK3EGUAISJreLgdgQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3935 X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1636115780918100001 Content-Type: text/plain; charset="utf-8" CONFIG_ACPI_INTERPRETER does not get defined anywhere, the enclosed code wouldn't build, and the default-to-phys logic works differently anyway (see genapic/bigsmp.c:probe_bigsmp()). Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- v2: New. --- a/xen/arch/x86/acpi/boot.c +++ b/xen/arch/x86/acpi/boot.c @@ -477,16 +477,6 @@ static int __init acpi_parse_fadt(struct const struct acpi_table_fadt *fadt =3D container_of(table, const struct acpi_table_fadt, header); =20 -#ifdef CONFIG_ACPI_INTERPRETER - /* initialize sci_int early for INT_SRC_OVR MADT parsing */ - acpi_fadt.sci_int =3D fadt->sci_int; - - /* initialize rev and apic_phys_dest_mode for x86_64 genapic */ - acpi_fadt.revision =3D fadt->revision; - acpi_fadt.force_apic_physical_destination_mode =3D - fadt->force_apic_physical_destination_mode; -#endif - /* detect the location of the ACPI PM Timer */ if (fadt->header.revision >=3D FADT2_REVISION_ID && fadt->xpm_timer_block.space_id =3D=3D ACPI_ADR_SPACE_SYSTEM_IO) {