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=-12.5 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,UNWANTED_LANGUAGE_BODY, 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 F2240C433DB for ; Tue, 9 Mar 2021 14:43:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B656A6523A for ; Tue, 9 Mar 2021 14:43:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231384AbhCIOn2 (ORCPT ); Tue, 9 Mar 2021 09:43:28 -0500 Received: from foss.arm.com ([217.140.110.172]:54648 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231376AbhCIOnZ (ORCPT ); Tue, 9 Mar 2021 09:43:25 -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 B3A3D31B; Tue, 9 Mar 2021 06:43:24 -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 B64B93F71B; Tue, 9 Mar 2021 06:43:23 -0800 (PST) Subject: Re: [PATCH kvmtool v2 17/22] virtio: Switch trap handling to use MMIO 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-18-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Tue, 9 Mar 2021 14:43:28 +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-18-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 existing MMIO callback routine to automatically determine > the region this trap came through, and call the existing I/O handlers. > Register the ioport region using the new registration function. Looks good to me: Reviewed-by: Alexandru Elisei Thanks, Alex > > Signed-off-by: Andre Przywara > --- > virtio/pci.c | 46 ++++++++++++++-------------------------------- > 1 file changed, 14 insertions(+), 32 deletions(-) > > diff --git a/virtio/pci.c b/virtio/pci.c > index 6eea6c68..eb91f512 100644 > --- a/virtio/pci.c > +++ b/virtio/pci.c > @@ -178,15 +178,6 @@ static bool virtio_pci__data_in(struct kvm_cpu *vcpu, struct virtio_device *vdev > return ret; > } > > -static bool virtio_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - struct virtio_device *vdev = ioport->priv; > - struct virtio_pci *vpci = vdev->virtio; > - unsigned long offset = port - virtio_pci__port_addr(vpci); > - > - return virtio_pci__data_in(vcpu, vdev, offset, data, size); > -} > - > static void update_msix_map(struct virtio_pci *vpci, > struct msix_table *msix_entry, u32 vecnum) > { > @@ -334,20 +325,6 @@ static bool virtio_pci__data_out(struct kvm_cpu *vcpu, struct virtio_device *vde > return ret; > } > > -static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - struct virtio_device *vdev = ioport->priv; > - struct virtio_pci *vpci = vdev->virtio; > - unsigned long offset = port - virtio_pci__port_addr(vpci); > - > - return virtio_pci__data_out(vcpu, vdev, offset, data, size); > -} > - > -static struct ioport_operations virtio_pci__io_ops = { > - .io_in = virtio_pci__io_in, > - .io_out = virtio_pci__io_out, > -}; > - > static void virtio_pci__msix_mmio_callback(struct kvm_cpu *vcpu, > u64 addr, u8 *data, u32 len, > u8 is_write, void *ptr) > @@ -455,12 +432,19 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, > { > struct virtio_device *vdev = ptr; > struct virtio_pci *vpci = vdev->virtio; > - u32 mmio_addr = virtio_pci__mmio_addr(vpci); > + u32 ioport_addr = virtio_pci__port_addr(vpci); > + u32 base_addr; > + > + if (addr >= ioport_addr && > + addr < ioport_addr + pci__bar_size(&vpci->pci_hdr, 0)) > + base_addr = ioport_addr; > + else > + base_addr = virtio_pci__mmio_addr(vpci); > > if (!is_write) > - virtio_pci__data_in(vcpu, vdev, addr - mmio_addr, data, len); > + virtio_pci__data_in(vcpu, vdev, addr - base_addr, data, len); > else > - virtio_pci__data_out(vcpu, vdev, addr - mmio_addr, data, len); > + virtio_pci__data_out(vcpu, vdev, addr - base_addr, data, len); > } > > static int virtio_pci__bar_activate(struct kvm *kvm, > @@ -478,10 +462,8 @@ static int virtio_pci__bar_activate(struct kvm *kvm, > > switch (bar_num) { > case 0: > - r = ioport__register(kvm, bar_addr, &virtio_pci__io_ops, > - bar_size, vdev); > - if (r > 0) > - r = 0; > + r = kvm__register_pio(kvm, bar_addr, bar_size, > + virtio_pci__io_mmio_callback, vdev); > break; > case 1: > r = kvm__register_mmio(kvm, bar_addr, bar_size, false, > @@ -510,7 +492,7 @@ static int virtio_pci__bar_deactivate(struct kvm *kvm, > > switch (bar_num) { > case 0: > - r = ioport__unregister(kvm, bar_addr); > + r = kvm__deregister_pio(kvm, bar_addr); > break; > case 1: > case 2: > @@ -625,7 +607,7 @@ int virtio_pci__exit(struct kvm *kvm, struct virtio_device *vdev) > virtio_pci__reset(kvm, vdev); > kvm__deregister_mmio(kvm, virtio_pci__mmio_addr(vpci)); > kvm__deregister_mmio(kvm, virtio_pci__msix_io_addr(vpci)); > - ioport__unregister(kvm, virtio_pci__port_addr(vpci)); > + kvm__deregister_pio(kvm, virtio_pci__port_addr(vpci)); > > return 0; > } 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 CB246C433DB for ; Tue, 9 Mar 2021 14:43:35 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 1E0E364EEE for ; Tue, 9 Mar 2021 14:43:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E0E364EEE 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 7D0254A32E; Tue, 9 Mar 2021 09:43:34 -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 FkXpwNVWLHx0; Tue, 9 Mar 2021 09:43:30 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id B840B4A523; Tue, 9 Mar 2021 09:43:30 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 820EF4A3A3 for ; Tue, 9 Mar 2021 09:43:29 -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 itknNcV0f3uN for ; Tue, 9 Mar 2021 09:43:25 -0500 (EST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 3BB0A4A32E for ; Tue, 9 Mar 2021 09:43:25 -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 B3A3D31B; Tue, 9 Mar 2021 06:43:24 -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 B64B93F71B; Tue, 9 Mar 2021 06:43:23 -0800 (PST) Subject: Re: [PATCH kvmtool v2 17/22] virtio: Switch trap handling to use MMIO handler To: Andre Przywara , Will Deacon , Julien Thierry References: <20210225005915.26423-1-andre.przywara@arm.com> <20210225005915.26423-18-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Tue, 9 Mar 2021 14:43:28 +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-18-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 existing MMIO callback routine to automatically determine > the region this trap came through, and call the existing I/O handlers. > Register the ioport region using the new registration function. Looks good to me: Reviewed-by: Alexandru Elisei Thanks, Alex > > Signed-off-by: Andre Przywara > --- > virtio/pci.c | 46 ++++++++++++++-------------------------------- > 1 file changed, 14 insertions(+), 32 deletions(-) > > diff --git a/virtio/pci.c b/virtio/pci.c > index 6eea6c68..eb91f512 100644 > --- a/virtio/pci.c > +++ b/virtio/pci.c > @@ -178,15 +178,6 @@ static bool virtio_pci__data_in(struct kvm_cpu *vcpu, struct virtio_device *vdev > return ret; > } > > -static bool virtio_pci__io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - struct virtio_device *vdev = ioport->priv; > - struct virtio_pci *vpci = vdev->virtio; > - unsigned long offset = port - virtio_pci__port_addr(vpci); > - > - return virtio_pci__data_in(vcpu, vdev, offset, data, size); > -} > - > static void update_msix_map(struct virtio_pci *vpci, > struct msix_table *msix_entry, u32 vecnum) > { > @@ -334,20 +325,6 @@ static bool virtio_pci__data_out(struct kvm_cpu *vcpu, struct virtio_device *vde > return ret; > } > > -static bool virtio_pci__io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > -{ > - struct virtio_device *vdev = ioport->priv; > - struct virtio_pci *vpci = vdev->virtio; > - unsigned long offset = port - virtio_pci__port_addr(vpci); > - > - return virtio_pci__data_out(vcpu, vdev, offset, data, size); > -} > - > -static struct ioport_operations virtio_pci__io_ops = { > - .io_in = virtio_pci__io_in, > - .io_out = virtio_pci__io_out, > -}; > - > static void virtio_pci__msix_mmio_callback(struct kvm_cpu *vcpu, > u64 addr, u8 *data, u32 len, > u8 is_write, void *ptr) > @@ -455,12 +432,19 @@ static void virtio_pci__io_mmio_callback(struct kvm_cpu *vcpu, > { > struct virtio_device *vdev = ptr; > struct virtio_pci *vpci = vdev->virtio; > - u32 mmio_addr = virtio_pci__mmio_addr(vpci); > + u32 ioport_addr = virtio_pci__port_addr(vpci); > + u32 base_addr; > + > + if (addr >= ioport_addr && > + addr < ioport_addr + pci__bar_size(&vpci->pci_hdr, 0)) > + base_addr = ioport_addr; > + else > + base_addr = virtio_pci__mmio_addr(vpci); > > if (!is_write) > - virtio_pci__data_in(vcpu, vdev, addr - mmio_addr, data, len); > + virtio_pci__data_in(vcpu, vdev, addr - base_addr, data, len); > else > - virtio_pci__data_out(vcpu, vdev, addr - mmio_addr, data, len); > + virtio_pci__data_out(vcpu, vdev, addr - base_addr, data, len); > } > > static int virtio_pci__bar_activate(struct kvm *kvm, > @@ -478,10 +462,8 @@ static int virtio_pci__bar_activate(struct kvm *kvm, > > switch (bar_num) { > case 0: > - r = ioport__register(kvm, bar_addr, &virtio_pci__io_ops, > - bar_size, vdev); > - if (r > 0) > - r = 0; > + r = kvm__register_pio(kvm, bar_addr, bar_size, > + virtio_pci__io_mmio_callback, vdev); > break; > case 1: > r = kvm__register_mmio(kvm, bar_addr, bar_size, false, > @@ -510,7 +492,7 @@ static int virtio_pci__bar_deactivate(struct kvm *kvm, > > switch (bar_num) { > case 0: > - r = ioport__unregister(kvm, bar_addr); > + r = kvm__deregister_pio(kvm, bar_addr); > break; > case 1: > case 2: > @@ -625,7 +607,7 @@ int virtio_pci__exit(struct kvm *kvm, struct virtio_device *vdev) > virtio_pci__reset(kvm, vdev); > kvm__deregister_mmio(kvm, virtio_pci__mmio_addr(vpci)); > kvm__deregister_mmio(kvm, virtio_pci__msix_io_addr(vpci)); > - ioport__unregister(kvm, virtio_pci__port_addr(vpci)); > + kvm__deregister_pio(kvm, virtio_pci__port_addr(vpci)); > > return 0; > } _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm