Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4159423pxb; Mon, 27 Sep 2021 10:35:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwMjwjp8Gadl5Tcw7oW6emYUzzok69pAlbCHqw03CuMlwD+1RQvBvFdoEtjyv9XVKnKPtr+ X-Received: by 2002:a65:6648:: with SMTP id z8mr746606pgv.418.1632764155629; Mon, 27 Sep 2021 10:35:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632764155; cv=none; d=google.com; s=arc-20160816; b=R1W/qHeHglI6M0YLeRRN4kdWzggZpfGbVqies/lG8kVc6gNSlPvuRGAlD6wSYUkzlx AkFkydL7R3/aLS5kx6uIf40+Jq6DtRyCuFpEeThC4k2+xS3SBY7I6Sp7g6LOLUKKw3fH CSPNqJsb8qrZ5ob8e21AWpYBeo4uEgaZYGLEQpWbggbtaM/wUfRqJekhr691eq8k8GZx SBrhsJDiSSTrKIJBRCrxygMz0fVVnd1+zwmzcDgcbEO/l1/uUW455ueSpsfGeO6lbbEY WAkFTl/KXqNwGwUfIG+mBLZr1WRunPmGE+5u6soWwvYMvrW5kkPrQu/EXGmr8xnokW1t X3Qg== 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=F3oBf8KNWR69oXGh1+/9AJ+//64Kc4RkA7cEoKjbtBUVGJDUBQlTv9RwyKnGUcXhXj r6YnroxoclXg2QgBJhFmZMZCDibH32T0To37gsImh0qtlNjYLX+wISGVOtf9h2aDd4O7 IXK58QhdxAX9SbsxDQVFgc9nLVoG9F/80rnL7SPKpFkRp96nfooKvoHGmFtArzHG+7tF SWW1k59R5TL7kVzzGCbhil3RE3kz92c+F73wRdlwuU7UrAbuaxQoj42E9NcmBYlAGx4a tylnpuqWAukJZW1BCuOKm9WbjDDbGr3YFUtm2T1dh2Y/LaXSyYZBUsFEUW3OWWIz5qbi bG2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WtU6ffsu; 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 u15si185058pjg.111.2021.09.27.10.35.41; Mon, 27 Sep 2021 10:35:55 -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=WtU6ffsu; 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 S237919AbhI0Rg1 (ORCPT + 99 others); Mon, 27 Sep 2021 13:36:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:44582 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237024AbhI0Rae (ORCPT ); Mon, 27 Sep 2021 13:30:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8279A6139F; Mon, 27 Sep 2021 17:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632763106; bh=eJQXPnNG74y+9NZ6TFaJhgpavFc0wb/46GG4b/cUM3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WtU6ffsuqojTqQSpKQj3D3zy1RR3LtR6bbjllImQG/o3zFCRtXqSTjGO0TIW29oeP xsj9FwZLe4H6PRvqE3Hu3vw9bSzIpST4++e1GV1lvaTfnwxZYErJPXbvIHVpbKJKCX iHYND7xpWvEQ/0wDuwmCGHQUOYmT0OXXbbKO2uX0= 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.14 158/162] xen/balloon: fix balloon kthread freezing Date: Mon, 27 Sep 2021 19:03:24 +0200 Message-Id: <20210927170238.891716108@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210927170233.453060397@linuxfoundation.org> References: <20210927170233.453060397@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;