From: "Jan Beulich" <JBeulich@suse.com>
To: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Olaf Hering <olaf@aepfle.de>, Wei Liu <wei.liu2@citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Julien Grall <julien.grall@linaro.org>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Andrew Jones <drjones@redhat.com>, Tim Deegan <tim@xen.org>,
David Vrabel <david.vrabel@citrix.com>,
xen-devel@lists.xenproject.org,
Daniel De Graaf <dgdegra@tycho.nsa.gov>,
Keir Fraser <keir@xen.org>
Subject: Re: [PATCH v9 08/11] xen: arch-specific hooks for domain_soft_reset()
Date: Fri, 24 Jul 2015 06:20:20 -0600 [thread overview]
Message-ID: <55B249A40200007800095277@prv-mh.provo.novell.com> (raw)
In-Reply-To: <1437064046-12174-9-git-send-email-vkuznets@redhat.com>
>>> On 16.07.15 at 18:27, <vkuznets@redhat.com> wrote:
> --- a/xen/arch/x86/domain.c
> +++ b/xen/arch/x86/domain.c
> @@ -704,6 +704,90 @@ void arch_domain_unpause(struct domain *d)
> viridian_time_ref_count_thaw(d);
> }
>
> +int arch_domain_soft_reset(struct domain *d)
> +{
> + struct page_info *page = virt_to_page(d->shared_info), *new_page;
> + int ret = 0;
> + struct domain *owner;
> + unsigned long mfn, mfn_new, gfn;
> + p2m_type_t p2mt;
> + unsigned int i;
> +
> + /* Soft reset is supported for HVM domains only. */
> + if ( !is_hvm_domain(d) )
> + return -EINVAL;
This suggests that the whole function may better go somewhere in
hvm/.
And is this intentionally excluding PVH?
> + hvm_destroy_all_ioreq_servers(d);
Or if the function was to stay here, you'd probably better add a
hvm_domain_soft_reset() instead of making this function non-
static.
> + spin_lock(&d->event_lock);
> + for ( i = 0; i < d->nr_pirqs ; i++ )
> + {
> + if ( domain_pirq_to_emuirq(d, i) != IRQ_UNBOUND )
> + {
> + ret = unmap_domain_pirq_emuirq(d, i);
> + if ( ret )
> + break;
> + }
> + }
> + spin_unlock(&d->event_lock);
> +
> + if ( ret )
> + return ret;
> +
> + /*
> + * shared_info page needs to be replaced with a new page, otherwise we
"The shared info page ..."
> + * will get a hole if the domain does XENMAPSPACE_shared_info.
> + */
> +
> + owner = page_get_owner_and_reference(page);
> + /* If shared_info page wasn't used, we do not need to replace it. */
> + if ( owner != d )
owner may be NULL, in which case you mustn't put_page(). Or if
you're sure owner can't be NULL here, then please ASSERT() so.
(I'm about to post a patch adjusting a remotely similar case in the
grant table code).
> + goto exit_put_page;
> +
> + mfn = page_to_mfn(page);
> + if ( !mfn_valid(mfn) )
This check makes sense at best ahead of calling
page_get_owner_and_reference(), but I can't see how
virt_to_page() could produce an invalid page unless there was a
bug elsewhere, or d->shared_info was NULL.
> + {
> + printk(XENLOG_G_ERR "Dom%d's shared_info page points to invalid MFN\n",
> + d->domain_id);
> + ret = -EINVAL;
> + goto exit_put_page;
> + }
> +
> + gfn = mfn_to_gmfn(d, mfn);
> + if ( mfn_x(get_gfn_query(d, gfn, &p2mt)) == INVALID_MFN )
Perhaps even != mfn?
> + {
> + printk(XENLOG_G_ERR "Failed to get Dom%d's shared_info GFN (%lx)\n",
> + d->domain_id, gfn);
> + ret = -EINVAL;
> + goto exit_put_page;
> + }
> +
> + new_page = alloc_domheap_page(d, 0);
> + if ( !new_page )
> + {
> + printk(XENLOG_G_ERR "Failed to alloc a page to replace"
> + " Dom%d's shared_info frame %lx\n", d->domain_id, gfn);
> + ret = -ENOMEM;
> + goto exit_put_gfn;
> + }
> + mfn_new = page_to_mfn(new_page);
mfn_new is used just once, and hence this variable can be easily
eliminated (either be re-using mfn after switching this and the
following lines, or by just not using an intermediate variable here
at all.
> --- a/xen/common/domain.c
> +++ b/xen/common/domain.c
> @@ -1035,6 +1035,10 @@ int domain_soft_reset(struct domain *d)
> for_each_vcpu ( d, v )
> unmap_vcpu_info(v);
>
> + rc = arch_domain_soft_reset(d);
> + if (rc)
> + return rc;
I don't think this can be done this late, or else you'd need to have
a way to undo everything you've done earlier in the function. This
of course also applies to what's being done inside the function. Or
if undoing is - as it looks like - rather hard, perhaps the domain
would better be crashed than left in an inconsistent state?
Also - coding style.
Jan
next prev parent reply other threads:[~2015-07-24 12:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 16:27 [PATCH v9 00/11] toolstack-assisted approach to PVHVM guest kexec Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 01/11] xen: introduce SHUTDOWN_soft_reset shutdown reason Vitaly Kuznetsov
2015-07-16 18:42 ` Konrad Rzeszutek Wilk
2015-07-24 11:54 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 02/11] libxl: support " Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 03/11] xl: introduce enum domain_restart_type Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 04/11] xen: evtchn: make evtchn_reset() ready for soft reset Vitaly Kuznetsov
2015-07-16 18:43 ` Konrad Rzeszutek Wilk
2015-07-24 11:56 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 05/11] xen: grant_table: implement grant_table_warn_active_grants() Vitaly Kuznetsov
2015-07-16 18:43 ` Konrad Rzeszutek Wilk
2015-07-24 12:00 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 06/11] xen: Introduce XEN_DOMCTL_soft_reset Vitaly Kuznetsov
2015-07-16 18:45 ` Konrad Rzeszutek Wilk
2015-07-17 12:30 ` Vitaly Kuznetsov
2015-07-24 12:03 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 07/11] flask: DOMCTL_soft_reset support Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 08/11] xen: arch-specific hooks for domain_soft_reset() Vitaly Kuznetsov
2015-07-16 18:45 ` Konrad Rzeszutek Wilk
2015-07-24 12:20 ` Jan Beulich [this message]
2015-07-24 12:41 ` Vitaly Kuznetsov
2015-07-24 12:45 ` Jan Beulich
2015-07-16 16:27 ` [PATCH v9 09/11] libxc: support XEN_DOMCTL_soft_reset operation Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 10/11] libxc: add XC_DEVICE_MODEL_SAVE_FILE Vitaly Kuznetsov
2015-07-16 16:27 ` [PATCH v9 11/11] (lib)xl: soft reset support Vitaly Kuznetsov
2015-07-16 18:51 ` Konrad Rzeszutek Wilk
2015-07-17 12:33 ` Vitaly Kuznetsov
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=55B249A40200007800095277@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=david.vrabel@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=drjones@redhat.com \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=julien.grall@linaro.org \
--cc=keir@xen.org \
--cc=olaf@aepfle.de \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=vkuznets@redhat.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 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).