From patchwork Thu Jun 23 08:24:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891928 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EAFF5CCA480 for ; Thu, 23 Jun 2022 08:25:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354578.581757 (Exim 4.92) (envelope-from ) id 1o4I9O-0005kg-39; Thu, 23 Jun 2022 08:25:18 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354578.581757; Thu, 23 Jun 2022 08:25:18 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4I9O-0005kX-06; Thu, 23 Jun 2022 08:25:18 +0000 Received: by outflank-mailman (input) for mailman id 354578; Thu, 23 Jun 2022 08:25:16 +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 1o4I9M-0005Uq-M4 for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:16 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 013765d6-f2ce-11ec-bd2d-47488cf2e6aa; Thu, 23 Jun 2022 10:25:15 +0200 (CEST) Received: from mail-dm6nam12lp2169.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.169]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:12 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:11 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:11 +0000 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: 013765d6-f2ce-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972715; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=f10z1FY1cEzgBr5aQzVFoWFCR34qa1FghZWIHlDrVVk=; b=ihXQi4ubWa5LSdoAzs65tqCvD8F/MdLQ4h5ILDm0SUX8RqxniHlWbxaN w5iz96Ie57Dj+eJISzFuM3Gwvcgb9GqwQfYs3gQ0kEYcg86jpgiguu8Ih Kswa2Md7TpcxUUqVuPJPE3IPsRLF2UWY3rNPQxRGA5JOpRNIiZ8p3OLvU U=; X-IronPort-RemoteIP: 104.47.59.169 X-IronPort-MID: 74236204 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:bBaqlK+7EiuI4WHy9zBFDrUD9H+TJUtcMsCJ2f8bNWPcYEJGY0x3y msaW22POfiCMzD2KdkjO9jn805UuJXdx95iQQVp+Cs8E34SpcT7XtnIdU2Y0wF+jyHgoOCLy +1EN7Es+ehtFie0Si+Fa+Sn9T8mvU2xbuKU5NTsY0idfic5DnZ74f5fs7Rh2NQw34LjW1/lV e7a+KUzBnf0g1aYDUpMg06zgEsHUCPa4W5wUvQWPJinjXeG/5UnJMt3yZKZdhMUdrJ8DO+iL 9sv+Znilo/vE7XBPfv++lrzWhVirrc/pmFigFIOM0SpqkAqSiDfTs/XnRfTAKtao2zhojx/9 DlCncO0VxoUY7+SodYifDlxFChvJrFt6IaSdBBTseTLp6HHW13F5qw0SW0TY8gf8OsxBnxS/ /sFLjxLdgqEm++93LO8TK9rm9gnK87oeogYvxmMzxmAVapgHc+FHvSMvIEJtNszrpkm8fL2f c0WZCApdB3dSxZOJk0WGNQ1m+LAanzXLGEC8wzP/fZfD2774i9S9OXBaPnvXMWVQ59IglyUv m+e1jGsav0dHJnFodafyVq8i+mKkS7lVYY6ELyj6uUskFCV3nYUChAdSR28u/bRoky0Vs9bK kcU0jEztqV0/0uuJvHiWzWorXjCuQQTM+e8CMU/4QCJj6bRvQCQAzFeSiYbMYJ38sgrWTYty 1mF2cvzAiBiu6GUTnTb8aqIqTS1Om4eKmpqiTI4cDbpKuLL+Okb5i8jhP44eEJpprUZwQ3N/ g0= IronPort-HdrOrdr: A9a23:+A0boa9G51zemGK+0xZuk+FKdb1zdoMgy1knxilNoENuH/Bwxv rFoB1E73TJYVYqN03IV+rwWpVoJkmsj6KdgLNhRotKOTOLhILGFvAH0WKP+V3d8mjFh5dgPM RbAtdD4aPLfD9HZK/BiWHXcurIguP3iJxA7d2us0uFJjsaDp2IgT0JaTpyRSZNNXR77NcCZd Ohz/sCgwDlVWUcb8y9CHVAd+/fp+fTnJajRRIdHRYo5CSHkDvtsdfBYlOl9yZbdwkK7aYp8G DDnQC8zqK/s8ujwhuZ82PI9ZxZlPbo19MGLs2Rjco+LCnql2+TFcxccozHmApwjPCk6V4snt WJixA8P/5r43eURW2xqQuF4XiV7B8er1vZjXOIi3rqpsL0ABggDdBauI5fehzFr2I9odBVys twri2knqsSKSmFsDX25tDOWR0vvFGzu2AenekaiGEaeZcCaYVWsZcU8CpuYds99RrBmcEa+d RVfYHhDK48SyLYU5mZhBgj/DWUZAV8Iv/cKXJy+PB80FBt7QVEJgUjtYkid0w7heMAoql/lp r525tT5cFzp7ctHMRA7cc6MLyK4z/2MGTx2Fz7GyWVKIg3f1TwlrXQ3JIZoMmXRb1g9upBpH 2GaiITiVIP X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="74236204" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CdkAzbg6Gg9lG8qBl9jAzxBuo5vKWuVYmCpURHXq6LKK+8+IuOdE+fWRaQ+Y/KWo89W6rSM+bUSHgibCkrhL9COz49OHjPasic/xCQZHizreN2J/ApTX9iZtKLZsemXIXLXfAZzshpp+gOuqtkLA+1KhXLT1XKmAiB5WpQDV4DQSqCXgrUsT9uanEwJEz7wf6piHD8plDdbZz3P9hihL9iHL6i71UMTzdLZEXbcAZ8nJEcQrBFCTgVwt79tzmfrOZYpNXgtG9dRkQWKGZG04bWC2qWhuz9HeWY+QMkOW/dj81pM9xys1ZbaoahlbI0sDZbwp0g4/YnGFrHseXcgb3A== 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=7D3+9B1wNBssAOS6U4CtpT3AYDnVm0sewLbpEyQ/iCE=; b=If/mSBDx8cbzhFT1GZJAkkBKJSuQeAJ2tUa3qbYt3uUCAWIeOl4/QJelSBjbuqlky6H94J51458ybzkNYcN8TvUYNn17BXxqYUO7SYIPoKUisR0U+V2QZmOrioumkW6p9BKK6HKzYzgC8bq/T0a/aiq/OFlm4EcxNpEIa6KiVIXJYG9fKyA+ErfmybmiPa4SYVo6YCJA+Ed9cGpEpzROWhqOBsEG0ofBWIp4W9PfK2Hm5vRuGHiwy4zyLDtI1OqYByYN1e3eSS1/4Rzt8qBlgMisSQEfImwnRXoKTXI1346FKRnHScQ1ezZ7QWtOvGZp5kDByExpQlhJAsU0ytU0Uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7D3+9B1wNBssAOS6U4CtpT3AYDnVm0sewLbpEyQ/iCE=; b=X19pl1H3V1PVUKEEgPY3Sm+x79WDnOA06+aMIFRiBg+G+okhW0/MWtyFe64y5XIuxQK+I1IMh8mgQSdUWEmLKPiToxa5GwfUJud7BkO70u4JLfNWjoQKKVYfCqpj3HDfR1/jgDPRrt6DVcM9ouVabu4wpVyBH+1vVHXAndYE0Cs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH 1/6] x86/Kconfig: add selection of default x2APIC destination mode Date: Thu, 23 Jun 2022 10:24:23 +0200 Message-Id: <20220623082428.28038-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0086.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:190::19) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5c426ef9-13df-4ac6-dd43-08da54f1e3bf X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1qaOju36ZDvS39oZEdLbat6Z5da2uQk/21u+2QN65Gh1V3c2n2lVXAQ/X5Zy5oz6ib1Yil1eN5hMGXsnvbLcXFOjt88bFFUZPO/EDTbdm2SNf5tI1j4HsN8ey741SlB9LaruuO6DqfFq9Ne9oE+ChzR+38RjkAzJgRT0mvceqbWhDblN2ZGVgdHkhQUTF1quarf6Blx9wpYJKxARe9j/rgSKT42KNt0XO15Y1aMa6Tf8Q3p98GoqmYOUb3D4+9lx+5IV0JP2VbKU9HdN7zUVsUa1hlpIYRsCmY2mF5BZ3sZU5c5wpIgcoGVtEZgELDsl08HKuxYYRd2cE1LryFm50+IooW0Is0cgbIuqG2NXmQEy+1QT9Fi+Iu/hQOxtyerraXyhloMRIp+A7a3jZ/SXC1tpxsdEOJJIe0z2oVekm1HnMtQ1AZF22AXaSMNHuMulR8Hz0R3PbOhk+Io5aZuh7BK7EJo76W9Pr59vYxPTkuia1WVwU6pTrfAx1xjtZAhk8tEldzJbXofQ1ApP37laJVnMxAKyl9BAxHJWIzni1Dma4IT/NFPrEtbpSqdUaHzN1dWZDprcIPGGXT3rDxGtovc1d8LH4ubNjgZvPlB+kbd97F1k63BIHKQpt69sEcZQUVo8RRZsTq5tW4G1kD9aW4rjNvzPm4BePwo7l9E7qwh5LL+KHNN6iIqOki0s7qkZ19ilKsWr/G+VD/wkvnGKbw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?/RLdRQQtMJvpcs/PYXvFdM/s1UVC?= =?utf-8?q?3uuaSWbL0LeAK96m4MfH2Rf0r5bHHQBR7d3XOPk2HmxgYUUtYZJt8MUtRJ8uyG4KL?= =?utf-8?q?qjsBYQ6I7G83sJv21yDO2C/UGaexgLF4bcxhyBQkfjeHPSTUGHx9hCC6Afj/GvTU9?= =?utf-8?q?sQbaqgwP01Dz6/4jNE9Z52yxvYtxFa4xdv/PcBViECKQ2EOvN7oxF6eLQp9NgEJkb?= =?utf-8?q?mhoZHKXCKfJ52EsRUsksCJrbwYv19uYJABzjf5BKgZzkvWQk96w5usmYnYfMRXXuz?= =?utf-8?q?N4ivI5L5ksCQGQ82uRom3Qd2hgn3unspaVp7Nim4yCdsbbGd5fghLM1QcVqfPKOOu?= =?utf-8?q?xWCnJd4kDruewBH6PpGi2jG6TifWzG0RGaXhHQacKJ7a1Ttt7CWMSW5toboA5eJ3r?= =?utf-8?q?yFDVX6NgWufiU8ES3/azSsaLZ6/7ZA0xuLhho17QzcEeO2lfJT0cV8eADx8C98nGN?= =?utf-8?q?vB851JMeSF8+XQavrNCmngo6TNc6Am4y+0v5Q/Pg6zWdAZ2ezx+IDNPFh0lN9D3Ey?= =?utf-8?q?SpcmMypXBhXIGJ3HCOl+sptoasULG9PKLE0+hcr1NWcZQzjCWaAaC2elczUnwNDR/?= =?utf-8?q?TKPPkEy2xj6JNxescCui9hyMxwgMxm158QxwW79kewcTq7AW0f2Ntc1lsEOCDYJPR?= =?utf-8?q?e/4pAgEG66WUnWgl6Rcmz1q69NSTQJQshDwjyIjUpz3kEqSzqCqrF2sE2k9BTN2jz?= =?utf-8?q?7xWavI6i5wmUkGI/j9SEMuPPifMZcedpFFFFsTDAqTlM06GwRJ8txEcMMAdZtttJX?= =?utf-8?q?tM7302K2uoQmx1cpvnNFVlEDV1yfW6EecBvS5BYy8GOCHQAwF64//KSsIxZcAGA0e?= =?utf-8?q?fF5SR6mecFPrFXXK7Q0rR1p6iBLdv3QZWeywC1wPgWQZzSuMjUuG+MB9r0jhf+L8b?= =?utf-8?q?d+wCCK6gXmiJi94ao3XZoMqK+OOpqCR87kimWOhayPTJycbpcPelnCQEI/OCeVxIw?= =?utf-8?q?VQrQoCRedmsMSyQHDrzggTVusGkdt9XcV5CiVSnDT1JMefkQb0xHzbrsAhUDhy3kx?= =?utf-8?q?5G5Wbqnqew0i5mz2XQfDGVjr0t767+kvhoVh8BiRUFHmC+ckvrI6Hh0od3GyKEXCF?= =?utf-8?q?j6hKTwWVSqOGp4Z3K61tRbL3Zsla51GRK0dRB+TMG2XnJ5WTBINuw+xn4FGvz/BnR?= =?utf-8?q?Ma7yMQ3PM7lcViSGCuNTlld4OjIxgGV7vXTRFMmqOXsinfnThD+/sOyunQLzlHUq8?= =?utf-8?q?oViIdpHWi804ijqKbfeVWJJNZGKIEvLkOeiTQ+0jVwDkOo5bMyWi9xmHur9Bp3rjC?= =?utf-8?q?yOGWdlYB8NKxmw9q1hz0nFz2rW8Z+xtBlb2bqFWkZqNSW7P9cz9rEEBg/8KNtupzA?= =?utf-8?q?SJY8NnQSF2sxfPd0Fp8sifQozE84Qu3WC+dXRG0lGgejaIGFJg1m5rpNLN6RG4XGy?= =?utf-8?q?5nhv6VjQt7G4wuka9KsSUuti2hnwtHs05JsF7Pcg+u9Mja4ZyV+Bc7CJO+hPDtafe?= =?utf-8?q?pPQsPUKuAoNGQoEaijgqHSCRK5sEmXzYXOA5rKRz++ZPLRftOOVbFEq+9pQ/j+PBm?= =?utf-8?q?t1LsUT0QgRIS?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5c426ef9-13df-4ac6-dd43-08da54f1e3bf X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:11.2619 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: vUNBIsXR+F2uvv68TB0aStpxT9JNDNR/nKrlHZ/lSM4XXMjQKyy/k01HLye2i+YlAiqnhnJnBIR7CUnA4X30YA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 Allow selecting the default x2APIC destination mode from Kconfig. Note the default destination mode is still Logical (Cluster) mode. Signed-off-by: Roger Pau Monné --- xen/arch/x86/Kconfig | 29 +++++++++++++++++++++++++++++ xen/arch/x86/genapic/x2apic.c | 6 ++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index 1e31edc99f..f560dc13f4 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -226,6 +226,35 @@ config XEN_ALIGN_2M endchoice +choice + prompt "x2APIC default destination mode" + default X2APIC_LOGICAL + ---help--- + Specify default destination mode for x2APIC. + + If unsure, choose "Logical". + +config X2APIC_LOGICAL + bool "Logical mode" + ---help--- + Use Logical Destination mode. + + When using this mode APICs are addressed using the Logical + Destination mode, which allows for optimized IPI sending, + but also reduces the amount of vectors available for external + interrupts when compared to physical mode. + +config X2APIC_PHYS + bool "Physical mode" + ---help--- + Use Physical Destination mode. + + When using this mode APICs are addressed using the Physical + Destination mode, which allows using all dynamic vectors on + each CPU independently. + +endchoice + config GUEST bool diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index de5032f202..4b9bbe2f3e 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -228,7 +228,7 @@ static struct notifier_block x2apic_cpu_nfb = { .notifier_call = update_clusterinfo }; -static s8 __initdata x2apic_phys = -1; /* By default we use logical cluster mode. */ +static int8_t __initdata x2apic_phys = -1; boolean_param("x2apic_phys", x2apic_phys); const struct genapic *__init apic_x2apic_probe(void) @@ -241,7 +241,9 @@ const struct genapic *__init apic_x2apic_probe(void) * the usage of the high 16 bits to hold the cluster ID. */ x2apic_phys = !iommu_intremap || - (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL); + (acpi_gbl_FADT.flags & ACPI_FADT_APIC_PHYSICAL) || + (IS_ENABLED(CONFIG_X2APIC_PHYS) && + !(acpi_gbl_FADT.flags & ACPI_FADT_APIC_CLUSTER)); } else if ( !x2apic_phys ) switch ( iommu_intremap ) From patchwork Thu Jun 23 08:24:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891925 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BC440C43334 for ; Thu, 23 Jun 2022 08:25:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354579.581769 (Exim 4.92) (envelope-from ) id 1o4I9S-000628-Cw; Thu, 23 Jun 2022 08:25:22 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354579.581769; Thu, 23 Jun 2022 08:25:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4I9S-00061z-9N; Thu, 23 Jun 2022 08:25:22 +0000 Received: by outflank-mailman (input) for mailman id 354579; Thu, 23 Jun 2022 08:25:21 +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 1o4I9R-0005Uq-C2 for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:21 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 03bd9dc0-f2ce-11ec-bd2d-47488cf2e6aa; Thu, 23 Jun 2022 10:25:19 +0200 (CEST) Received: from mail-dm6nam12lp2168.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.168]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:17 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:15 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:15 +0000 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: 03bd9dc0-f2ce-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972719; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=GAh16+3k4c8+TUlKcf9+shdqpJejBCp6iXhFkcuF4Bw=; b=MAzvwkM4e0dg9NNWo/wgkmO8KXv339NSQwVSJlo+wFD2kLq/M3J00S3R GopU7cMqU1tNRhhtnc2BAQ+ZAzJ+/CeTWs4/uaF98M9TQzAEOiXe2DW9Q u0qBfw3iJlXaxHE37HbhwKhETVQ0z6TWvNypnT19oIfl5CnHokQ45ezdp M=; X-IronPort-RemoteIP: 104.47.59.168 X-IronPort-MID: 74257063 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:WdLx3aLHG/rYz7/FFE+RzZQlxSXFcZb7ZxGr2PjKsXjdYENSgzxWy mIWWzyOP/6LNmP0ed51Pty/p0kB78fTzYVgHlNlqX01Q3x08seUXt7xwmUcns+xwm8vaGo9s q3yv/GZdJhcokf0/0vrav67xZVF/fngqoDUUYYoAQgsA14+IMsdoUg7wbRh3NQy2YTR7z6l4 rseneWOYDdJ5BYsWo4kw/rrRMRH5amaVJsw5zTSVNgT1LPsvyB94KE3fMldG0DQUIhMdtNWc s6YpF2PEsE1yD92Yj+tuu6TnkTn2dc+NyDW4pZdc/DKbhSvOkXee0v0XRYRQR4/ttmHozx+4 PwKuYDtaiF5B4nBg8Zedkh7TTx3AKITrdcrIVDn2SCS52vvViK2htlLUgQxN4Be/ftrC2ZT8 /BeMCoKch2Im+OxxvS8V/VogcMgasLsOevzuFk5lW2fUalgHMGFGvuajTNb9G5YasRmB/HRa tBfcTNyRB/BfwdOKhEcD5dWcOKA2SWlLmIA9gn9SawfwVKJlBJA07rXaoTRUPnUa+9yu0GEq TeTl4j+KlRAXDCF8hKV/3TpiuLRkCfTXIMJCKb+5vNsmEeUxGEYFFsRT1TTifuzh1O6WtlfA 1cJ4Sdopq83nGSpU938UhuQsHOC+BkGVLJ4CPYm4QuAzq7V5QexBWUeSDNFLts8u6ceWjgCx lKP2dTzClRSXKa9THuc8vKYqG20MC1Md2saP3ZaHU0C/sXpp5w1glTXVNF/HaWpj9rzXzbt3 zSNqyt4jLIW5SIW65iGEZn8q2rEjvD0osQdvG07gkrNAttFWbOY IronPort-HdrOrdr: A9a23:i9xhhai31kgLKkVuNGyk0eserXBQX0h13DAbv31ZSRFFG/FwyP rCoB1L73XJYWgqM03I+eruBEBPewK/yXcT2/hqAV7CZnichILMFu1fBOTZslnd8kHFltK1kJ 0QCpSWa+eAcmSS8/yKhzVQeuxIqLfnzEnrv5an854Ed3AXV0gK1XYdNu/0KDwUeOEQbqBJaa Z0q/A37gaISDAyVICWF3MFV+/Mq5nik4/nWwcPA1oC5BOVhT2lxbbmG1zAty1uGA9n8PMHyy zoggb57qKsv7WSzQLd7Xba69BzlMH6wtVOKcSQgow+KynqiCyveIN9Mofy9AwdkaWK0hIHgd PMqxAvM4Ba7G7QRHi8pV/X1wzpwF8Vmgvf4G7dpUGmjd3yRTo8BcYEr5leaAHl500pu8w5+L 5X3kqC3qAnQi/orWDY3ZzlRhtqnk27rT4JiugIlUFSVoMYdft4sZEfxkVIC50NdRiKpLzPKN MeTf002cwmMW9zNxvizypSKZ2XLzkO9y69MwY/Upf/6UkVoJh7p3FosfD30E1wsa7VcKM0lt gsAp4Y6o2mcfVmHZ6VfN1xJ/dfKla9Ni4kY1jiV2gOKsk8SgHwgq+yxokJz8eXX7FN5KcOuf 36ISFlXCgJCgjTNfE= X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="74257063" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bSeHdKlGl6KeIQqP5EybgsYP1KcCpx9XAxf+5iVFGT9/EDvrLdj/xEzwDY6W47BFOexPLqw//06ReXRkP2/B1oCwutzRRCAoU3QB/CbF6RCdCFMLS5SLpYONJvU4gXPYJekClFzkhnIRBxTNKnCaql/LkkH00CMJw3j39vcXLAseL4npD1kevBsegE3WPqVSAb7KRNXXr9ZO04JpMjyMqPm4mO8DUB5G09w0KuLS6lTqrdK9kpze+TYJOCVME8QPillSQOzPfB33Pp0Ps2RCWasPfyexLG4NCmF/gXulNloQFT6kHVKfwFhDGfxhv6flPdimupXonCUx3vRaGHXOlA== 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=mV+GSA3oDieHR/bXqJJFOlJFFYmGghYFGMWvwZGx7cE=; b=oIs9ZGWLbsDTb946MHt44xHElFjiUkn4dz55fAvTmwNwQyubEDLZZxzuHzB2vcS40N87XZKhsOZFSBlSQmapMzI39qMWStgRLv/BOwI0lVG301QV00KUdKJrR8NhDafe+AtswBcV4qukDbKVy0PwMeejIbDh8niaxLn4groLdSllKHbwNSHZWuNbgfhCKoeMOXPNmWfWxEkdtMjffJD5qg6ZtVRrLrVQaSH1WqR4+QN7DaAbYzQPMUe8dwFWOAH6HmzxRqVvavtGrOExTA0AnbTZW899Pu05ZXoJHTI5+dt7uyInYPSJolqJyTcfNGvGFe7RahcGxQ8seU4u0eHNWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mV+GSA3oDieHR/bXqJJFOlJFFYmGghYFGMWvwZGx7cE=; b=NihpBs3xlP6GPZHWiQsL897C4nYXY1nAqLnIfFpzTRk/4B/j7CfrSfyDh5yuWhVJQlowHOgFHDj10nBXwf4wRSDptJtvNBLUf/uNhsB9FiiCx2lC1GvfhphPqWAgoQe4+e+6YdnPKcY0mdIPp3avRVCxWADnrHl5R9c4xM3Stn0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [PATCH 2/6] x86/x2apic: use physical destination mode by default Date: Thu, 23 Jun 2022 10:24:24 +0200 Message-Id: <20220623082428.28038-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0283.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a1::31) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d4a3772-7508-45f7-1cea-08da54f1e65e X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D2Y5WEx4/BFdvmZ295YheBUcUCdEYvWGrO7/Hvqak120tE7Osu+LH1D3HihQhcLSIOsu/H4ENrAAym85zzHydjMKlcE3H5D9ZB24gse2CJxNgBNiVWjukyh/+mmpoU+fMOxIWzKPFW3UHWS4SY/q9gwmLUd6CAwe7eut8JTVug3MJ2VxxYnnxdbJ4xkW3HfrRNbvs77bVOKzEbG7cCYqSPX/RLSPx0Em/g0XoReWRjfg3kUASf93wnPhfQo+2M+x77v6ZPzyBFrQ2z2nU/stsdO6aanYv0+GbBBdaiOmhOjMyGlYsgCygDabO+4ae6TeV9gdCHayRefxJzYTTomBKhRmS2jzz1Kpbjuqwp3Mf4ULOU42CvKYCXOqxUva41n2dDzLt0NIOVVv0QsFhyoIzn8IlEIhouWBD4Hi/0gisV3N86KH177A9k/fFRk0g+KRBILk7rNYC0YW0HRP88ZvJBTNVRSFn0rXHA40XUmF3DvvEh6ahYOEIfxFxhWj8agOWOPS5bwsIEl7++BqOas3LybQjCGGPJA4Xx45hXMdXuqiWtcBrWXOGATCoPvQMJrfHyZQUA3Du/27EKaAbUS2A5sKWxCgeM/5Xt14mURaTO3ACVJPyD1UP2SWNYAoUbO8wau5+qZ2epT7bmaLrT2BmAkCsp7FLwqy70UMMvVhLc8axK9M2o3bosXOYBxCJJKuLKbGHUBm9Qf7gWzldSJUPw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?jQ8OM0DAgd71gMjXy1eFtsAE6Thx?= =?utf-8?q?tgKUMQrYC8qXe44LkRLvoHtcmIwibnjIJ+x8UUvCwl2ZwzdrIeakEvjnY7ZlRaLyy?= =?utf-8?q?NnEMMtJK6588WXKDUl6nF89fBzWvSlQk73BGpFxcVNozvB99oR0xL4Uiri2p0YLm0?= =?utf-8?q?pno/REaUKrlx08S3oKst0u19kIkT8qtR49jWPEIMazKtpbU8pK6ZtCCx1f7HIaT3v?= =?utf-8?q?G+NkZBVwYi3jU5lpV6ApZoYJEg32frzHVef8Frqn8DLP6jpiQ+hQB/BxJ05YkkFG3?= =?utf-8?q?aHHEC1RKR3UpUFmZ9OVd5FZ34fQS/MBYxXwqbcr+0CqaIXlc1OOMC6bt2Fhk6RfM6?= =?utf-8?q?3HJBlkChrsLP0Xd/luPsxFcLNyeKSMY81txlFIKGtn3uZ7O0bbwEQUXd7/dere2W7?= =?utf-8?q?7kDPwimWdp8BAiyIUxG21yIOutzDmV4m6ZV5AIdbIjsHqG7IRHfFMtJ6n66TJB5UO?= =?utf-8?q?FMOBD488PqH4dmNMvMj6a6/L7PrtlWKpq7NbdZDRJwTRPR+zcF2SqznvufddAnu1y?= =?utf-8?q?u0touP1XmJT9TfCWPAiwC/MSBjR7YRX3gWRsQLKvNTXnnEO6xUu+rwCtuHPD4iAfQ?= =?utf-8?q?lZcLjW5bZFxkfyBMeXWF7OsbZOFM76gnlUkktHCztrhWnqr+8eugduCaKWniSmoyh?= =?utf-8?q?m9WeW8CHYiGyLwoYhg5IQHG4vhSnpuwRIGJEFGdshm6uzb+kZ8pPq/rSm+1KfpDlI?= =?utf-8?q?Y78BQAovq52vbBO+N4JmsUP8GpkBYhFdIJ78fmCFIMsnW5EsaQKvOWGJPbCsmT3Es?= =?utf-8?q?J1ahpmyxQCxpwV3vsvSSI19Lvng6f3YEMgic2RN2w1bxjd3cqTlSrcTGEkmsmc91K?= =?utf-8?q?3S9ktM+/I6auKYV5n4J1CIhc1LEnlal57MQJr4U/TaUoXXtdxwNU8aCsFAqbCqRrh?= =?utf-8?q?+0lt7zr+dcGoPqeYJo8PLSK296GdBluqtd0Wf85E9gq33DjjprToX+Po8V7u9VzF+?= =?utf-8?q?vyUBIvidNE6dYGL5B+TuEF6nIysj8pZxRD41dYHIVSUv2qRmfrJRRL0T73Z2Ae/Mm?= =?utf-8?q?WPHzF8bGAHl5ps6ny4Yc/OoC7XTDWZ040z/wCafthRZMpEKN91jwSsP1zRPSxjzTb?= =?utf-8?q?DMngztxlwBD3vTWOnu6o2lgGap4Kv2x7RZNI13XHYE2KBM7MjawtgFnXpzbuluCae?= =?utf-8?q?Fdf9gysWg4xKv9+8ZFRtHqFhAWki8Y4C9u5N9yk8FxO4SJLgfjBTQQVZAKDoAhi8W?= =?utf-8?q?r8EekTrfO93jindryrYdU2YJ3l4NSSmZbx/f5NmD22asCu+4DxOa/fJFiypzUXG5E?= =?utf-8?q?MhTdlm1SozfXMS+3jCz5ynFpl+ilJYC99PcA1W9uiXbqFDEkSi6yU9eJxjsJxgz+e?= =?utf-8?q?3NQIlLy+iQmaWteo3K5Fjg+rSkvf3XlHmZiglmTQUfRHMHRrYwaQ1vjyRoe4swndr?= =?utf-8?q?M9+ciqRmm+glWRu/JS32Wd1T/jfM46SQl9rRM/n+OdNVleSai82qfCe8KVoPwEzIp?= =?utf-8?q?DeuBwf7dbVWdooS95zVXxVOISNAOH6NLzkmsFtNCBmqeanMUS5J9CVnoDouMAYB+0?= =?utf-8?q?D6xpUlqkIGtw?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d4a3772-7508-45f7-1cea-08da54f1e65e X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:15.7000 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3chuX1jtqy/+Slkd4t9ZsZH9lM/5hdZcU7jPdw2Nnmhm2J69Ap1wqzgCnKcTCn8yzFOhhO5oKoINSOFimmwFLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 Using cluster mode by default greatly limits the amount of vectors available, as then vector space is shared amongst all the CPUs in the logical cluster. This can lead to vector shortage issues on boxes with not a huge amount of CPUs but with a non-trivial amount of devices, there are reports of boxes with 32 CPUs (2 logical clusters, and thus only 414 dynamic vectors) that run out of vectors and fail to setup interrupts for dom0. This could be considered as a regression when switching from xAPIC mode, as when using xAPIC only physical mode is supported. Switch default Kconfig selection to use x2APIC physical mode. Signed-off-by: Roger Pau Monné --- docs/misc/xen-command-line.pandoc | 5 ++--- xen/arch/x86/Kconfig | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/misc/xen-command-line.pandoc b/docs/misc/xen-command-line.pandoc index a92b7d228c..952874c4f4 100644 --- a/docs/misc/xen-command-line.pandoc +++ b/docs/misc/xen-command-line.pandoc @@ -2646,11 +2646,10 @@ Permit use of x2apic setup for SMP environments. ### x2apic_phys (x86) > `= ` -> Default: `true` if **FADT** mandates physical mode or if interrupt remapping -> is not available, `false` otherwise. +> Default: `false` if **FADT** mandates cluster mode, `true` otherwise. In the case that x2apic is in use, this option switches between physical and -clustered mode. The default, given no hint from the **FADT**, is cluster +clustered mode. The default, given no hint from the **FADT**, is physical mode. ### xenheap_megabytes (arm32) diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig index f560dc13f4..74bfb37db4 100644 --- a/xen/arch/x86/Kconfig +++ b/xen/arch/x86/Kconfig @@ -228,11 +228,11 @@ endchoice choice prompt "x2APIC default destination mode" - default X2APIC_LOGICAL + default X2APIC_PHYS ---help--- Specify default destination mode for x2APIC. - If unsure, choose "Logical". + If unsure, choose "Physical". config X2APIC_LOGICAL bool "Logical mode" From patchwork Thu Jun 23 08:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891926 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0882FCCA481 for ; Thu, 23 Jun 2022 08:25:39 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354580.581780 (Exim 4.92) (envelope-from ) id 1o4I9V-0006Kf-M9; Thu, 23 Jun 2022 08:25:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354580.581780; Thu, 23 Jun 2022 08:25:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4I9V-0006KU-Id; Thu, 23 Jun 2022 08:25:25 +0000 Received: by outflank-mailman (input) for mailman id 354580; Thu, 23 Jun 2022 08:25:24 +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 1o4I9U-0005Uq-7v for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:24 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0654112a-f2ce-11ec-bd2d-47488cf2e6aa; Thu, 23 Jun 2022 10:25:22 +0200 (CEST) Received: from mail-dm6nam12lp2177.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.177]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:21 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:20 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:20 +0000 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: 0654112a-f2ce-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972722; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=NjywiNvb5PqoOaAfnLLHWPA+CBvHvcnWE3RraIAqnd4=; b=Jlq173b3GqB4GPmrAAxdB+XgBjTIB6L5wRmFKBbHTjAFrvxOapW2keMu IWN1Tu5+665xt3mwCajw1YZtNTpFFvD4oNHpxHyJAkwarqASThxa7+Iee 4j6IPwQ7oOsBcWwS2NuP97ev1EUzMIFIJtluQIAbboY1tFQHQrWYP3Wth Y=; X-IronPort-RemoteIP: 104.47.59.177 X-IronPort-MID: 74257078 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:jXkjVK77mnKEs5Nl/GGMKgxRtEzGchMFZxGqfqrLsTDasY5as4F+v mdNX27XPqmKZWT9ctl3bYzk8x9XuZCHmNVrTwFpr30yHi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw03qPp8Zj2tQy2YbjWVvR0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurSsTlt1JPXUkt8QdF5KMQdsBJQYyJLIdC3XXcy7lyUqclPK6tA3VgQaGNNd/ex6R2ZT6 fYfNTYBKAiZgP67y666Te8qgdk/KM7sP8UUvXQIITPxVK56B8ycBfibo4YHg1/chegXdRraT 9AeZjd1KgzJfjVEO0sNCYJ4l+Ct7pX6W2IE8g/K/fVni4TV5DZ18KfwDt7XQcSTb4J6ul6dh z6W82usV3n2M/Tak1Jp6EmEluLJ2C/2Ro8WPLm57eJxxk2ewHQJDx8bXkf9puO24ma8Ud9CL 00f+gI1sLM/skesS7HVQBmQsHOC+BkGVLJt//YS7QiMzu/Y5lifD21dFDpZMoV564kxWCAg0 UKPk5XxHztzvbaJSHWbsLCJsTe1PitTJmgHDcMZcTY4DxDYiNlbpnryohxLT8ZZUvWd9enM/ g23 IronPort-HdrOrdr: A9a23:kBSp9KN/xIpokcBcT1P155DYdb4zR+YMi2TDiHoddfUFSKalfp 6V98jztSWatN/eYgBDpTnmAtj7fZq8z+8P3WB1B9uftWbdyQ+Vxe1ZjbcKhgeQYhEWldQtqp uIDZIOb+EYZGIS5aia3OD7KadZ/DDuytHVuQ609QYJcegFUdAC0+8vYTzrb3GeCTM2TKYRJd 653I5qtjCgcXMYYoCSAWQEZfHKo5numIj9aRALKhY74E3W5AnYo4LSIly95FMzQjlPybAt/S zslBH43Lyqt7WexgXH32HewpxKkJ/Ky8dFBuaLls8JQw+cwjqAVcBEYfmvrTo1qOag5BIDl8 TNmQ4pO4BJ53bYbgiO0G/Q8jil9Axrx27pyFeej3emi9f+XigGB81Igp8cWgfF6mI71esMn5 5j7ia8jd56HBnAlCPy65zjTBdxjHe5pnIkjKo6k2Ffa40Dc7VcxLZvsH+9KK1wXR4S1bpXUN WHVKrnlbVrmBKhHj3kV1BUsZKRti9ZJGbFfqAA0vblpgS+0koJinfw//Zv70voxKhNNaWs2N 60QpiA7Is+KPP+TZgNc9vpEvHHfFAkf3r3QRGvCGWiMp07EFTwjLOyyIkJxYiRCe41Jd0J6d 78bG8= X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="74257078" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iL8aIN3wJ7cPzXI8qHuc0KZdMsJ6gd5qgRwlmV3lLnmeluQrSx73IX4mUBP86RAXqS4tPRtShIAVczzS86jbaq7p3BbH/cH9vwgtyO12RWJ2rK5BjEIPXBH+DJdJdJ/q6eRh94PwzUK2sEtHSTWbyC+z+RQvwhjVIUj/OGLivVi/ZbJHQ5Bu6SYwKZfk7UZKPxvCakzT9p0yRNjwluF1Dfs/yxNE0yWx95b0vVAiN8OMB1MKhf36v7uQjM7ZXAR3HIO+VMqSso1ZdRf/dB5DOOfm4onlFiPra/JT3TWZkPliCDKzpr1cmQrKZynwEYQGB4wRPDe4hR5CvYlMm6HIfw== 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=euzhKLQqaFSC2Ezhbo0Ek1xKzO4ctm4oHFntZFUVdLc=; b=GZEpsL9d8KrvWll+fUW/Z+Omgq152MKC2I5k3qFGSFoN5zrk3CG/r/3YxC5VvKX036SXbECGG7+JOzcT8PRP9NTouN431/oyUIZ4wMYwYorxTCkI9eqrTRJGcOmOVUQO1FrgI9pQd8wZPgRV2vSQf6jmIAAv5cKyIYbHf2rGskyAgSJXgynobOJLk6yS0zbXgu4IqpMT2bLTQmqsIHY+TM/xwACKEoPIwRiLMxptPbfbdfxE47CxpSXhf5JPTlB2GQRz2sIS8mRDRjrSAyDGDT4iGTCkxMjc/8JucV77PWG4tLmalBjptbmYb+GaddCkF7JhvfCyhJLJFabeC0+1gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=euzhKLQqaFSC2Ezhbo0Ek1xKzO4ctm4oHFntZFUVdLc=; b=hBt1RxWje6BWRx+Smhg5wy2IHoU6j/kb0Ae8BfFUxXv3BQWbry35R2Y+siRGqOhoF4UbMHEJf0hk5JpD9YzwiTpB97KrHvSA3i2f90DP2yKoNKwelMQnjigz38cWcX2GFvDTPSz6RBv/A1fmqkqrSrfVJ/oP28fy/+btVmbM/1s= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH 3/6] x86/setup: init nr_irqs after having detected x2APIC support Date: Thu, 23 Jun 2022 10:24:25 +0200 Message-Id: <20220623082428.28038-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0099.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:c::15) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8378000c-f92a-4cc3-a2e5-08da54f1e91e X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ApsOg2QddOPmUNEeQARYgbum+t93fL12wA2Oz9As92US6dqObtWYgd6wDJluA/LLk/h7SwN9j3q+xpu/cbxp+7J4tCRhyZLEa1N9FFCZvKJ8EKnOAD41mDlKNidUTAKhZ1Rzf4be9Rihem3Vb/kLBGjMdAxAldvg5Ya8PTVs5GlYXodH9+bSPFPhbfzO8aCsmtvQZ5ObBwn5N4E1Y4ZEhYvOHyMGkd1y2IEHTrkIduZlOFAV98t5dvsc7gL0sFWaNcKenl6Da2aj6jmnYfjaUiCXOlZUzQ8Eis04N+R9eTUONyj4RWXE+YBrSG5cG0Ll4cUe+jF2Vdt8vSSFDv8b5Rb9cK+6MWFsAOF+pCvcJJWqsL3sR5BGGGdCpuzBF0DA/0uiVhB4w7U9JbUfHxWplq8UfNc52xag39RfGHHxUZ50DJiJyFmjVklfAGf/yQM5AAKRSG1xdz6LlPNWrdSoRZ0yfKfvXlZ/vQo4MVUcDWMnT0hKNW2XHhgb3jl1Z9FGj8mtStu5Z+ekApxksnFQq+LIRt+m/WAILUUEc57NULSp23F4d/6Lk4I6xyiGXulKYESgJlLVWGB9wMeYuZ5Vm5n92pGjz5BSzSs8hI3fLMXwdgJXSM+gkXpj9ETFSkbp5Pch4sO1IGugJbIm/rFz37T2TCeYqO8exs9fAHZF124nSfpiDyH0nTq8fZNiwAP9AHvK0DVs8wQCpLm4OXKBPg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?E8BHM7pvzZeEUMnMFYcJXAxSsR9d?= =?utf-8?q?ir2SS4zGWtuYqEgZpTZfpyDSlosuueH1sy9UMATZtfDfUeNc2xNJ+KR97t5Ms1lMx?= =?utf-8?q?f7/Jw8Igttl7OCNSN31wKHMz1xo+/cQI1N/A+kNp9FYdIBtzo22c7JvZEw/fLMQ8K?= =?utf-8?q?55BOHrnPJxsGoVDQ1nQuS5vuO7aAqe8JxJzbbIZ0EqofgsDUNYbUMzp1Orny3Pw+k?= =?utf-8?q?/dRKHdnoV8i9kjZb933cy8rSYmol7vXkng2uSw+lBTjqLQjHHYkJBO5nlPjexEoGC?= =?utf-8?q?+7jWTmnY2sQQJbEZPfK5lbhS1FUlJJEUT2wxu2ypnxh07YaQc1r6m5eo89KsLGWOy?= =?utf-8?q?h7tEMvK0zY3/gvg9jfEYyWootAfHNIHWWT6MogXKu4wh/ohn6vKjeGsYW2UC+Ph5p?= =?utf-8?q?/862vc/KPLBBYVssinKPhIgU45tOak6eQ+UDLgWCVXbsmNVrseyCsKBT4AuXwq+sn?= =?utf-8?q?+BgcI2svSKeNmBc6qTBw46/grWV1aciLm8vGjeuNhkDGoh3F782BYni+lod/Z5KlO?= =?utf-8?q?uSJYVV8966ePxMan/5taeJ0v37bv+hXDXWxEbFg0vsyAhLwIWwGflD3BFz0i74P+C?= =?utf-8?q?3itnBlEtO+X7EeoOrh2fTVNDI4vwX6kaOyTqdG35LUrmRaUiGFrj7AIGu+iNbMoCy?= =?utf-8?q?MMKB7ORqCKqCAU+HMXrMfNIlnVlMakizvZXgQZpmkRYElgntA7q43qMtnvKL0XIHM?= =?utf-8?q?hg3z9wcFmGdPRXg4RXQInS4B9T7qPJVapUVKEo0Gaw0fe0ZBdxRpAtr0p2rg5D/NW?= =?utf-8?q?X4SgRKBX9uUVyIdiSEbHleocxkK97wPmZe0nAWZCT3uhlFxhBYOPKUOYxBHxFuiE1?= =?utf-8?q?S9emfecbOUzEJD4txPO4XRY/4x6HFWVVc5hBLQummcvP6CVbeNcmYln8RgqACa0Wx?= =?utf-8?q?Za6UktvxmQtkfvV5nSt+JVd96LqJpG8jwMeqBZYvytT5hN6im2CRs+Y5f2O3WAzN0?= =?utf-8?q?D708EOh4RfBAkKnm5we8117WAn1mNuhvrAQYdtUaep6l8nUwbE3G/XVobo0vwwRbv?= =?utf-8?q?AvXFjUZIUiqQDer+oB8z6l9BpfnTSoGBKeJbUdUb+pQQFbSlpFhW9DONrA11w0FdI?= =?utf-8?q?Yg6V2zbMEWqdw7X5mv8eiyxXOOWzk7KZ6aZSwTPcF0j3nCZRAI0xojxag7coK3ztL?= =?utf-8?q?1VHOwExDxiL9xImYp8OqM42/yhCW/aEOc0uRaBkG9i7aHVrAO4EA5IehywS0eMybl?= =?utf-8?q?+XdvJ9o7t0XpB4knGbgdVrLSZDuRdnVLSl3rPLk+8i/NGHNvRJx3dM7RkA1Emy0Ed?= =?utf-8?q?njA8JlYzpiAW9teFf/uDkySaSKMNKPdpKMd8cxOiAlG3V75WSqC2wKWY255q+cfAr?= =?utf-8?q?8c4avHups4FH++VfxRsKJyTCkSc0BPQ0Y0lh/H4vGlUTgO6zYDVPMYq3V0wvObdku?= =?utf-8?q?aXEO/fnw1fprJPWOYNFGlFEsk3UvkKpRKVc6V7dZTp3pfvB/9I706XJn2MTXesECB?= =?utf-8?q?xz3Cij6ykmDJ/ppNYdgbotCGM8oZPQmNAoKWsQzVLKE/2oAR3Tn/jGAT0priU7m4C?= =?utf-8?q?GmBLjO2sAovB?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8378000c-f92a-4cc3-a2e5-08da54f1e91e X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:20.3172 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Pbgpvk9SeTPA37xo3J6C3XwxNNra7TJPalWdwIETnmijAujHabhdsKJBtrExHW3NGc+SuoP3OMd2wD551g0cBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 Logic in ioapic_init() that sets the number of available vectors for external interrupts requires knowing the x2APIC Destination Mode. As such move the call after x2APIC BSP setup. Do it as part of init_irq_data(), which is called just after x2APIC BSP init and also makes use of nr_irqs itself. No functional change intended. Signed-off-by: Roger Pau Monné --- xen/arch/x86/io_apic.c | 10 ---------- xen/arch/x86/irq.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index c086f40f63..8d4923ba9a 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2653,16 +2653,6 @@ void __init ioapic_init(void) max_gsi_irqs, nr_irqs_gsi); nr_irqs_gsi = max_gsi_irqs; } - - if ( nr_irqs == 0 ) - nr_irqs = cpu_has_apic ? - max(0U + num_present_cpus() * NR_DYNAMIC_VECTORS, - 8 * nr_irqs_gsi) : - nr_irqs_gsi; - else if ( nr_irqs < 16 ) - nr_irqs = 16; - printk(XENLOG_INFO "IRQ limits: %u GSI, %u MSI/MSI-X\n", - nr_irqs_gsi, nr_irqs - nr_irqs_gsi); } unsigned int arch_hwdom_irqs(domid_t domid) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index de30ee7779..b51e25f696 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -420,6 +420,16 @@ int __init init_irq_data(void) struct irq_desc *desc; int irq, vector; + if ( nr_irqs == 0 ) + nr_irqs = cpu_has_apic ? max(0U + num_present_cpus() * + NR_DYNAMIC_VECTORS, 8 * nr_irqs_gsi) + : nr_irqs_gsi; + else if ( nr_irqs < 16 ) + nr_irqs = 16; + + printk(XENLOG_INFO "IRQ limits: %u GSI, %u MSI/MSI-X\n", + nr_irqs_gsi, nr_irqs - nr_irqs_gsi); + for ( vector = 0; vector < X86_NR_VECTORS; ++vector ) this_cpu(vector_irq)[vector] = INT_MIN; From patchwork Thu Jun 23 08:24:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891927 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4D010CCA482 for ; Thu, 23 Jun 2022 08:25:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354581.581791 (Exim 4.92) (envelope-from ) id 1o4I9b-0006iy-88; Thu, 23 Jun 2022 08:25:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354581.581791; Thu, 23 Jun 2022 08:25:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4I9b-0006il-43; Thu, 23 Jun 2022 08:25:31 +0000 Received: by outflank-mailman (input) for mailman id 354581; Thu, 23 Jun 2022 08:25:29 +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 1o4I9Y-0005Uq-VK for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:29 +0000 Received: from esa2.hc3370-68.iphmx.com (esa2.hc3370-68.iphmx.com [216.71.145.153]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0918ba58-f2ce-11ec-bd2d-47488cf2e6aa; Thu, 23 Jun 2022 10:25:27 +0200 (CEST) Received: from mail-dm6nam12lp2177.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.177]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:26 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:25 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:25 +0000 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: 0918ba58-f2ce-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972727; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=hWcVLNaotcKVHvD2Y7Nh3KgfaTFcIeIe5XDhmeBgrpo=; b=KnifK4c21ygIHcdUE97aCDu7cKVlxALqsrw/Mka4UgBtUjZO1kBbQRBZ OGNYWgq56WipSdeH1CFqHNF3LstMNr5wapQV9LbZszHuwtM25y2nrQWmY 6CqE7jPk0+4Ghw0hnQyjChBxdtVBYMX6p2/U6DgOvn/TqG11u4u6rCN6V A=; X-IronPort-RemoteIP: 104.47.59.177 X-IronPort-MID: 74257084 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:2jM0Mq5O7mFisw188LihdgxRtEzGchMFZxGqfqrLsTDasY5as4F+v mQZWDjXMqyMYmL9eN8nbI3jpBtS7JbVx9I2QVM4+Sg9Hi5G8cbLO4+Ufxz6V8+wwmwvb67FA +E2MISowBUcFyeEzvuVGuG96yE6j8lkf5KkYAL+EnkZqTRMFWFw03qPp8Zj2tQy2YbjWVvR0 T/Pi5a31GGNimYc3l08s8pvmDs31BglkGpF1rCWTakjUG72zxH5PrpGTU2CByKQrr1vNvy7X 47+IISRpQs1yfuP5uSNyd4XemVSKlLb0JPnZnB+A8BOiTAazsA+PzpS2FPxpi67hh3Q9+2dx umhurS2UDt3Do3+kt8heDQFPiNxMbFco7v+dC3XXcy7lyUqclPK6tA3VgQaGNNd/ex6R2ZT6 fYfNTYBKAiZgP67y666Te8qgdk/KM7sP8UUvXQIITPxVK56B8ycBfibo4YHg1/chegXdRraT 9AeZjd1KgzJfjVEO0sNCYJ4l+Ct7pX6W2IE8g/K/fpri4TV5CBOiei8FerHRvuhf8pHmmaTn 13h0nusV3n2M/Tak1Jp6EmEluLJ2C/2Ro8WPLm57eJxxk2ewHQJDx8bXkf9puO24ma8Ud9CL 00f+gI1sLM/skesS7HVQBmQsHOC+BkGVLJt//YS7QiMzu/Y5lifD21dFDpZMoV564kxWCAg0 UKPk5XxHztzvbaJSHWbsLCJsTe1PitTJmgHDcMZcTY4DxDYiNlbpnryohxLScZZUvWd9enM/ g23 IronPort-HdrOrdr: A9a23:VnTGCa31+BmutAKtSTJEWQqjBSByeYIsimQD101hICG9Lfb0qy n+pp4mPEHP4wr5OEtOpTlPAtjjfZq6z+8O3WBxB8bYYOCCggeVxe5ZnO/fKlHbexEWs9QtrJ uIEJIOd+EYc2IK6voSiTPQe7hA/DDEytHRuQ639QYQcegAUdAE0+4WMHf5LqUgLzM2eKbRWa Dsr/Zvln6FQzA6f867Dn4KU6zqoMDKrovvZVojCwQ84AeDoDu04PqieiLolSs2Yndq+/MP4G LFmwv26uGKtOy68AbV0yv2445NkNXs59NfDIini9QTKB/rlgG0Db4RE4GqjXQQmqWC+VwqmN 7Dr1MJONly0WrYeiWPrR7ky2DboUITwk6n7WXdrWrooMT/Sj5/IdFGn5hlfhzQ7FdllM1g0Y pQtljp+KZ/PFflpmDQ9tLIXxZlmg6funw5i9MeiHRZTM83dKJRl4oC50lYea1wUB4S0LpXUd WGMfuspMq/KTihHjPkVyhUsZGRt00Ib1m7qhNogL3W79BU9EoJunfwivZv20voz6hNOqWs19 60TJiAq4s+PvP+FZgNYtvpYfHHfVAlEii8Rl57HzzcZdI6EkOIjaLLy5MIw8zvUKA07fIJ6e b8uRVjxCQPR34= X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="74257084" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I2ehmWVdJvUw66ElPaZ1bc19Zq7K1yj0i7CAiHcaEr/3kCdTz/QPJtNzD+/1nyWEBm7S3AMKfOJ+aHM+u7oHeL5d5UkjxbujUhfG47ZmmtBAQ4hJv+R1B5qyNq4UcTwr7x2O7qydx/6vfsbvtkL7edaLwM3DDVFhvjYJlC8fZhwUcbaNZehBFAYhHOJRx4VkEpuXX3V7N/zjn87B7TfamWvstNeih4G2icH35SKp/MU7Juu7IZ+EKuELut+MssYnHNpz6c0qThe6Dc/7apen6eHu+Gq7ZJCsdLsYPlSKFVUCe/Ng3S9Td4dN8Q/j/I/IX6CN60iyxdWBIUFQG8MqRw== 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=iVzwTq/xdU/s19XtAghAqqOGblBvPwgi6X4ZhhHGtpI=; b=g7RSb/YUYYNlt3ZhUA0b1/22kE1b6SSCn5l0lN2fUejFprizKx577XrWZenhcdB9ets4zwv9JKD8YF3lbvdxe2s7xD5Mi1XuRvWt79f3jm5zRV8hUOTPXdZcWmJBzuSad0uSep5tatE1d4+05tPIlvDj0+YMrhxRNii9CCzblAg5uurzGjgH1y+iItuetMWKLf24vODoFn8/IyChQol/4XHXlwoCHFfzZEGg09QRBtMLD4mSsxF9ZmRuubV13TmqS4SjyPoDyyw7lQsVIMvivkLM31a2U5znfJmZik0mGYs3Wzblnd4DMEUhRo1DPV/jIlBxcD0w1Ct9tbtoV5E50w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iVzwTq/xdU/s19XtAghAqqOGblBvPwgi6X4ZhhHGtpI=; b=IhBmCe2429XqK9TvVOS9uiLWniekxZvd/+7dZhYLEY0oVG1vYR/aOJVwJ0NayspBl7xF3G3pS9EJgwGyfm85MaHuULuaHMJNEOxa8T+o+OZ9nrSentBkqyjX6p5P3GE30Gl0UOprhHJdoFp/AghU03670BV/ivykpR//FssOyOo= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH 4/6] x86/irq: fix setting irq limits Date: Thu, 23 Jun 2022 10:24:26 +0200 Message-Id: <20220623082428.28038-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0318.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:197::17) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d776e669-7b2d-4ea3-d4d3-08da54f1ec01 X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DGdaAAQBwwtYWoBcbDQ/PRYDEKWwmjSixRheUY4bUdtzg9hHge6pQNHXLpHkBE3HsQ9D6D2ZhPVrkABRYl/agzM/fpkOeNgJot+aXrdJD5FL4SGnSIidHL1WtrmYLJzQ18iTt7J7rel9qAmrKM6PNd2qYAupWWag9zGxrWrzhNjkKhkEeffnoOc7BvZp60JMWY6+PXMWfGA8nadO3VgJmLLWgdqqr/00YnIkwXc21oFhJFZ2FuPwCVRxAOyu9knxUdZaRNvQa793aHHZe51cv85R1irr3Nz7ZZBp+CBVETBeR74Af0UgKkMMDxjFIFcScBM8WXmM1mu/0nYvPIKTTwWOBkfx+4127jl7DIBdB6jVBgVIawEQqHIBUrEg0Bfkx5e+psYkJdBG8XPNkhGtSAMnb9OLeHt77MjbQzmHGnQvA9oL6oS6dkH8tiA0j87LE3ptEJI8yZkNzjqOuU+0q768/UoaQWdVsrD4zvqn8ZvAgasURZWreXet89eoh2jRxQHNhQMDm9VbWuVT1xVW8fVEsEu/OXMxD5w0X0150WdHQpSZp4w9U49PrmKRiAxyXW4momOzyKkIQPutKM+Qdn1x+D4Vk3qvEqLzs1YZNW55iV3HGB+MjpV6e+lHai7e3Edh57d2nLXTPSTFUnFFjwF0ONCXEcTBkgO4ii9ozOR9cjng0d0y8jjHDzfL7yNetN7d+BRlV1n7D8t6VGYT0w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Qh/jMzYCmbDXUlbuZ/ORfLoL5rcU?= =?utf-8?q?HOr1ThKDuLuXB0u36Fq65B7XRJMha/CV1UEfWODQgwfUv8wOsTt3qbDjbFMTKiVwx?= =?utf-8?q?Tt6+pVHse9han0furGQy1yRycHLMJ+P+GBN2ReMoto7FxBYjzA+GuWZYUVQrNi3q/?= =?utf-8?q?RDws+PGzErmdTkOK1GOJLd894L4fj51LXTPnIX11kv48k5XNGmyl86FV375oiOH+Y?= =?utf-8?q?NpDacAVZorB/Yx/owI4Cy3OjKYhqIg5ChkT9muISuflQvhtPasPyH9jc7TtBQ1hVe?= =?utf-8?q?SN4jyIRcVvbFXX2aI7JT5IFU9looNlNr5jwW2yzmSk2qMmRsQH6ohb3EsTqMPivbd?= =?utf-8?q?bEVKueCXbrfzmi0iNxOQHtTijfVJRm/GONW9wU3QFpE5ebCaFa40yt6RVag2qADkM?= =?utf-8?q?MaB9vFr9AwMDFXDAS+aRy0l3EiR1YIQiEKaMlzLpwRMYrwUfqbBE3Bm74pA7+rl+S?= =?utf-8?q?Tn0fyQy2caNKuo5UfkwTdFrGhLfjtDVkmwqOUuy7ofFxZQXtHJZeJBweGsKNyPMVo?= =?utf-8?q?5qXUO6gsEMRPLlQY4toOh33pP7mdJJg+OWP9nSaXUABGDIdJcdn1vHVNLG7Dr9qNL?= =?utf-8?q?jpNDLoQzko/RP+mvfqUKuSEGHR/9ZjN+LjIQmeD0a2iU7Cqkaqt7tUzOitZQqsq0F?= =?utf-8?q?ztR6nPtB3ShnttztaCXMpmo6FftPiFwamE2DICQUrg0OI788mPWGm2frEa5qU9CFj?= =?utf-8?q?lMESyF4z7e+KBM+Kiu1hKMe3rvwLYsIUVrfLZugqDa7gWCLDwLwDRlMUzTEkIY3EG?= =?utf-8?q?YHg+wHeLUaA0i8M62zRH9JMJDV7knx4MYCGY6jlsUQFVspyVP6dpFSmSc+rUVP2FQ?= =?utf-8?q?dSzadwGBWUGKGyZiazx8Dt04VuDmMZAF9Bl12BrbaHDPO8InnENSZuDY4hnV0hstt?= =?utf-8?q?FM3bTWDYX/pIZvhhXr9oGrfRkLHZU0NHS9YMGig/Sa+3WZBizEZm0OrtQsHG6mw5e?= =?utf-8?q?j1boWV8Ftab5eXSDpW/R2xMXzmInsaKFt+mx+5+HqilmlEyWyyKk8oVHLNSMOQnrI?= =?utf-8?q?vkPfPyLES1ZzZJHzUYIxq9OT9Zm5q+/jQ4VNw7qnZj9MhnhYR52xpPxEk/lzZZEvJ?= =?utf-8?q?XqDihTPE1D5oA+lGgi47Glnf7wn/VPLK8v4YZHukQWv7I6ldw4qNAtjT0R3mEaiyq?= =?utf-8?q?AgoTEagFhGX2l473HVYZrO77WGe6FxXlobF08JIfJXNF2F4ZWPX2NOm/wAc3FvGjT?= =?utf-8?q?omZK4B5skg9ss7FzpbinisNPXF/d3IvtNdgbd8d7mkVjvAV4OzMG7Jhgxznrp+Vgi?= =?utf-8?q?pz7FUnasTzylDkUk62XO2bSkyn/oUV4Ol0m4zAZN67H5fAG0KyVdPz6UY03ZDfcb5?= =?utf-8?q?0EjVNF93pf5q8mLA5bScK0tSPkC3b9t8xKYPK1PQwR0lcdEfSLypq5CF9PSEQd7X5?= =?utf-8?q?QP6+ETQB37k7NBXGcycqZ2cJ8OnGDNFZNRHmKCvODEvOlagZVT9VbRTn/82/2pDSB?= =?utf-8?q?8D4Vpoutl8V4gd1BxEp36aqLi9qwBjbVwishimwubEfhYWPdFfp2LFTrvsTFEmeuQ?= =?utf-8?q?vmvIvdbXlEay?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: d776e669-7b2d-4ea3-d4d3-08da54f1ec01 X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:25.1146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1D481zu6kv/HZs6btEfI6qh+lPwliaTf+EWPNjcDaRSJbL/Qjy73kFSO6Z6GycIwZZhDHpVk9Vv4mw7xEGNn8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 Current code to calculate nr_irqs assumes the APIC destination mode to be physical, so all vectors on each possible CPU is available for use by a different interrupt source. This is not true when using Logical (Cluster) destination mode, where CPUs in the same cluster share the vector space. Fix by calculating the maximum Cluster ID and use it to derive the number of clusters in the system. Note the code assumes Cluster IDs to be contiguous, or else we will set nr_irqs to a number higher than the real amount of vectors (still not fatal). The number of clusters is then used instead of the number of present CPUs when calculating the value of nr_irqs. Signed-off-by: Roger Pau Monné --- xen/arch/x86/genapic/x2apic.c | 2 +- xen/arch/x86/include/asm/apic.h | 2 ++ xen/arch/x86/irq.c | 10 ++++++++-- xen/arch/x86/mpparse.c | 5 +++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index 4b9bbe2f3e..cd1f55cad8 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -228,7 +228,7 @@ static struct notifier_block x2apic_cpu_nfb = { .notifier_call = update_clusterinfo }; -static int8_t __initdata x2apic_phys = -1; +int8_t __initdata x2apic_phys = -1; boolean_param("x2apic_phys", x2apic_phys); const struct genapic *__init apic_x2apic_probe(void) diff --git a/xen/arch/x86/include/asm/apic.h b/xen/arch/x86/include/asm/apic.h index 7625c0ecd6..6060628836 100644 --- a/xen/arch/x86/include/asm/apic.h +++ b/xen/arch/x86/include/asm/apic.h @@ -27,6 +27,8 @@ enum apic_mode { extern bool iommu_x2apic_enabled; extern u8 apic_verbosity; extern bool directed_eoi_enabled; +extern uint16_t x2apic_max_cluster_id; +extern int8_t x2apic_phys; void check_x2apic_preenabled(void); void x2apic_bsp_setup(void); diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index b51e25f696..b64d18c450 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -421,9 +421,15 @@ int __init init_irq_data(void) int irq, vector; if ( nr_irqs == 0 ) - nr_irqs = cpu_has_apic ? max(0U + num_present_cpus() * - NR_DYNAMIC_VECTORS, 8 * nr_irqs_gsi) + { + unsigned int vec_spaces = + (x2apic_enabled && !x2apic_phys) ? x2apic_max_cluster_id + 1 + : num_present_cpus(); + + nr_irqs = cpu_has_apic ? max(vec_spaces * NR_DYNAMIC_VECTORS, + 8 * nr_irqs_gsi) : nr_irqs_gsi; + } else if ( nr_irqs < 16 ) nr_irqs = 16; diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c index d8ccab2449..dc112bffc7 100644 --- a/xen/arch/x86/mpparse.c +++ b/xen/arch/x86/mpparse.c @@ -131,6 +131,8 @@ static int __init mpf_checksum(unsigned char *mp, int len) return sum & 0xFF; } +uint16_t __initdata x2apic_max_cluster_id; + /* Return xen's logical cpu_id of the new added cpu or <0 if error */ static int MP_processor_info_x(struct mpc_config_processor *m, u32 apicid, bool hotplug) @@ -199,6 +201,9 @@ static int MP_processor_info_x(struct mpc_config_processor *m, def_to_bigsmp = true; } + x2apic_max_cluster_id = max(x2apic_max_cluster_id, + (uint16_t)(apicid >> 4)); + return cpu; } From patchwork Thu Jun 23 08:24:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B9CA9C43334 for ; Thu, 23 Jun 2022 08:25:45 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354583.581802 (Exim 4.92) (envelope-from ) id 1o4I9f-0007Cv-K4; Thu, 23 Jun 2022 08:25:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354583.581802; Thu, 23 Jun 2022 08:25:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4I9f-0007CT-F3; Thu, 23 Jun 2022 08:25:35 +0000 Received: by outflank-mailman (input) for mailman id 354583; Thu, 23 Jun 2022 08:25:34 +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 1o4I9e-00071z-Q3 for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:34 +0000 Received: from esa3.hc3370-68.iphmx.com (esa3.hc3370-68.iphmx.com [216.71.145.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0ba0c902-f2ce-11ec-b725-ed86ccbb4733; Thu, 23 Jun 2022 10:25:33 +0200 (CEST) Received: from mail-mw2nam12lp2047.outbound.protection.outlook.com (HELO NAM12-MW2-obe.outbound.protection.outlook.com) ([104.47.66.47]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:30 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:29 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:29 +0000 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: 0ba0c902-f2ce-11ec-b725-ed86ccbb4733 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972733; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=MuxBZdCHcFcLAUSqULIUORd90AHHM71XIXawMiighH0=; b=Pbb4Or+lR1t+hsU1PGLBIIP5aYQ3zLq6YnAKQImDgB/OqqHZqoVeETWh Ejyq51I0GEne7NSCqB2ix9TPMLy49dEZ0MqX5eYjzuhx9FzlHQ7N+I7QU cOjBBs+T4ntkCucjaKh/PmOts6PImAJ/HSdQ7ISRwU7mVIof90U8P5ir3 k=; X-IronPort-RemoteIP: 104.47.66.47 X-IronPort-MID: 74236222 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:ajDlJayDFherKT+l01t6t+dCxyrEfRIJ4+MujC+fZmUNrF6WrkUFy WQYWWyPPamDZGD1L9l2Odm+9k8HvJfSz9A2GQA9+CAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnj/0bv656yMUOZigHtIQMsadUsxKbVIiGX1JZS5LwbZj2NY224LhX2thh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ NpliaSoVR4FEb/2lccbXBBkDwh3I4BoweqSSZS/mZT7I0zuVVLJmq8rKX5seIoS96BwHH1E8 uEeJHYVdBefiumqwbW9DO5xmsAkK8qtN4Qa0p1i5WiBUbB6HtadHeOWure03x9p7ixKNezZa McDLyJmcTzLYgFVO0dRA5U79AutriajKWYG8gjPzUYxy3iC3DF8jeHWC9TqZPqSbtp8mGSch VuTqgwVBTlfbrRz0wGt4n+qw+PCgy7/cIYTD6GjsO5nhkWJwW4eAwFQUkG0ydG7gEOjX9NUK 2QP5zEj66M18SSDUd3VTxC+5nmesXYht8F4FuQ77ESI1fDS6gPAXGwcFGYdN5ohqdM8QiEs2 hmRhdT1CDdzsbqTD3WA6rOTqjD0Mi8QRYMfWRI5ocI+y4GLiOkOYtjnF76PzIbdYgXJJAzN IronPort-HdrOrdr: A9a23:LVaPda/QO0JkLC82CSZuk+FKdb1zdoMgy1knxilNoENuH/Bwxv rFoB1E73TJYVYqN03IV+rwWpVoJkmsj6KdgLNhRotKOTOLhILGFvAH0WKP+V3d8mjFh5dgPM RbAtdD4aPLfD9HZK/BiWHXcurIguP3iJxA7d2us0uFJjsaDp2IgT0JaTpyRSZNNXR77NcCZd Ohz/sCgwDlVWUcb8y9CHVAd+/fp+fTnJajRRIdHRYo5CSHkDvtsdfBYlOl9yZbdwkK7aYp8G DDnQC8zqK/s8ujwhuZ82PI9ZxZlPbo19MGLs2Rjco+LCnql2+TFcxccozHmApwjPCk6V4snt WJixA8P/5r43eURW2xqQuF4XiV7B8er1vZjXOIi3rqpsL0ABggDdBauI5fehzFr2I9odBVys twri2knqsSKSmFsDX25tDOWR0vvFGzu2AenekaiGEaeZcCaYVWsZcU8CpuYds99RrBmcEa+d RVfYHhDK48SyLYU5mZhBgj/DWUZAV8Iv/cKXJy+PB80FBt7QVEJgUjtYkid0w7heMAoql/lp r525tT5cFzp7ctHMRA7cc6MLyK4z/2MGTx2Fz7GyWVKIg3f1TwlrXQ3JIZoMmXRb1g9upBpH 2GaiITiVIP X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="74236222" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Oz1G4NNOcg9EMpi/lxw3xgBlL/paAng0Tbluqh9tIzUbXzkAJa9o1XOYNtpTu0Uu/OY71hMPUIL69nLr9nOTzSKUTJpcFUitWaBvQvQnMYNlpQlU7TfiPwpu57oXwZ3cma3F5KpjCsJO5DArxIe/VYZLLg68ifo0Cw5M2TFjv9PB0LC6mC8twY1066sGo6KwPu3qA8DPaZ6a3Tps+14RnJbWoyL/hZjNvaNrRtFnG/fdX3Kwe6syX4YNsI9mz2kFmOoHm31adI50+vQVy2JHSTjsyHcVGuN1fTJUbgp4HEW5cRuKAR8rVYvP44oj8txqgeoUTBIZFnacWViEb5zW/Q== 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=dsP+mK1T59nSfzkuyerDtNZDx7JRlt36zNeR2aRBE2k=; b=EJ/rCCVfICdGNnMlrMuigFdWlf5cEP7aXClTcxVf40X0n7d4yAiqjHLJXS4vrYLmM00ZI0I0gUoGBwvtauxe7vZej1PvdT7cK/JnKEfoEbn6qkbfyggh2+iQTLvqGtVGGmJjLFudmU31aEIQyDKHJOuhmOkcu2b2CtQTXzig7ZPCHpLfRUTCfz5p9Ov1KJ83dwHNb7shUdpoimDQbuX9SEPAk31jP8x+QHygzPDl94IF0IGQ0/QeBQFhEFgxz6SUC7YDczogtA82X6MA0ZufOcwn0LIIbL0I1WK0ngsa5NbdtwWSo7SexgohJmiRkK037k+nQPVwi7Vg3RUNeUP1mQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dsP+mK1T59nSfzkuyerDtNZDx7JRlt36zNeR2aRBE2k=; b=k46nflQk5tPwrSGJUfmRqlxiQ0f5NbQD5MUMYtVhqOeUvPyhSAGPOAk1RtgD/qi3ss8AFNGffGpC4aBaOrJrgRH4sTXSAMpQQkVbHMTrQ7daSleXUWlobn1uHhGyFnIZnYINTLqV1BY+UUC56pEZiMdTV0xt09vCZmvuGekBTIc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH 5/6] x86/irq: print nr_irqs as limit on the number of MSI(-X) interrupts Date: Thu, 23 Jun 2022 10:24:27 +0200 Message-Id: <20220623082428.28038-6-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO4P123CA0190.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a4::15) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a46a249c-89e5-4a0a-745f-08da54f1ee5d X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BbB50cEbad1sB4At5jrgxjLVqX5mhsCGe85ytnPyJzsfvWMg0ZEhVPnNzV5UMarMxWoZg2o1ujoX4xc7lMuEBoJxL8SjrXpntwTPG57qkft1wt+Fj6xgITaWS09ICEmu9ja+ZX9c1v5xQYX7vLV5zDNzvz+W6MjCjcAbrpUHu+gXWVKMvgExQKvWCh8u2MAsn+cILlUoVpzW80cEsOe+B7NnOMncRo8Fnkgn/vkVGUXLq3Gwxx90OOdZu+DtuUQD65ShH7MWOD4LrQfjYZCuoz9niNrtRkMq1IfWn77QV89bfTiy/zqoS1AiqgXrGkgKuIK8hbmGZL2VNFtBTttnExkiH53n4C7nfPwaRZ2e6luN1j2jV4Q/k084n/BQ7NX22CR0qSFIeOciGhLuY6/uQoYdo5SGEnm0VYpeIq5pbyG/U55skWGolEWKNArFvRm8qF5o2qMSWVFxGQ1XBC8xtvtRN/KcYaqX8PGsCThoHnhuTppbkh1aBANo2KMOX2CwxFLuV8/URxjjrjt0gkTNdCFsK2XdtVZvtD7675O77nbF5FJpdrOlz9MHp1qn5sWy+xq2TDwPW5rzWNA50A9ESkH5mhUH98MuneVCcx55nBmjBd4mlduYDvCnrmSB1mq2kLaQ/vc+tvoE2EzwBAKg6MdWLd11NQj1Dg1Pv4LbYgKAqYg01JnTmiNlJJGjv4B4JMqvUOnRR9pghWUpwoImDA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(4744005)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?rs+kUthsV53pyjF1eSHPRuFe1Cj4?= =?utf-8?q?bcKPj2pjB4bvyMTtjF7713QdGIPF4RM9XOMosKFs8/U5Xd/0KoociZDktKHNpgDUz?= =?utf-8?q?NTPCfyC9hdyUleCQNG+FsmUXB0nqNXEUax0DyhTwbS/bIvOmdTNV9n8Rrkf3JrqUd?= =?utf-8?q?Z2Eh+eBSDZgbOUc/YbDxiZRPVUSsb2cg/v8ZrHHi8gMIp7SEfihhJpSQZ0P48V1qr?= =?utf-8?q?FYMXlc+Oz4c0BIzK+qGVYHCM36WsSWqLxVvd1XWkf55+ZYDNiT0uppkfBeqzksLkA?= =?utf-8?q?ZaU9LIIVP7rtznu1WfES0Vhwol2/VqdAUuFigVvDiX7ZcgYKVTcfwWFCb7+XG/kIW?= =?utf-8?q?Ro8Qbxv5gxCUBmt0J8msoRtgBgNSdx7kRsFPJg2E2jZ4WJVEjjA/pmlqBF74NF/3p?= =?utf-8?q?YQdJwaXYQOhqHcsw5j2nT/22hRQ+WcB3zTgz55bPG8RcBYxtW1ThnD0+jm7XVF0r3?= =?utf-8?q?XxH57ugXn8IBuSOHgbRx7eMqr2iT7FFQlBUq4cVa/KZXO6yhFkOpPE2XlRj86/YIb?= =?utf-8?q?XaLXc7UGJsYFly2AEf8HewsMVcVqJc7/NlTjdir/T3VmpLSAxVuNjZQSHx+YTObpT?= =?utf-8?q?00zb/q29lFjYwNQvT35BhDAdsgS2+AbheUfc8r7CFXM+I+6DvEmcBd++ClM4kaSAf?= =?utf-8?q?O7unCGdq8QSrjfPSfOTMUX6g+w1/RRUh89jWnS1dUH04gvLZTSCVD8tuHHLkv48UL?= =?utf-8?q?hbKUoFu1PYGLm+THSjCvOuMbblnS67lasaB0ziMSVPObP1B9w49W06BG14HBmrYUv?= =?utf-8?q?o2WBsqOLNjmBjhdB8I9GVqjg8g9RMjlbORnfO54wrXEp8ZBmRwKUBlrB63GzTaoBI?= =?utf-8?q?DctE6mNllYlhC/ZAwmsqm9/UcYOpn1YkpB8YghFrp0i8yL700TbKqNePZfaQ8y4q6?= =?utf-8?q?Bgy526o2Oh6KT06/x4pRqm4M94EjqCObk59b+Rv5pMYP96PVFQyal3G+b8MQZTJxT?= =?utf-8?q?SDZXSn9riC9N+hY7bHS0zed11v0KALs+m/NPbCWj6zjHd43VAZWjGU489xGdAQcZ8?= =?utf-8?q?O3h+1kLSVCZl+btICxVGSi2CELmbX+SeXwJ1pz0l0nRFihlHhK9vmTW3JqEpm8Op9?= =?utf-8?q?//JFvqtMUOVCBLJHomMT6SKhsEVxLn3WhP35o6Kcl8wH5Mw7/VOMlOv2hWzyiSLyw?= =?utf-8?q?s31ELqHOo6ICPXI0H0deLWYYwR86ydiP1Z+EMQFnfNIPnzYrRhNXJ3fEeCWKDA3XV?= =?utf-8?q?Fv4M4uKl9ZFH3msYZPY7WQONsPPC7ZeSXr+uix1Rfu/9X8PNdLtkgK0eaJ0a1RP8N?= =?utf-8?q?xC12TZPsLhaxKBR0jXFJdvKToAWldEOsTzaGyiBxokip/ImjVD0FQ682b9So3tMDT?= =?utf-8?q?Ha4+dfuGWZ9tBgR2n/TimtDmL8WdwkorrhqWyCAq8AmHnpQiULR4EBvaCoXVqfjFU?= =?utf-8?q?Gzq1xAwNFpDWKurSSLyoMC8tYl5XGKWZPClEVKLxgCFjZXO4F4itfr/YdCcOzPA/j?= =?utf-8?q?tuABH7NT7IUDyb1sIRLn7XHCqD3EmfTKnj3q00lTN4NFAaWx0ubiPAQcwRIn6vufY?= =?utf-8?q?yQW6I9XFo43c?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: a46a249c-89e5-4a0a-745f-08da54f1ee5d X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:29.0394 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: hkZQeG+pQm43iOjdnZkE2hNNhiI1l3NXvNRz5XIqEXOn5s5No3Gav89F7L/0Moo8x1WspT9EI1lEe5lpCMqBoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 Using nr_irqs minus nr_irqs_gsi is misleading, as GSI interrupts are not allocated unless requested by the hardware domain, so a hardware domain could not use any GSI (or just one for the ACPI SCI), and hence (almost) all nr_irqs will be available for MSI(-X) usage. No functional difference, just affects the printed message. Signed-off-by: Roger Pau Monné --- xen/arch/x86/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index b64d18c450..7f75ec8bcc 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -434,7 +434,7 @@ int __init init_irq_data(void) nr_irqs = 16; printk(XENLOG_INFO "IRQ limits: %u GSI, %u MSI/MSI-X\n", - nr_irqs_gsi, nr_irqs - nr_irqs_gsi); + nr_irqs_gsi, nr_irqs); for ( vector = 0; vector < X86_NR_VECTORS; ++vector ) this_cpu(vector_irq)[vector] = INT_MIN; From patchwork Thu Jun 23 08:24:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 12891930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 20D63C43334 for ; Thu, 23 Jun 2022 08:28:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.354611.581813 (Exim 4.92) (envelope-from ) id 1o4ICh-0000fZ-2T; Thu, 23 Jun 2022 08:28:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 354611.581813; Thu, 23 Jun 2022 08:28:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1o4ICg-0000fQ-Vc; Thu, 23 Jun 2022 08:28:42 +0000 Received: by outflank-mailman (input) for mailman id 354611; Thu, 23 Jun 2022 08:28: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 1o4I9w-0005Uq-MY for xen-devel@lists.xenproject.org; Thu, 23 Jun 2022 08:25:52 +0000 Received: from esa5.hc3370-68.iphmx.com (esa5.hc3370-68.iphmx.com [216.71.155.168]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 16bbc3bb-f2ce-11ec-bd2d-47488cf2e6aa; Thu, 23 Jun 2022 10:25:51 +0200 (CEST) Received: from mail-dm6nam12lp2174.outbound.protection.outlook.com (HELO NAM12-DM6-obe.outbound.protection.outlook.com) ([104.47.59.174]) by ob1.hc3370-68.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 23 Jun 2022 04:25:40 -0400 Received: from DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) by MN2PR03MB5008.namprd03.prod.outlook.com (2603:10b6:208:1ac::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Thu, 23 Jun 2022 08:25:33 +0000 Received: from DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534]) by DS7PR03MB5608.namprd03.prod.outlook.com ([fe80::40af:d5f4:95eb:d534%7]) with mapi id 15.20.5353.022; Thu, 23 Jun 2022 08:25:33 +0000 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: 16bbc3bb-f2ce-11ec-bd2d-47488cf2e6aa DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1655972751; h=from:to:cc:subject:date:message-id:in-reply-to: references:content-transfer-encoding:mime-version; bh=M9sDkqyoWe8u+1pJDvGlTJ+8UF/5g6xliqOyamJnVWI=; b=F7fy1z09bxx8iGH5vfE62HRDlKLGLlapEq6BKKPUwGtFow1zHTkD3Dva lYal19zr7NMFqYDtY06d1XUJ3cdK9MMEZ+svD1+lCTwiKyIUljW1ENl7C ErUQgjeBcW9YX7XQHMKjJ0TbK7CFis4c3jY7WaGifAuGHLv8u5tKFGrnO M=; X-IronPort-RemoteIP: 104.47.59.174 X-IronPort-MID: 73580354 X-IronPort-Reputation: None X-IronPort-Listener: OutboundMail X-IronPort-SenderGroup: RELAY_O365 X-IronPort-MailFlowPolicy: $RELAYED IronPort-Data: A9a23:ayqbl6AJ4h1+cBVW/13iw5YqxClBgxIJ4kV8jS/XYbTApGwnhjYPx jEfDWrQa/fba2b0eYwlYI+y/E0Fv5eDn4JrQQY4rX1jcSlH+JHPbTi7wuYcHM8wwunrFh8PA xA2M4GYRCwMZiaA4E/raNANlFEkvU2ybuOU5NXsZ2YgH2eIdA970Ug5w7Bj2NY06TSEK1jlV e3a8pW31GCNg1aYAkpMg05UgEoy1BhakGpwUm0WPZinjneH/5UmJMt3yZWKB2n5WuFp8tuSH I4v+l0bElTxpH/BAvv9+lryn9ZjrrT6ZWBigVIOM0Sub4QrSoXfHc/XOdJFAXq7hQllkPh/5 8tju5+TRjszGaqPuNYtcCFHLSJhaPguFL/veRBTsOS15mifKT7A5qsrC0s7e4oF5uxwHGdCs +QCLywAZQyCgOTwx6+nTu5rhYIoK8yD0IE34yk8i22GS6t3B8mcH80m5vcBtNs0rtpJEvvEI dIQdBJkbQjaYg0JMVASYH47tLjz2ymnKGAEwL6TjZsbvXb95QJw7IboMPrFZ93bAvx7h1nN8 woq+Ey8WHn2Lue32TeDt36hmOLLtSf6Q54JUq218OZwh1+ezXBVDwcZPXO5q/Skjk+1W/pEN lcZvCEpqMAa60iDXtT7GRqirxa5UgU0XtNRF6g27V+Lw6+NuQKBXDFbEnhGdcAss9IwSXoyz FiVktj1BDtp9rqIVXaa8bTSpjS3UcQIEVI/ieY/ZVNty7HeTEsb03ojkv4L/HaJs+DI IronPort-HdrOrdr: A9a23:o9muhq9dYfPOqit5Bh1uk+FKdb1zdoMgy1knxilNoENuH/Bwxv rFoB1E73TJYVYqN03IV+rwWpVoJkmsj6KdgLNhRotKOTOLhILGFvAH0WKP+V3d8mjFh5dgPM RbAtdD4aPLfD9HZK/BiWHXcurIguP3iJxA7d2us0uFJjsaDp2IgT0JaTpyRSZNNXR77NcCZd Ohz/sCgwDlVWUcb8y9CHVAd+/fp+fTnJajRRIdHRYo5CSHkDvtsdfBYlOl9yZbdwkK7aYp8G DDnQC8zqK/s8ujwhuZ82PI9ZxZlPbo19MGLs2Rjco+LCnql2+TFcxccozHmApwjPCk6V4snt WJixA8P/5r43eURW2xqQuF4XiV7B8er1vZjXOIi3rqpsL0ABggDdBauI5fehzFr2I9odBVys twri2knqsSKSmFsDX25tDOWR0vvFGzu2AenekaiGEaeZcCaYVWsZcU8CpuYds99RrBmcEa+d RVfYHhDK48SyLYU5mZhBgj/DWUZAV8Iv/cKXJy+PB80FBt7QVEJgUjtYkid0w7heMAoql/lp r525tT5cFzp7ctHMRA7cc6MLyK4z/2MGTx2Fz7GyWVKIg3f1TwlrXQ3JIZoMmXRb1g9upBpH 2GaiITiVIP X-IronPort-AV: E=Sophos;i="5.92,215,1650945600"; d="scan'208";a="73580354" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AxCIowIDGrOKrX7/eLjIYrjmeMdqBJgDPCf6tzqnlxhmJHMV3lMsbrEbGMXfAKDc96sM6kZzBLE+RaQD2kOFZQYRgCQwlip9I7RDrx4xKtgPWQfUb9KlgQZL0Ilo4nW07DYVDhVh1KJfCtauG+XUJBeo1F78x3fPtx8arGT/yR8JXohG3DJObIejyrvlI356/qKYaP1Kqr1AwHxAN69tYQqJAywXWuzPtkHhgoXGZczF0jFjQsgvCJwl/t4cdfsBaQLbX/ZBHbwv2aGh3QM7wzh5qXKpyOg8fIhUsP8PztgBUYN7I+aSWKbZHRWtpLjDSF4c9wttfiINhi+1YF0/Fg== 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=f+VcW6quQIs1mH4she5NONTPj4PREd8r33VA4ThvE2Y=; b=Vm1JnhpCimwNl09RPPYqhRrqKB6StYkwhHCnxWA9i2y97qBp1c4MTgToOhcIraCGdWo4NR2GxTtcia+Qygnxv8BBk2lI6Bo+9BphEnez/kPqGxJEstqbs+QhZNtMiQzLrSRCqun9gpsW8Mo/SHJ/XPnes3VJIUYVT3moEUgEbNNlQMMKC9Pm0AeLOE8X/GfzmLXxKwDmi3BWW7C9rsJ7tQyuM6yUo7eEr9kV3XkE8sv+iBKEk9cXscIk7FYq4VU6u+xhzbtYK/swYJW+r5Jp45kvueFXTEGI1fHDAOcQryv3UbBMTKFr8MbPjl+DERxDrJ1koRs2fmUFtDB495ghYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.onmicrosoft.com; s=selector2-citrix-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=f+VcW6quQIs1mH4she5NONTPj4PREd8r33VA4ThvE2Y=; b=kUovyGIqr6eagJG1A7sgbmKqvnXYjccK8voJuqegfyNGB8kwmkdXEYw/GL7EKLut5ggNAvlQXN6QzfLJLKPEPmv+bXQY2bj5tSOsRSVgLxrxxJseKoWM9BonIVJJb4pnEIdUDCRnYjYbayy6VcwnIczMO57JKk4MzSrwEpvxMz4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Wei Liu Subject: [PATCH 6/6] x86/irq: do not set nr_irqs based on nr_irqs_gsi in APIC mode Date: Thu, 23 Jun 2022 10:24:28 +0200 Message-Id: <20220623082428.28038-7-roger.pau@citrix.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623082428.28038-1-roger.pau@citrix.com> References: <20220623082428.28038-1-roger.pau@citrix.com> X-ClientProxiedBy: LO2P265CA0447.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::27) To DS7PR03MB5608.namprd03.prod.outlook.com (2603:10b6:5:2c9::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5f99e338-6a36-44ae-1460-08da54f1f0fe X-MS-TrafficTypeDiagnostic: MN2PR03MB5008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dgl5riFRUauTheRMLupyjcOw1ebgF36stwfZBAek9SNtCKjXBmh95IdfC6PXZZ+/tcsVtCEk/3QsYVgcYF/CjUD/sL5PPWKtzCLf5PByjIqd9mu2lKZbzmb7mGdg3W0EuMt7Nut825VgLHW6/ZG/QB14RWPP/KyS2XpF4nRiZrfjKcPp8hdWf+4sfX3Ji2cu6ukqlkXqSwhNE8F4fpk74WB26LomZHD1JBAhGjzs1E6aUwye83WGVrw9dfwl70+Kr0iF8CxWFCInrQRrnFsxD0yyogUMUUUY2aSyvkaWL4icz+M3Kg9QitN/V+wM5krHXjaWsVZ3/P07Zx4VxwqAh0XXSowbNVt4xhKqgHrnwAN0LJSZz9EmrnhU2mkFu52VGkc1iMd/NmerttY5114A2rO3qkVe+GqNp4bZObGZP4RiksABBn0O1wdEFiXPLy0kZpMohcM8boFpguGNLlhp3l4kH7HzwUtmbsuCHR7SKtWIv/TQG6beN48X0hOf6Z85WEiZuirnCf7uLeigEpemT0tVtH6hqsX5dRrBSk2wOGHNJfzYvvrQ9UCwE67AxPySie3TntH7xafKSGBY1wRzCJWTg0mX2gWz1IlG52gH7PdmYjA4OcemR1FHqtfFtJUas8CwWfhMn6eufwHolVmFHY8mbj9Tgo4RdN2cia5UC+rg//ELwA6iM7DhVH97iWeWBiJV3DReG1161Kfkaomx6Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR03MB5608.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(4636009)(136003)(366004)(376002)(396003)(346002)(39860400002)(82960400001)(6916009)(2906002)(6486002)(38100700002)(5660300002)(316002)(86362001)(4744005)(8936002)(6512007)(66556008)(8676002)(36756003)(54906003)(2616005)(4326008)(66946007)(6506007)(83380400001)(1076003)(26005)(41300700001)(478600001)(66476007)(186003)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?3R1UD4DCsKFMYh+i2o7d/0gY8+UO?= =?utf-8?q?IgqeZs0RQdSoTa6T6Jd3MKyF05spdxVODO9f5oUoakHP/WRGgVxQFaZkHzx7zgpkz?= =?utf-8?q?OlclJOW4jvXY8Zhz/c+edXugbAFubckupYm3kj6tugzwZ3U4VuLb+7siDsrmccXV7?= =?utf-8?q?1w87it2oEz3FM9fkq7TM9CmnqPae2EKAU2UdNq+4bU8h0z0gMqYgr6WamOXXKWchD?= =?utf-8?q?HD8cIVby+AeYnNeWEUiJHf2eB/GUxi0KLm0ZPRCq9mUVT5hcD4DCMXkLdbueGMGJF?= =?utf-8?q?mS8kt/nOjSrL7gUTjeALSv5jWagnzgxmCJa/Ul6boNu2QU/In7X+qWDc2pKxankQo?= =?utf-8?q?tMx/QB6gzNfhWg52SEPAHTHH21Y7eOpzbkcI5HSEcOeHrNgiuRSo1dY9O+VrzajmM?= =?utf-8?q?0K/ZamhF4BZd5v3F84s2GAwe7+CNV6+o1jw9K2YCI3vPrcZs+d1VlVSq7MQd31hFN?= =?utf-8?q?4yohlZaOGG7JQfUO5NBPmOKGW9NT+aU3KNtZhiPnDdZPGXof63GovrKIfk8MMySMT?= =?utf-8?q?3IfAgdXwcRAK7aJWLbrJzNFvrPBPNRMeoBpgfxMStqyCrz9cYpt7NBAFxdWsP9Qln?= =?utf-8?q?dCODUbsciY2J1ISoWJg/uMHYrzvRysR2YD72DJIQkGeFPt0cP4x8xAqgf3rw+CvqL?= =?utf-8?q?j+2sdBa/WTIr/g9klw49XbyScPkRaRynICGe1iIX+QEyA46wgVkExx7g3+ixcakW6?= =?utf-8?q?TksuwQDLys5WSzCBFBBjie5dBsa3aph+4vS5O5cIzIM6CU+CNB3xDuXxL9uKWbfKE?= =?utf-8?q?ig8aNeJFdFAvDXh/BDbey8wPSzHqkAazUZYB7h6T2FUBe79/WWXDi+yQB3M4Zg8Z1?= =?utf-8?q?t7bTpaEV0ZLvDF4SdVHVGkvGcX32ApidmwEbWdY+PoYSikhyCzvbu7YQM1E8A4MFN?= =?utf-8?q?70/rp/Va2Rwcx+sNf87HPsow37Y0bC3Pi3am06MFfP8YOo5gVnEOIzTH4rjU8vaK1?= =?utf-8?q?ujB0RuNmgVkXpuzAP9rI8ez2Sowgv5d9LYo9hrIKg1e9MLtCj/IT3zg1m/C8V0Iog?= =?utf-8?q?6XP9/RBuMGlwUd7mOg4RV/q+fs/LjCenJCHvclny0lkuKvA71MEBqp6YSsm4IRXJF?= =?utf-8?q?qASAOHHeG3w5RnTSOP5nQOAXKZkXfNiqTg7icIOy91aZ6LUD8K7vRthnXW7QdJO/W?= =?utf-8?q?pwyJ6fWeUEc/WGXmwrjXZAFgpsFH5jRzUNfpuWKWIJq1S1K3pflJv3534ue+mga0W?= =?utf-8?q?jdGF3AAWmakKu3AlBwXNz5x73UpMmFE4LidYBedX7yYC3ZzAr/P89hzG22ELBicHr?= =?utf-8?q?LZf2KygfiPd652iL6X2Wr784QE8uBDXsAcPyx/deFLStXWcbC2RzuoQLg6WR1aFSa?= =?utf-8?q?TJkcFw2E7Tst++KLARTFMoSN82zDLQbtflohfLYjpLPWzlr/P36JVaETX0sZ7PXhe?= =?utf-8?q?6fLO9+eAIwzp5CjuvWXLU3RncoB/Iy26rQ79zxyGCzKK16lH8QMW3ZVg4g7nOjjFi?= =?utf-8?q?sZSkuOoe+xdSVqGGJFN66uPccrRwf7NG3xXBIz4IstwtUw7P5SP/IzYrkYyevsH/L?= =?utf-8?q?BCzOvKzdueu6TMR/0gNkjktRqkGJSqg7Lw=3D=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f99e338-6a36-44ae-1460-08da54f1f0fe X-MS-Exchange-CrossTenant-AuthSource: DS7PR03MB5608.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jun 2022 08:25:33.5412 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CpGckuVjjZjhPRGfyVuGz6rhYne9hwQlUPbRxKbumSVGuMtfORHXcu3e9k4KYT2mIFqA2CTbwyuEDdzeuLt7GQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR03MB5008 When using an APIC do not set nr_irqs based on a factor of nr_irqs_gsi (currently x8), and instead do so exclusively based on the amount of available vectors on the system. There's no point in setting nr_irqs to a value higher than the available set of vectors, as vector allocation will fail anyway. Fixes: e99d45da8a ('x86/x2apic: properly implement cluster mode') Signed-off-by: Roger Pau Monné --- xen/arch/x86/irq.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 7f75ec8bcc..e3b0bee527 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -426,8 +426,7 @@ int __init init_irq_data(void) (x2apic_enabled && !x2apic_phys) ? x2apic_max_cluster_id + 1 : num_present_cpus(); - nr_irqs = cpu_has_apic ? max(vec_spaces * NR_DYNAMIC_VECTORS, - 8 * nr_irqs_gsi) + nr_irqs = cpu_has_apic ? vec_spaces * NR_DYNAMIC_VECTORS : nr_irqs_gsi; } else if ( nr_irqs < 16 )