From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752457AbdBUMLP (ORCPT ); Tue, 21 Feb 2017 07:11:15 -0500 Received: from mail-eopbgr20096.outbound.protection.outlook.com ([40.107.2.96]:27920 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752085AbdBUMLH (ORCPT ); Tue, 21 Feb 2017 07:11:07 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ktkhai@virtuozzo.com; Subject: [PATCH 3/3] sched/fair: Kill task_change_group_fair() From: Kirill Tkhai To: , , , Date: Tue, 21 Feb 2017 15:10:51 +0300 Message-ID: <148767904663.5212.9972276733201696001.stgit@localhost.localdomain> In-Reply-To: <148767900991.5212.16341443539923627997.stgit@localhost.localdomain> References: <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: VI1P194CA0011.EURP194.PROD.OUTLOOK.COM (10.175.178.21) To VI1PR0802MB2286.eurprd08.prod.outlook.com (10.172.13.141) X-MS-Office365-Filtering-Correlation-Id: 5a356c32-9c6d-4f84-250e-08d45a52af09 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:VI1PR0802MB2286; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2286;3:im42E2yInJt8kTmo9XXhVcRv1ZZRL2I+IsuB33OQ/KrDyUvZiZnwXCoPke4+2bKbQm32VX50N/TZVnusYAZXsqjy7+P8/X99GDdQblFryHCikZJfp6olxwy9X/4fMJPRpR9RQtRS7s3swAsPwBZv8p0QNbdjeXnZLZLetuRuZjIGXNh4tXE3xPmVSg9dD50Te/o+qrFr6PL/71DH6JKmUcbA0W2LKaHQMZ+ih0T4HHFjKU9oQEcyD/JMwcxJQ7bRkSnv9wvtAW5Qdzlnr2k2xQ==;25:b8CbNs4aw7C86qiFnGsA2rIAJeVa1K/S2RPTd05oOM+OtXz85Z2Qt4AcdTZe6MaQZgIkBqudE8uuRy9zNk8gCay4wPjyRUMjGJndVvoIUG+pYVMXXxq0UzgTpjfmk8ZoDfwcW6uIjnRY86SF4K/mG1YkAabwepF1Sc+xDb9CSjfOlfPL/EC+iMeXAF1R0sM3HksvIyZmoItwsV8vONw+CipiP3BaB63nRTHNMPNoLhS4PfuDYWN/ldI7wYzkYvtEmFehvh4Qi101HUor5urfIINSakWk/NhIVAnIwrV3sSecEh96lPAmIKhHsetR26Q+kuscjUYXaKjQeEuhW+r7ArLWAG9OpdIxPEKnTTWRugbtTULW1twgFQ2/suYLijfn7ZUYEi0Uequp/OJp4LCG/fGk2CWpYDmVStaOZCxdwKjIE7t4D81RB03l8eu4yGBZm1pleJdPt/mzqBDZ9HyRTg== X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2286;31:2XbPGYH3b1hda0vhcwo8AWyx55n2KAZudftFAqEJr5b5MuJuKKtUTuT42PJUwiYeMtRHRFvO9+BsYXQYv6hRzcVoPA+Vh4F3UEcLWVcIZlvdhgVuJ6peDhTZ0oTcjZ3TINBDMVexNK+i8CwjlGWMYckptjGutxsyNf/Yvf+88iMy/LPh+vBHRcO8o6qN/OE9BVKoDlI7HeH0Y04LiPc6+8iQDhBtO4wgb588RUbVaxs=;20:JCP1+sKjtknSmsp5FePwYqhf0yTkCbcsF17DD89YIK3edS1Q+DIz5vnWwBA5p3Ctf7j0Fagpx0Ru4y7x+ZtmF0IihEifbfHzUq++00j4IEsvuugnX9qH9WSVb2v4F25cZk2EIw5lS+y3dQ2D1jxNC4CbhiIlEM8PwEIIS3LLnjYtXse38O5cdKB+ApoIa3rQoVPl0CYNPd1pau07UOb3ZcUkfmp4d+0y/mfnjd49fpc1f7tbQo+6b3MG9J625NW/d9JWjoq7p1ZCqtuIewMN4RgUMtu6popinpJ61ZcRUeZbONpmN0BJTsA4407XD1AFsk72yfrYVvEWGCGC+iIU2fBSfNUO5mFK0D11RiWPanfw1BwmMOn5JgCxnUlW9obJUtKr2ASG6tqMbGj7/XiIRtqcM2OmqwUI/5CeusPDSME= 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:VI1PR0802MB2286;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0802MB2286; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2286;4:ax9mWSzSHWrvAKwXYoinTqkAj66mFmJCQIWIiZXLa1TqNo4tteb+4MOvbU7/FLBwSDSbgh0SLGRrGV2cXjmbPqNEIRT4ed7o/XuizwBhzV5THWASY++5W9jDohr+DWtC+k16e+v476mvi6va4OY43btcvMn5KmsA5e5sY/QnZMYU88w8zD7IJsDCZIj2x45YvPzYmIyYsrNxSZTemAUF6uvnJjRtmhg0oaDROC+qK1Tq10MAtgzm7jpATuZBQKBSs6s+oOahj1+w7JKjWrDYWE63y54rurcCs6ifAps/MEx7M0/aOb92xt+T1a9Q3Qw1sbFmtYBIE7MnAh4tnBkg7BV82J65HFxynVx2EltqVjoaRro9ylfUYY7m5Hk79brGg0Tari5uujZeftkc5a8OKJdenb1MMw4NjnSrdEg8khqsUdlj1iPqsYS0G5UBXDM6nnI9z173xBoXrHpkTm34rBXeDfsiJUKUMYBradRDaGbCAsYP2jp2bwNZOBXYXrwzdTR2LDfQyxGzLBPAGHZUHyAz7tM8PpRCc3bjySOkuEm+39FOaBcfNIHt04psIzcJlNzTIvT44pUJWUwouNKCPmJz7RUUeYh0IcfQnlLgS70= X-Forefront-PRVS: 0225B0D5BC X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(39410400002)(39450400003)(39830400002)(189002)(199003)(6116002)(2950100002)(54356999)(4001350100001)(97736004)(50986999)(6506006)(3846002)(105586002)(76176999)(5660300001)(230700001)(106356001)(42186005)(38730400002)(50466002)(8676002)(92566002)(47776003)(68736007)(81156014)(33646002)(86362001)(23676002)(9686003)(575784001)(2201001)(101416001)(2906002)(61506002)(25786008)(53936002)(81166006)(103116003)(305945005)(55016002)(83506001)(66066001)(189998001)(5890100001)(7736002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0802MB2286;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA4MDJNQjIyODY7MjM6Y3k1TVpzKzZUWTR2YVFodlYvSVcxbUI5?= =?utf-8?B?SlEyMmFpWjNVd212L2pnYXBFUkxQekVCUzUrTWJjSnpQRGFjWjRnUm9CbGhT?= =?utf-8?B?NEVkU1ZqOGtXc2J4Ym9ldU9DQXI1YXp5Q2xybTlJSENaMFYrb0k4TnRWbHJO?= =?utf-8?B?MmE4ekdjWkwyN2VQb056YU1tV1dGOTVpWXVQODRqTlN3VjZLTTdHRTI0WHJi?= =?utf-8?B?MnArZXJVTEo2Y1V5cng0YzBnVlNlZXdQWTZxN2VuQjZWMy9MOSt2Vk5Wam1h?= =?utf-8?B?T2pkQU45ZjJoL1VueHRqc1VSaFk3a091YTZXZVNQS1RIV2UvWWtEeEdWdFRI?= =?utf-8?B?WVJqdjdleHdybjFZOWFSeVhQOXg4Y2xsK3FKUk5pMHgzbEZVekZuZTVqNTZz?= =?utf-8?B?T1RmaVhqNTlTRFhXRnpyaCtZN1RWOExXU2xjdXRZRkRIbFBudmNTcmR6dURp?= =?utf-8?B?aFJ1SDc4Z2pMRjhjcDQzU1M3bExCYXlpZXI2YTZ1SFNpbHNDZzZnWUVaVGhE?= =?utf-8?B?Z1h6dk8zVHFPME44dmNFRWcwbzlpSCtIMGF5S2RMRTFlK21IY3BTc0NTOHkz?= =?utf-8?B?NEFKK2ZFbFhoY0YzWFRJOHd6S3VXT3N2b2QxKzNFSlFNcTcxd0M3dHE1UHov?= =?utf-8?B?elp5N1ZxcGVQUEJualJOSys2RkdrRTZSRzllanBrTmJDY0k1Nm40QXRjY3hC?= =?utf-8?B?K3V6KzNWeGlqcjE1cXhQOWN3K2FuV2VnYWNUeTBjR2U0d3JURDNOL2dXSnVK?= =?utf-8?B?QWtqNng5VFhETXlEZGdhTHZySUhuMWNBeUVTcnlmNVIraEZ6VXk3R0R2MDAy?= =?utf-8?B?Z0tTaUJ3QzlYUzhBK3ZEZ1ZjenFEcnNGcUZGSFI2emJ6RkFuMFRrL2FqaEpX?= =?utf-8?B?aW5QdENkUHF5WjRDMDJETUVvd1o2V2pIVUhNZWovRmFFTXM3UW5YZDRPWUhh?= =?utf-8?B?SURnZURPaVo3dXN6MmFYVXl1VVJDbndlUlE0M3ZLa3cyZTkyeTZVclhJV0k1?= =?utf-8?B?eUcxMlhNWkM5RHNGeVh4THJUNXB5ZlFoVE5YeDkvNzBhai90bU5VRHVVVzBK?= =?utf-8?B?Ny9ScnZFS1pYM0M5WDNtU2NXSzdHTTZQZCttc0VQMWZJU0FidzVrVVI4eTUr?= =?utf-8?B?cGxJbHMxK3J2anQyYnFxOFlEK0FJVUxsT2VodmRiWEZ6RTBDRllkOUpQM1VD?= =?utf-8?B?ejIzdHFBalJ1NHRQVEVHV1MzdnpBK0d0RjE0UU5YWTBQZ2tGZm81bkZ6bUox?= =?utf-8?B?Ri9YUW9mL0NHV3ZXbi9BQ0hBdmZpNEdtYTJJN1MvVVIwRTRLeG5MbmtZTXNh?= =?utf-8?B?RmZoTVVVRnN0eE9KR2JXMnpZWHF4K2Nkbk1PNkxWYnZzNm5LQlphUFhPRlFX?= =?utf-8?B?UWQvRmo0aTlmV1pzQ1ZlS2FTQ3dqQUVKMUJJNnZjbUN1Mkp1dWlBVXI5VDVl?= =?utf-8?B?YkYxdnkzU1o2SHRITVVyQTJZakZ1cStlME1yN1ZsVDdoSHo1LzVSeDVGTEkx?= =?utf-8?B?VFkrZkh2TnkrV0QrSWZnV01LcTRtYWNaVjVFT1hlcWFVZ1h6cWVvdVNrRWQv?= =?utf-8?B?WitqOGhQMG1PQzZmanN5bkFkZ0dGUjBVM3ZIcStlRFdUM1g1cTFCWTc1c0tN?= =?utf-8?B?SDJIWGs1NFpVb3ZiZjBmZGZadGNRVDIxRm9uVWpVWTlRNmFWOEZhdnlDNGc9?= =?utf-8?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2286;6:KaS87PvwaGvvWgnMyw1CbeKPYmOXXglNLrZI1Ua8CSJqD7vJTdvfOtEmC1Qg4W6CEflm51XYRIXuFT0cAzWaRXQYdNVz+Yh1QlIpapTzyRt85B6LTSZOLhYroGpf3L7TJhhy6eBAAyWb+56qS66Kqz2qf6a072L6zKS3allBFxvJOiq1n2Kf+bPm8OHr1rhTl81eTcKCpbOR97W5QOqefaBHAq5n6LBwCFT/ZgR7Fu4i3PWdy/VDjfibIozOGwO7FDP6NEfo+MwlnjqptENq923xICZOfMY++hv8nJVriU86UXOYlCrnsir9Rk5skfTp1p4kqg7aADFbI37jr2KQlgCwrWzURCr9hnXz/X13yciGMxuMRxBpIuEFCkPfx3zsTl+YoQ0OoleTv747Oplv8g==;5:UVDuiElZoqXLmGhja7GZiHCTGis+Dq08NxlakGbQGY30LXrWkWck4/QoiTXMnNgbkP5dX3WdEQbfD9MFmAFOq2OF5tI1Ye3mRe/WclbUmx6w9+AT+6QsHttr3hJsjxTdkyiQF1zU6ZMJi56ntD+ncQ==;24:hGd7ZUXqyT5GlQr7sCohs5KJs2luKNA+4v36QL4E2MV+yKmXRBtdETfie9JEzTkOUXoeJY91kGL0++9vVwvblmTjjuwjv6Rq8Rx5bRpNohg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;VI1PR0802MB2286;7:JJtikZoXm8Tr2PZYkSH1BoZ7eZuQ4Od4izYZ7K9GgHndR9QicQaGk6sm+uU4nJGyjXsb14Hp51c0wShh0qs1RTPdwieNQnnkA1AOlWq1YSspY5dTM2sudMwFGWJHzMwx2pX2ByQlQB5nZSU1/Rib/10crJ0kxmQ2ppwUYheT/jj9bg9ZoohLKW+AzzxqUBsYJlzK5IbrQ9qSR46ORKbt7HyrUFoX2wbCLEHJ9OadyuGLFt+zpCVQ3XG6rleQO8wbLWOKInepV5QNalP90+Sp/tKFtoczvQ/yg4Y07v9/2PkWp5f8Y8xcEjpvQl6Yq0rJ5AMNnBdvHdSNueSTwcDgCQ==;20:H8y3Zw9XD15nK2WpUZ0oJWgO/Mw+ASbbsYl/vmvjd2DWHRBZRpOquZ0tSK6BrxYQFW3JWdzwlfL30HqfmvL316DBOMh6x/MQoy4HMAu1CEbqwVyENEDniFBx5K8U4VGbQtE8+iROtb5oSWGY7MEJ/Vvbek5zA3h7Ei2ESvv3NTg= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2017 12:10:53.2789 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2286 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since we need the special behaviour for TASK_MOVE_GROUP case only, we may move the switch up to sched_change_group() and kill task_change_group_fair(). I suppose, this may simplify the code in some way. Signed-off-by: Kirill Tkhai --- kernel/sched/core.c | 4 ++-- kernel/sched/fair.c | 15 +-------------- kernel/sched/sched.h | 2 +- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 8f972df76eb2..5007892342b2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6395,8 +6395,8 @@ static void sched_change_group(struct task_struct *tsk, int type) tsk->sched_task_group = tg; #ifdef CONFIG_FAIR_GROUP_SCHED - if (tsk->sched_class->task_change_group) - tsk->sched_class->task_change_group(tsk, type); + if (tsk->sched_class->task_move_group && type == TASK_MOVE_GROUP) + tsk->sched_class->task_move_group(tsk); else #endif set_task_rq(tsk, task_cpu(tsk)); diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index a005bee12e0b..cf6d12513a3f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -9206,19 +9206,6 @@ static void task_move_group_fair(struct task_struct *p) attach_task_cfs_rq(p); } -static void task_change_group_fair(struct task_struct *p, int type) -{ - switch (type) { - case TASK_SET_GROUP: - set_task_rq(p, task_cpu(p)); - break; - - case TASK_MOVE_GROUP: - task_move_group_fair(p); - break; - } -} - void free_fair_sched_group(struct task_group *tg) { int i; @@ -9462,7 +9449,7 @@ const struct sched_class fair_sched_class = { .update_curr = update_curr_fair, #ifdef CONFIG_FAIR_GROUP_SCHED - .task_change_group = task_change_group_fair, + .task_move_group = task_move_group_fair, #endif }; diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 4a9313f0b5c8..f2bc04826ea5 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -1407,7 +1407,7 @@ struct sched_class { #define TASK_MOVE_GROUP 1 #ifdef CONFIG_FAIR_GROUP_SCHED - void (*task_change_group) (struct task_struct *p, int type); + void (*task_move_group) (struct task_struct *p); #endif };