From: Alexandru Elisei <alexandru.elisei@arm.com>
To: Andre Przywara <andre.przywara@arm.com>,
Will Deacon <will@kernel.org>,
Julien Thierry <julien.thierry.kdev@gmail.com>
Cc: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org,
Marc Zyngier <maz@kernel.org>
Subject: Re: [PATCH kvmtool 18/21] pci: Switch trap handling to use MMIO handler
Date: Wed, 17 Feb 2021 15:14:59 +0000 [thread overview]
Message-ID: <eb1c56ad-8842-2d39-032e-dc018aa96a27@arm.com> (raw)
In-Reply-To: <20201210142908.169597-19-andre.przywara@arm.com>
Hi Andre,
On 12/10/20 2:29 PM, 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.
>
> Merge the existing _in and _out handlers to adhere to that MMIO
> interface, and register these using the new registration function.
>
> Signed-off-by: Andre Przywara <andre.przywara@arm.com>
It looks like there's no change in functionality, the patch looks correct to me:
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Thanks,
Alex
> ---
> pci.c | 82 +++++++++++++++++------------------------------------------
> 1 file changed, 24 insertions(+), 58 deletions(-)
>
> diff --git a/pci.c b/pci.c
> index 2e2c0270..d6da79e0 100644
> --- a/pci.c
> +++ b/pci.c
> @@ -87,29 +87,16 @@ static void *pci_config_address_ptr(u16 port)
> return base + offset;
> }
>
> -static bool pci_config_address_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> +static void pci_config_address_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data,
> + u32 len, u8 is_write, void *ptr)
> {
> - void *p = pci_config_address_ptr(port);
> + void *p = pci_config_address_ptr(addr);
>
> - memcpy(p, data, size);
> -
> - return true;
> -}
> -
> -static bool pci_config_address_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> -{
> - void *p = pci_config_address_ptr(port);
> -
> - memcpy(data, p, size);
> -
> - return true;
> + if (is_write)
> + memcpy(p, data, len);
> + else
> + memcpy(data, p, len);
> }
> -
> -static struct ioport_operations pci_config_address_ops = {
> - .io_in = pci_config_address_in,
> - .io_out = pci_config_address_out,
> -};
> -
> static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_number)
> {
> union pci_config_address pci_config_address;
> @@ -125,49 +112,27 @@ static bool pci_device_exists(u8 bus_number, u8 device_number, u8 function_numbe
> return !IS_ERR_OR_NULL(device__find_dev(DEVICE_BUS_PCI, device_number));
> }
>
> -static bool pci_config_data_out(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> -{
> - union pci_config_address pci_config_address;
> -
> - if (size > 4)
> - size = 4;
> -
> - pci_config_address.w = ioport__read32(&pci_config_address_bits);
> - /*
> - * If someone accesses PCI configuration space offsets that are not
> - * aligned to 4 bytes, it uses ioports to signify that.
> - */
> - pci_config_address.reg_offset = port - PCI_CONFIG_DATA;
> -
> - pci__config_wr(vcpu->kvm, pci_config_address, data, size);
> -
> - return true;
> -}
> -
> -static bool pci_config_data_in(struct ioport *ioport, struct kvm_cpu *vcpu, u16 port, void *data, int size)
> +static void pci_config_data_mmio(struct kvm_cpu *vcpu, u64 addr, u8 *data,
> + u32 len, u8 is_write, void *kvm)
> {
> union pci_config_address pci_config_address;
>
> - if (size > 4)
> - size = 4;
> + if (len > 4)
> + len = 4;
>
> pci_config_address.w = ioport__read32(&pci_config_address_bits);
> /*
> * If someone accesses PCI configuration space offsets that are not
> * aligned to 4 bytes, it uses ioports to signify that.
> */
> - pci_config_address.reg_offset = port - PCI_CONFIG_DATA;
> + pci_config_address.reg_offset = addr - PCI_CONFIG_DATA;
>
> - pci__config_rd(vcpu->kvm, pci_config_address, data, size);
> -
> - return true;
> + if (is_write)
> + pci__config_wr(vcpu->kvm, pci_config_address, data, len);
> + else
> + pci__config_rd(vcpu->kvm, pci_config_address, data, len);
> }
>
> -static struct ioport_operations pci_config_data_ops = {
> - .io_in = pci_config_data_in,
> - .io_out = pci_config_data_out,
> -};
> -
> static int pci_activate_bar(struct kvm *kvm, struct pci_device_header *pci_hdr,
> int bar_num)
> {
> @@ -512,11 +477,12 @@ int pci__init(struct kvm *kvm)
> {
> int r;
>
> - r = ioport__register(kvm, PCI_CONFIG_DATA + 0, &pci_config_data_ops, 4, NULL);
> + r = kvm__register_pio(kvm, PCI_CONFIG_DATA, 4,
> + pci_config_data_mmio, NULL);
> if (r < 0)
> return r;
> -
> - r = ioport__register(kvm, PCI_CONFIG_ADDRESS + 0, &pci_config_address_ops, 4, NULL);
> + r = kvm__register_pio(kvm, PCI_CONFIG_ADDRESS, 4,
> + pci_config_address_mmio, NULL);
> if (r < 0)
> goto err_unregister_data;
>
> @@ -528,17 +494,17 @@ int pci__init(struct kvm *kvm)
> return 0;
>
> err_unregister_addr:
> - ioport__unregister(kvm, PCI_CONFIG_ADDRESS);
> + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS);
> err_unregister_data:
> - ioport__unregister(kvm, PCI_CONFIG_DATA);
> + kvm__deregister_pio(kvm, PCI_CONFIG_DATA);
> return r;
> }
> dev_base_init(pci__init);
>
> int pci__exit(struct kvm *kvm)
> {
> - ioport__unregister(kvm, PCI_CONFIG_DATA);
> - ioport__unregister(kvm, PCI_CONFIG_ADDRESS);
> + kvm__deregister_pio(kvm, PCI_CONFIG_DATA);
> + kvm__deregister_pio(kvm, PCI_CONFIG_ADDRESS);
>
> return 0;
> }
next prev parent reply other threads:[~2021-02-17 15:29 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-10 14:28 [PATCH kvmtool 00/21] Unify I/O port and MMIO trap handling Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 01/21] ioport: Remove ioport__setup_arch() Andre Przywara
2021-02-10 17:44 ` Alexandru Elisei
2021-02-11 17:16 ` Andre Przywara
2021-02-11 17:32 ` Alexandru Elisei
2021-02-17 16:46 ` Andre Przywara
2021-02-22 10:23 ` Andre Przywara
2021-02-22 15:01 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 02/21] hw/serial: Use device abstraction for FDT generator function Andre Przywara
2021-02-11 12:05 ` Alexandru Elisei
2021-02-11 17:45 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 03/21] ioport: Retire .generate_fdt_node functionality Andre Przywara
2021-02-11 14:05 ` Alexandru Elisei
2021-02-17 15:54 ` Andre Przywara
2021-02-17 16:06 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 04/21] mmio: Extend handling to include ioport emulation Andre Przywara
2021-02-11 16:10 ` Alexandru Elisei
2021-02-17 17:43 ` Andre Przywara
2021-02-22 15:50 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 05/21] hw/i8042: Clean up data types Andre Przywara
2021-02-11 16:55 ` Alexandru Elisei
2021-02-17 17:46 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 06/21] hw/i8042: Refactor trap handler Andre Przywara
2021-02-11 17:23 ` Alexandru Elisei
2021-02-18 10:34 ` Andre Przywara
2021-02-18 11:17 ` Alexandru Elisei
2021-02-18 11:48 ` Andre Przywara
2021-02-22 16:03 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 07/21] hw/i8042: Switch to new trap handlers Andre Przywara
2021-02-12 10:41 ` Alexandru Elisei
2021-02-18 12:09 ` Andre Przywara
2021-02-22 16:19 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 08/21] x86/ioport: Refactor " Andre Przywara
2021-02-12 11:14 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 09/21] x86/ioport: Switch to new " Andre Przywara
2021-02-12 11:27 ` Alexandru Elisei
2021-02-18 14:05 ` Andre Przywara
2020-12-10 14:28 ` [PATCH kvmtool 10/21] hw/rtc: Refactor " Andre Przywara
2021-02-12 11:56 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 11/21] hw/rtc: Switch to new trap handler Andre Przywara
2021-02-12 12:02 ` Alexandru Elisei
2020-12-10 14:28 ` [PATCH kvmtool 12/21] hw/vesa: Switch trap handling to use MMIO handler Andre Przywara
2021-02-12 17:50 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 13/21] hw/serial: Refactor trap handler Andre Przywara
2021-02-16 14:22 ` Alexandru Elisei
2021-02-18 14:41 ` Andre Przywara
2021-02-22 17:40 ` Alexandru Elisei
2021-02-24 14:54 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 14/21] hw/serial: Switch to new trap handlers Andre Przywara
2021-02-16 14:31 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 15/21] vfio: Refactor ioport trap handler Andre Przywara
2021-02-16 14:47 ` Alexandru Elisei
2021-02-18 15:51 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 16/21] vfio: Switch to new ioport trap handlers Andre Przywara
2021-02-16 14:52 ` Alexandru Elisei
2020-12-10 14:29 ` [PATCH kvmtool 17/21] virtio: Switch trap handling to use MMIO handler Andre Przywara
2021-02-16 17:03 ` Alexandru Elisei
2021-02-18 16:13 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 18/21] pci: " Andre Przywara
2021-02-17 15:14 ` Alexandru Elisei [this message]
2020-12-10 14:29 ` [PATCH kvmtool 19/21] Remove ioport specific routines Andre Przywara
2021-02-17 15:49 ` Alexandru Elisei
2021-02-17 16:11 ` Alexandru Elisei
2021-02-18 16:34 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 20/21] hw/serial: ARM/arm64: Use MMIO at higher addresses Andre Przywara
2021-02-17 16:48 ` Alexandru Elisei
2021-02-18 12:18 ` Alexandru Elisei
2021-02-18 16:38 ` Andre Przywara
2020-12-10 14:29 ` [PATCH kvmtool 21/21] hw/rtc: " Andre Przywara
2021-02-18 13:33 ` Alexandru Elisei
2021-02-18 16:41 ` Andre Przywara
2021-02-10 17:44 ` [PATCH kvmtool 00/21] Unify I/O port and MMIO trap handling Alexandru Elisei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eb1c56ad-8842-2d39-032e-dc018aa96a27@arm.com \
--to=alexandru.elisei@arm.com \
--cc=andre.przywara@arm.com \
--cc=julien.thierry.kdev@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=maz@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).