From patchwork Mon May 6 23:50:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Cross X-Patchwork-Id: 2529121 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CB4943FE81 for ; Mon, 6 May 2013 23:55:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932368Ab3EFXzn (ORCPT ); Mon, 6 May 2013 19:55:43 -0400 Received: from mail-qa0-f74.google.com ([209.85.216.74]:48410 "EHLO mail-qa0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759427Ab3EFXzl (ORCPT ); Mon, 6 May 2013 19:55:41 -0400 Received: by mail-qa0-f74.google.com with SMTP id i13so22577qae.1 for ; Mon, 06 May 2013 16:55:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=QrNmINf30itCTd4VqHXSqKkI28DqioyptfRt0rPHTmg=; b=lHrnlJzsi6SBDePX8+VPupUFlNZ576iCIDTE6fRc5RXyCvZ7W998ll2XjlBccyX9da oMTQg1fKj4FHzkkAazTpmHca6bhrTqH4KxbynKCiZ5zbkNg2IS+fWSYwKmDDnKcR4Qzw JJ7ab2MQtAATR7B8f04A80iZj2uL4TjsFuolgS9SEXQpTDDQJh9LP76RfjR/67rcOOHl SGJu7ieWwgkKOczRh0aEami8ecpg7KVp/FrKGdoaQZ5porM8G1kEcEgmLAZk1n2htu5M Dm1PRukO0n2LYUmIOeQm101yYWn/i6oEvZl4aT7werVVWFCfjwqvCkyAxZ44bhGIeLEt Lgew== X-Received: by 10.236.124.226 with SMTP id x62mr10809141yhh.47.1367884233313; Mon, 06 May 2013 16:50:33 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id u42si1443090yhi.0.2013.05.06.16.50.33 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Mon, 06 May 2013 16:50:33 -0700 (PDT) Received: from walnut.mtv.corp.google.com (walnut.mtv.corp.google.com [172.18.105.48]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 21F995A4250; Mon, 6 May 2013 16:50:33 -0700 (PDT) Received: by walnut.mtv.corp.google.com (Postfix, from userid 99897) id D617C1613E8; Mon, 6 May 2013 16:50:32 -0700 (PDT) From: Colin Cross To: linux-kernel@vger.kernel.org Cc: Pavel Machek , "Rafael J. Wysocki" , Peter Zijlstra , Ingo Molnar , Andrew Morton , Mandeep Singh Baines , Colin Cross , Oleg Nesterov , linux-nfs@vger.kernel.org, linux-pm@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , Tejun Heo , Thomas Gleixner Subject: [PATCH v3 14/16] nanosleep: use freezable blocking call Date: Mon, 6 May 2013 16:50:19 -0700 Message-Id: <1367884221-20462-15-git-send-email-ccross@android.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1367884221-20462-1-git-send-email-ccross@android.com> References: <1367884221-20462-1-git-send-email-ccross@android.com> X-Gm-Message-State: ALoCoQltB9s/spl/gt+wwYKFsc9l+NvybUFEhCjap6Qhgw6WNeDehO0wraD9gqYoUPgF+p8amnyRwOU7E0MizTQw3KKoJcDXQd44N96BWJxKdIZqW/xbreNXLLkwinhtw8zbNGyVfY5ktR0SLNZa2HLn/xcaOD84pDvlUSq/cJRHKy+aUB5hlxBBFkNf1nnvc6V799Ty90X9 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Avoid waking up every thread sleeping in a nanosleep call during suspend and resume by calling a freezable blocking call. Previous patches modified the freezer to avoid sending wakeups to threads that are blocked in freezable blocking calls. This call was selected to be converted to a freezable call because it doesn't hold any locks or release any resources when interrupted that might be needed by another freezing task or a kernel driver during suspend, and is a common site where idle userspace tasks are blocked. Acked-by: Tejun Heo Acked-by: Thomas Gleixner Signed-off-by: Colin Cross --- kernel/hrtimer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 14be27f..e036276 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -47,6 +47,7 @@ #include #include #include +#include #include @@ -1525,7 +1526,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod t->task = NULL; if (likely(t->task)) - schedule(); + freezable_schedule(); hrtimer_cancel(&t->timer); mode = HRTIMER_MODE_ABS;