From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752378AbdBUMKh (ORCPT ); Tue, 21 Feb 2017 07:10:37 -0500 Received: from mail-ve1eur01on0129.outbound.protection.outlook.com ([104.47.1.129]:3136 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752309AbdBUMK2 (ORCPT ); Tue, 21 Feb 2017 07:10:28 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Subject: [PATCH 1/3] sched/fair: Set sched_entity::depth only when parent has changed From: Kirill Tkhai To: , , , Date: Tue, 21 Feb 2017 15:10:22 +0300 Message-ID: <148767900991.5212.16341443539923627997.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: AM4PR0701CA0008.eurprd07.prod.outlook.com (10.165.102.18) To AM4PR0802MB2273.eurprd08.prod.outlook.com (10.172.217.151) X-MS-Office365-Filtering-Correlation-Id: b2110344-96ca-42da-3eb4-08d45a529df9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:AM4PR0802MB2273; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0802MB2273;3:H3wDtA9saG1vFMUU8k8Zilcsg0n0Tx7kw2G/DSDdj/gRngiBo+lOvQRENNzLXY/fVlRSdBF/TbWrXe0LXJmL0pf/GjBC4k9QrLJfSpNUqHeSAfvT07i0CXbKNXOb1qHjiKMSqmjmpFmjHvSZe/a+4E5Xk4tRKM7KlCTRkY2a+olmHs+ENKanAvjgz7741ljNnxD7/SUWC7/hZvpe3NCB/YrnWV9rVge57zR4hL6AScaOBHLausWWEtAcQxwpWe2nKul31yPDZzlOMTheJTLhGA==;25:u4PTwhpVy8p7ASxwcOVdmIDy2ky3+VFeDstu2tUr4iqrfuAN88zO/yJKaWOSUc5MAnNHbeNuL4Kfb6gwr/fUwU37UvMGPjlop4jo4xy/oOVcCdVs2S3zdeuiB/VyjEF9NVbAWMxq2kldx749sXMpdq0zVYqJJip9zj1rGg3iI/RfYEOQfrCICP+pKPT9Q+Z8zkZz7EG5o+MFxKQ6cYDF94Gvc58dDd9V3qBIWb5NNFY1RqrMueIhlrmXOYFUbvVrcGOfCKcGbp2MK3XH1k12B+IL8OiUMDUpwIffUNa9U9PEGhassNcJLh/69A22ojWfA+hbGxqJ0MMOoIqwDUyE2BcagOgPmEyDThoNJhJD1lrm+d9JIER0zvadSKe/uPePzcuhOamKg/corRvINHmdMW2jq+ug5zkkUzGTPJQFHFHvILkRhcTXxS82+fYgcdL+5ObT9vhzzHux0B6l9Pfeng== X-Microsoft-Exchange-Diagnostics: 1;AM4PR0802MB2273;31:itKlZ4f2/WdSA2DozlmUfdS1WImaXFYPWDytqqRrpwep98ieETp2o46zJWi+dZnd7/rS4ww0MGRmGaQIhzEv67k9Zz9btOoGsLuuM4ItPbeN1Rxe8ak8yrVKk/xQIzH5iOsxxwUeOaQ5VESmyJVssQPNxRxtVYT302+tRJY7ZGD4WyTtJdWqVizLUWXwMco131Uap8AyA71s6s5244Q/qbUOVDwfBgyDwNF8pZ3tTHk=;20:7xw0hq6lnX7UzEXDnCNzLA41NONjPnIVrBHjAE2eXaMH3kFfs6V6b2+5PRt3NXfDAjOpcV6IRU+KQSw2qh3JA0hrqxa3ym5MvqEUN430odMCRpuhFhG7Cxz1WHJsIQX6xZ5ZN6HMp9W9bFgeJ+3Yf/jwA87UQHrBcmmzDxnUiuBzb9gvgKdKME5fOdqKPdp9Bovnq198XnDG6yfsILna1ag8nivZWXlpMHmBBFUTvsmxOiJmvnB5eB7vYXJoZ3JUulzlFODiqyCsHPckSXP8uLGfKeo1cgQFD/5hVTi0MevVtgFBecrDyUEq2I9+pBiICE/mGtg4oCG4uZ/PKoMPVguXJu42nN1lpvFKPdlLIG8kJrdWwx9XbaXe30TfVdPHRlEGjsuJSSbt+arp+kzmaTPbTsPtgVRutCFvP9VO2VI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(20161123558025)(6072148);SRVR:AM4PR0802MB2273;BCL:0;PCL:0;RULEID:;SRVR:AM4PR0802MB2273; X-Microsoft-Exchange-Diagnostics: 1;AM4PR0802MB2273;4:m6RhwYhbewUvNqR6YXj2XgkmUEdZpKJEpO6ZIh+xDli5axkF7v50Qs2UDRudmcRsZmSfgzOzxr7teBG4q8f60aOIYcImg7KUxlX5POwL5wRKc9uzNQ2OqVBvePhexaIZU5ZUN/51SRs9MIXC4NTExPA+J+h1D5cDuhTQ7Ou/e71877U3dbc7NjiGWQI8Os+2V7ssVZRxW6cNUCgQDxFbWPPWAUCxfFKnRep6BtzRGM3NQWTsEaUmwhiAtP8DsbWGl6TNkZWGLoTXfzdTj9hyb9zHdqvcOew8MdonmWP9ESb5Nk2xIG/39j1SuiZbhmnX4LLRth7wzWtCQtN3tVvmDLX1YalFfhLIjqMf6tEmwSj6b5OcF/Nvm44Mj23jFw6Jxs2GZEdJpmm6Wh0Z/s/V8mEHggy2OTKyR8PaM+E8znZMQK0X0NtYEZuY636qprjfwZU1SAwGHyD+R4zSrk4sanEEZawkIl7ZRLB1J7sld6yDm+Sr+gWjtBBnHWB/1+YoQ4Ke/P36SWTltn/Z14T8uKMzFs3m5g6GoQgYddnLiKKQMS0RYsCZ9wUiJkgP8KoUsUZiq9YFrqm+zGfL733m30+0fr/m1pG0EdgrEqzFr6o= X-Forefront-PRVS: 0225B0D5BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(6069001)(7916002)(39410400002)(39830400002)(39450400003)(189002)(199003)(305945005)(7736002)(68736007)(83506001)(106356001)(38730400002)(5890100001)(86362001)(92566002)(4001350100001)(575784001)(103116003)(97736004)(2906002)(9686003)(55016002)(23676002)(230700001)(6506006)(61506002)(47776003)(66066001)(54356999)(33646002)(25786008)(8676002)(6116002)(2201001)(3846002)(5660300001)(50466002)(42186005)(101416001)(81166006)(189998001)(50986999)(105586002)(53936002)(81156014);DIR:OUT;SFP:1102;SCL:1;SRVR:AM4PR0802MB2273;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTTRQUjA4MDJNQjIyNzM7MjM6dVJpYW9jZm5XSEs3RU1yZ3FpUjZ1NlBi?= =?utf-8?B?c3QxbHQ4V3FiZHFQTXd0aG9sWTJMZUtDU283cFlTY2J2YnRtM3VEZkdpZWRw?= =?utf-8?B?alZlOHE2TUx2SUZIS2l2eU5YNlBjS3c1UmI5aUJmb29jUVlhREdkSWtFcWcw?= =?utf-8?B?ZzErR2lZTVVkOHZNT1ZtdkpEd3RBOTVpUUp2b2xraTF4NlBnbkNIZFcveHlp?= =?utf-8?B?RlhmQ1RURzNEOUVUTHQwOFdnbDBoNmlyQ29zWUZwZFRWaDVKTUwwUG92L2NN?= =?utf-8?B?NG9yN2lvSDdVQWhuR21Cb21NbHJQYUFDTWlVY3oyUXljRGlZaVBNekE5UXVs?= =?utf-8?B?bHRnUENZZGwxZjJPM3A3a25SbU4vZUFGcUNaZGhPeFpuVm1DYjVzVThid0NY?= =?utf-8?B?WGdBenJ4VFgybEdkdUpPUHhWWm5mM0orUUNiVE8vNjFnemU3U0JSalV5ai8v?= =?utf-8?B?ZlpDUVViVWU3eVZ2K1oxcU03RDVrNXpyMVBHNG1Ta2JUUjBtZ3IrcjJ2cHNw?= =?utf-8?B?VlhhVTZyYnZ0UFBUZXFjN0M0QlFoVFlJbWVuc3NPUHRiWHk0T002RmUyenRs?= =?utf-8?B?eWcyb0Fla0Qza1JJSmdnSGwvZUNSaEowQXo3c1dEVlBzVi9FYm81eC9YU2kz?= =?utf-8?B?REVESWRjaisyem4wc3c5ZW5Pc1FJbHFVeFRrYkQ2TEU0ZlZ2bllvSGdHSGta?= =?utf-8?B?WGtDMXFPSzQrcWRGRGFaVytkaUV6L3FVcHlmUWkyRThFemhGVTBsQS91VFZy?= =?utf-8?B?M09oSFFpb3puTVNSMDJENi83ZGJIcWdnbGZXNHE5TCtRWjdNN3RnY0hDODZT?= =?utf-8?B?V2ppaldqc3g5RmJERUtKNS8xUnhvSEE5OWExSlVIazNmOFRFSjJTYkhxUHdq?= =?utf-8?B?bnI4ZWtaVWY5WW1lTUNZV002Z2FNc2czcXpmRUJEK1BYNFBUSVZxZG9ZYVE1?= =?utf-8?B?cHl6ZFdKT0NEUkJGQWlqOEx5Y0srVE5qeG9GcVdWekg3MnNiUk1hM0wxek9D?= =?utf-8?B?ZkU3a1RqWEtISkg5aUpiL3lMR01mUEJPckFBc3U3dC95Z252MnZ6KzNPYTlK?= =?utf-8?B?dWI0blNmT2k5R1FtU25NUGNnZEFiQXRXam9HdGRpU0oxQnoxZ1hrUEJ0ak1Y?= =?utf-8?B?YjNYZ1RjVy91czM4TVBsZ3dBZHUzZjhlWTh6SUlQbVdPaDBSY0tiWFE4cnhF?= =?utf-8?B?S0FjakZMbXJaWHBza3poSWhZbjdTUW9ZbFkrMnFDZUJGREJmbW9jQWVEVHBV?= =?utf-8?B?S1dlZG8yK2EwTEV0eXZFVEJ3VUE4MCtYQXpETkJkNFhNZUlqL2lqVFBvNUxp?= =?utf-8?B?dXpOcHlTeEQxUWJqMmtZSThtaXlqUmNkRUVsZFdGT0tnaDMydGQ5U0owMXEx?= =?utf-8?B?UzdGTmpuSS81dnQ5U2ltbTZWdG5nLzR3bGxZQ241SkxKcElvTHFZU05tVUJT?= =?utf-8?B?c2RpQTJrL0NRME1SNGw2UlhCakJwb3JaU0wzVGM0MGVnOXVTemtnSkVHTjhs?= =?utf-8?B?UUZCMmVqajhnaGZYc3k4NWV6bXVRWml2RzFQL2FBS21WR0xPRFhXWWNQMXFJ?= =?utf-8?B?SklCaXBKNExKbU9tUXNsWDhFS01zWHVBYWZZQjQ2ZUpiSjRhSFQ0UFdrY2FX?= =?utf-8?Q?8=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM4PR0802MB2273;6:cTA9h0xpllSQgCw3+5Qc3X7GkuUl5VfvpZUoDyMv3b1cg2ukjxkNh7ko+0st3CXzybswZqmYsPo3+MK6DanO/3TTn6bX/tcOCdER5gpogNiyWHc8e4XzgadvXvX7j8Bp3aOL2XLQ235eFzPGjNdKaa3d4Pa3ImT4SzuYBASmrFY8JMCJf42+PZAS92RTzHVQiMv8Tu8eJM+SMslmmn7Lz8pdfEBHV6kCLWBArT80aKgM5bbV6SuQ35sWarR3lqFkBSVLl6xgXlv9oxCp9QHaYJCYQPs/9tgSZOIMPi37bQUQU441gGbb2SPHIcWYohvgIzarEpgf+cwssjWW012KJJ1+aJhTP5CeQ/g/cZwQTOMXbEop2d6si6Vv0GejoEudgE26qOfrJTP+OMRcb5Wb0g==;5:AHhYR4vEt438zC1sCSQXEVOtwQki/Shoxvc7ZLJMOO/tCnuANDUlLy9VdFKkMTcuDXzuhvJH771yCcpF4GYjGkEb4ybQi8lwfw9tGgGc2BskVrXcs6UVbRY1A4BnVBwYfNNFl+YhpjSCNrmDNeS8iQ==;24:8ORhi8zN/eQf4jGbmmRNV5+XqzZYM3uE+sSv/Nq/lZ97vCeTUURyUXRRhU8pBMxCWZQSpeaENyJpvrKXkeRSDC6hg62Wc/gf1BBtMHmykKA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM4PR0802MB2273;7:nw7/e9ZxnRbk1YOVs2ucunBGMhhWVmDYFKkRUYXIvfl5Yobqj/W/5Xx5iZDEe3+USJLAuwe02TLTNMBGMgotkWHu3cW3YbIFnWc9vbgk6B1mEzr4BgsC6AOutUi5avUQt48NAQJ/68vnER9Jl0/5A3r4twRu++aWh6km/Mh+/+ZjQH1oylmOFQRdifC9xxEEHf5NJGTKCZwmsESyGlaOf8WOBybLbR3stF9GBYjx9FL/xbcemhALNnIJ/TRUy7BkZie4t20DQAo27VkSVJXEZv2/vzZZV3MqDf5z3g9X3hdRSEmvTOqdqJeiRnka4QVZ5GZIOHAbXC/D0sb2NOvXhA==;20:x6cOSX6pN9b82S7iA+FIPbKYueP4CAF5cHdDGUQyefi8d7LVXLuqCVbIU0dzSqECqkl4CDgOvfNk655x/5zwaVwTPS/uL9FZiC7Vmo43XwyLUiqUKMd2Y38ktfKG1gj5KJB4FLnHEoA7w4wCB07//rbfWS3eyfxD/BGhy4Qs+B4= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2017 12:10:24.7435 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0802MB2273 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we set depth in two places, and this confuses a reader. Task's depth depends on parent's depth and it may change only if parent has changed. So, set it in set_task_rq(), where parent is set. (cfs_rq's depth is set in init_tg_cfs_entry() and it's static, so this change don't touch them). Signed-off-by: Kirill Tkhai --- kernel/sched/fair.c | 11 ----------- kernel/sched/sched.h | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 3e88b35ac157..33b46ca301f0 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9102,14 +9102,6 @@ static void attach_entity_cfs_rq(struct sched_entity *se) { struct cfs_rq *cfs_rq = cfs_rq_of(se); -#ifdef CONFIG_FAIR_GROUP_SCHED - /* - * Since the real-depth could have been changed (only FAIR - * class maintain depth value), reset depth properly. - */ - se->depth = se->parent ? se->parent->depth + 1 : 0; -#endif - /* Synchronize entity with its cfs_rq */ update_load_avg(se, sched_feat(ATTACH_AGE_LOAD) ? 0 : SKIP_AGE_LOAD); attach_entity_load_avg(cfs_rq, se); @@ -9204,10 +9196,7 @@ void init_cfs_rq(struct cfs_rq *cfs_rq) #ifdef CONFIG_FAIR_GROUP_SCHED static void task_set_group_fair(struct task_struct *p) { - struct sched_entity *se = &p->se; - set_task_rq(p, task_cpu(p)); - se->depth = se->parent ? se->parent->depth + 1 : 0; } static void task_move_group_fair(struct task_struct *p) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 207fc1f4c764..4a9313f0b5c8 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1123,6 +1123,7 @@ static inline void set_task_rq(struct task_struct *p, unsigned int cpu) set_task_rq_fair(&p->se, p->se.cfs_rq, tg->cfs_rq[cpu]); p->se.cfs_rq = tg->cfs_rq[cpu]; p->se.parent = tg->se[cpu]; + p->se.depth = p->se.parent ? p->se.parent->depth + 1 : 0; #endif #ifdef CONFIG_RT_GROUP_SCHED