From patchwork Mon May 23 16:46:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 97013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 62654B6FB3 for ; Tue, 24 May 2011 02:47:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QOYHY-0008EN-S1; Mon, 23 May 2011 16:47:04 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QOYHW-0008Bs-R9 for kernel-team@lists.ubuntu.com; Mon, 23 May 2011 16:47:02 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QOYHW-0006dq-Og for ; Mon, 23 May 2011 16:47:02 +0000 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.3]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QOYHW-0003G4-Ao for kernel-team@lists.ubuntu.com; Mon, 23 May 2011 16:47:02 +0000 Subject: [Natty][SRU][PATCH] ips: use interruptible waits in ips-monitor From: Leann Ogasawara To: kernel-team Date: Mon, 23 May 2011 09:46:59 -0700 Message-ID: <1306169219.1548.15.camel@adamo> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Hi, Please consider the following patch for Natty SRU. It has been confirmed to resolve LP bug 765082. I've also submitted it to upstream stable for 2.6.38.y but it is still waiting to get accepted. Thanks, Leann SRU Justification: Impact: ips-monitor is in 'D' state continuously and produces a constant load of 1 Fix: upstream commit a3424216e4935221fdaa5ca3c26e024f11297164 Test case: Boot a kernel with the patch applied and confirm ips-monitor is no loner is a 'D' state and load drops below 1. The following changes since commit 4a93549299ec1b4b5c137449a13b5efd535487d9: Greg Kroah-Hartman (1): Linux 2.6.38.6 are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-natty.git lp765082 Jesse Barnes (1): ips: use interruptible waits in ips-monitor drivers/platform/x86/intel_ips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) From 727d78d90d2a337ef124a41524493cdd5a540094 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Mon, 28 Mar 2011 06:36:30 -0400 Subject: [PATCH] ips: use interruptible waits in ips-monitor BugLink: https://bugs.launchpad.net/ubuntu/+bug/765082 This is what I intended to do since: 1) the driver handles variable waits just fine, and 2) interruptible waits aren't reported as load in the load avg. Reported-and-tested-by: Andreas Hartmann Signed-off-by: Jesse Barnes Signed-off-by: Matthew Garrett (cherry picked from commit a3424216e4935221fdaa5ca3c26e024f11297164) Signed-off-by: Leann Ogasawara Acked-by: John Johansen Acked-by: Seth Forshee --- drivers/platform/x86/intel_ips.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel_ips.c index 1294a39..85c8ad4 100644 --- a/drivers/platform/x86/intel_ips.c +++ b/drivers/platform/x86/intel_ips.c @@ -1111,7 +1111,7 @@ static int ips_monitor(void *data) last_msecs = jiffies_to_msecs(jiffies); expire = jiffies + msecs_to_jiffies(IPS_SAMPLE_PERIOD); - __set_current_state(TASK_UNINTERRUPTIBLE); + __set_current_state(TASK_INTERRUPTIBLE); mod_timer(&timer, expire); schedule();