From: Zhenzhong Duan <zhenzhong.duan@oracle.com>
To: xen-devel@lists.xen.org
Cc: kevin.tian@intel.com, andrew.cooper3@citrix.com,
srinivas.eeda@oracle.com, JBeulich@suse.com,
shane.wang@intel.com, boris.ostrovsky@oracle.com,
gang.wei@intel.com
Subject: [PATCH v2 2/2] x86/dmar: zap DMAR signature for dom0 once in TBOOT case
Date: Mon, 20 Aug 2018 03:43:13 -0700 (PDT) [thread overview]
Message-ID: <306c82cd-b5cd-405a-9af7-f4cd1f1a8881@default> (raw)
When TBOOT enabled, acpi_parse_dmar() zap a copy of DMAR table rather
than the real table, so make it controled by config option based on the
fact that we already have done the real zapping in tboot_parse_dmar_table().
As said above, acpi_parse_dmar() doesn't zaps APCI DMAR signature in
real TXT heap table, fix the stale comments.
This is osmetic change, it's unnecessory to zap a copy of DMAR table which
is freed later.
-v2: Add some description per Jan.
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
---
xen/arch/x86/tboot.c | 3 +--
xen/drivers/passthrough/vtd/dmar.c | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index d5a5292..f22fa24 100644
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -490,8 +490,7 @@ int __init tboot_parse_dmar_table(acpi_table_handler dmar_handler)
rc = dmar_handler(dmar_table);
xfree(dmar_table);
- /* acpi_parse_dmar() zaps APCI DMAR signature in TXT heap table */
- /* but dom0 will read real table, so must zap it there too */
+ /* Dom0 will read real DMAR table, so must zap it there */
acpi_dmar_zap();
return rc;
diff --git a/xen/drivers/passthrough/vtd/dmar.c b/xen/drivers/passthrough/vtd/dmar.c
index 8c5fa80..ed4c04e 100644
--- a/xen/drivers/passthrough/vtd/dmar.c
+++ b/xen/drivers/passthrough/vtd/dmar.c
@@ -866,8 +866,10 @@ static int __init acpi_parse_dmar(struct acpi_table_header *table)
}
out:
+#ifndef CONFIG_TBOOT
/* Zap ACPI DMAR signature to prevent dom0 using vt-d HW. */
acpi_dmar_zap();
+#endif
return ret;
}
--
1.7.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
reply other threads:[~2018-08-20 10:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=306c82cd-b5cd-405a-9af7-f4cd1f1a8881@default \
--to=zhenzhong.duan@oracle.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=gang.wei@intel.com \
--cc=kevin.tian@intel.com \
--cc=shane.wang@intel.com \
--cc=srinivas.eeda@oracle.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).