From patchwork Tue Sep 22 20:19:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11793035 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 4F48C59D for ; Tue, 22 Sep 2020 20:19:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 23CEE23787 for ; Tue, 22 Sep 2020 20:19:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KK3CueDH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726743AbgIVUTl (ORCPT ); Tue, 22 Sep 2020 16:19:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:42382 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgIVUTl (ORCPT ); Tue, 22 Sep 2020 16:19:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600805980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gYUw7on53U22xygxI96tyg7A07dVivNHpOasjcBU6xE=; b=KK3CueDHnDmi1ASk9v5HnzGDDQRORg2sXQktK+g+b7nB8/2S9CgVIj7C12j/CCO9FCYhrq vTvzWHAMRMepVflcWhYILB7C4ggaG38QS/1N1qqXoiFxVA16jENmhjm1HMVsdgeRutUDEK qnyuPIifKKvmvGriUpGDCA8VyU/OpLk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-490-qWR7WA25Mr63xgyCP0dkpg-1; Tue, 22 Sep 2020 16:19:38 -0400 X-MC-Unique: qWR7WA25Mr63xgyCP0dkpg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0283C8B124D; Tue, 22 Sep 2020 20:19:37 +0000 (UTC) Received: from localhost (unknown [10.10.67.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id E406F5DD99; Tue, 22 Sep 2020 20:19:30 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Sergio Lopez , kvm@vger.kernel.org, Richard Henderson , Marcelo Tosatti Subject: [PATCH 1/3] i386/kvm: Require KVM_CAP_IRQ_ROUTING Date: Tue, 22 Sep 2020 16:19:20 -0400 Message-Id: <20200922201922.2153598-2-ehabkost@redhat.com> In-Reply-To: <20200922201922.2153598-1-ehabkost@redhat.com> References: <20200922201922.2153598-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org KVM_CAP_IRQ_ROUTING is available since 2009 (Linux v2.6.30), so it's safe to just make it a requirement on x86. Signed-off-by: Eduardo Habkost --- target/i386/kvm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9efb07e7c83..d884ff1b071 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -2129,6 +2129,11 @@ int kvm_arch_init(MachineState *ms, KVMState *s) int ret; struct utsname utsname; + if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { + error_report("kvm: KVM_CAP_IRQ_ROUTING not supported by KVM"); + return -ENOTSUP; + } + has_xsave = kvm_check_extension(s, KVM_CAP_XSAVE); has_xcrs = kvm_check_extension(s, KVM_CAP_XCRS); has_pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2); From patchwork Tue Sep 22 20:19:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11793037 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 55D4959D for ; Tue, 22 Sep 2020 20:19:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3204822206 for ; Tue, 22 Sep 2020 20:19:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="g0/M9i0G" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726753AbgIVUTn (ORCPT ); Tue, 22 Sep 2020 16:19:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30205 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgIVUTn (ORCPT ); Tue, 22 Sep 2020 16:19:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600805981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=52XNin5Hd63T3Wdn9qi1J9VaOtpC4qNSf/yGry9fMRE=; b=g0/M9i0GY/WSarWje8twyFE8WOypnj23Dx9czpCoNNUft4U4LmBoyEy4Y/ithX1wnAyHJK Plns/NGRHcrnpy7WFox6QHg9fQqOpIc0ixS1MB/33elf/X52MX4+6mrdvo/kaXJP+yUcuL Us0rmfZJxoREZc9TGHO7Peo2c9GRpng= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-11-lpF4hf4rMqOJmjGEfKsm1g-1; Tue, 22 Sep 2020 16:19:39 -0400 X-MC-Unique: lpF4hf4rMqOJmjGEfKsm1g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1D481104D3E2; Tue, 22 Sep 2020 20:19:38 +0000 (UTC) Received: from localhost (unknown [10.10.67.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEE075DE86; Tue, 22 Sep 2020 20:19:37 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Sergio Lopez , kvm@vger.kernel.org, Richard Henderson , Marcelo Tosatti Subject: [PATCH 2/3] i386/kvm: Remove IRQ routing support checks Date: Tue, 22 Sep 2020 16:19:21 -0400 Message-Id: <20200922201922.2153598-3-ehabkost@redhat.com> In-Reply-To: <20200922201922.2153598-1-ehabkost@redhat.com> References: <20200922201922.2153598-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org KVM_CAP_IRQ_ROUTING is always available on x86, so replace checks for kvm_has_gsi_routing() and KVM_CAP_IRQ_ROUTING with asserts. Signed-off-by: Eduardo Habkost --- hw/i386/kvm/apic.c | 5 ++--- hw/i386/kvm/ioapic.c | 33 ++++++++++++++++----------------- target/i386/kvm.c | 7 ------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 4eb2d77b87b..dd29906061c 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -225,9 +225,8 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) memory_region_init_io(&s->io_memory, OBJECT(s), &kvm_apic_io_ops, s, "kvm-apic-msi", APIC_SPACE_SIZE); - if (kvm_has_gsi_routing()) { - msi_nonbroken = true; - } + assert(kvm_has_gsi_routing()); + msi_nonbroken = true; } static void kvm_apic_unrealize(DeviceState *dev) diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index c5528df942a..dfc3c980057 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -25,27 +25,26 @@ void kvm_pc_setup_irq_routing(bool pci_enabled) KVMState *s = kvm_state; int i; - if (kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { - for (i = 0; i < 8; ++i) { - if (i == 2) { - continue; - } - kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i); - } - for (i = 8; i < 16; ++i) { - kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); + assert(kvm_has_gsi_routing()); + for (i = 0; i < 8; ++i) { + if (i == 2) { + continue; } - if (pci_enabled) { - for (i = 0; i < 24; ++i) { - if (i == 0) { - kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2); - } else if (i != 2) { - kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i); - } + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_MASTER, i); + } + for (i = 8; i < 16; ++i) { + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); + } + if (pci_enabled) { + for (i = 0; i < 24; ++i) { + if (i == 0) { + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2); + } else if (i != 2) { + kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, i); } } - kvm_irqchip_commit_routes(s); } + kvm_irqchip_commit_routes(s); } typedef struct KVMIOAPICState KVMIOAPICState; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index d884ff1b071..cf6dc90f7c5 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -4558,13 +4558,6 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cs) void kvm_arch_init_irq_routing(KVMState *s) { - if (!kvm_check_extension(s, KVM_CAP_IRQ_ROUTING)) { - /* If kernel can't do irq routing, interrupt source - * override 0->2 cannot be set up as required by HPET. - * So we have to disable it. - */ - no_hpet = 1; - } /* We know at this point that we're using the in-kernel * irqchip, so we can use irqfds, and on x86 we know * we can use msi via irqfd and GSI routing. From patchwork Tue Sep 22 20:19:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 11793039 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 1143359D for ; Tue, 22 Sep 2020 20:19:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E173E2388B for ; Tue, 22 Sep 2020 20:19:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ih5Y9jS+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726761AbgIVUTv (ORCPT ); Tue, 22 Sep 2020 16:19:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:48635 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726785AbgIVUTt (ORCPT ); Tue, 22 Sep 2020 16:19:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600805988; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jiMyrJEnAYgkkVWygOH1TIFk/RLS8Nq9gl/xrF7Oldk=; b=ih5Y9jS+2imi9EmR0vnj9XG8lToA1rzahkOyQFgyvkLQYrdxMn3VvqgrIUlpo8PHQ1EkX3 oqjlWxLnlh5XIbiFvwqQ7QQXZmI2RpzcxP/XcWsjh4JRRvmhpSBOUKIbfdO3vpr6VplElN ixioHXBize3kKdGEkeuFzHkE3himPTE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-NJpeCggvNqm9K1aDoFmkpg-1; Tue, 22 Sep 2020 16:19:46 -0400 X-MC-Unique: NJpeCggvNqm9K1aDoFmkpg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1905E8B1242; Tue, 22 Sep 2020 20:19:45 +0000 (UTC) Received: from localhost (unknown [10.10.67.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id 085B473689; Tue, 22 Sep 2020 20:19:38 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , Eduardo Habkost , "Michael S. Tsirkin" , Paolo Bonzini , Sergio Lopez , kvm@vger.kernel.org, Richard Henderson , Marcelo Tosatti Subject: [PATCH 3/3] i386/kvm: Delete kvm_allows_irq0_override() Date: Tue, 22 Sep 2020 16:19:22 -0400 Message-Id: <20200922201922.2153598-4-ehabkost@redhat.com> In-Reply-To: <20200922201922.2153598-1-ehabkost@redhat.com> References: <20200922201922.2153598-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org As IRQ routing is always available on x86, kvm_allows_irq0_override() will always return true, so we don't need the function anymore. Signed-off-by: Eduardo Habkost --- target/i386/kvm_i386.h | 1 - hw/i386/fw_cfg.c | 2 +- hw/i386/microvm.c | 2 +- hw/i386/pc.c | 2 +- target/i386/kvm-stub.c | 5 ----- target/i386/kvm.c | 5 ----- 6 files changed, 3 insertions(+), 14 deletions(-) diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h index 064b8798a26..b11704cc772 100644 --- a/target/i386/kvm_i386.h +++ b/target/i386/kvm_i386.h @@ -32,7 +32,6 @@ #endif /* CONFIG_KVM */ -bool kvm_allows_irq0_override(void); bool kvm_has_smm(void); bool kvm_has_adjust_clock_stable(void); bool kvm_has_exception_payload(void); diff --git a/hw/i386/fw_cfg.c b/hw/i386/fw_cfg.c index 33441ad4840..e06579490c4 100644 --- a/hw/i386/fw_cfg.c +++ b/hw/i386/fw_cfg.c @@ -123,7 +123,7 @@ FWCfgState *fw_cfg_arch_create(MachineState *ms, fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, acpi_tables, acpi_tables_len); #endif - fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); + fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1); fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, &e820_reserve, sizeof(e820_reserve)); diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 60d32722301..05fb0536dcc 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -225,7 +225,7 @@ static void microvm_memory_init(MicrovmMachineState *mms) fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, machine->smp.cpus); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, machine->smp.max_cpus); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)machine->ram_size); - fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, kvm_allows_irq0_override()); + fw_cfg_add_i32(fw_cfg, FW_CFG_IRQ0_OVERRIDE, 1); fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, &e820_reserve, sizeof(e820_reserve)); fw_cfg_add_file(fw_cfg, "etc/e820", e820_table, diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b55369357e5..0bc569d4c6b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -859,7 +859,7 @@ void pc_guest_info_init(PCMachineState *pcms) MachineState *ms = MACHINE(pcms); X86MachineState *x86ms = X86_MACHINE(pcms); - x86ms->apic_xrupt_override = kvm_allows_irq0_override(); + x86ms->apic_xrupt_override = true; pcms->numa_nodes = ms->numa_state->num_nodes; pcms->node_mem = g_malloc0(pcms->numa_nodes * sizeof *pcms->node_mem); diff --git a/target/i386/kvm-stub.c b/target/i386/kvm-stub.c index 872ef7df4c8..92f49121b8f 100644 --- a/target/i386/kvm-stub.c +++ b/target/i386/kvm-stub.c @@ -13,11 +13,6 @@ #include "cpu.h" #include "kvm_i386.h" -bool kvm_allows_irq0_override(void) -{ - return 1; -} - #ifndef __OPTIMIZE__ bool kvm_has_smm(void) { diff --git a/target/i386/kvm.c b/target/i386/kvm.c index cf6dc90f7c5..c419c52ec58 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -148,11 +148,6 @@ bool kvm_has_exception_payload(void) return has_exception_payload; } -bool kvm_allows_irq0_override(void) -{ - return !kvm_irqchip_in_kernel() || kvm_has_gsi_routing(); -} - static bool kvm_x2apic_api_set_flags(uint64_t flags) { KVMState *s = KVM_STATE(current_accel());