From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: George Dunlap <George.Dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 3/4] x86/mm: drop redundant local variable from _get_page_type()
Date: Wed, 13 Mar 2019 06:38:54 -0600 [thread overview]
Message-ID: <5C88F9DE020000780021E17D@prv1-mh.provo.novell.com> (raw)
In-Reply-To: <5C88F524020000780021E12C@prv1-mh.provo.novell.com>
Instead of the separate iommu_ret, the general rc can be used even for
the IOMMU operations.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -2814,7 +2814,7 @@ static int _get_page_type(struct page_in
bool preemptible)
{
unsigned long nx, x, y = page->u.inuse.type_info;
- int rc = 0, iommu_ret = 0;
+ int rc = 0;
ASSERT(!(type & ~(PGT_type_mask | PGT_pae_xen_l2)));
ASSERT(!in_irq());
@@ -2926,18 +2926,14 @@ static int _get_page_type(struct page_in
mfn_t mfn = page_to_mfn(page);
if ( (x & PGT_type_mask) == PGT_writable_page )
- iommu_ret = iommu_legacy_unmap(d, _dfn(mfn_x(mfn)),
- PAGE_ORDER_4K);
+ rc = iommu_legacy_unmap(d, _dfn(mfn_x(mfn)), PAGE_ORDER_4K);
else if ( type == PGT_writable_page )
- iommu_ret = iommu_legacy_map(d, _dfn(mfn_x(mfn)), mfn,
- PAGE_ORDER_4K,
- IOMMUF_readable |
- IOMMUF_writable);
+ rc = iommu_legacy_map(d, _dfn(mfn_x(mfn)), mfn, PAGE_ORDER_4K,
+ IOMMUF_readable | IOMMUF_writable);
- if ( unlikely(iommu_ret) )
+ if ( unlikely(rc) )
{
_put_page_type(page, false, NULL);
- rc = iommu_ret;
goto out;
}
}
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-03-13 12:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-13 12:18 [PATCH 0/4] x86: some further follow-up to recent XSAs Jan Beulich
2019-03-13 12:38 ` [PATCH 1/4] x86: suppress XPTI-related TLB flushes when possible Jan Beulich
2019-04-03 18:52 ` Andrew Cooper
2019-04-04 10:07 ` Jan Beulich
2019-03-13 12:38 ` [PATCH 2/4] x86: relax a few get_gfn() invocations Jan Beulich
2019-04-03 18:16 ` Andrew Cooper
2019-04-05 10:30 ` George Dunlap
2019-04-05 10:30 ` [Xen-devel] " George Dunlap
2019-04-05 10:52 ` Jan Beulich
2019-04-05 10:52 ` [Xen-devel] " Jan Beulich
2019-03-13 12:38 ` Jan Beulich [this message]
2019-04-03 18:17 ` [PATCH 3/4] x86/mm: drop redundant local variable from _get_page_type() Andrew Cooper
2019-04-05 10:37 ` George Dunlap
2019-04-05 10:37 ` [Xen-devel] " George Dunlap
2019-03-13 12:39 ` [PATCH 4/4] x86/PV: remove unnecessary toggle_guest_pt() overhead Jan Beulich
2019-04-03 18:32 ` Andrew Cooper
2019-04-04 9:42 ` Jan Beulich
[not found] ` <5C88F9F30200000000104057@prv1-mh.provo.novell.com>
[not found] ` <5C88F9F3020000780023294C@prv1-mh.provo.novell.com>
2019-05-27 9:25 ` Ping: " Jan Beulich
2019-05-27 9:25 ` [Xen-devel] " 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=5C88F9DE020000780021E17D@prv1-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=roger.pau@citrix.com \
--cc=wei.liu2@citrix.com \
--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 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.