lkml.org 
[lkml]   [2020]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 2/4] xen/balloon: make the balloon wait interruptible
    Date
    So it can be killed, or else processes can get hung indefinitely
    waiting for balloon pages.

    Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
    Reviewed-by: Juergen Gross <jgross@suse.com>
    Cc: stable@vger.kernel.org
    ---
    Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
    Cc: Juergen Gross <jgross@suse.com>
    Cc: Stefano Stabellini <sstabellini@kernel.org>
    Cc: xen-devel@lists.xenproject.org
    ---
    drivers/xen/balloon.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
    index 3cb10ed32557..292413b27575 100644
    --- a/drivers/xen/balloon.c
    +++ b/drivers/xen/balloon.c
    @@ -568,11 +568,13 @@ static int add_ballooned_pages(int nr_pages)
    if (xen_hotplug_unpopulated) {
    st = reserve_additional_memory();
    if (st != BP_ECANCELED) {
    + int rc;
    +
    mutex_unlock(&balloon_mutex);
    - wait_event(balloon_wq,
    + rc = wait_event_interruptible(balloon_wq,
    !list_empty(&ballooned_pages));
    mutex_lock(&balloon_mutex);
    - return 0;
    + return rc ? -ENOMEM : 0;
    }
    }

    --
    2.27.0
    \
     
     \ /
      Last update: 2020-07-27 11:15    [W:4.506 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site