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 D5C4BE7071E for ; Thu, 21 Sep 2023 11:20:33 +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:MIME-Version:References:In-Reply-To: Subject:Cc:To:From:Message-ID:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=I1/1wmfmwQHGqeK1eExINlEuWt5T5upX+k3dhMyK0Rc=; b=ds+a/jpFsZhBZD s38w4rXxdUfIX9LDiwaG3U74lzjUnEwNu58gsVH/yuvNEuw3vOIJ21fQ7c2AEs+aGMZ5zO5W8S/6r F5MH3Rj0mQn8KgzoS5K1L1SmkNTpC0eBZwuGAq6LqN+kfTCn8v1DAYqb8IlSe/aIxW5CnrxTC45Wc GT7BkykPOxJW0kVFXAHWps/4cx6680hykSMpoKnRk/ezK2lY/MqxGmZFWfloZyv+y9AcqNdj2itQD xR1mXip1BD58uZl425bRJ1JjEnygRamMM7orXvLx1+Mr/wF0aZRd/TSRCyZL08DJKK2iRlcn2fUYp muuhLZ/obT+9goNBBaIg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qjHj8-005uEi-0J; Thu, 21 Sep 2023 11:20:10 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qjHj5-005uE2-1d for linux-arm-kernel@lists.infradead.org; Thu, 21 Sep 2023 11:20:08 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id BA1B761E5B; Thu, 21 Sep 2023 11:20:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 262DEC4AF70; Thu, 21 Sep 2023 11:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695295206; bh=kTT7BVQcKHCD0y3aHHeZIjx0nch8oE5LcRCwCYPxOis=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=OmKJ8wjjmKTnf8uPmYY1pD5WlKeBuBuuT/c1PUDdxqhZdE6wJ4q70dOyvSAvF95WU 4dHw4kh4/HFrPlKQz81xeGuGvLefXOPqNdzkE2x3ANH+oql6SRM23XcqmpXTkipo7t e+3JKiF1O0rG3du3sFlg22btEzc+UNXHLlhZ3vrz03TDZ92KG9HEFJodoJwz8UWkbf fJ43/tAbdZvOKRKtSEiVkkvJ3Wf8yD1G2mMzAuoiNSWO40ji5t1XJIp9deDsuvNyhO TykN3EsMIRuS5f5+0wobf8PWhCr24nvmP2Twwkz2tkhYtGM2u5ORFjOOErj48lqZYL fZziDBLfjra+A== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.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 1qjHj1-00EuJu-Rw; Thu, 21 Sep 2023 12:20:03 +0100 Date: Thu, 21 Sep 2023 12:20:02 +0100 Message-ID: <8634z7pycd.wl-maz@kernel.org> From: Marc Zyngier To: Zenghui Yu Cc: , , , James Morse , Suzuki K Poulose , Oliver Upton , Joey Gouly , Shameerali Kolothum Thodi , Xu Zhao , Eric Auger Subject: Re: [PATCH v2 01/11] KVM: arm64: vgic: Make kvm_vgic_inject_irq() take a vcpu pointer In-Reply-To: References: <20230920181731.2232453-1-maz@kernel.org> <20230920181731.2232453-2-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/29.1 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: yuzenghui@huawei.com, kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, joey.gouly@arm.com, shameerali.kolothum.thodi@huawei.com, zhaoxu.35@bytedance.com, eric.auger@redhat.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230921_042007_633752_3164ECD8 X-CRM114-Status: GOOD ( 27.03 ) 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 On Thu, 21 Sep 2023 10:11:00 +0100, Zenghui Yu wrote: > > On 2023/9/21 2:17, Marc Zyngier wrote: > > Passing a vcpu_id to kvm_vgic_inject_irq() is silly for two reasons: > > > > - we often confuse vcpu_id and vcpu_idx > > - we eventually have to convert it back to a vcpu > > - we can't count > > > > Instead, pass a vcpu pointer, which is unambiguous. A NULL vcpu > > is also allowed for interrupts that are not private to a vcpu > > (such as SPIs). > > > > Signed-off-by: Marc Zyngier > > --- > > arch/arm64/kvm/arch_timer.c | 2 +- > > arch/arm64/kvm/arm.c | 20 ++++++++++---------- > > arch/arm64/kvm/pmu-emul.c | 2 +- > > arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +- > > arch/arm64/kvm/vgic/vgic.c | 12 +++++------- > > include/kvm/arm_vgic.h | 4 ++-- > > 6 files changed, 20 insertions(+), 22 deletions(-) > > > > diff --git a/arch/arm64/kvm/arch_timer.c b/arch/arm64/kvm/arch_timer.c > > index 6dcdae4d38cb..1f828f3b854c 100644 > > --- a/arch/arm64/kvm/arch_timer.c > > +++ b/arch/arm64/kvm/arch_timer.c > > @@ -458,7 +458,7 @@ static void kvm_timer_update_irq(struct kvm_vcpu *vcpu, bool new_level, > > timer_ctx->irq.level); > > if (!userspace_irqchip(vcpu->kvm)) { > > - ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu->vcpu_id, > > + ret = kvm_vgic_inject_irq(vcpu->kvm, vcpu, > > timer_irq(timer_ctx), > > timer_ctx->irq.level, > > timer_ctx); > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > > index 4866b3f7b4ea..872679a0cbd7 100644 > > --- a/arch/arm64/kvm/arm.c > > +++ b/arch/arm64/kvm/arm.c > > @@ -1134,27 +1134,27 @@ int kvm_vm_ioctl_irq_line(struct kvm *kvm, struct kvm_irq_level *irq_level, > > bool line_status) > > { > > u32 irq = irq_level->irq; > > - unsigned int irq_type, vcpu_idx, irq_num; > > + unsigned int irq_type, vcpu_id, irq_num; > > int nrcpus = atomic_read(&kvm->online_vcpus); > > struct kvm_vcpu *vcpu = NULL; > > bool level = irq_level->level; > > irq_type = (irq >> KVM_ARM_IRQ_TYPE_SHIFT) & > > KVM_ARM_IRQ_TYPE_MASK; > > - vcpu_idx = (irq >> KVM_ARM_IRQ_VCPU_SHIFT) & KVM_ARM_IRQ_VCPU_MASK; > > - vcpu_idx += ((irq >> KVM_ARM_IRQ_VCPU2_SHIFT) & KVM_ARM_IRQ_VCPU2_MASK) * (KVM_ARM_IRQ_VCPU_MASK + 1); > > + vcpu_id = (irq >> KVM_ARM_IRQ_VCPU_SHIFT) & KVM_ARM_IRQ_VCPU_MASK; > > + vcpu_id += ((irq >> KVM_ARM_IRQ_VCPU2_SHIFT) & KVM_ARM_IRQ_VCPU2_MASK) * (KVM_ARM_IRQ_VCPU_MASK + 1); > > irq_num = (irq >> KVM_ARM_IRQ_NUM_SHIFT) & KVM_ARM_IRQ_NUM_MASK; > > - trace_kvm_irq_line(irq_type, vcpu_idx, irq_num, > > irq_level->level); > > + trace_kvm_irq_line(irq_type, vcpu_id, irq_num, irq_level->level); > > switch (irq_type) { > > case KVM_ARM_IRQ_TYPE_CPU: > > if (irqchip_in_kernel(kvm)) > > return -ENXIO; > > - if (vcpu_idx >= nrcpus) > > + if (vcpu_id >= nrcpus) > > return -EINVAL; > > What we actually need to check is 'vcpu->vcpu_idx >= nrcpus' and this is > covered by the 'if (!vcpu)' statement below. Let's just drop this > _incorrect_ checking? Good point. Let me fix this. Thanks, M. -- Without deviation from the norm, progress is not possible. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel