From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: P J P <ppandit@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: "Prasad J Pandit" <pjp@fedoraproject.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Li Qiang" <liq3ea@gmail.com>,
"QEMU Developers" <qemu-devel@nongnu.org>,
"Lei Sun" <slei.casper@gmail.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: Re: [PATCH v4 6/9] spapr_pci: add spapr msi read method
Date: Tue, 11 Aug 2020 16:07:59 +0200 [thread overview]
Message-ID: <9da90cfa-71d3-b7cd-5e5b-a19db72fc405@redhat.com> (raw)
In-Reply-To: <20200811114133.672647-7-ppandit@redhat.com>
Cc'ing PCI maintainers
On 8/11/20 1:41 PM, P J P wrote:
> From: Prasad J Pandit <pjp@fedoraproject.org>
>
> Add spapr msi mmio read method to avoid NULL pointer dereference
> issue.
>
> Reported-by: Lei Sun <slei.casper@gmail.com>
> Acked-by: David Gibson <david@gibson.dropbear.id.au>
> Reviewed-by: Li Qiang <liq3ea@gmail.com>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/ppc/spapr_pci.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> Update v4: fix multi-line comment and log guest_error
> -> https://lists.nongnu.org/archive/html/qemu-devel/2020-07/msg05311.html
>
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 363cdb3f7b..53dfd3d8c6 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -52,6 +52,7 @@
> #include "sysemu/kvm.h"
> #include "sysemu/hostmem.h"
> #include "sysemu/numa.h"
> +#include "qemu/log.h"
>
> /* Copied from the kernel arch/powerpc/platforms/pseries/msi.c */
> #define RTAS_QUERY_FN 0
> @@ -738,6 +739,12 @@ static PCIINTxRoute spapr_route_intx_pin_to_irq(void *opaque, int pin)
> return route;
> }
>
> +static uint64_t spapr_msi_read(void *opaque, hwaddr addr, unsigned size)
> +{
> + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid access\n", __func__);
> + return 0;
> +}
> +
> /*
> * MSI/MSIX memory region implementation.
> * The handler handles both MSI and MSIX.
> @@ -755,8 +762,11 @@ static void spapr_msi_write(void *opaque, hwaddr addr,
> }
>
> static const MemoryRegionOps spapr_msi_ops = {
> - /* There is no .read as the read result is undefined by PCI spec */
> - .read = NULL,
> + /*
> + * .read result is undefined by PCI spec.
> + * define .read method to avoid assert failure in memory_region_init_io
> + */
> + .read = spapr_msi_read,
Shouldn't this be a read_with_attrs handler returning MEMTX_ERROR
instead? Maybe we need another MemTxResult which does not yet exist.
> .write = spapr_msi_write,
> .endianness = DEVICE_LITTLE_ENDIAN
> };
>
next prev parent reply other threads:[~2020-08-11 14:09 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-11 11:41 [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks P J P
2020-08-11 11:41 ` [PATCH v4 1/9] hw/pci-host: add pci-intack write method P J P
2020-08-11 11:41 ` [PATCH v4 2/9] pci-host: designware: add pcie-msi read method P J P
2020-08-11 11:41 ` [PATCH v4 3/9] vfio: add quirk device write method P J P
2020-08-11 11:41 ` [PATCH v4 4/9] prep: add ppc-parity " P J P
2020-08-11 15:48 ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 5/9] nvram: add nrf51_soc flash read method P J P
2020-08-11 15:42 ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 6/9] spapr_pci: add spapr msi " P J P
2020-08-11 14:07 ` Philippe Mathieu-Daudé [this message]
2020-08-11 17:04 ` P J P
2020-08-11 11:41 ` [PATCH v4 7/9] tz-ppc: add dummy read/write methods P J P
2020-08-11 15:39 ` Li Qiang
2020-08-11 11:41 ` [PATCH v4 8/9] imx7-ccm: add digprog mmio write method P J P
2020-08-11 11:41 ` [PATCH v4 9/9] memory: assert MemoryRegionOps callbacks are defined P J P
2020-09-16 14:17 ` Philippe Mathieu-Daudé
2020-09-30 6:05 ` P J P
2020-08-13 6:36 ` [PATCH v4 0/9] memory: assert and define MemoryRegionOps callbacks David Gibson
2020-08-13 13:43 ` P J P
2020-08-13 15:01 ` Philippe Mathieu-Daudé
2020-08-16 16:27 ` Philippe Mathieu-Daudé
2020-08-17 5:02 ` P J P
2020-08-17 5:26 ` Philippe Mathieu-Daudé
2020-08-17 17:38 ` P J P
2020-08-27 12:08 ` P J P
2020-09-03 18:36 ` P J P
2020-09-15 13:33 ` P J P
2020-11-25 13:50 ` P J P
2021-02-02 16:40 ` Paolo Bonzini
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=9da90cfa-71d3-b7cd-5e5b-a19db72fc405@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=liq3ea@gmail.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=pjp@fedoraproject.org \
--cc=ppandit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=slei.casper@gmail.com \
/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).