x86/livepatch: Prevent patching with active waitqueues

The safety of livepatching depends on every stack having been unwound, but
there is one corner case where this is not true.  The Sharing/Paging/Monitor
infrastructure may use waitqueues, which copy the stack frame sideways and
longjmp() to a different vcpu.

This case is rare, and can be worked around by pausing the offending
domain(s), waiting for their rings to drain, then performing a livepatch.

In the case that there is an active waitqueue, fail the livepatch attempt with
-EBUSY, which is preforable to the fireworks which occur from trying to unwind
the old stack frame at a later point.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Reviewed-by: Ross Lagerwall <ross.lagerwall@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Andrew Cooper committed 2019-11-22 17:05:43 +00:00
1 parent d7cd999faa
commit ca4cd36682
4 files changed
+54

No files matched your search

+5
View File
@@ -18,6 +18,11 @@
void *vmap_of_xen_text;
int arch_livepatch_safety_check(void)
{
return 0;
}
int arch_livepatch_quiesce(void)
{
mfn_t text_mfn;
+40
View File
@@ -10,10 +10,50 @@
#include <xen/vmap.h>
#include <xen/livepatch_elf.h>
#include <xen/livepatch.h>
#include <xen/sched.h>
#include <asm/nmi.h>
#include <asm/livepatch.h>
static bool has_active_waitqueue(const struct vm_event_domain *ved)
{
/* ved may be xzalloc()'d without INIT_LIST_HEAD() yet. */
return (ved && !list_head_is_null(&ved->wq.list) &&
!list_empty(&ved->wq.list));
}
/*
* x86's implementation of waitqueue violates the livepatching safey principle
* of having unwound every CPUs stack before modifying live content.
*
* Search through every domain and check that no vCPUs have an active
* waitqueue.
*/
int arch_livepatch_safety_check(void)
{
struct domain *d;
for_each_domain ( d )
{
#ifdef CONFIG_MEM_SHARING
if ( has_active_waitqueue(d->vm_event_share) )
goto fail;
#endif
#ifdef CONFIG_MEM_PAGING
if ( has_active_waitqueue(d->vm_event_paging) )
goto fail;
#endif
if ( has_active_waitqueue(d->vm_event_monitor) )
goto fail;
}
return 0;
fail:
printk(XENLOG_ERR LIVEPATCH "%pd found with active waitqueue\n", d);
return -EBUSY;
}
int arch_livepatch_quiesce(void)
{
/* Disable WP to allow changes to read-only pages. */
+8
View File
@@ -1060,6 +1060,14 @@ static int apply_payload(struct payload *data)
unsigned int i;
int rc;
rc = arch_livepatch_safety_check();
if ( rc )
{
printk(XENLOG_ERR LIVEPATCH "%s: Safety checks failed: %d\n",
data->name, rc);
return rc;
}
printk(XENLOG_INFO LIVEPATCH "%s: Applying %u functions\n",
data->name, data->nfuncs);
+1
View File
@@ -104,6 +104,7 @@ static inline int livepatch_verify_distance(const struct livepatch_func *func)
* These functions are called around the critical region patching live code,
* for an architecture to take make appropratie global state adjustments.
*/
int arch_livepatch_safety_check(void);
int arch_livepatch_quiesce(void);
void arch_livepatch_revive(void);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.