From patchwork Wed Jan 31 09:34:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 10193629 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7AD1B603EE for ; Wed, 31 Jan 2018 09:36:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6091F285FC for ; Wed, 31 Jan 2018 09:36:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5528928608; Wed, 31 Jan 2018 09:36:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3B25A285FC for ; Wed, 31 Jan 2018 09:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=5GQKxt28bO8xoqUqCLfProRPYRfBpkbvt4KUaxlmV7k=; b=ncT4C0w/hSBzryQWe6vYDwZwY6 MimmOXoygzxROTgTIifCRer20bIf/+NdaGNg5afnJH4GZM3+OgMHL71BHdRbwCUN0hXGcsLOyaONX /hmxJwp5iBvm0yLbyPAAoMVQE0lO792QBzhSzWODxccPA6kkGvQ9nuGQ21n91VlMKtv/Tk5lBWJjV 4D856cA+q45FWcBchoaNQLm6HXKePMOWsOGZWyPOekPG1qOqDyJTOJ464f8op1kbFxmk0w+qXLDkY c+wMhwfqRBUvErZ4QKEyqwUPMN5cUi0v2h9cTH1SOAGUMMDNc8DCtp7BU+swyRrenGI2CTTMfd8Gb sgDnhUOw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1egop1-0006vI-PY; Wed, 31 Jan 2018 09:36:51 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1egoni-0005YM-Ob for linux-arm-kernel@lists.infradead.org; Wed, 31 Jan 2018 09:35:38 +0000 Received: by mail-wm0-x242.google.com with SMTP id i186so6665425wmi.4 for ; Wed, 31 Jan 2018 01:35:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7KPMJBZEfc0lCaprIsw+36s4HzSd9UMf7za4HX6aycc=; b=g684UXH5ZYXO3RVdEAgvz3hEhGRXPQ+uDxps/p9NuYhyjmfpC8DSY9Ttwlfio7Jm7j 9DPI0aibydohMcbvKC0sDS5JBfhIK6xF4+rRyh/jLUKoI4D5sX+plBrz13pWM8h/Gvxw OhPn4hHcZfeO7MJWuw1mZ2wuy6/4rEFx847z4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7KPMJBZEfc0lCaprIsw+36s4HzSd9UMf7za4HX6aycc=; b=KrPtSOzT6Vd9itd7b3Oz/YahcPHVV5PWFqD34HO866NGq+YKM8BecbyG414yAbRa/l wxAJXuG0ynHgeU3TRYgrc78i4D23+GDZ0WisRnXtHoa/N/d+VZB0a1pwTu+JtKn+UK59 2+H4Fk6eVyUiOWAihh3kC8a9T0clvUGiXSdKnCXyIE/ISNhDEHzqxoAWv1UXbpgs3c44 o1u8TLMVahMscGRYOQehUo0xrQ2dbdpAFFaHiq4wnc9BUat6EyGqby8ydr+I1qaEO7gb 0UKttx1l9sjKIpbpfoyf3zjygz6yLkxyrci5OuJ99K9UIPG1e/ROyY+sDu6L5au6JwoV w5Mw== X-Gm-Message-State: AKwxytfwkKaOb5gg6pOqAVFuaGS945jerKKgNFATcRxW1BfUmeZFt6hB whrtZZRtj5x9QB9IBOQKBVZ6gA== X-Google-Smtp-Source: AH8x227A74+W7wkYVObpw4yD7mfJtOiWPTOngBI95sBg2oBBWD1FvfPMGEDE8VnqZwgUK/MjaBN0PA== X-Received: by 10.80.158.110 with SMTP id z101mr55289946ede.89.1517391318748; Wed, 31 Jan 2018 01:35:18 -0800 (PST) Received: from localhost.localdomain (x50d2404e.cust.hiper.dk. [80.210.64.78]) by smtp.gmail.com with ESMTPSA id z2sm10247837edc.50.2018.01.31.01.35.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 31 Jan 2018 01:35:17 -0800 (PST) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 04/28] KVM: arm/arm64: Factor out functionality to get vgic mmio requester_vcpu Date: Wed, 31 Jan 2018 10:34:43 +0100 Message-Id: <20180131093507.22219-5-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180131093507.22219-1-christoffer.dall@linaro.org> References: <20180131093507.22219-1-christoffer.dall@linaro.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We are about to distinguish between userspace accesses and mmio traps for a number of the mmio handlers. When the requester vcpu is NULL, it means we are handling a userspace access. Factor out the functionality to get the request vcpu into its own function, mostly so we have a common place to document the semantics of the return value. Also take the chance to move the functionality outside of holding a spinlock and instead explicitly disable and enable preemption. This supports PREEMPT_RT kernels as well. Acked-by: Marc Zyngier Reviewed-by: Andre Przywara Signed-off-by: Christoffer Dall --- virt/kvm/arm/vgic/vgic-mmio.c | 44 +++++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c index deb51ee16a3d..fdad95f62fa3 100644 --- a/virt/kvm/arm/vgic/vgic-mmio.c +++ b/virt/kvm/arm/vgic/vgic-mmio.c @@ -122,6 +122,27 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, return value; } +/* + * This function will return the VCPU that performed the MMIO access and + * trapped from within the VM, and will return NULL if this is a userspace + * access. + * + * We can disable preemption locally around accessing the per-CPU variable, + * and use the resolved vcpu pointer after enabling preemption again, because + * even if the current thread is migrated to another CPU, reading the per-CPU + * value later will give us the same value as we update the per-CPU variable + * in the preempt notifier handlers. + */ +static struct kvm_vcpu *vgic_get_mmio_requester_vcpu(void) +{ + struct kvm_vcpu *vcpu; + + preempt_disable(); + vcpu = kvm_arm_get_running_vcpu(); + preempt_enable(); + return vcpu; +} + void vgic_mmio_write_spending(struct kvm_vcpu *vcpu, gpa_t addr, unsigned int len, unsigned long val) @@ -184,24 +205,10 @@ unsigned long vgic_mmio_read_active(struct kvm_vcpu *vcpu, static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, bool new_active_state) { - struct kvm_vcpu *requester_vcpu; unsigned long flags; - spin_lock_irqsave(&irq->irq_lock, flags); + struct kvm_vcpu *requester_vcpu = vgic_get_mmio_requester_vcpu(); - /* - * The vcpu parameter here can mean multiple things depending on how - * this function is called; when handling a trap from the kernel it - * depends on the GIC version, and these functions are also called as - * part of save/restore from userspace. - * - * Therefore, we have to figure out the requester in a reliable way. - * - * When accessing VGIC state from user space, the requester_vcpu is - * NULL, which is fine, because we guarantee that no VCPUs are running - * when accessing VGIC state from user space so irq->vcpu->cpu is - * always -1. - */ - requester_vcpu = kvm_arm_get_running_vcpu(); + spin_lock_irqsave(&irq->irq_lock, flags); /* * If this virtual IRQ was written into a list register, we @@ -213,6 +220,11 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, * vgic_change_active_prepare) and still has to sync back this IRQ, * so we release and re-acquire the spin_lock to let the other thread * sync back the IRQ. + * + * When accessing VGIC state from user space, requester_vcpu is + * NULL, which is fine, because we guarantee that no VCPUs are running + * when accessing VGIC state from user space so irq->vcpu->cpu is + * always -1. */ while (irq->vcpu && /* IRQ may have state in an LR somewhere */ irq->vcpu != requester_vcpu && /* Current thread is not the VCPU thread */