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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B45DC43334 for ; Thu, 14 Jul 2022 07:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232847AbiGNHBk (ORCPT ); Thu, 14 Jul 2022 03:01:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229928AbiGNHBh (ORCPT ); Thu, 14 Jul 2022 03:01:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAD1E2B62E for ; Thu, 14 Jul 2022 00:01:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 65B2861B48 for ; Thu, 14 Jul 2022 07:01:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C1271C34114; Thu, 14 Jul 2022 07:01:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657782095; bh=I6nKqehx8IlVE8OdjnnvBPhclf2olmzRtsOCDRBmX+4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=XRVW22wxADxr4PD6x5AtVgCmHCuNbW0CyHbwoaRgkVeegCt0+NPXnuZafarxP/Wfa b7k5uJM5TqFRvFvhCvfOL43Q4YQhgvSJJJr1Q0ioKlZCBPtQx5fZT8kEk74ctJA080 H+tfza9hkAokZdCRzPrSL/03wUtCaxrAoYqDpR3Nzpj/sgGmPpYvkS5OwdSpBtjzOl pBS0kzpPo//uybeJGaQVxSPepHEO89QabgdWOiAgY9V9J6sETR2nWDqBaPDLGfx4ks VbOa7vj3gQUoWG0Ss3sUeJuu9jKDINqHE2OTwHp6tBfKrdKQ2R5vfrdCpLmhTBrNb+ mKUEScmJE20yQ== Received: from ip-185-104-136-29.ptr.icomera.net ([185.104.136.29] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oBsqq-007NWI-2M; Thu, 14 Jul 2022 08:01:33 +0100 Date: Thu, 14 Jul 2022 08:01:21 +0100 Message-ID: <877d4gyy7y.wl-maz@kernel.org> From: Marc Zyngier To: Reiji Watanabe Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, Linux ARM , Schspa Shi , kernel-team@android.com, Oliver Upton Subject: Re: [PATCH 15/19] KVM: arm64: vgic-v2: Add helper for legacy dist/cpuif base address setting In-Reply-To: References: <20220706164304.1582687-1-maz@kernel.org> <20220706164304.1582687-16-maz@kernel.org> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.104.136.29 X-SA-Exim-Rcpt-To: reijiw@google.com, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, schspa@gmail.com, kernel-team@android.com, oliver.upton@linux.dev X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Thu, 14 Jul 2022 07:37:25 +0100, Reiji Watanabe wrote: > > Hi Marc, > > On Wed, Jul 6, 2022 at 10:05 AM Marc Zyngier wrote: > > > > We carry a legacy interface to set the base addresses for GICv2. > > As this is currently plumbed into the same handling code as > > the modern interface, it limits the evolution we can make there. > > > > Add a helper dedicated to this handling, with a view of maybe > > removing this in the future. > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/kvm/arm.c | 11 ++------- > > arch/arm64/kvm/vgic/vgic-kvm-device.c | 32 +++++++++++++++++++++++++++ > > include/kvm/arm_vgic.h | 1 + > > 3 files changed, 35 insertions(+), 9 deletions(-) > > > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > > index 83a7f61354d3..bf39570c0aef 100644 > > --- a/arch/arm64/kvm/arm.c > > +++ b/arch/arm64/kvm/arm.c > > @@ -1414,18 +1414,11 @@ void kvm_arch_flush_remote_tlbs_memslot(struct kvm *kvm, > > static int kvm_vm_ioctl_set_device_addr(struct kvm *kvm, > > struct kvm_arm_device_addr *dev_addr) > > { > > - unsigned long dev_id, type; > > - > > - dev_id = (dev_addr->id & KVM_ARM_DEVICE_ID_MASK) >> > > - KVM_ARM_DEVICE_ID_SHIFT; > > - type = (dev_addr->id & KVM_ARM_DEVICE_TYPE_MASK) >> > > - KVM_ARM_DEVICE_TYPE_SHIFT; > > - > > - switch (dev_id) { > > + switch (FIELD_GET(KVM_ARM_DEVICE_ID_MASK, dev_addr->id)) { > > case KVM_ARM_DEVICE_VGIC_V2: > > if (!vgic_present) > > return -ENXIO; > > - return kvm_vgic_addr(kvm, type, &dev_addr->addr, true); > > + return kvm_set_legacy_vgic_v2_addr(kvm, dev_addr); > > default: > > return -ENODEV; > > } > > diff --git a/arch/arm64/kvm/vgic/vgic-kvm-device.c b/arch/arm64/kvm/vgic/vgic-kvm-device.c > > index fbbd0338c782..0dfd277b9058 100644 > > --- a/arch/arm64/kvm/vgic/vgic-kvm-device.c > > +++ b/arch/arm64/kvm/vgic/vgic-kvm-device.c > > @@ -41,6 +41,38 @@ static int vgic_check_type(struct kvm *kvm, int type_needed) > > return 0; > > } > > > > +int kvm_set_legacy_vgic_v2_addr(struct kvm *kvm, struct kvm_arm_device_addr *dev_addr) > > +{ > > + struct vgic_dist *vgic = &kvm->arch.vgic; > > + int r; > > + > > + mutex_lock(&kvm->lock); > > + switch (FIELD_GET(KVM_ARM_DEVICE_ID_MASK, dev_addr->id)) { > > Shouldn't this be KVM_ARM_DEVICE_TYPE_MASK (not KVM_ARM_DEVICE_ID_MASK) ? Damn, you just ruined my attempt at deprecating this API ;-). More seriously, thanks for catching this one! M. -- Without deviation from the norm, progress is not possible.