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 AA3CAC433E0 for ; Tue, 9 Mar 2021 11:50:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6BCE065259 for ; Tue, 9 Mar 2021 11:50:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230047AbhCILtb (ORCPT ); Tue, 9 Mar 2021 06:49:31 -0500 Received: from foss.arm.com ([217.140.110.172]:51944 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbhCILt1 (ORCPT ); Tue, 9 Mar 2021 06:49:27 -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 4B2711042; Tue, 9 Mar 2021 03:49:27 -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 4DAD73F70D; Tue, 9 Mar 2021 03:49:26 -0800 (PST) Subject: Re: [PATCH kvmtool v2 08/22] x86/ioport: Refactor trap handlers 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-9-andre.przywara@arm.com> From: Alexandru Elisei Message-ID: Date: Tue, 9 Mar 2021 11:49:47 +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-9-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, Regarding the naming of the functions, these are real ioport emulation functions, which are executed because a KVM_EXIT_IO exit reason from KVM_RUN. Wouldn't naming the functions something like *_pio or *_io be more appropriate? Thanks, Alex On 2/25/21 12:59 AM, Andre Przywara wrote: > With the planned retirement of the special ioport emulation code, we > need to provide emulation functions compatible with the MMIO > prototype. > > Adjust the trap handlers to use that new function, and provide shims to > implement the old ioport interface, for now. > > Signed-off-by: Andre Przywara > Reviewed-by: Alexandru Elisei > --- > x86/ioport.c | 30 ++++++++++++++++++++++++++---- > 1 file changed, 26 insertions(+), 4 deletions(-) > > diff --git a/x86/ioport.c b/x86/ioport.c > index a8d2bb1a..78f9a863 100644 > --- a/x86/ioport.c > +++ b/x86/ioport.c > @@ -3,8 +3,14 @@ > #include > #include > > +static void dummy_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > +{ > +} > + > static bool debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, true, NULL); > return 0; > } > > @@ -12,15 +18,23 @@ static struct ioport_operations debug_ops = { > .io_out = debug_io_out, > }; > > -static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void seabios_debug_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, > + u32 len, u8 is_write, void *ptr) > { > char ch; > > + if (!is_write) > + return; > + > ch = ioport__read8(data); > > putchar(ch); > +} > > - return true; > +static bool seabios_debug_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +{ > + seabios_debug_mmio(vcpu, port, data, size, true, NULL); > + return 0; > } > > static struct ioport_operations seabios_debug_ops = { > @@ -29,11 +43,13 @@ static struct ioport_operations seabios_debug_ops = { > > static bool dummy_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, false, NULL); > return true; > } > > static bool dummy_io_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > { > + dummy_mmio(vcpu, port, data, size, true, NULL); > return true; > } > > @@ -50,13 +66,19 @@ static struct ioport_operations dummy_write_only_ioport_ops = { > * The "fast A20 gate" > */ > > -static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +static void ps2_control_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data, u32 len, > + u8 is_write, void *ptr) > { > /* > * A20 is always enabled. > */ > - ioport__write8(data, 0x02); > + if (!is_write) > + ioport__write8(data, 0x02); > +} > > +static bool ps2_control_a_io_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size) > +{ > + ps2_control_mmio(vcpu, port, data, size, false, NULL); > return true; > } >