From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: "Jan Beulich" <JBeulich@suse.com>, "Wei Liu" <wl@xen.org>,
"Andrew Cooper" <andrew.cooper3@citrix.com>,
"Suravee Suthikulpanit" <suravee.suthikulpanit@amd.com>,
"Boris Ostrovsky" <boris.ostrovsky@oracle.com>,
"Brian Woods" <brian.woods@amd.com>,
"Roger Pau Monné" <roger.pau@citrix.com>
Subject: [Xen-devel] [PATCH] x86/AMD-Vi: Fold exit paths of {enable, disable}_iommu()
Date: Mon, 12 Aug 2019 18:52:05 +0100 [thread overview]
Message-ID: <20190812175205.29143-1-andrew.cooper3@citrix.com> (raw)
... to avoid having multiple spin_unlock_irqrestore() calls.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wl@xen.org>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Boris Ostrovsky <boris.ostrovsky@oracle.com>
CC: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
CC: Brian Woods <brian.woods@amd.com>
Interestingly GCC 6.3 managed to fold disable_iommu() automatically. There is
some partial folding for enable_iommu() (insofar as there is only a single
call to _spin_unlock_irqrestore emitted), but this delta yeilds
add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-20 (-20)
Function old new delta
enable_iommu 1844 1824 -20
Total: Before=3340299, After=3340279, chg -0.00%
which means that something wasn't done automatically.
Noticed while investigating the S3 regression.
---
xen/drivers/passthrough/amd/iommu_init.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c
index bb9f33e264..bb5a3e57c9 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -899,11 +899,8 @@ static void enable_iommu(struct amd_iommu *iommu)
spin_lock_irqsave(&iommu->lock, flags);
- if ( iommu->enabled )
- {
- spin_unlock_irqrestore(&iommu->lock, flags);
- return;
- }
+ if ( unlikely(iommu->enabled) )
+ goto out;
amd_iommu_erratum_746_workaround(iommu);
@@ -957,6 +954,8 @@ static void enable_iommu(struct amd_iommu *iommu)
amd_iommu_flush_all_caches(iommu);
iommu->enabled = 1;
+
+ out:
spin_unlock_irqrestore(&iommu->lock, flags);
}
@@ -966,11 +965,8 @@ static void disable_iommu(struct amd_iommu *iommu)
spin_lock_irqsave(&iommu->lock, flags);
- if ( !iommu->enabled )
- {
- spin_unlock_irqrestore(&iommu->lock, flags);
- return;
- }
+ if ( unlikely(!iommu->enabled) )
+ goto out;
if ( !iommu->ctrl.int_cap_xt_en )
amd_iommu_msi_enable(iommu, IOMMU_CONTROL_DISABLED);
@@ -988,6 +984,7 @@ static void disable_iommu(struct amd_iommu *iommu)
iommu->enabled = 0;
+ out:
spin_unlock_irqrestore(&iommu->lock, flags);
}
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next reply other threads:[~2019-08-13 6:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-12 17:52 Andrew Cooper [this message]
2019-08-12 18:01 ` [Xen-devel] [PATCH] x86/AMD-Vi: Fold exit paths of {enable, disable}_iommu() Woods, Brian
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=20190812175205.29143-1-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=brian.woods@amd.com \
--cc=roger.pau@citrix.com \
--cc=suravee.suthikulpanit@amd.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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).