From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id C8AF21A06F8 for ; Wed, 1 Apr 2015 10:29:16 +1100 (AEDT) Received: from e23smtp02.au.ibm.com (e23smtp02.au.ibm.com [202.81.31.144]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2961314012F for ; Wed, 1 Apr 2015 10:29:16 +1100 (AEDT) Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 1 Apr 2015 09:29:14 +1000 Received: from d23relay09.au.ibm.com (d23relay09.au.ibm.com [9.185.63.181]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 9E0462BB0047 for ; Wed, 1 Apr 2015 10:29:09 +1100 (EST) Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay09.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t2VNT1MM29884548 for ; Wed, 1 Apr 2015 10:29:09 +1100 Received: from d23av03.au.ibm.com (localhost [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t2VNSZnl004366 for ; Wed, 1 Apr 2015 10:28:36 +1100 Date: Wed, 1 Apr 2015 10:28:11 +1100 From: Gavin Shan To: Alex Williamson Subject: Re: [PATCH v5 3/3] drivers/vfio: Support EEH error injection Message-ID: <20150331232811.GB14672@shangw> Reply-To: Gavin Shan References: <1427348529-7060-1-git-send-email-gwshan@linux.vnet.ibm.com> <1427348529-7060-4-git-send-email-gwshan@linux.vnet.ibm.com> <1427829206.5567.184.camel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1427829206.5567.184.camel@redhat.com> Cc: linuxppc-dev@ozlabs.org, agraf@suse.de, Gavin Shan , kvm@vger.kernel.org, david@gibson.dropbear.id.au List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Tue, Mar 31, 2015 at 01:13:26PM -0600, Alex Williamson wrote: >On Thu, 2015-03-26 at 16:42 +1100, Gavin Shan wrote: >> The patch adds one more EEH sub-command (VFIO_EEH_PE_INJECT_ERR) >> to inject the specified EEH error, which is represented by >> (struct vfio_eeh_pe_err), to the indicated PE for testing purpose. >> >> Signed-off-by: Gavin Shan >> Reviewed-by: David Gibson >> --- >> Documentation/vfio.txt | 12 ++++++++++++ >> drivers/vfio/vfio_spapr_eeh.c | 10 ++++++++++ >> include/uapi/linux/vfio.h | 14 +++++++++++++- >> 3 files changed, 35 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt >> index 96978ec..4c746a7 100644 >> --- a/Documentation/vfio.txt >> +++ b/Documentation/vfio.txt >> @@ -385,6 +385,18 @@ The code flow from the example above should be slightly changed: >> >> .... >> >> + /* Inject EEH error, which is expected to be caused by 32-bits >> + * config load. >> + */ >> + pe_op.op = VFIO_EEH_PE_INJECT_ERR; >> + pe_op.err.type = EEH_ERR_TYPE_32; >> + pe_op.err.func = EEH_ERR_FUNC_LD_CFG_ADDR; >> + pe_op.err.addr = 0ul; >> + pe_op.err.mask = 0ul; >> + ioctl(container, VFIO_EEH_PE_OP, &pe_op); >> + >> + .... >> + >> /* When 0xFF's returned from reading PCI config space or IO BARs >> * of the PCI device. Check the PE's state to see if that has been >> * frozen. >> diff --git a/drivers/vfio/vfio_spapr_eeh.c b/drivers/vfio/vfio_spapr_eeh.c >> index 5fa42db..38edeb4 100644 >> --- a/drivers/vfio/vfio_spapr_eeh.c >> +++ b/drivers/vfio/vfio_spapr_eeh.c >> @@ -85,6 +85,16 @@ long vfio_spapr_iommu_eeh_ioctl(struct iommu_group *group, >> case VFIO_EEH_PE_CONFIGURE: >> ret = eeh_pe_configure(pe); >> break; >> + case VFIO_EEH_PE_INJECT_ERR: >> + minsz = offsetofend(struct vfio_eeh_pe_op, err.mask); >> + if (op.argsz < minsz) >> + return -EINVAL; >> + if (copy_from_user(&op, (void __user *)arg, minsz)) >> + return -EFAULT; >> + >> + ret = eeh_pe_inject_err(pe, op.err.type, op.err.func, >> + op.err.addr, op.err.mask); >> + break; >> default: >> ret = -EINVAL; >> } >> diff --git a/include/uapi/linux/vfio.h b/include/uapi/linux/vfio.h >> index 82889c3..d81c17f 100644 >> --- a/include/uapi/linux/vfio.h >> +++ b/include/uapi/linux/vfio.h >> @@ -468,12 +468,23 @@ struct vfio_iommu_spapr_tce_info { >> * - unfreeze IO/DMA for frozen PE; >> * - read PE state; >> * - reset PE; >> - * - configure PE. >> + * - configure PE; >> + * - inject EEH error. >> */ >> +struct vfio_eeh_pe_err { >> + __u32 type; >> + __u32 func; >> + __u64 addr; >> + __u64 mask; >> +}; >> + >> struct vfio_eeh_pe_op { >> __u32 argsz; >> __u32 flags; >> __u32 op; >> + union { >> + struct vfio_eeh_pe_err err; >> + }; >> }; >> >> #define VFIO_EEH_PE_DISABLE 0 /* Disable EEH functionality */ >> @@ -490,6 +501,7 @@ struct vfio_eeh_pe_op { >> #define VFIO_EEH_PE_RESET_HOT 6 /* Assert hot reset */ >> #define VFIO_EEH_PE_RESET_FUNDAMENTAL 7 /* Assert fundamental reset */ >> #define VFIO_EEH_PE_CONFIGURE 8 /* PE configuration */ >> +#define VFIO_EEH_PE_INJECT_ERR 9 /* Inject EEH error */ >> >> #define VFIO_EEH_PE_OP _IO(VFIO_TYPE, VFIO_BASE + 21) >> > >I assume you want this to go in through the PPC tree, so > >Acked-by: Alex Williamson > Thanks, Alex.W. Yes, It can go via PPC tree. Thanks, Gavin