Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp586254pxb; Wed, 27 Jan 2021 15:56:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJyLc1vtdB421qPHOCTIMqxMIUssqcMauSDKhrF5JS/Ix5ZUkTn7w8n9wUcEPpu7tXEU5Hws X-Received: by 2002:aa7:d40f:: with SMTP id z15mr11064861edq.276.1611791796152; Wed, 27 Jan 2021 15:56:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611791796; cv=none; d=google.com; s=arc-20160816; b=j08Hwbq1LeJ6JjJRXdgdZoc0PD0LW9WQIW+rmCY38SLEfNbaHlsG3HX2XwxaWoqiFb /HfRuo/ccN/xDWy2oEbFBiieIz9th6WJUs4kMa+PEPFT4Z3FRU50q5eZ1a/qcXpT1dVk KcSM+/m1Umo/i84Ow8G7o/l5J1+svjoqkM5a53M/oDx+AKSuTjrjZaASzBLGoKLp2B2s t75MKwYfBIaspte1hbPHduKZNlu3z3OpeirvnRWDhtKkRrbupT/+myzCIkLdhzmGOwPP oc+RBTqD7mjyxGhKDZbc8OhKx5/otQQGZmMvCJUAgvnwlioyLBrv52X1Spo01hS8VoVl tDoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=QkOJBaald7B7nn/ssdKM6fr5SJU05z+AX+1yAZmjcrc=; b=s6CH25F41KOLHIE79l6r69vCtwN+N85Vqm6NyQuBva3GZWeEsdSg7EJf82gxn3aQhq EJ8Igjt/QBJ4tMLkbIn9Z48X/OgFSb5MsffTNbLao4i16+Rw5vWkAtz3A4BW0so/wNnf dQfl1UxHB+Nqpe9MRcoAxaqTebDgoKPUhy6wNEfdhxzP3JuapMcABXKbXgJCMz1Z7zAt V69gCMOtnvJmw/NUatjqG54SCMEXUQbtWN5nfY0UKZEbDJructs0PXjDHpPPr4eytwfE RVSdivbL2m29ULnDfGvkM1+2JELO3OraQMdYpOrZPhAgQ60S6+nvx+HLWBydctnNiu/C UdFA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r2si1727066edv.308.2021.01.27.15.56.09; Wed, 27 Jan 2021 15:56:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237803AbhA0MS6 (ORCPT + 99 others); Wed, 27 Jan 2021 07:18:58 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:11518 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235771AbhA0MPB (ORCPT ); Wed, 27 Jan 2021 07:15:01 -0500 Received: from DGGEMS404-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DQjDF3NKpzjDLd; Wed, 27 Jan 2021 20:13:01 +0800 (CST) Received: from DESKTOP-7FEPK9S.china.huawei.com (10.174.186.182) by DGGEMS404-HUB.china.huawei.com (10.3.19.204) with Microsoft SMTP Server id 14.3.498.0; Wed, 27 Jan 2021 20:14:04 +0800 From: Shenming Lu To: Marc Zyngier , Eric Auger , "Will Deacon" , , , , CC: Alex Williamson , Cornelia Huck , Lorenzo Pieralisi , , , Subject: [PATCH v3 2/4] KVM: arm64: GICv4.1: Try to save hw pending state in save_pending_tables Date: Wed, 27 Jan 2021 20:13:35 +0800 Message-ID: <20210127121337.1092-3-lushenming@huawei.com> X-Mailer: git-send-email 2.27.0.windows.1 In-Reply-To: <20210127121337.1092-1-lushenming@huawei.com> References: <20210127121337.1092-1-lushenming@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.174.186.182] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After pausing all vCPUs and devices capable of interrupting, in order to save the information of all interrupts, besides flushing the pending states in kvm’s vgic, we also try to flush the states of VLPIs in the virtual pending tables into guest RAM, but we need to have GICv4.1 and safely unmap the vPEs first. As for the saving of VSGIs, which needs the vPEs to be mapped and might conflict with the saving of VLPIs, but since we will map the vPEs back at the end of save_pending_tables and both savings require the kvm->lock to be held (only happen serially), it will work fine. Signed-off-by: Shenming Lu --- arch/arm64/kvm/vgic/vgic-v3.c | 61 +++++++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index 52915b342351..06b1162b7a0a 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-only #include +#include +#include #include #include #include @@ -356,6 +358,32 @@ int vgic_v3_lpi_sync_pending_status(struct kvm *kvm, struct vgic_irq *irq) return 0; } +/* + * The deactivation of the doorbell interrupt will trigger the + * unmapping of the associated vPE. + */ +static void unmap_all_vpes(struct vgic_dist *dist) +{ + struct irq_desc *desc; + int i; + + for (i = 0; i < dist->its_vm.nr_vpes; i++) { + desc = irq_to_desc(dist->its_vm.vpes[i]->irq); + irq_domain_deactivate_irq(irq_desc_get_irq_data(desc)); + } +} + +static void map_all_vpes(struct vgic_dist *dist) +{ + struct irq_desc *desc; + int i; + + for (i = 0; i < dist->its_vm.nr_vpes; i++) { + desc = irq_to_desc(dist->its_vm.vpes[i]->irq); + irq_domain_activate_irq(irq_desc_get_irq_data(desc), false); + } +} + /** * vgic_v3_save_pending_tables - Save the pending tables into guest RAM * kvm lock and all vcpu lock must be held @@ -365,14 +393,26 @@ int vgic_v3_save_pending_tables(struct kvm *kvm) struct vgic_dist *dist = &kvm->arch.vgic; struct vgic_irq *irq; gpa_t last_ptr = ~(gpa_t)0; - int ret; + bool vlpi_avail = false; + int ret = 0; u8 val; + /* + * As a preparation for getting any VLPI states. + * The vgic initialized check ensures that the allocation and + * enabling of the doorbells have already been done. + */ + if (kvm_vgic_global_state.has_gicv4_1 && !WARN_ON(!vgic_initialized(kvm))) { + unmap_all_vpes(dist); + vlpi_avail = true; + } + list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) { int byte_offset, bit_nr; struct kvm_vcpu *vcpu; gpa_t pendbase, ptr; bool stored; + bool is_pending = irq->pending_latch; vcpu = irq->target_vcpu; if (!vcpu) @@ -387,24 +427,33 @@ int vgic_v3_save_pending_tables(struct kvm *kvm) if (ptr != last_ptr) { ret = kvm_read_guest_lock(kvm, ptr, &val, 1); if (ret) - return ret; + goto out; last_ptr = ptr; } stored = val & (1U << bit_nr); - if (stored == irq->pending_latch) + + if (irq->hw && vlpi_avail) + vgic_v4_get_vlpi_state(irq, &is_pending); + + if (stored == is_pending) continue; - if (irq->pending_latch) + if (is_pending) val |= 1 << bit_nr; else val &= ~(1 << bit_nr); ret = kvm_write_guest_lock(kvm, ptr, &val, 1); if (ret) - return ret; + goto out; } - return 0; + +out: + if (vlpi_avail) + map_all_vpes(dist); + + return ret; } /** -- 2.19.1