Message ID | 20190517130802.4596-1-aryabinin@virtuozzo.com |
---|---|
State | New |
Series | "Series without cover letter" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.131.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Tue, 21 May 2019 06:07:58 +0200 (CEST) Received: by 2002:a6b:251:0:0:0:0:0 with SMTP id 78csp1934580ioc; Fri, 17 May 2019 06:10:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxv/yYHUQon+K8bwfmb8u2Ed/olPYq3Oasidg4tAm9QsQx6hkBX98qr1kVBWn06/1FqVn/U X-Received: by 2002:a63:17:: with SMTP id 23mr56021854pga.206.1558098610244; Fri, 17 May 2019 06:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558098610; cv=none; d=google.com; s=arc-20160816; b=F4wNII5SH7z6h38gTC8L1cnvosqHS20YLwWaB3Ph+KRYx/nWayLw9A9i5FQk4QPuqH xTiIIGlr2ayJ6k3pbO3HJowGsrMScodpXyEBcuG4xF7fh0jzUY+JRDrKEa3mGIrNVO3p HbwYOAZk/tz5sHzQyWSlURuN06UPRID1ONplxZkl13Q+UKArVyKUe6StfhF8xR9KmObn jqfs5fhcI5LlA8gmqfcFzqTUzkIksgLkK9Zoc3hlgtPqzLnMH6D7ZSXcp9jUBb0JNMAv Y9UUcYfLa6QqpHGjHe6JjzHFF65HssVmdVf5bpclXc60A9MSrnHGpw39Qf2Uo5qIzBJX alAQ== 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:message-id:date:to:from; bh=RgeQVdhJAEY66vEKbrwpEsX5fs7QSt13Sp+XeP0ZqKk=; b=yKZ+7FoIzMNO6fXDypL0Tzsj97Fxx+ipOzLcVVZeKsTqoVuToh/mf3UYv3eLZo+bOS TpYUnW0yHKg7iLj80mGYulYQ1I1ClbH2srCH2PTlaPdgU7NIXyWLbt+wdyvsSBtrpsIb DEBzfVd0LaYLhgBrqCKbhT1lEWtRe8Ar9mRqpfvXKiPsNRQougVAQmLHY801pnHJLPZw c3cTqyvRLPOwgMnV/TcsesFapuUAVtUqKQtribtogJ+pCWj6fBdcE3qchAaj3vX/gJuj h6lsczf9NFSzma79QszMFxC5feqHbzopFZlofRHSItBSvpcpVL3XCx2tHGeGPMN0s7Sw NNRA== 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=NONE sp=NONE 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 m4si9436801pfb.134.2019.05.17.06.10.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 May 2019 06:10:10 -0700 (PDT) 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=NONE sp=NONE 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 x4HD80qD027554; Fri, 17 May 2019 16:08:00 +0300 Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02lp2059.outbound.protection.outlook.com [104.47.4.59]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id x4HD7kdQ027537 for <devel@openvz.org>; Fri, 17 May 2019 16:07:46 +0300 Received: from VI1PR08CA0276.eurprd08.prod.outlook.com (2603:10a6:803:dc::49) by VI1PR08MB3183.eurprd08.prod.outlook.com (2603:10a6:803:47::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1900.16; Fri, 17 May 2019 13:07:50 +0000 Received: from HE1EUR01FT008.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e1f::200) by VI1PR08CA0276.outlook.office365.com (2603:10a6:803:dc::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1900.16 via Frontend Transport; Fri, 17 May 2019 13:07:50 +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=relay.sw.ru; Received: from relay.sw.ru (185.231.240.75) by HE1EUR01FT008.mail.protection.outlook.com (10.152.1.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1900.16 via Frontend Transport; Fri, 17 May 2019 13:07:49 +0000 Received: from [172.16.25.12] (helo=i7.sw.ru) by relay.sw.ru with esmtp (Exim 4.91) (envelope-from <aryabinin@virtuozzo.com>) id 1hRcaS-00052p-OI; Fri, 17 May 2019 16:07:48 +0300 From: Andrey Ryabinin <aryabinin@virtuozzo.com> To: <devel@openvz.org> Date: Fri, 17 May 2019 16:08:00 +0300 Message-ID: <20190517130802.4596-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: SFV:SKI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:VI1PR08MB3183; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c45b0f4e-99c1-427e-c96e-08d6dac8aa00 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600141)(711020)(4605104)(4709054)(2017052603328); SRVR:VI1PR08MB3183; X-MS-TrafficTypeDiagnostic: VI1PR08MB3183: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NbDonLzKgPdl/af/r81lRzxAyPz4rS/7y9vhr2j9ff5MDQT+CQRRjZobwW6e?= =?us-ascii?Q?MB5F4B6eWFopvnz3zJ/O5C2Azv0+Dk1tFhbn6fcuUyBMdBYL4MongX9YtI/U?= =?us-ascii?Q?hOxzxTXBgW55FS0em09EndZ4zP1DeCkeHdvMz/XNcgS9cFI8LiR6vhI0EgPM?= =?us-ascii?Q?dy2TDSFo1Q1W+HEbxrPoBR20mdscuMphMdhopjIuk/lmT8McVFY7qK0qejXF?= =?us-ascii?Q?ZW75/amvM7Z6jIOy5ZgAdLT4bP7L/OElX4QWSIm7PIP7K7AaSN1lDtz0zC6w?= =?us-ascii?Q?zCYjLg3J3zGaHauDkrCTxhTvOP8PNA7WAh8GbaCP4Vr+VdmXjUcw/sQMZsnn?= =?us-ascii?Q?6Nt+D0bt80mSliOYh5LcR0LktHU2f2ouXdfBMTW+Srs52NqZFntqaoHTxse7?= =?us-ascii?Q?aGAPYejv1dV4ub6LSzLzEkBn7ZHj8CAotI29QknsjF7hHlUAed2/4Og8ORz6?= =?us-ascii?Q?X/jmd71Irrvz6Dqf92mDfvQ5PQdaOR3dAXbBqiI30Lx0DDNxJuH60dUdc3H9?= =?us-ascii?Q?cqUiA8VZ5Y+MAuKraySVMv1pL+YSLYj95iS8vvE2B/ILB7sa04C8/VQl+KB9?= =?us-ascii?Q?O5wyKo+qOjmWOdR1DQxK1ASqy8veeKZfyU/zQOu4RYh9agIevdBV5A88wtWd?= =?us-ascii?Q?K99ZmTN2ytZNPx/ghDZdEFdv0Nl/dNk9OR52i6kwm4z+z3NqhTpfhf2uRk72?= =?us-ascii?Q?mvj0ACuyoUy16gQKXqpIA5UYAqcyUm7w0DQRDeZ0lURM+rAEIxzs4n+FvJQ/?= =?us-ascii?Q?0aJYGztq2WypK7++bq6xm/hggSy46dUq4YJpAq3Ru6kcEIS/OTWuTdR2k4Sr?= =?us-ascii?Q?hx1pLZx8y8cU5g0U1sAEr5mCdJ+M9b6OQ5Qw1of+5jM+r1B5LmGPFd//RPcW?= =?us-ascii?Q?ykldDmifIhNpb4+dtZHucrPTWsj1363YAhXYjZ+3RUPKNg+aiWL6N86HClyB?= =?us-ascii?Q?tUFTxJgTo/U553Gbwdn869rp3cztTLrNtlVsHIdCvJ9e+cYOEezWoPDExl/n?= =?us-ascii?Q?79vY?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2019 13:07:49.9506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c45b0f4e-99c1-427e-c96e-08d6dac8aa00 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=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB3183 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 185.231.240.75 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: HE1EUR01FT008.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: VI1PR08MB3183.eurprd08.prod.outlook.com Subject: [Devel] [PATCH rh7 1/3] mm/workingset: fix possible with memcg deletion. 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/workingset.c b/mm/workingset.c index 1168cc122828..1d7bdbf7a5d6 100644 --- a/mm/workingset.c +++ b/mm/workingset.c @@ -250,6 +250,7 @@ bool workingset_refault(void *shadow) unsigned long refault; struct zone *zone; int memcgid; + bool ret = false; unpack_shadow(shadow, &memcgid, &zone, &eviction); @@ -278,7 +279,6 @@ bool workingset_refault(void *shadow) lruvec = mem_cgroup_zone_lruvec(zone, memcg); refault = atomic_long_read(&lruvec->inactive_age); active_file = lruvec_lru_size(lruvec, LRU_ACTIVE_FILE); - rcu_read_unlock(); /* * The unsigned subtraction here gives an accurate distance @@ -303,9 +303,10 @@ bool workingset_refault(void *shadow) if (refault_distance <= active_file) { memcg_inc_ws_activate(memcg); inc_zone_state(zone, WORKINGSET_ACTIVATE); - return true; + ret = true; } - return false; + rcu_read_unlock(); + return ret; } /**
workingset_refault() releases RCU lock too soon, before the memcg_inc_ws_activate() which may result in crash if memcg deletion runs in parallel with workingset_refault() Fixes: f6a8b015027e ("ms/mm: workingset: per-cgroup cache thrash detection") Signed-off-by: Andrey Ryabinin <aryabinin@virtuozzo.com> --- mm/workingset.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)