Message ID | 201704171617.v3HGHmBw020280@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Series | "Revert "sched/fair: Fix ENQUEUE_WAKEUP false appearance in enqueue_task_fair()"" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.164.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 18 Apr 2017 06:32:14 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp1330913pjb; Mon, 17 Apr 2017 09:20:37 -0700 (PDT) X-Received: by 10.200.41.8 with SMTP id y8mr9762580qty.220.1492446037625; Mon, 17 Apr 2017 09:20:37 -0700 (PDT) Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [199.115.104.192]) by mx.google.com with ESMTPS id l126si11341623qke.10.2017.04.17.09.20.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Apr 2017 09:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) client-ip=199.115.104.192; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 199.115.104.192 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3HGHxXs027220; Mon, 17 Apr 2017 09:18:09 -0700 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02lp0178.outbound.protection.outlook.com [213.199.180.178]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3HGHtSL027217 for <devel@openvz.org>; Mon, 17 Apr 2017 09:17:55 -0700 Received: from VI1PR0802CA0008.eurprd08.prod.outlook.com (10.172.253.146) by AM4PR0801MB2706.eurprd08.prod.outlook.com (10.167.90.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Mon, 17 Apr 2017 16:17:53 +0000 Received: from VE1EUR01FT026.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::201) by VI1PR0802CA0008.outlook.office365.com (2603:10a6:800:aa::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10 via Frontend Transport; Mon, 17 Apr 2017 16:17:50 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by VE1EUR01FT026.mail.protection.outlook.com (10.152.2.212) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Mon, 17 Apr 2017 16:17:49 +0000 Received: from finist_cl7.x64_64.work.ct (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v3HGHmMo027306 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 17 Apr 2017 19:17:48 +0300 (MSK) Received: from finist_cl7.x64_64.work.ct (localhost [127.0.0.1]) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7) with ESMTP id v3HGHmcZ020281; Mon, 17 Apr 2017 20:17:48 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v3HGHmBw020280; Mon, 17 Apr 2017 20:17:48 +0400 Date: Mon, 17 Apr 2017 20:17:48 +0400 Message-ID: <201704171617.v3HGHmBw020280@finist_cl7.x64_64.work.ct> X-Authentication-Warning: finist_cl7.x64_64.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Konstantin Khorenko <khorenko@virtuozzo.com> In-Reply-To: <149244355525.3320.5981277427187701503.stgit@localhost.localdomain> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM4PR0801MB2706; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT026; 1:oCkQ6AjJ93sFGQUfb79neOsSXw4/ozS3lFzwpVwtrQKjvR0lLz8XXwiPjiLoaVynkzOAYvdqkmZOuBjcVKgtFC5puJ8w7GA+lSjyj4Mbb/wfNQIj/eVCciiCMGT6YgrYk16BGr2uJYjkb/hHfkoVoXalslZse+4PbyrGjAxjCcImxJmhzH6oSCyGjncOzDEo2Y5QdZ5Pg78WOFikSOdvwi83XmJv8uxtoUV4BK2DVuFOQefNKmGkclVDIPkz/ELFg3dw/PdmbxkGL/KUaeFVAHRun+pCKRCNntjgHOmebQ1dviHyCwDH6WdZUR+4nUj4/n3K5RxJFEJegsA4RklzMypf98ZvJSGhH5PLD51BlH40m8xGZQOlsLWZOUIBEiYfpNG3btbg0hUemlA6KAHb7baL9bj8WcwWH2eP0xzTH1f7135xDsLri31PvhlPqR70ATmFsGDODowRWuF0LY2+ECO87QS7yTTLC567NvEBMi3sygiEKZxMbH2S5p09IrFDZ5NTzC1xXjjsuxojWra9qQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 99337da7-565b-414c-05e5-08d485ad4afa X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:AM4PR0801MB2706; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 3:m1Omt3Ih4JR6KrYTe6pbsKc/YBgcfEwlJr0kEHFJAhsbxCt9IFWafAFyCky5DqbfaRorAcYTWzQjrcDkYBAARwEQkJy3JtyMGmRRiktq/e5kg8h1+9Kr2tCeRFQguXoLCMFZibVNgko1k7ZlqmwmrLJ5pKkET9bMYCad3GcLWW8dUIbGa4ImGhVs0lXgp//KhixU/qwUiJWGHMk37ZO2O3O9HI/8imU/xD4LCYN1UbnLImohSaEXhc8t7EmicgZY9UKHwjxdEvC44Dq3oWnE2sQ+3G6YrBiizT2Fxw0ogMXajw8rZnCTmFkqwC3bFJnsDDTwYm15c8WUW450QFSIowekr0U/u0sJJ0GUx5+1lgIQqkLDpMAHw6y1YQI4ele6BbdsYhLD2qbVTn7mpk79NA8VBFTIq3KOxDRQGhAuhp3frUuzgweUYAcyMEqPvPDQRbL7jI+XYPq+OLcUjmlOXqyleMZX+cIP6D2jf76MvcArQ3hwHbNR/+7ZIyIQRreUqCwIrWFPYx4XmzHzVxrdCw== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 25:T0QjUbfC51bbeABkvYVR4Ac247/I1JeiGP+76W35kYSB2N2qcsFVZdoPW1+DneJ/qtFMpmE0bIjMMc081/4xZZrFAfIdH/7Qdkpcy3mL3UkPWLxMLdd1tkeyQsqnSXYna/VY/gdeHK8q7+i9jl8Ha6TWBY/rZifQg0bOLiCjT4c0DSBktydAbCdv0vq/o5qYTyhHsTAcl2Q3fU4FekJ090LClglnFcRuSYjVz3z2zm4JCLgQYErdEbXTeG1JXcUhKG0CWrz26nLs8pVuyvRD8N+CcDWm095Ak5nDciT06/FmQv/ixXNISYQy+JcSV3u8f0iAtcziGTew8Fqur8nUkRMp0vaTt6+DLIT4a9WHqkp2f+8Qod/5wfyPAIGr6l1UePha1idZS2kCRQT2va2+cjIwNUpH6HuKVKGSS/jtc5gi3nctpsSeyNqdXWyKpJKYgp2If45g0wDQcsl0e5hzKA==; 31:rM7yojSX2AKAi4imNgJJ1NaXMEw0XZXfuIoVTLo2H8KJoehA2J3ncEH4bx1ZcCfnSSpwdY3MToohudC0QcwhrxwbTgZvY+3wmZmmre9xNdueCzGyFrdiQ2Mp+p1/8iJPPac3ZqOJpG3WI3dKMG+S4EIU+Fgs/qFxgyeGxa8AFw9W/GBnuIy1TS4cB+ocEAzz5JRQC4LaxOfXZJwo1aEfH9BN/ljOEX3/JYcJ2B7QEgugoVeyUgeAfiQAdJNPyAPrtfDuxNDqvT8qnXGAWVZS9GQurZSjd1aq/bhQIyCk2kAkg0WHoNFWSwG5ljSzyqk4YE0rG36dpiEJjzH9vmvweA== X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 20:Cs91WNUzxKstDyigMxYxYZckJXo8/dWdUELKpfLc//SettJ8D6vujgDMwZQ/L62ReKboJQjzcwkwzq9iHOWs53WUYrMAEJC/pGAekJoKDskUWVu6Kintk1HzRHVl6jlxkk+unHS+BIAefBjiwACzwv7PHxiRmBZUIMIzWH7OrjMa81/Bvn5ssqzSEyN+q73brF62T/BXxjfHQ3Kj0L6c/tX8d4i5rA7kih0PYtULxZFO6/enVJH7EGqoqv9yrRBHaRK7hvAQaSpJJbpsOztGwOL5afFipi4Z5QIeAVy7em1igreLwuKDbsGRR9c/FCCixgMkMoejlye0eI84KqxF8nZ9jyCl9nzGkxyihu3CnM8ub7Twsa4mFdZF8Gk6v6fMYeerYGIWQOrg00gKqM8yYtMK0ne6X4C/yAfjDBV6kRXqUwMN51O2EoZGmPhITF3WQuEsI07eeQY40+yuFCBSeE3BiEuGptC95N5kqObZl62ej3A49zzn6xz/2XNMxRuDdih3AmsiKOoT+45Y9Iv9lw== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(13013025)(8121501046)(13023025)(13020025)(93006095)(93004095)(3002001)(10201501046); SRVR:AM4PR0801MB2706; BCL:0; PCL:0; RULEID:; SRVR:AM4PR0801MB2706; X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 4:gq3YUC36iBhDSv6UqlEeyTtQBmhT4WGYQysvVm2IWKMCeroYsQsAiJHwfERXb7O2bf3LbJ6abYKCVOOJMWIEWPjnzIEggldmTdH2zQpady6SH/uUisOqr5eNtYTgYGsda5oPB+Eu1IYxSqo3Cai6dnKAmRrRmagV7xfJNt+VINmqxmnHDl/UmD6NfZVDTWe2g8c03j6UsOnpV+HQRnrBNkYiEheo2qg9UoGI4bqKBngNhsK1JZXbZ7LFDzrhR7qD7MdY75WkqitvpNgFemkGVdSaAAjQazJlDb3K6bxo/gRG5aiywa8qaKRTx3yEOpg0Ratr7/G+stpV7vF9cUicx/0fwDW4PDsT162fc0lWtiRyVn0qu6J8kb2u7KPH4uoAE06xXUIkpvluLAgF8wMWNFaAlht+0NXxqw5JTpz22kqzAuF0buJX1X950XrY1rNSfoftM5bPzD/4g9vU+57UwKX7yNuuwH/sYsU/U/cd2nUOHqXOzVe+saUS3WTVsLN9wyN3siZ/BX9Ipm2Qv9s9PPLfS+PcEFr1vuZzk4YQAXo=; 23:WQZwW2W9Q9Zwc+4XFZyeaNgMmhhjvLC1eBJYxt6rHxL6VhDpuVD8OxqA8rTg59gHQQcKeau+kKT/JNyFcoNYNume4XEU1okmXaaeMzZCbvL2LsNHXdbAdWt0JzpElowZeaHRMlaP5vBFaxOoxBCBGwFdOARVImFkM07lhOA5pKPx83GX/73POooIcok783B1 X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 6:kf2d/lo+9tU4g7eXqtKN2LRq/JBkAG17v5f9H1eMgpXLI57nk0z0zNMX4SHyJI5ONJj9lIRM5pTXOk5K4RRuOoaIpRYU7ZYDFHhgxGO0l0xr18S7YM+W3J44TmbDQ7gkQCPDMYJEPt76gh9m/vqU8R3t6jcsMsAnDwlZG7SBYtIgAOWDlFupBeCCZ7ouRTDCIJEcBj5sRaut6/1ZK71NuhY38+KeS+BSkzwOMcjHgZXY44bb44K+L0myomFPuZXldNggFa5DqDnJnTqRxyK/RTf8eVvgg6yXP97HQspsryBgOSwcYwaKvteafQ4xDdjBcca7+ZIp3GsNJP8oARWS0uI9YmTs1ObnWH88wmEKEHP77JJxFDMUZibG+oT3bQuOgVFNuCHvPEmeuNLSMW0y5vF1BcXsolBxRyiar0V1t31NMBor2LcBFmpoSss9Z4bH; 5:aWeU4gAFc3ePqZIPjAOHFetnS1e4FWQ6lRwX27GV3VYOxfxAQm04gBBv2WdjpQrVI9Fi1zve91fwYKhtxJxIeu6MnskZni1jhiyCHQd0Q9roh83ewj1LsaK27j0/OEQsbcVF+KUMQ0WFVyNAnSTaPQ==; 24:aKQi0m+DiIXc66JEUiWciSQPMxaotkf31eGhp/SsibKJN3/ZjVdpsODpnLW5rT22jJq4d62UHuGSP/cqA+nLxUre5a3DZdyQERa4xMNsljk= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; AM4PR0801MB2706; 7:adnzu+EQ8JLftYYtEdajtdeb8zhqf3pFLYv9gyzJeGmArqzrFsfXYIzgFVJwlaPrJMS42u4ggwseq+5XpSFmWZpxlcUYEf/STFaG6tFu/jWu4wMF8aHxpt1/9gV+IeHdvws5IiPboZnxt03Du8yuhtiaYteiYmFuUzTIPOg7RnSeBDaTnoHATnQVmbPBVGnwOghvnCMp70g5dqtaIFbtcdp9ua9TMZe2Y21nx8pUyYGArsU50A5EWCkpggO8aV4NxK6YuYpyB9kfySqSFa0eujwmrunFaFHHRihIevKAUTXlTcgc0mjYLsj4S1H/dn8XQXzn2jtghm3ZHwdCa4T7gN/NDVP+DsOA3g/rpmoqm4+0BR87ugwyStWgtB4rF5wqck6PU6z6j7t6E3wZ7Puhlw==; 20:vM+XmOivT3cHmGimxgSeMbH0fVeQR+t6dyBbohSATi4U8O+GG1z0GM9YvRFW1eMeTnZQ3VJ1DQgi7FMXPua1fRVHrHCHaVDBTSIrBWF+5X766qb23nq14V4zAf1GYufqI9WLbrmI/E9JKGp2ArqUfPARW/E/9tHnEWJcgNHg2DA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2017 16:17:49.5755 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0801MB2706 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT026.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM4PR0801MB2706.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] Revert "sched/fair: Fix ENQUEUE_WAKEUP false appearance in enqueue_task_fair()" X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6de2bc3..35562e2 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4291,7 +4291,7 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags) if (boost) boost = enqueue_boosted_entity(cfs_rq, se); - flags &= ~ENQUEUE_BOOST; + flags = ENQUEUE_WAKEUP; } for_each_sched_entity(se) {
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-514.16.1.vz7.30.1 ------> commit 5055eaf8964e0390c29d400dd9d69684dc01af10 Author: Konstantin Khorenko <khorenko@virtuozzo.com> Date: Mon Apr 17 20:16:12 2017 +0400 Revert "sched/fair: Fix ENQUEUE_WAKEUP false appearance in enqueue_task_fair()" This reverts commit 5c55133e47d0fc6cca3ccc26e7067593025ca129. It came from mainstream and it's need for correct placing parent cfs_rq on a task wakeup. Must not touch that, because it introduces imbalance. https://jira.sw.ru/browse/PSBM-64576 Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com> --- kernel/sched/fair.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)