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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D538DC433E0 for ; Tue, 16 Feb 2021 14:53:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A127264E04 for ; Tue, 16 Feb 2021 14:53:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230117AbhBPOxl (ORCPT ); Tue, 16 Feb 2021 09:53:41 -0500 Received: from foss.arm.com ([217.140.110.172]:36732 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbhBPOxk (ORCPT ); Tue, 16 Feb 2021 09:53:40 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36D8431B; Tue, 16 Feb 2021 06:52:55 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3677B3F694; Tue, 16 Feb 2021 06:52:54 -0800 (PST) Subject: Re: [PATCH kvmtool 16/21] vfio: Switch to new ioport trap handlers To: Andre Przywara , Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, Marc Zyngier References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-17-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <797e9b63-2e0b-b2b0-f291-97f722f4a64d@arm.com> Date: Tue, 16 Feb 2021 14:52:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-17-andre.przywara@arm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Andre, Looks good, _vfio_ioport_{in,out} could have been renamed to vfio_ioport_{in,out}, but it's fine either way: Reviewed-by: Alexandru Elisei Thanks, Alex On 12/10/20 2:29 PM, Andre Przywara wrote: > Now that the vfio device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > vfio/core.c | 29 ++++++----------------------- > 1 file changed, 6 insertions(+), 23 deletions(-) > > diff --git a/vfio/core.c b/vfio/core.c > index f55f1f87..10919101 100644 > --- a/vfio/core.c > +++ b/vfio/core.c > @@ -160,25 +160,6 @@ static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > _vfio_ioport_in(region, offset, data, len); > } > > -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, true, ioport->priv); > - return true; > -} > - > -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, false, ioport->priv); > - return true; > -} > - > -static struct ioport_operations vfio_ioport_ops = { > - .io_in = vfio_ioport_in, > - .io_out = vfio_ioport_out, > -}; > - > static void vfio_mmio_access(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > u8 is_write, void *ptr) > { > @@ -223,9 +204,11 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev, > struct vfio_region *region) > { > if (region->is_ioport) { > - int port = ioport__register(kvm, region->port_base, > - &vfio_ioport_ops, region->info.size, > - region); > + int port; > + > + port = kvm__register_pio(kvm, region->port_base, > + region->info.size, vfio_ioport_mmio, > + region); > if (port < 0) > return port; > return 0; > @@ -292,7 +275,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region) > munmap(region->host_addr, region->info.size); > region->host_addr = NULL; > } else if (region->is_ioport) { > - ioport__unregister(kvm, region->port_base); > + kvm__deregister_pio(kvm, region->port_base); > } else { > kvm__deregister_mmio(kvm, region->guest_phys_addr); > } 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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B17B8C433E0 for ; Tue, 16 Feb 2021 14:52:59 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 0B91E64E02 for ; Tue, 16 Feb 2021 14:52:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B91E64E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 736264B2B2; Tue, 16 Feb 2021 09:52:58 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id osctbYNWrGvh; Tue, 16 Feb 2021 09:52:57 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3C26C4B4FC; Tue, 16 Feb 2021 09:52:57 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id C58A14B2B2 for ; Tue, 16 Feb 2021 09:52:56 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4zQVCG9n+GnQ for ; Tue, 16 Feb 2021 09:52:55 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B65434B289 for ; Tue, 16 Feb 2021 09:52:55 -0500 (EST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36D8431B; Tue, 16 Feb 2021 06:52:55 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3677B3F694; Tue, 16 Feb 2021 06:52:54 -0800 (PST) Subject: Re: [PATCH kvmtool 16/21] vfio: Switch to new ioport trap handlers To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-17-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <797e9b63-2e0b-b2b0-f291-97f722f4a64d@arm.com> Date: Tue, 16 Feb 2021 14:52:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-17-andre.przywara@arm.com> Content-Language: en-US Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Andre, Looks good, _vfio_ioport_{in,out} could have been renamed to vfio_ioport_{in,out}, but it's fine either way: Reviewed-by: Alexandru Elisei Thanks, Alex On 12/10/20 2:29 PM, Andre Przywara wrote: > Now that the vfio device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > vfio/core.c | 29 ++++++----------------------- > 1 file changed, 6 insertions(+), 23 deletions(-) > > diff --git a/vfio/core.c b/vfio/core.c > index f55f1f87..10919101 100644 > --- a/vfio/core.c > +++ b/vfio/core.c > @@ -160,25 +160,6 @@ static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > _vfio_ioport_in(region, offset, data, len); > } > > -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, true, ioport->priv); > - return true; > -} > - > -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, false, ioport->priv); > - return true; > -} > - > -static struct ioport_operations vfio_ioport_ops = { > - .io_in = vfio_ioport_in, > - .io_out = vfio_ioport_out, > -}; > - > static void vfio_mmio_access(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > u8 is_write, void *ptr) > { > @@ -223,9 +204,11 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev, > struct vfio_region *region) > { > if (region->is_ioport) { > - int port = ioport__register(kvm, region->port_base, > - &vfio_ioport_ops, region->info.size, > - region); > + int port; > + > + port = kvm__register_pio(kvm, region->port_base, > + region->info.size, vfio_ioport_mmio, > + region); > if (port < 0) > return port; > return 0; > @@ -292,7 +275,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region) > munmap(region->host_addr, region->info.size); > region->host_addr = NULL; > } else if (region->is_ioport) { > - ioport__unregister(kvm, region->port_base); > + kvm__deregister_pio(kvm, region->port_base); > } else { > kvm__deregister_mmio(kvm, region->guest_phys_addr); > } _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm 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 X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3978DC433E0 for ; Tue, 16 Feb 2021 14:54:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BAD0264E02 for ; Tue, 16 Feb 2021 14:54:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BAD0264E02 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=u4zWgIovM8nAhQrshTgbUT4eKj12zlqjUCnGGxmf6/A=; b=3Pdxu/Cs97gt2/teoOtPQE2r7 xVTnIWvJNFXwmoR8wRyhLZLrEtnZm02qy1mlMZ9kTdXCeGaz2c1mdyHDG8L5N92oIUrNS4Li+kyNz 4L52++k1q/4/s4rdB++vS+upGV9FfTnLpdjnoKqjRJthrs/DPJ5ehajUGRKVvNorccnRXT/WBtg7L n1kvZ1jWk5Z5t8O+kKQ/ZLalDOB27Eq4agkSadU5dHKkYx+BwvM2Sb+z8wRgEcfZnOvLYFTrLmj1A i2s5w+AIHwBIb7vR0xziVfILf5BcddkCB1qw+AGOOf4sNSVBCOj4IVy2Q6ifjsepFHcJdppSZI1gr FZZCAis0g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lC1ix-0003ss-Ii; Tue, 16 Feb 2021 14:53:11 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lC1iu-0003s6-Jz for linux-arm-kernel@lists.infradead.org; Tue, 16 Feb 2021 14:53:09 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 36D8431B; Tue, 16 Feb 2021 06:52:55 -0800 (PST) Received: from [192.168.0.110] (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3677B3F694; Tue, 16 Feb 2021 06:52:54 -0800 (PST) Subject: Re: [PATCH kvmtool 16/21] vfio: Switch to new ioport trap handlers To: Andre Przywara , Will Deacon , Julien Thierry References: <20201210142908.169597-1-andre.przywara@arm.com> <20201210142908.169597-17-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: <797e9b63-2e0b-b2b0-f291-97f722f4a64d@arm.com> Date: Tue, 16 Feb 2021 14:52:57 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <20201210142908.169597-17-andre.przywara@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210216_095308_742435_53A2AE09 X-CRM114-Status: GOOD ( 19.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Marc Zyngier , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org 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 Hi Andre, Looks good, _vfio_ioport_{in,out} could have been renamed to vfio_ioport_{in,out}, but it's fine either way: Reviewed-by: Alexandru Elisei Thanks, Alex On 12/10/20 2:29 PM, Andre Przywara wrote: > Now that the vfio device has a trap handler adhering to the MMIO fault > handler prototype, let's switch over to the joint registration routine. > > This allows us to get rid of the ioport shim routines. > > Signed-off-by: Andre Przywara > --- > vfio/core.c | 29 ++++++----------------------- > 1 file changed, 6 insertions(+), 23 deletions(-) > > diff --git a/vfio/core.c b/vfio/core.c > index f55f1f87..10919101 100644 > --- a/vfio/core.c > +++ b/vfio/core.c > @@ -160,25 +160,6 @@ static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > _vfio_ioport_in(region, offset, data, len); > } > > -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, true, ioport->priv); > - return true; > -} > - > -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > -{ > - vfio_ioport_mmio(vcpu, port, data, len, false, ioport->priv); > - return true; > -} > - > -static struct ioport_operations vfio_ioport_ops = { > - .io_in = vfio_ioport_in, > - .io_out = vfio_ioport_out, > -}; > - > static void vfio_mmio_access(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > u8 is_write, void *ptr) > { > @@ -223,9 +204,11 @@ static int vfio_setup_trap_region(struct kvm *kvm, struct vfio_device *vdev, > struct vfio_region *region) > { > if (region->is_ioport) { > - int port = ioport__register(kvm, region->port_base, > - &vfio_ioport_ops, region->info.size, > - region); > + int port; > + > + port = kvm__register_pio(kvm, region->port_base, > + region->info.size, vfio_ioport_mmio, > + region); > if (port < 0) > return port; > return 0; > @@ -292,7 +275,7 @@ void vfio_unmap_region(struct kvm *kvm, struct vfio_region *region) > munmap(region->host_addr, region->info.size); > region->host_addr = NULL; > } else if (region->is_ioport) { > - ioport__unregister(kvm, region->port_base); > + kvm__deregister_pio(kvm, region->port_base); > } else { > kvm__deregister_mmio(kvm, region->guest_phys_addr); > } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel