From patchwork Fri Mar 27 19:05:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11462975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 735CC92A for ; Fri, 27 Mar 2020 19:07:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4FFE72071B for ; Fri, 27 Mar 2020 19:07:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xen.org header.i=@xen.org header.b="O3Pnm3WT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FFE72071B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIu-00010d-7s; Fri, 27 Mar 2020 19:06:04 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIs-00010S-J6 for xen-devel@lists.xenproject.org; Fri, 27 Mar 2020 19:06:02 +0000 X-Inumbo-ID: fff63f92-705d-11ea-a6c1-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id fff63f92-705d-11ea-a6c1-bc764e2007e4; Fri, 27 Mar 2020 19:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=LbkHRMejVzjX2Y1W5Wqka+7qxm9kBms8I4prnQ0VkJ4=; b=O3Pnm3WTHlxwO/aHPiA6TzTVb7 z93HNWeUDmHKZptteXNzz/tIQ9Am3ge431GMOPbjS79vSNNJuEf+wjJ4PdCfvOKnCP1ozJsHkONyz Bm6Xq+aLsXI1dKHK7eZanZ/zXFVBBvLfwbb8FBFZUbgk7hKSlE/1+tChL44swRLvzYJ8=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIr-0000HW-7V; Fri, 27 Mar 2020 19:06:01 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jHuIq-0008GW-UI; Fri, 27 Mar 2020 19:06:01 +0000 From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 27 Mar 2020 19:05:44 +0000 Message-Id: <20200327190546.21580-2-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200327190546.21580-1-julien@xen.org> References: <20200327190546.21580-1-julien@xen.org> Subject: [Xen-devel] [PATCH 1/3] xen/x86: ioapic: Use true/false in bad_ioapic_register() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, Wei Liu , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Julien Grall bad_ioapic_register() is return a bool, so we should switch to true/false. Signed-off-by: Julien Grall Reviewed-by: Wei Liu Acked-by: Jan Beulich --- xen/arch/x86/io_apic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index e98e08e9c8..9868933287 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2531,10 +2531,10 @@ static __init bool bad_ioapic_register(unsigned int idx) { printk(KERN_WARNING "I/O APIC %#x registers return all ones, skipping!\n", mp_ioapics[idx].mpc_apicaddr); - return 1; + return true; } - return 0; + return false; } void __init init_ioapic_mappings(void) From patchwork Fri Mar 27 19:05:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11462973 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CC18317EF for ; Fri, 27 Mar 2020 19:07:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A67CE2071B for ; Fri, 27 Mar 2020 19:07:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xen.org header.i=@xen.org header.b="qh8qt/Z9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A67CE2071B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIy-00011X-TM; Fri, 27 Mar 2020 19:06:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIx-000118-FW for xen-devel@lists.xenproject.org; Fri, 27 Mar 2020 19:06:07 +0000 X-Inumbo-ID: 009d02a0-705e-11ea-bec1-bc764e2007e4 Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 009d02a0-705e-11ea-bec1-bc764e2007e4; Fri, 27 Mar 2020 19:06:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=jjF1bOOYAwCDwYk7dmh1xYKDxjJ8k2AnoUufOIgOUNw=; b=qh8qt/Z9PIDY3m2Zo3lrBjqB7x j0YUTy7D6uXZE/UJQ8mZDEGoOv+ScZo3Jrc6VnUB1LJA2D0xBg2eLb4SZHIgqbFAxhQt4HSqdQVX2 Zd2yrHB/IW3+H0W8Ex+i0I+ClBZC6YoMjE169sZP5gBn/ylZmrQ2jIn93tsk2/97Hl9A=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIs-0000Ht-FZ; Fri, 27 Mar 2020 19:06:02 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jHuIs-0008GW-6h; Fri, 27 Mar 2020 19:06:02 +0000 From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 27 Mar 2020 19:05:45 +0000 Message-Id: <20200327190546.21580-3-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200327190546.21580-1-julien@xen.org> References: <20200327190546.21580-1-julien@xen.org> Subject: [Xen-devel] [PATCH 2/3] xen/x86: ioapic: Rename init_ioapic_mappings() to init_ioapic() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, Wei Liu , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Julien Grall The function init_ioapic_mappings() is doing more than initialization mappings. It is also initialization the number of IRQs/GSIs supported. So rename the function to init_ioapic(). This will allow us to re-use the name in a follow-up patch. Signed-off-by: Julien Grall Reviewed-by: Roger Pau Monné Acked-by: Jan Beulich --- xen/arch/x86/apic.c | 2 +- xen/arch/x86/io_apic.c | 2 +- xen/include/asm-x86/io_apic.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index cde67cd87e..c7a54cafc3 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -978,7 +978,7 @@ __next: boot_cpu_physical_apicid = get_apic_id(); x86_cpu_to_apicid[0] = get_apic_id(); - init_ioapic_mappings(); + init_ioapic(); } /***************************************************************************** diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 9868933287..9a11ee8342 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2537,7 +2537,7 @@ static __init bool bad_ioapic_register(unsigned int idx) return false; } -void __init init_ioapic_mappings(void) +void __init init_ioapic(void) { unsigned long ioapic_phys; unsigned int i, idx = FIX_IO_APIC_BASE_0; diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h index 998905186b..8c0af4bdd3 100644 --- a/xen/include/asm-x86/io_apic.h +++ b/xen/include/asm-x86/io_apic.h @@ -180,7 +180,7 @@ extern int io_apic_get_version (int ioapic); extern int io_apic_get_redir_entries (int ioapic); extern int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int active_high_low); -extern void init_ioapic_mappings(void); +extern void init_ioapic(void); extern void ioapic_suspend(void); extern void ioapic_resume(void); From patchwork Fri Mar 27 19:05:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11462971 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 63C1A92A for ; Fri, 27 Mar 2020 19:07:14 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 408072072F for ; Fri, 27 Mar 2020 19:07:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=xen.org header.i=@xen.org header.b="28SU1bQe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 408072072F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIx-00011E-KW; Fri, 27 Mar 2020 19:06:07 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIw-000113-Pp for xen-devel@lists.xenproject.org; Fri, 27 Mar 2020 19:06:06 +0000 X-Inumbo-ID: 0160e7c4-705e-11ea-8a1a-12813bfff9fa Received: from mail.xenproject.org (unknown [104.130.215.37]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 0160e7c4-705e-11ea-8a1a-12813bfff9fa; Fri, 27 Mar 2020 19:06:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=/kgX5xknhEqORZatyugjOY2mzp7As56zH4Y5K1HikCY=; b=28SU1bQebDXQ8tQqfWMjDEuD3o owCEoSDHSZJ0gu3B1wnFQuwOxrAibjOaSsqokMLH9dWqe4GomPPbRkMnuWVtTqcr+3crRf3XHCROf RH1iLW36eF5KeDwMebugKgjyJM6eiUemvGBJRECar3RjKORLZRVvfu7Ba/0u1Yai5BQI=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jHuIt-0000I0-OJ; Fri, 27 Mar 2020 19:06:03 +0000 Received: from 54-240-197-235.amazon.com ([54.240.197.235] helo=ufe34d9ed68d054.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1jHuIt-0008GW-FX; Fri, 27 Mar 2020 19:06:03 +0000 From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 27 Mar 2020 19:05:46 +0000 Message-Id: <20200327190546.21580-4-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200327190546.21580-1-julien@xen.org> References: <20200327190546.21580-1-julien@xen.org> Subject: [Xen-devel] [PATCH 3/3] xen/x86: ioapic: Simplify ioapic_init() X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, Wei Liu , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Julien Grall Since commit 9facd54a45 "x86/ioapic: Add register level checks to detect bogus io-apic entries", Xen is able to cope with IO APICs not mapped in the fixmap. Therefore the whole logic to allocate a fake page for some IO APICs is unnecessary. With the logic removed, the code can be simplified a lot as we don't need to go through all the IO APIC if SMP has not been detected or a bogus zero IO-APIC address has been detected. To avoid another level of tabulation, the simplification is now moved in its own function. Signed-off-by: Julien Grall --- xen/arch/x86/io_apic.c | 63 ++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c index 9a11ee8342..3d52e4daf1 100644 --- a/xen/arch/x86/io_apic.c +++ b/xen/arch/x86/io_apic.c @@ -2537,34 +2537,25 @@ static __init bool bad_ioapic_register(unsigned int idx) return false; } -void __init init_ioapic(void) +static void __init init_ioapic_mappings(void) { - unsigned long ioapic_phys; unsigned int i, idx = FIX_IO_APIC_BASE_0; - union IO_APIC_reg_01 reg_01; - if ( smp_found_config ) - nr_irqs_gsi = 0; for ( i = 0; i < nr_ioapics; i++ ) { - if ( smp_found_config ) - { - ioapic_phys = mp_ioapics[i].mpc_apicaddr; - if ( !ioapic_phys ) - { - printk(KERN_ERR "WARNING: bogus zero IO-APIC address " - "found in MPTABLE, disabling IO/APIC support!\n"); - smp_found_config = false; - skip_ioapic_setup = true; - goto fake_ioapic_page; - } - } - else + union IO_APIC_reg_01 reg_01; + unsigned long ioapic_phys = mp_ioapics[i].mpc_apicaddr; + + ioapic_phys = mp_ioapics[i].mpc_apicaddr; + if ( !ioapic_phys ) { - fake_ioapic_page: - ioapic_phys = __pa(alloc_xenheap_page()); - clear_page(__va(ioapic_phys)); + printk(KERN_ERR + "WARNING: bogus zero IO-APIC address found in MPTABLE, disabling IO/APIC support!\n"); + smp_found_config = false; + skip_ioapic_setup = true; + break; } + set_fixmap_nocache(idx, ioapic_phys); apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08Lx (%08lx)\n", __fix_to_virt(idx), ioapic_phys); @@ -2576,18 +2567,24 @@ void __init init_ioapic(void) continue; } - if ( smp_found_config ) - { - /* The number of IO-APIC IRQ registers (== #pins): */ - reg_01.raw = io_apic_read(i, 1); - nr_ioapic_entries[i] = reg_01.bits.entries + 1; - nr_irqs_gsi += nr_ioapic_entries[i]; - - if ( rangeset_add_singleton(mmio_ro_ranges, - ioapic_phys >> PAGE_SHIFT) ) - printk(KERN_ERR "Failed to mark IO-APIC page %lx read-only\n", - ioapic_phys); - } + /* The number of IO-APIC IRQ registers (== #pins): */ + reg_01.raw = io_apic_read(i, 1); + nr_ioapic_entries[i] = reg_01.bits.entries + 1; + nr_irqs_gsi += nr_ioapic_entries[i]; + + if ( rangeset_add_singleton(mmio_ro_ranges, + ioapic_phys >> PAGE_SHIFT) ) + printk(KERN_ERR "Failed to mark IO-APIC page %lx read-only\n", + ioapic_phys); + } +} + +void __init init_ioapic(void) +{ + if ( smp_found_config ) + { + nr_irqs_gsi = 0; + init_ioapic_mappings(); } nr_irqs_gsi = max(nr_irqs_gsi, highest_gsi() + 1);