From mboxrd@z Thu Jan 1 00:00:00 1970 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A2290C433EF for ; Thu, 2 Jun 2022 20:09:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ROOtXqINTUp9M+0qG8czBwQrclnEQi4D6eTVIAFbiNE=; b=V5ECn/NMbFcYuJ xIqBQYhLtp420K5ZuG0qC88XN71Ec+W+b++aV93oNAzmZ4R7Fj31PSEDLAWDJSAnkde25usw/5NQQ i5oO+1B6tBUXYPsc1C7sC9a5G5XogaVJ+bfA6IPou5JPy5r/nQPrMPLqDCU1j90oWdLgVtFIr81zy CkzQ8Hd2qjAivdvypgJDnI8MMpNSZh4QRkUmr9dhb7cNERrjY00i0xU9P/q+Zhpjqth9vUTpOhiUV silCa4voi7rAzuL8+bb7uyG9uYHfbLn89XKKPZZT8ncXnXY/NgOLPk5kQFUXXYPhXyeOlSdOrv/hc rdOVAFBIYPbaofEJFVoQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwr7S-004COn-LY; Thu, 02 Jun 2022 20:08:34 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nwr7O-004CNr-W1 for linux-arm-kernel@lists.infradead.org; Thu, 02 Jun 2022 20:08:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654200507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IB/Vlnp4xtDrg/E/9iId0p0IwjHTTbtc1GZm3Z/63a4=; b=gIfciea83AGKQqCzGO9wpWSQKh2JUZ5xEzSHMtqD+9jG2s8OYKIMUCmm1h5nWmIXwmAg+S G/6/pTiI3G2BHqfYcdPu2wVh8mG3MR5OwjYpTzX28Rc5Jon+rG9+noJ8oQHLeq1aQpdVy3 +hM7C9f8MWKnetpEWNRpeKqWIzwo4BU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-352-Wo3sx32SOuKHn5bQNn1yEg-1; Thu, 02 Jun 2022 16:08:26 -0400 X-MC-Unique: Wo3sx32SOuKHn5bQNn1yEg-1 Received: by mail-wm1-f72.google.com with SMTP id m26-20020a05600c3b1a00b00397220d6329so3322337wms.5 for ; Thu, 02 Jun 2022 13:08:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=IB/Vlnp4xtDrg/E/9iId0p0IwjHTTbtc1GZm3Z/63a4=; b=7e56/FZsrNqsH9jHPTPYf8J8hMyIy5nYUM4X38t4M2Dgxkmfsik0/XnrsAHMvpctvH bMt6JIXEGTFYm/GcFIRN7WtP9jUhgAq1Ko2Hj+UA6q7CNOAWNegcczHssnPMbmhMhXS7 Mcvlcql2+lMMXhfrbezO0DYDfqb68oCu3++XCvRCgJttgm1xLRFkS5zoCitF7RVV40ei bxffas89nMppVpmjst97h2WPkoAS1eHVQ61MHS0Hl9s4JCngItu6Kf+5fmYA2DCzAxXr NAHLro2riHjo6Cu0iHCEnsDgZBipDWuuJRyfXp1A4mvNOOay2zHznRmXW/hS2ZwFRAPD fJDw== X-Gm-Message-State: AOAM531sBmuz8Mopehf4alaM6cTSxAhtYDAi49p8/6k+AqcWaHHu6mSF vTkQVYBXvf/WkOyAWBDFzpzNSvJVlA8XnXKU4guSGDOVSrvrMkroU1yZupQJxFJHxmEBa77yN6L BewfDlvxDxPOIIrzLSXhTb5Mr1oIseqA+HM8= X-Received: by 2002:adf:e8cd:0:b0:210:2b10:ab22 with SMTP id k13-20020adfe8cd000000b002102b10ab22mr4970816wrn.476.1654200505458; Thu, 02 Jun 2022 13:08:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM5F6JgsKGDtu6GyHns/lkcUnrlSJd7dUYftOOVGVMQv8KigpKfTOOpmHYrxeyjunNyCekoQ== X-Received: by 2002:adf:e8cd:0:b0:210:2b10:ab22 with SMTP id k13-20020adfe8cd000000b002102b10ab22mr4970800wrn.476.1654200505241; Thu, 02 Jun 2022 13:08:25 -0700 (PDT) Received: from ?IPV6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id bg20-20020a05600c3c9400b0039c15861001sm3796679wmb.21.2022.06.02.13.08.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 02 Jun 2022 13:08:24 -0700 (PDT) Message-ID: <203411bb-39e5-ea3a-3265-354adf1fb551@redhat.com> Date: Thu, 2 Jun 2022 22:08:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH 1/3] KVM: arm64: Don't read a HW interrupt pending state in user context To: Marc Zyngier , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Ricardo Koller , James Morse , Suzuki K Poulose , Alexandru Elisei , Oliver Upton , kernel-team@android.com References: <20220602083025.1110433-1-maz@kernel.org> <20220602083025.1110433-2-maz@kernel.org> From: Eric Auger In-Reply-To: <20220602083025.1110433-2-maz@kernel.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eauger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220602_130831_170486_39998E0E X-CRM114-Status: GOOD ( 23.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Marc, On 6/2/22 10:30, Marc Zyngier wrote: > Since 5bfa685e62e9 ("KVM: arm64: vgic: Read HW interrupt pending state > from the HW"), we're able to source the pending bit for an interrupt > that is stored either on the physical distributor or on a device. > > However, this state is only available when the vcpu is loaded, > and is not intended to be accessed from userspace. Unfortunately, > the GICv2 emulation doesn't provide specific userspace accessors, > and we fallback with the ones that are intended for the guest, > with fatal consequences. > > Add a new vgic_uaccess_read_pending() accessor for userspace > to use, build on top of the existing vgic_mmio_read_pending(). > > Reported-by: Eric Auger > Signed-off-by: Marc Zyngier > Fixes: 5bfa685e62e9 ("KVM: arm64: vgic: Read HW interrupt pending state from the HW") Feel free to add my Tested-by: Eric Auger Thanks! Eric > --- > arch/arm64/kvm/vgic/vgic-mmio-v2.c | 4 ++-- > arch/arm64/kvm/vgic/vgic-mmio.c | 19 ++++++++++++++++--- > arch/arm64/kvm/vgic/vgic-mmio.h | 3 +++ > 3 files changed, 21 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v2.c b/arch/arm64/kvm/vgic/vgic-mmio-v2.c > index 77a67e9d3d14..e070cda86e12 100644 > --- a/arch/arm64/kvm/vgic/vgic-mmio-v2.c > +++ b/arch/arm64/kvm/vgic/vgic-mmio-v2.c > @@ -429,11 +429,11 @@ static const struct vgic_register_region vgic_v2_dist_registers[] = { > VGIC_ACCESS_32bit), > REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_SET, > vgic_mmio_read_pending, vgic_mmio_write_spending, > - NULL, vgic_uaccess_write_spending, 1, > + vgic_uaccess_read_pending, vgic_uaccess_write_spending, 1, > VGIC_ACCESS_32bit), > REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_PENDING_CLEAR, > vgic_mmio_read_pending, vgic_mmio_write_cpending, > - NULL, vgic_uaccess_write_cpending, 1, > + vgic_uaccess_read_pending, vgic_uaccess_write_cpending, 1, > VGIC_ACCESS_32bit), > REGISTER_DESC_WITH_BITS_PER_IRQ(GIC_DIST_ACTIVE_SET, > vgic_mmio_read_active, vgic_mmio_write_sactive, > diff --git a/arch/arm64/kvm/vgic/vgic-mmio.c b/arch/arm64/kvm/vgic/vgic-mmio.c > index 49837d3a3ef5..dc8c52487e47 100644 > --- a/arch/arm64/kvm/vgic/vgic-mmio.c > +++ b/arch/arm64/kvm/vgic/vgic-mmio.c > @@ -226,8 +226,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu, > return 0; > } > > -unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, > - gpa_t addr, unsigned int len) > +static unsigned long __read_pending(struct kvm_vcpu *vcpu, > + gpa_t addr, unsigned int len, > + bool is_user) > { > u32 intid = VGIC_ADDR_TO_INTID(addr, 1); > u32 value = 0; > @@ -248,7 +249,7 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, > IRQCHIP_STATE_PENDING, > &val); > WARN_RATELIMIT(err, "IRQ %d", irq->host_irq); > - } else if (vgic_irq_is_mapped_level(irq)) { > + } else if (!is_user && vgic_irq_is_mapped_level(irq)) { > val = vgic_get_phys_line_level(irq); > } else { > val = irq_is_pending(irq); > @@ -263,6 +264,18 @@ unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, > return value; > } > > +unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, > + gpa_t addr, unsigned int len) > +{ > + return __read_pending(vcpu, addr, len, false); > +} > + > +unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu, > + gpa_t addr, unsigned int len) > +{ > + return __read_pending(vcpu, addr, len, true); > +} > + > static bool is_vgic_v2_sgi(struct kvm_vcpu *vcpu, struct vgic_irq *irq) > { > return (vgic_irq_is_sgi(irq->intid) && > diff --git a/arch/arm64/kvm/vgic/vgic-mmio.h b/arch/arm64/kvm/vgic/vgic-mmio.h > index 3fa696f198a3..6082d4b66d39 100644 > --- a/arch/arm64/kvm/vgic/vgic-mmio.h > +++ b/arch/arm64/kvm/vgic/vgic-mmio.h > @@ -149,6 +149,9 @@ int vgic_uaccess_write_cenable(struct kvm_vcpu *vcpu, > unsigned long vgic_mmio_read_pending(struct kvm_vcpu *vcpu, > gpa_t addr, unsigned int len); > > +unsigned long vgic_uaccess_read_pending(struct kvm_vcpu *vcpu, > + gpa_t addr, unsigned int len); > + > void vgic_mmio_write_spending(struct kvm_vcpu *vcpu, > gpa_t addr, unsigned int len, > unsigned long val); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel