From: "Jan Beulich" <JBeulich@suse.com>
To: Quan Xu <quan.xu@intel.com>
Cc: Kevin Tian <kevin.tian@intel.com>,
Stefano Stabellini <sstabellini@kernel.org>,
Feng Wu <feng.wu@intel.com>,
Liu Jinsong <jinsong.liu@alibaba-inc.com>,
dario.faggioli@citrix.com, xen-devel@lists.xen.org,
Julien Grall <julien.grall@arm.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>
Subject: Re: [Patch v6 07/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU suspending (top level ones)
Date: Wed, 01 Jun 2016 04:39:08 -0600 [thread overview]
Message-ID: <574ED76C02000078000F055B@prv-mh.provo.novell.com> (raw)
In-Reply-To: <1464703056-4741-8-git-send-email-quan.xu@intel.com>
>>> On 31.05.16 at 15:57, <quan.xu@intel.com> wrote:
> static int device_power_down(void)
> {
> - console_suspend();
> + if ( console_suspend() )
> + return SAVED_NONE;
>
> - time_suspend();
> + if ( time_suspend() )
> + return SAVED_CONSOLE;
>
> - i8259A_suspend();
> + if ( i8259A_suspend() )
> + return SAVED_TIME;
>
> + /* ioapic_suspend cannot fail */
> ioapic_suspend();
>
> - iommu_suspend();
> + if ( iommu_suspend() )
> + return SAVED_IOAPIC;
>
> - lapic_suspend();
> + if ( lapic_suspend() )
> + return SAVED_IOMMU;
>
> - return 0;
> + return SAVED_NONE;
SAVED_ALL
> @@ -169,6 +203,10 @@ static int enter_state(u32 state)
> {
> printk(XENLOG_ERR "Some devices failed to power down.");
> system_state = SYS_STATE_resume;
> +
> + if ( error > 0 )
> + device_power_up(error);
if ( error != SAVED_NONE )
(Or really you could just call this without any if().)
> @@ -2389,16 +2393,25 @@ static int intel_iommu_group_id(u16 seg, u8 bus, u8 devfn)
> }
>
> static u32 iommu_state[MAX_IOMMUS][MAX_IOMMU_REGS];
> -static void vtd_suspend(void)
> +
> +static int __must_check vtd_suspend(void)
> {
> struct acpi_drhd_unit *drhd;
> struct iommu *iommu;
> u32 i;
> + int rc = 0;
Pointless initializer.
> if ( !iommu_enabled )
> - return;
> + return 0;
>
> - iommu_flush_all();
> + rc = iommu_flush_all();
> + if ( unlikely(rc) )
> + {
> + printk(XENLOG_WARNING VTDPREFIX
> + " suspend: IOMMU flush all failed: %d\n", rc);
> +
> + return rc;
> + }
>
> for_each_drhd_unit ( drhd )
> {
> @@ -2427,6 +2440,8 @@ static void vtd_suspend(void)
> if ( !iommu_intremap && iommu_qinval )
> disable_qinval(iommu);
> }
> +
> + return rc;
> }
Perhaps better "return 0" to make obvious that no error path comes
here.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-06-01 10:39 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 13:57 [Patch v6 00/11] Check VT-d Device-TLB flush error Xu, Quan
2016-05-31 13:57 ` [Patch v6 01/11] IOMMU: handle IOMMU mapping and unmapping failures Xu, Quan
2016-06-01 9:52 ` Jan Beulich
2016-05-31 13:57 ` [Patch v6 02/11] IOMMU/MMU: enhance the call trees of IOMMU unmapping and mapping Xu, Quan
2016-06-01 10:05 ` Jan Beulich
2016-06-02 6:00 ` Xu, Quan
2016-06-02 9:13 ` Jan Beulich
2016-05-31 13:57 ` [Patch v6 03/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU unmapping (top level ones) Xu, Quan
2016-05-31 13:57 ` [Patch v6 04/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU mapping " Xu, Quan
2016-06-01 10:24 ` Jan Beulich
2016-06-02 7:25 ` Xu, Quan
2016-06-02 9:21 ` Jan Beulich
2016-06-02 12:43 ` Xu, Quan
2016-06-07 7:51 ` Xu, Quan
2016-06-07 8:19 ` Jan Beulich
2016-06-07 8:40 ` Xu, Quan
2016-06-07 10:11 ` Jan Beulich
2016-05-31 13:57 ` [Patch v6 05/11] IOMMU/MMU: propagate IOMMU Device-TLB flush error up to iommu_iotlb_flush{, _all} " Xu, Quan
2016-05-31 13:57 ` [Patch v6 06/11] propagate IOMMU Device-TLB flush error up to EPT update " Xu, Quan
2016-05-31 13:57 ` [Patch v6 07/11] IOMMU: propagate IOMMU Device-TLB flush error up to IOMMU suspending " Xu, Quan
2016-06-01 10:39 ` Jan Beulich [this message]
2016-06-02 2:58 ` Xu, Quan
2016-06-02 9:22 ` Jan Beulich
2016-05-31 13:57 ` [Patch v6 08/11] IOMMU: propagate IOMMU Device-TLB flush error (leaf ones) Xu, Quan
2016-05-31 13:57 ` [Patch v6 09/11] vt-d: fix the IOMMU flush issue Xu, Quan
2016-06-01 15:36 ` Jan Beulich
2016-06-02 2:50 ` Xu, Quan
2016-05-31 13:57 ` [Patch v6 10/11] vt-d: propagate the IOMMU Device-TLB flush error up to ME phantom functions Xu, Quan
2016-05-31 13:57 ` [Patch v6 11/11] vt-d: add __must_check annotation to IOMMU flush pointers and handlers Xu, Quan
2016-06-02 10:06 ` Jan Beulich
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=574ED76C02000078000F055B@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=dario.faggioli@citrix.com \
--cc=feng.wu@intel.com \
--cc=jinsong.liu@alibaba-inc.com \
--cc=julien.grall@arm.com \
--cc=keir@xen.org \
--cc=kevin.tian@intel.com \
--cc=quan.xu@intel.com \
--cc=sstabellini@kernel.org \
--cc=suravee.suthikulpanit@amd.com \
--cc=xen-devel@lists.xen.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).