Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4145871pxb; Mon, 27 Sep 2021 10:18:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwWHPH1eIBFROyWNJ/8jWKpEzFGlq2DbEUUn6JIJSVtO8W6q5surZU8mnN9A8VYkImyYl/U X-Received: by 2002:a17:902:d202:b0:13a:709b:dfb0 with SMTP id t2-20020a170902d20200b0013a709bdfb0mr638873ply.34.1632763139066; Mon, 27 Sep 2021 10:18:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632763139; cv=none; d=google.com; s=arc-20160816; b=gIrI3rihrYIGJVD9HiqkgN4usgH+I3EDrNzj9Bk65uJkxmDpBVSyr9icd/h3A1sT0n HYeuv4SdE/3QxnGTPhZCps0VD3veDnvscb+7PDxCPgqRmPvKtSK2+uGhGmZ7rf9AnDs3 8WcAkVO2O2wO3DzMNbaGXEJgFTdjSc0UpoFQZ8PpRYGPeq1hhRXM2ROsqKq7zhr6+Cn0 yWkK4Jggw4E/12pgQSKp6j6lUqUb1qNZjV5wnj2i9rdbYlPgU4cdoHG2TB0mG2UWMzf5 QR7/uDaPeSXw1iecLDo/R7a8WCb/Fmj5s9nOLm6uzgbUGLbOkOUlQXHzUGejVtAfdzB1 JFPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mZNnBIBZ/vHlJyAX3lQzKyM1uReITSVG/VpO0Hec3Xo=; b=aw9N5aaCuWqM2MXzpy3Di1hZiInzkI1Ky5oiFZhnXsauvXMxJkNsI1fmnrj6xDG4ZJ agFb0z6C5G1vVbq7AenB3g+jWc8q1hfCngthaq/8Td5aIgsrPkxGyzl+LFsUUmNvT/7Z Xfuperxc8RxJGmzNZpJteQnTvRQ3/zFZ8gOS50Hbbun+pa0onNpXpJ5K31ztTVTMhopi LH03G+BFpS+j5+/51lUDHeDdZO8hP3eiyRXqSIVEuixLV/b50/zEHhRfxNYwcUpOBImk 13akF+rFzYGc/g4WEvVOV8DwaQf8WuqKYuDlqnIhC6kF85rCN5J3I/I+p6VMYC0v7MPy ELbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="03M/i3NA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h8si190822pjq.2.2021.09.27.10.18.46; Mon, 27 Sep 2021 10:18:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="03M/i3NA"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236647AbhI0RTb (ORCPT + 99 others); Mon, 27 Sep 2021 13:19:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:56710 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236604AbhI0RPB (ORCPT ); Mon, 27 Sep 2021 13:15:01 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9485161178; Mon, 27 Sep 2021 17:10:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632762644; bh=eJQXPnNG74y+9NZ6TFaJhgpavFc0wb/46GG4b/cUM3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=03M/i3NAOcInecyVVPm0HdPG9u1VHFF0q36fTgjre7rRrn9cKD/jzP0dc8H++pcLP yYRQBBixAfvWOilJ6uKDIT48yw8rNh3OCqoKUEXIX1IdEol5X+N9OUDF/+0/kP+W68 ymiBEu01cP+FI0vAjDwsSTGTh3RAuUvSPdB010Gk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juergen Gross , Boris Ostrovsky Subject: [PATCH 5.10 102/103] xen/balloon: fix balloon kthread freezing Date: Mon, 27 Sep 2021 19:03:14 +0200 Message-Id: <20210927170229.298743010@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170225.702078779@linuxfoundation.org> References: <20210927170225.702078779@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Juergen Gross commit 96f5bd03e1be606987644b71899ea56a8d05f825 upstream. Commit 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a workqueue") switched the Xen balloon driver to use a kernel thread. Unfortunately the patch omitted to call try_to_freeze() or to use wait_event_freezable_timeout(), causing a system suspend to fail. Fixes: 8480ed9c2bbd56 ("xen/balloon: use a kernel thread instead a workqueue") Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky Link: https://lore.kernel.org/r/20210920100345.21939-1-jgross@suse.com Signed-off-by: Juergen Gross Signed-off-by: Greg Kroah-Hartman --- drivers/xen/balloon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -522,8 +522,8 @@ static int balloon_thread(void *unused) timeout = 3600 * HZ; credit = current_credit(); - wait_event_interruptible_timeout(balloon_thread_wq, - balloon_thread_cond(state, credit), timeout); + wait_event_freezable_timeout(balloon_thread_wq, + balloon_thread_cond(state, credit), timeout); if (kthread_should_stop()) return 0;