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,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 AEAF8C433DB for ; Tue, 9 Mar 2021 14:22:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5D4D965228 for ; Tue, 9 Mar 2021 14:22:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230116AbhCIOVZ (ORCPT ); Tue, 9 Mar 2021 09:21:25 -0500 Received: from foss.arm.com ([217.140.110.172]:54426 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230126AbhCIOVA (ORCPT ); Tue, 9 Mar 2021 09:21:00 -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 AAEF931B; Tue, 9 Mar 2021 06:20:59 -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 AABC53F71B; Tue, 9 Mar 2021 06:20:58 -0800 (PST) Subject: Re: [PATCH kvmtool v2 15/22] vfio: Refactor ioport trap handler To: Andre Przywara , Will Deacon , Julien Thierry Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, Marc Zyngier , Sami Mujawar References: <20210225005915.26423-1-andre.przywara@arm.com> <20210225005915.26423-16-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Tue, 9 Mar 2021 14:21:20 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210225005915.26423-16-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, On 2/25/21 12:59 AM, Andre Przywara wrote: > With the planned retirement of the special ioport emulation code, we > need to provide an emulation function compatible with the MMIO prototype. > > Adjust the I/O port trap handler to use that new function, and provide > shims to implement the old ioport interface, for now. > > Signed-off-by: Andre Przywara > --- > vfio/core.c | 51 ++++++++++++++++++++++++++++++++++++--------------- > 1 file changed, 36 insertions(+), 15 deletions(-) > > diff --git a/vfio/core.c b/vfio/core.c > index 0b45e78b..ddd3c2c7 100644 > --- a/vfio/core.c > +++ b/vfio/core.c > @@ -81,15 +81,12 @@ out_free_buf: > return ret; > } > > -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > +static bool _vfio_ioport_in(struct vfio_region *region, u32 offset, > + void *data, int len) > { > - u32 val; > - ssize_t nr; > - struct vfio_region *region = ioport->priv; > struct vfio_device *vdev = region->vdev; > - > - u32 offset = port - region->port_base; > + ssize_t nr; > + u32 val; > > if (!(region->info.flags & VFIO_REGION_INFO_FLAG_READ)) > return false; > @@ -97,7 +94,7 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > nr = pread(vdev->fd, &val, len, region->info.offset + offset); > if (nr != len) { > vfio_dev_err(vdev, "could not read %d bytes from I/O port 0x%x\n", > - len, port); > + len, offset + region->port_base); > return false; > } > > @@ -118,15 +115,13 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > return true; > } > > -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > +static bool _vfio_ioport_out(struct vfio_region *region, u32 offset, > + void *data, int len) > { > - u32 val; > - ssize_t nr; > - struct vfio_region *region = ioport->priv; > struct vfio_device *vdev = region->vdev; > + ssize_t nr; > + u32 val; > > - u32 offset = port - region->port_base; > > if (!(region->info.flags & VFIO_REGION_INFO_FLAG_WRITE)) > return false; > @@ -148,11 +143,37 @@ static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > nr = pwrite(vdev->fd, &val, len, region->info.offset + offset); > if (nr != len) > vfio_dev_err(vdev, "could not write %d bytes to I/O port 0x%x", > - len, port); > + len, offset + region->port_base); > > return nr == len; > } > > +static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > +{ > + struct vfio_region *region = ptr; > + u32 offset = addr - region->port_base; > + > + if (is_write) > + _vfio_ioport_out(region, offset, data, len); > + else > + _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, The new code looks functionally identical to the old one: Reviewed-by: Alexandru Elisei Thanks, Alex 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,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 93BDAC433DB for ; Tue, 9 Mar 2021 14:21:08 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id D5E7F64E21 for ; Tue, 9 Mar 2021 14:21:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5E7F64E21 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 406B64B3E2; Tue, 9 Mar 2021 09:21:07 -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 PFmj9SzjtP4l; Tue, 9 Mar 2021 09:21:03 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 653194B3E5; Tue, 9 Mar 2021 09:21:03 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id EDA124B3E5 for ; Tue, 9 Mar 2021 09:21:01 -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 IRbMJm1bMc+X for ; Tue, 9 Mar 2021 09:21:00 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 2E38E4B3E2 for ; Tue, 9 Mar 2021 09:21:00 -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 AAEF931B; Tue, 9 Mar 2021 06:20:59 -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 AABC53F71B; Tue, 9 Mar 2021 06:20:58 -0800 (PST) Subject: Re: [PATCH kvmtool v2 15/22] vfio: Refactor ioport trap handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20210225005915.26423-1-andre.przywara@arm.com> <20210225005915.26423-16-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Tue, 9 Mar 2021 14:21:20 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210225005915.26423-16-andre.przywara@arm.com> Content-Language: en-US Cc: Marc Zyngier , Sami Mujawar , 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, On 2/25/21 12:59 AM, Andre Przywara wrote: > With the planned retirement of the special ioport emulation code, we > need to provide an emulation function compatible with the MMIO prototype. > > Adjust the I/O port trap handler to use that new function, and provide > shims to implement the old ioport interface, for now. > > Signed-off-by: Andre Przywara > --- > vfio/core.c | 51 ++++++++++++++++++++++++++++++++++++--------------- > 1 file changed, 36 insertions(+), 15 deletions(-) > > diff --git a/vfio/core.c b/vfio/core.c > index 0b45e78b..ddd3c2c7 100644 > --- a/vfio/core.c > +++ b/vfio/core.c > @@ -81,15 +81,12 @@ out_free_buf: > return ret; > } > > -static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > +static bool _vfio_ioport_in(struct vfio_region *region, u32 offset, > + void *data, int len) > { > - u32 val; > - ssize_t nr; > - struct vfio_region *region = ioport->priv; > struct vfio_device *vdev = region->vdev; > - > - u32 offset = port - region->port_base; > + ssize_t nr; > + u32 val; > > if (!(region->info.flags & VFIO_REGION_INFO_FLAG_READ)) > return false; > @@ -97,7 +94,7 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > nr = pread(vdev->fd, &val, len, region->info.offset + offset); > if (nr != len) { > vfio_dev_err(vdev, "could not read %d bytes from I/O port 0x%x\n", > - len, port); > + len, offset + region->port_base); > return false; > } > > @@ -118,15 +115,13 @@ static bool vfio_ioport_in(struct ioport *ioport, struct kvm_cpu *vcpu, > return true; > } > > -static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > - u16 port, void *data, int len) > +static bool _vfio_ioport_out(struct vfio_region *region, u32 offset, > + void *data, int len) > { > - u32 val; > - ssize_t nr; > - struct vfio_region *region = ioport->priv; > struct vfio_device *vdev = region->vdev; > + ssize_t nr; > + u32 val; > > - u32 offset = port - region->port_base; > > if (!(region->info.flags & VFIO_REGION_INFO_FLAG_WRITE)) > return false; > @@ -148,11 +143,37 @@ static bool vfio_ioport_out(struct ioport *ioport, struct kvm_cpu *vcpu, > nr = pwrite(vdev->fd, &val, len, region->info.offset + offset); > if (nr != len) > vfio_dev_err(vdev, "could not write %d bytes to I/O port 0x%x", > - len, port); > + len, offset + region->port_base); > > return nr == len; > } > > +static void vfio_ioport_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > +{ > + struct vfio_region *region = ptr; > + u32 offset = addr - region->port_base; > + > + if (is_write) > + _vfio_ioport_out(region, offset, data, len); > + else > + _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, The new code looks functionally identical to the old one: Reviewed-by: Alexandru Elisei Thanks, Alex _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm