From: Henry Wang <xin.wang2@amd.com>
To: <xen-devel@lists.xenproject.org>
Cc: Henry Wang <xin.wang2@amd.com>,
Anthony PERARD <anthony@xenproject.org>,
Alec Kwapis <alec.kwapis@medtronic.com>
Subject: [PATCH v2 3/4] tools/init-dom0less: Avoid hardcoding GUEST_MAGIC_BASE
Date: Sat, 11 May 2024 08:56:10 +0800 [thread overview]
Message-ID: <20240511005611.83125-4-xin.wang2@amd.com> (raw)
In-Reply-To: <20240511005611.83125-1-xin.wang2@amd.com>
Currently the GUEST_MAGIC_BASE in the init-dom0less application is
hardcoded, which will lead to failures for 1:1 direct-mapped Dom0less
DomUs.
Since the guest magic region is now allocated from the hypervisor,
instead of hardcoding the guest magic pages region, use
xc_hvm_param_get() to get the guest magic region PFN, and based on
that the XenStore PFN can be calculated. Also, we don't need to set
the max mem anymore, so drop the call to xc_domain_setmaxmem(). Rename
the alloc_xs_page() to get_xs_page() to reflect the changes.
Take the opportunity to do some coding style improvements when possible.
Reported-by: Alec Kwapis <alec.kwapis@medtronic.com>
Signed-off-by: Henry Wang <xin.wang2@amd.com>
---
v2:
- Update HVMOP keys name.
---
tools/helpers/init-dom0less.c | 40 +++++++++++++++--------------------
1 file changed, 17 insertions(+), 23 deletions(-)
diff --git a/tools/helpers/init-dom0less.c b/tools/helpers/init-dom0less.c
index fee93459c4..04039a2a66 100644
--- a/tools/helpers/init-dom0less.c
+++ b/tools/helpers/init-dom0less.c
@@ -19,24 +19,20 @@
#define XENSTORE_PFN_OFFSET 1
#define STR_MAX_LENGTH 128
-static int alloc_xs_page(struct xc_interface_core *xch,
- libxl_dominfo *info,
- uint64_t *xenstore_pfn)
+static int get_xs_page(struct xc_interface_core *xch, libxl_dominfo *info,
+ uint64_t *xenstore_pfn)
{
int rc;
- const xen_pfn_t base = GUEST_MAGIC_BASE >> XC_PAGE_SHIFT;
- xen_pfn_t p2m = (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET;
+ xen_pfn_t magic_base_pfn;
- rc = xc_domain_setmaxmem(xch, info->domid,
- info->max_memkb + (XC_PAGE_SIZE/1024));
- if (rc < 0)
- return rc;
-
- rc = xc_domain_populate_physmap_exact(xch, info->domid, 1, 0, 0, &p2m);
- if (rc < 0)
- return rc;
+ rc = xc_hvm_param_get(xch, info->domid, HVM_PARAM_HV_RSRV_BASE_PFN,
+ &magic_base_pfn);
+ if (rc < 0) {
+ printf("Failed to get HVM_PARAM_HV_RSRV_BASE_PFN\n");
+ return 1;
+ }
- *xenstore_pfn = base + XENSTORE_PFN_OFFSET;
+ *xenstore_pfn = magic_base_pfn + XENSTORE_PFN_OFFSET;
rc = xc_clear_domain_page(xch, info->domid, *xenstore_pfn);
if (rc < 0)
return rc;
@@ -100,6 +96,7 @@ static bool do_xs_write_vm(struct xs_handle *xsh, xs_transaction_t t,
*/
static int create_xenstore(struct xs_handle *xsh,
libxl_dominfo *info, libxl_uuid uuid,
+ xen_pfn_t xenstore_pfn,
evtchn_port_t xenstore_port)
{
domid_t domid;
@@ -145,8 +142,7 @@ static int create_xenstore(struct xs_handle *xsh,
rc = snprintf(target_memkb_str, STR_MAX_LENGTH, "%"PRIu64, info->current_memkb);
if (rc < 0 || rc >= STR_MAX_LENGTH)
return rc;
- rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%lld",
- (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET);
+ rc = snprintf(ring_ref_str, STR_MAX_LENGTH, "%"PRIu_xen_pfn, xenstore_pfn);
if (rc < 0 || rc >= STR_MAX_LENGTH)
return rc;
rc = snprintf(xenstore_port_str, STR_MAX_LENGTH, "%u", xenstore_port);
@@ -245,9 +241,9 @@ static int init_domain(struct xs_handle *xsh,
if (!xenstore_evtchn)
return 0;
- /* Alloc xenstore page */
- if (alloc_xs_page(xch, info, &xenstore_pfn) != 0) {
- printf("Error on alloc magic pages\n");
+ /* Get xenstore page */
+ if (get_xs_page(xch, info, &xenstore_pfn) != 0) {
+ printf("Error on getting xenstore page\n");
return 1;
}
@@ -278,13 +274,11 @@ static int init_domain(struct xs_handle *xsh,
if (rc < 0)
return rc;
- rc = create_xenstore(xsh, info, uuid, xenstore_evtchn);
+ rc = create_xenstore(xsh, info, uuid, xenstore_pfn, xenstore_evtchn);
if (rc)
err(1, "writing to xenstore");
- rc = xs_introduce_domain(xsh, info->domid,
- (GUEST_MAGIC_BASE >> XC_PAGE_SHIFT) + XENSTORE_PFN_OFFSET,
- xenstore_evtchn);
+ rc = xs_introduce_domain(xsh, info->domid, xenstore_pfn, xenstore_evtchn);
if (!rc)
err(1, "xs_introduce_domain");
return 0;
--
2.34.1
next prev parent reply other threads:[~2024-05-11 0:56 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-11 0:56 [PATCH v2 0/4] Guest magic region allocation for 11 Dom0less domUs - Take two Henry Wang
2024-05-11 0:56 ` [PATCH v2 1/4] xen/arm: Alloc hypervisor reserved pages as magic pages for Dom0less DomUs Henry Wang
2024-05-11 8:46 ` Julien Grall
2024-05-11 9:02 ` Henry Wang
2024-05-11 9:33 ` Julien Grall
2024-05-11 11:03 ` Julien Grall
2024-05-13 3:42 ` Henry Wang
2024-05-11 0:56 ` [PATCH v2 2/4] xen/arm: Add new HVM_PARAM_HV_RSRV_{BASE_PFN,SIZE} keys in HVMOP Henry Wang
2024-05-11 9:17 ` Julien Grall
2024-05-11 0:56 ` Henry Wang [this message]
2024-05-11 9:46 ` [PATCH v2 3/4] tools/init-dom0less: Avoid hardcoding GUEST_MAGIC_BASE Julien Grall
2024-05-11 0:56 ` [PATCH v2 4/4] docs/features/dom0less: Update the late XenStore init protocol Henry Wang
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=20240511005611.83125-4-xin.wang2@amd.com \
--to=xin.wang2@amd.com \
--cc=alec.kwapis@medtronic.com \
--cc=anthony@xenproject.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 read-only IMAP folder(s) and NNTP newsgroup(s).