From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: stable-review@kernel.org, torvalds@linux-foundation.org,
akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@elte.hu>
Subject: [01/34] sched: cgroup: Implement different treatment for idle shares
Date: Fri, 06 Aug 2010 11:56:56 -0700 [thread overview]
Message-ID: <20100806185833.915291684@clark.site> (raw)
In-Reply-To: <20100806185853.GA28270@kroah.com>
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
commit cd8ad40de36c2fe75f3b731bd70198b385895246 upstream.
When setting the weight for a per-cpu task-group, we have to put in a
phantom weight when there is no work on that cpu, otherwise we'll not
service that cpu when new work gets placed there until we again update
the per-cpu weights.
We used to add these phantom weights to the total, so that the idle
per-cpu shares don't get inflated, this however causes the non-idle
parts to get deflated, causing unexpected weight distibutions.
Reverse this, so that the non-idle shares are correct but the idle
shares are inflated.
Reported-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Tested-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1257934048.23203.76.camel@twins>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
kernel/sched.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1623,7 +1623,7 @@ static void update_group_shares_cpu(stru
*/
static int tg_shares_up(struct task_group *tg, void *data)
{
- unsigned long weight, rq_weight = 0, shares = 0;
+ unsigned long weight, rq_weight = 0, sum_weight = 0, shares = 0;
unsigned long *usd_rq_weight;
struct sched_domain *sd = data;
unsigned long flags;
@@ -1639,6 +1639,7 @@ static int tg_shares_up(struct task_grou
weight = tg->cfs_rq[i]->load.weight;
usd_rq_weight[i] = weight;
+ rq_weight += weight;
/*
* If there are currently no tasks on the cpu pretend there
* is one of average load so that when a new task gets to
@@ -1647,10 +1648,13 @@ static int tg_shares_up(struct task_grou
if (!weight)
weight = NICE_0_LOAD;
- rq_weight += weight;
+ sum_weight += weight;
shares += tg->cfs_rq[i]->shares;
}
+ if (!rq_weight)
+ rq_weight = sum_weight;
+
if ((!shares && rq_weight) || shares > tg->shares)
shares = tg->shares;
next prev parent reply other threads:[~2010-08-06 19:16 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-06 18:58 [00/34] 2.6.32.18-stable review Greg KH
2010-08-06 18:56 ` Greg KH [this message]
2010-08-06 18:56 ` [02/34] mm: fix ia64 crash when gcore reads gate area Greg KH
2010-08-06 18:56 ` [03/34] Re: acl trouble after upgrading ubuntu Greg KH
2010-08-06 18:56 ` [04/34] comedi: Uncripple 8255-based DIO subdevices Greg KH
2010-08-06 18:57 ` [05/34] NFS: kswapd must not block in nfs_release_page Greg KH
2010-08-06 18:57 ` [06/34] PARISC: led.c - fix potential stack overflow in led_proc_write() Greg KH
2010-08-06 18:57 ` [07/34] arm/imx/gpio: add spinlock protection Greg KH
2010-08-06 18:57 ` [08/34] parisc: pass through \t to early (iodc) console Greg KH
2010-08-06 18:57 ` [09/34] amd64_edac: Fix DCT base address selector Greg KH
2010-08-06 18:57 ` [10/34] amd64_edac: Correct scrub rate setting Greg KH
2010-08-06 18:57 ` [11/34] e1000e: dont inadvertently re-set INTX_DISABLE Greg KH
2010-08-06 18:57 ` [12/34] e1000e: 82577/82578 PHY register access issues Greg KH
2010-08-06 18:57 ` [13/34] 9p: strlen() doesnt count the terminator Greg KH
2010-08-06 18:57 ` [14/34] ath9k: enable serialize_regmode for non-PCIE AR9160 Greg KH
2010-08-06 18:57 ` [15/34] ath9k_hw: fix an off-by-one error in the PDADC boundaries calculation Greg KH
2010-08-06 18:57 ` [16/34] ath9k: fix TSF after reset on AR913x Greg KH
2010-08-06 18:57 ` [17/34] ath9k: fix yet another buffer leak in the tx aggregation code Greg KH
2010-08-06 18:57 ` [18/34] iwlwifi: fix scan abort Greg KH
2010-08-06 18:57 ` [19/34] cfg80211: ignore spurious deauth Greg KH
2010-08-06 18:57 ` [20/34] cfg80211: dont get expired BSSes Greg KH
2010-08-06 18:57 ` [21/34] xfs: prevent swapext from operating on write-only files Greg KH
2010-08-06 18:57 ` [22/34] SCSI: enclosure: fix error path - actually return ERR_PTR() on error Greg KH
2010-08-06 18:57 ` [23/34] GFS2: rename causes kernel Oops Greg KH
2010-08-06 18:57 ` [24/34] slow-work: use get_ref wrapper instead of directly calling get_ref Greg KH
2010-08-06 18:57 ` [25/34] CIFS: Remove __exit mark from cifs_exit_dns_resolver() Greg KH
2010-08-06 18:57 ` [26/34] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition Greg KH
2010-08-06 20:53 ` [Stable-review] " Ben Hutchings
2010-08-06 21:06 ` Greg KH
2010-08-07 3:38 ` Michael Neuling
2010-08-06 18:57 ` [27/34] xen: drop xen_sched_clock in favour of using plain wallclock time Greg KH
2010-08-06 18:57 ` [28/34] drm/i915: Fix LVDS presence check Greg KH
2010-08-06 18:57 ` [29/34] drm/i915: parse child device from VBT Greg KH
2010-08-06 18:57 ` [30/34] Revert "ssb: Handle Netbook devices where the SPROM address is changed" Greg KH
2010-08-06 18:57 ` [31/34] ssb: do not read SPROM if it does not exist Greg KH
2010-08-06 18:57 ` [32/34] ssb: Look for SPROM at different offset on higher rev CC Greg KH
2010-08-06 18:57 ` [33/34] ssb: fix NULL ptr deref when pcihost_wrapper is used Greg KH
2010-08-06 18:57 ` [34/34] ssb: Handle alternate SSPROM location Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100806185833.915291684@clark.site \
--to=gregkh@suse.de \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=stable-review@kernel.org \
--cc=stable@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®