Message ID | 20201111172111.19300-3-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from imap.gmail.com [108.177.119.109] by patchwork.criu.org with IMAP (fetchmail-6.4.8) for <root@localhost> (single-drop); Thu, 12 Nov 2020 11:47:00 +0100 (CET) Received: by 2002:a9a:4d14:0:b029:97:cf3a:849f with SMTP id h20csp607867lko; Wed, 11 Nov 2020 09:22:47 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyLAXQZYSOCUDb/9tdv2XxuZ5hMxonr7asRSIHfQ2/7gp0kXwOeLSkawKuUS9fx2xblwjD X-Received: by 2002:a2e:a486:: with SMTP id h6mr8630412lji.105.1605115367313; Wed, 11 Nov 2020 09:22:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605115367; cv=none; d=google.com; s=arc-20160816; b=comzR+euOE4B/N5QWCIBznvQwkljOG7Qzb6Lh5MtWZ7DwZZ/eZjLI0E9jhAt+U1vf8 q9kXqzRH/l3i7ES/hdtcvJKU7xdIA/z09E3Emp4cfa3noTVoDrsm3vN3rdGZ5/Ymq40Y vcusuudt9i9xnheSezSON5oW97dWiqtxcV5YGhmPqCkLPm1ZJ84heRunAdsfTkFAGhqE bYCQaOHate8HWpVNRN+CsM4b00xvae4KD/dbFi2uBEwgs8Vl/SPVYPn02VC7Fqoi4Ic9 Zscwr4SUATzr8Ss/Rib3aUwdTWJimM2ka/0yIhPq+mMnPXsN8HDT0Z/7RjjrBHjBLCTf k/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from; bh=UAl3yMeteJ+KZqWGNtZEv+DFi/jpVe09Ow8kdcCcsq0=; b=VW+k0uqns2P1RMH5DxWwKVAolADI7sgShlMkVuUJebfRnTye8lA64bK1HjaZuokdtR LYQhURgw7V0cIRKkA2LB06u8Gonym99zfwsK2fk8/QlXM8f6+xd4vhk9xvXVgqN/gvHs 6Waoqm8kGTYN9JU7N3aFBtri6QYPvb9AzOTdl30SGQg7Zt92nckxunWkls3ZM2GS05ab cwGEoQytrWhMsy9AGe4gr8UYDmlu1NrEDnPDBp18XLj2OJ2daZtwYdXFb/NT2TrByleU tPuqzMqbrb+3v3sVFpGjcdM8q3loPoe57Jq2qwumo1MUoEjYGTxXRokdPiwlnI26oelt VfMQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id u4si1072229lfm.14.2020.11.11.09.22.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Nov 2020 09:22:47 -0800 (PST) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 0ABHMKBo008968; Wed, 11 Nov 2020 20:22:34 +0300 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04lp2058.outbound.protection.outlook.com [104.47.14.58]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 0ABHMI32008965 for <devel@openvz.org>; Wed, 11 Nov 2020 20:22:19 +0300 Received: from AM0PR10CA0053.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::33) by AM6PR08MB3048.eurprd08.prod.outlook.com (2603:10a6:209:46::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Wed, 11 Nov 2020 17:22:22 +0000 Received: from HE1EUR01FT005.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:150:cafe::b7) by AM0PR10CA0053.outlook.office365.com (2603:10a6:20b:150::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21 via Frontend Transport; Wed, 11 Nov 2020 17:22:21 +0000 Authentication-Results: spf=pass (sender IP is 185.231.240.75) 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 185.231.240.75 as permitted sender) receiver=protection.outlook.com; client-ip=185.231.240.75; helo=relay3.sw.ru; Received: from relay3.sw.ru (185.231.240.75) by HE1EUR01FT005.mail.protection.outlook.com (10.152.1.229) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.22 via Frontend Transport; Wed, 11 Nov 2020 17:22:21 +0000 Received: from [192.168.15.230] (helo=localhost.sw.ru) by relay3.sw.ru with esmtp (Exim 4.94) (envelope-from <aryabinin@virtuozzo.com>) id 1kctoX-008B65-Sm; Wed, 11 Nov 2020 20:21:45 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: devel@openvz.org Date: Wed, 11 Nov 2020 20:21:11 +0300 Message-Id: <20201111172111.19300-3-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201111172111.19300-1-aryabinin@virtuozzo.com> References: <20201111172111.19300-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d618bd75-20a0-4ef7-ca77-08d886665943 X-MS-TrafficTypeDiagnostic: AM6PR08MB3048: X-Forefront-Antispam-Report: CIP:185.231.240.75; CTRY:RU; LANG:en; SCL:-1; SRV:; IPV:CAL; SFV:SKN; H:relay3.sw.ru; PTR:relay.sw.ru; CAT:NONE; SFS:; DIR:INB; X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9z6DUs2Vh84id4YbyWKff/CCLR2RhrMjbmJS0Jmr95rBQ+MFrLahlGMyj6wr?= =?us-ascii?Q?gycnMW489BMOqXiZM59tlmEgjl58du+7YoD6zG30Wm8+lnDodJNhga08oncL?= =?us-ascii?Q?9Wps7mEZ0PPCGfcXMfMm508ELnEI47V0AtJooghXld//5LWtpTeO/7X/050O?= =?us-ascii?Q?Ha6z8mAhHp4OfydpX2K/bx8wa0lal6E+rXiuB7sEYW+MzrBQXRMjtZzqUN3Q?= =?us-ascii?Q?JxA7Lj27Y4WmORKu9mbk9+gLnV8iAr1cI6HITjF+Iu3sQeLZL9TObucHFrfm?= =?us-ascii?Q?SIjOrcVnjTvit+L96b7VHYCL1D4RCpg+wy4v5HqNYYvrPdzKIbPl0YsdcTRJ?= =?us-ascii?Q?Gx64q1O34C8FHaAS4yC7Bcpx8MWDjSpohe7NfPZtoSOmDFVqJhwiV90mHWdP?= =?us-ascii?Q?ptEJXZRJhGSgsCEBJuJnSOtTPDKr3YzXQ+Jv8pySxQgYmSEgtr4JumapkCMw?= =?us-ascii?Q?1Q2D+SMsQcR8CpCy05eR1ucwIX6O3tiYtUAyx/1UymGeBiKH7LkDMoTWmkQI?= =?us-ascii?Q?aelJSgfX+q5Bm4aga1zLPgYFa5RnWpX70BuPXfnktnQ6N66jUSIZHODDqQfe?= =?us-ascii?Q?Im1p+V5uTQ7YnReO+l+Q/ssJvqqXHBQHEFAhzvfSseCYeQQ3BrclmYRklyH4?= =?us-ascii?Q?rNbMiwvQ31PzosDOnYVSta22r7EW/fxOrFFubLGDJEz69EmitLFKxtTJfoNW?= =?us-ascii?Q?4xqWtWAjiFXeNxzpgVWoeN6V93Xv9rQxrqd4aR7pcREixM0X5n0F+vh2R5m1?= =?us-ascii?Q?7IBCKRqnh1/1VAJmkT1Os1FCjr/OhXa2KwxwsUNqw36OcEW209U7YqPKNY7B?= =?us-ascii?Q?EYGasufMd+DK28LOt/R7hI+yy73baXFGtbuugjfsGaIJjZOv2qzbynHWILdW?= =?us-ascii?Q?1CdC8eFuD25dO7WEZrnuQRaJIfm7eNtoVLyd/kmQeYyIWTu7RWfMijuLHn4W?= =?us-ascii?Q?pJ3uwkopfffPRZlg0ImP27GIEhchlHmt+POkW7B/ivkIGA5JbUbNsbIJipG/?= =?us-ascii?Q?Wt1P+AQI28MpYSUlk0rnLkFyU0n9jtG4337U58b+bZD2e+e9s5pfFL+p1qrj?= =?us-ascii?Q?og/AFpN/GKsN/a/FtuiwvXwkGqv3T/BvIm5ReFDBFTsLQH4+TWQrUDjySM0K?= =?us-ascii?Q?RXrritlI2JNOYgpDHciV9mtJXn6BafeLpcHttl5wsKblLLKpQBUktzccOubA?= =?us-ascii?Q?PxnkBD8ZWaRhWk1F/UPIHMZQccmFbG6DjIPPH4ws+fsxvCOX0sBrqBcHEaPW?= =?us-ascii?Q?XY+Rsu7kZ9lKkAuYBHBPpE+GnvCucOkBQLhoP+3qOeCykR2iUT500FtpxaPl?= =?us-ascii?Q?sxPg2xpQuFpcTf6IJ3BBsKpopyGzsU4oNxkzCeo8VS+Ptcv6knMlifZf4/Ao?= =?us-ascii?Q?UBwBQ9hn86HLmFOlMGiA+GfxR6xJ9mcvCwa/X4zKEjZPjgSDIQ=3D=3D?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2020 17:22:21.5246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d618bd75-20a0-4ef7-ca77-08d886665943 X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[185.231.240.75]; Helo=[relay3.sw.ru] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT005.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3048 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT005.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: AM6PR08MB3048.eurprd08.prod.outlook.com Subject: [Devel] [PATCH vz8 3/3] oom: make berserker more aggressive 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/mm/oom_kill.c b/mm/oom_kill.c index e746b41d558c..1cf75939aba6 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -1016,11 +1016,11 @@ static void oom_berserker(struct oom_control *oc) continue; /* - * Consider tasks as equally bad if they have equal - * normalized scores. + * Consider tasks as equally bad if they occupy equal + * percentage of available memory. */ - if (tsk_points * 1000 / oc->totalpages < - oc->chosen_points * 1000 / oc->totalpages) + if (tsk_points * 100 / oc->totalpages < + oc->chosen_points * 100 / oc->totalpages) continue; if (__ratelimit(&berserker_rs)) { @@ -1061,6 +1061,7 @@ static void oom_kill_process(struct oom_control *oc, const char *message) wake_oom_reaper(victim); task_unlock(victim); put_task_struct(victim); + oom_berserker(oc); return; } task_unlock(victim);