From: Gavin Shan <gwshan@linux.vnet.ibm.com>
To: David Gibson <david@gibson.dropbear.id.au>
Cc: qemu-devel@nongnu.org, aik@ozlabs.ru, agraf@suse.de,
Gavin Shan <gwshan@linux.vnet.ibm.com>,
alex.williamson@redhat.com, qemu-ppc@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v15 2/2] sPAPR: Implement sPAPRPHBClass::eeh_handler
Date: Thu, 15 Jan 2015 11:25:58 +1100 [thread overview]
Message-ID: <20150115002558.GB18267@shangw> (raw)
In-Reply-To: <20150114014159.GR3654@voom.BigPond>
On Wed, Jan 14, 2015 at 12:41:59PM +1100, David Gibson wrote:
>On Mon, Jan 05, 2015 at 11:26:28AM +1100, Gavin Shan wrote:
>> The patch implements sPAPRPHBClass::eeh_handler so that the
>> EEH RTAS requests can be routed to VFIO for further handling.
>>
>> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
>> ---
>> hw/ppc/spapr_pci_vfio.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++
>> hw/vfio/common.c | 1 +
>> 2 files changed, 57 insertions(+)
>>
>> diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
>> index 144912b..73652a9 100644
>> --- a/hw/ppc/spapr_pci_vfio.c
>> +++ b/hw/ppc/spapr_pci_vfio.c
>> @@ -71,6 +71,61 @@ static void spapr_phb_vfio_finish_realize(sPAPRPHBState *sphb, Error **errp)
>> spapr_tce_get_iommu(tcet));
>> }
>>
>> +static int spapr_phb_vfio_eeh_handler(sPAPRPHBState *sphb, int req, int opt)
>> +{
>> + sPAPRPHBVFIOState *svphb = SPAPR_PCI_VFIO_HOST_BRIDGE(sphb);
>> + struct vfio_eeh_pe_op op = { .argsz = sizeof(op) };
>
>This is a local variable, which means it won't be initialized. You
>never memset() it and it's not obvious that all fields get
>initialized, which makes it dangerous to pass to an ioctl().
>
Yeah, we might get uncertain "flags" passed to ioctl(). I'll change the
code like this if you agree:
struct vfio_eeh_pe_op op;
memset(&op, 0, sizeof(op));
op.argsz = sizeof(op);
>> + int cmd;
>> +
>> + switch (req) {
>> + case RTAS_EEH_REQ_SET_OPTION:
>> + switch (opt) {
>> + case RTAS_EEH_DISABLE:
>> + cmd = VFIO_EEH_PE_DISABLE;
>> + break;
>> + case RTAS_EEH_ENABLE:
>> + cmd = VFIO_EEH_PE_ENABLE;
>> + break;
>> + case RTAS_EEH_THAW_IO:
>> + cmd = VFIO_EEH_PE_UNFREEZE_IO;
>> + break;
>> + case RTAS_EEH_THAW_DMA:
>> + cmd = VFIO_EEH_PE_UNFREEZE_DMA;
>> + break;
>> + default:
>> + return -EINVAL;
>> + }
>> + break;
>> + case RTAS_EEH_REQ_GET_STATE:
>> + cmd = VFIO_EEH_PE_GET_STATE;
>> + break;
>> + case RTAS_EEH_REQ_RESET:
>> + switch (opt) {
>> + case RTAS_SLOT_RESET_DEACTIVATE:
>> + cmd = VFIO_EEH_PE_RESET_DEACTIVATE;
>> + break;
>> + case RTAS_SLOT_RESET_HOT:
>> + cmd = VFIO_EEH_PE_RESET_HOT;
>> + break;
>> + case RTAS_SLOT_RESET_FUNDAMENTAL:
>> + cmd = VFIO_EEH_PE_RESET_FUNDAMENTAL;
>> + break;
>> + default:
>> + return -EINVAL;
>> + }
>> + break;
>> + case RTAS_EEH_REQ_CONFIGURE:
>> + cmd = VFIO_EEH_PE_CONFIGURE;
>> + break;
>> + default:
>> + return -EINVAL;
>> + }
>> +
>> + op.op = cmd;
>> + return vfio_container_ioctl(&svphb->phb.iommu_as, svphb->iommugroupid,
>> + VFIO_EEH_PE_OP, &op);
>
>Don't you need some sort of translation from the errnos the ioctl()
>returns into RTAS error codes?
>
Currently, errors from ioctl() is simply translated to RTAS_OUT_HW_ERROR if
the RTAS call supports it. Otherwise, RTAS_OUT_PARAM_ERROR will be returned.
Thanks,
Gavin
>> +}
>> +
>> static void spapr_phb_vfio_reset(DeviceState *qdev)
>> {
>> /* Do nothing */
>> @@ -84,6 +139,7 @@ static void spapr_phb_vfio_class_init(ObjectClass *klass, void *data)
>> dc->props = spapr_phb_vfio_properties;
>> dc->reset = spapr_phb_vfio_reset;
>> spc->finish_realize = spapr_phb_vfio_finish_realize;
>> + spc->eeh_handler = spapr_phb_vfio_eeh_handler;
>> }
>>
>> static const TypeInfo spapr_phb_vfio_info = {
>> diff --git a/hw/vfio/common.c b/hw/vfio/common.c
>> index cf483ff..8a10c8b 100644
>> --- a/hw/vfio/common.c
>> +++ b/hw/vfio/common.c
>> @@ -948,6 +948,7 @@ int vfio_container_ioctl(AddressSpace *as, int32_t groupid,
>> switch (req) {
>> case VFIO_CHECK_EXTENSION:
>> case VFIO_IOMMU_SPAPR_TCE_GET_INFO:
>> + case VFIO_EEH_PE_OP:
>> break;
>> default:
>> /* Return an error on unknown requests */
>
>--
>David Gibson | I'll have my music baroque, and my code
>david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
> | _way_ _around_!
>http://www.ozlabs.org/~dgibson
next prev parent reply other threads:[~2015-01-15 0:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-05 0:26 [Qemu-devel] [PATCH v15 0/2] EEH Support for VFIO Devices Gavin Shan
2015-01-05 0:26 ` [Qemu-devel] [PATCH v15 1/2] sPAPR: Implement EEH RTAS calls Gavin Shan
2015-01-14 1:39 ` David Gibson
2015-01-15 0:14 ` Gavin Shan
2015-01-15 1:33 ` David Gibson
2015-01-15 3:21 ` Gavin Shan
2015-01-05 0:26 ` [Qemu-devel] [PATCH v15 2/2] sPAPR: Implement sPAPRPHBClass::eeh_handler Gavin Shan
2015-01-14 1:41 ` David Gibson
2015-01-15 0:25 ` Gavin Shan [this message]
2015-02-04 13:42 ` Alexander Graf
2015-02-04 13:44 ` David Gibson
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=20150115002558.GB18267@shangw \
--to=gwshan@linux.vnet.ibm.com \
--cc=agraf@suse.de \
--cc=aik@ozlabs.ru \
--cc=alex.williamson@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.