From patchwork Tue Oct 5 01:31:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12535303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13EC6C433EF for ; Tue, 5 Oct 2021 01:34:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B8E8C61406 for ; Tue, 5 Oct 2021 01:33:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B8E8C61406 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 73032940028; Mon, 4 Oct 2021 21:31:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DE28940020; Mon, 4 Oct 2021 21:31:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BE0F940028; Mon, 4 Oct 2021 21:31:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0216.hostedemail.com [216.40.44.216]) by kanga.kvack.org (Postfix) with ESMTP id 3D43A940020 for ; Mon, 4 Oct 2021 21:31:46 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 01B6618224B69 for ; Tue, 5 Oct 2021 01:31:46 +0000 (UTC) X-FDA: 78660657012.17.14F71DC Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf23.hostedemail.com (Postfix) with ESMTP id 8E25990018ED for ; Tue, 5 Oct 2021 01:31:45 +0000 (UTC) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19511ntx024407; Tue, 5 Oct 2021 01:31:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=Bj3fLapn7xY+BdV96sONz2fX9EzvUkup6IEOMssVztQ=; b=fclmqeOxjG2+r/j1zRV8rMxkqojwUNEQ0vmdETm7u+wkQ+SnUdtvSO/0P1GTFTr47qYW RjHAgqMFRirtdJEt7OBacc18Fwv2A/j+QfPXBgK0GKHuPrwaynEfA+35uhEMk/+SwT7q cJYe4wvhOKVcSJgKfM3GvZF0WDDXP6tQSETcTXSJfdvZGei0WFHdttFneZ7t8GWZBv+o jgl5xVXm7AAYUZ3IpgZGqYxLymPWbGN932QjRbv11wcN6W5W4/YVfXMuXkEnRoLsvsp9 PdYHJzM74cbzU8+pXoDmt7pCFFlIC3/KiIzEZvi8oXxK8e4hulPWBykjPuv80odHTSW6 ZA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3bg454bvqq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:31:35 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1951UHTX178361; Tue, 5 Oct 2021 01:31:34 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2171.outbound.protection.outlook.com [104.47.58.171]) by aserp3020.oracle.com with ESMTP id 3bev8w0386-10 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 05 Oct 2021 01:31:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CesFLlmr4uMH4dc56971utUG1xjbZdyvs0cd5tTzCWM8NRJ1zOqzS8dhZksPc5tMJDAQYEdQLeMRZIVItYM/pG+1Ck/0fRre1LEnOiAk0AAbpfrCCTBRIVo4doNjaznKTk9bl2ptslxm8x3G4vj6B7PLwry8G0GHenNWfC/tFcF7uOb08vb+VfxK84nHZYCEQ5fGkF6Q8x7whV1M7eVQzoaQl0GFEa4bt9w3m+6s76Dv7EWzLfxEmGx2bvvbfGbS6fMjjDzYvvLzYxPL7sl7McwB8jzk05KeliitMtAOvRSboYQ1yIUss+9WIOyre3uXqr0X9JB8UGJ1hQqKmmYh0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Bj3fLapn7xY+BdV96sONz2fX9EzvUkup6IEOMssVztQ=; b=PHMz+aYet0I6UJZugbB6M8HeZoqouGmnth7+QXV11/YJ17MWsjSHRaGjJAKL/WX50IURUY7FGxSLCrFE5f0KeTy0TC1+X5OZ68f+0Lw8KkGonfWtZk+pGZaUbSNtGTRidJ+s6+a0kAgsEBUOd4By27h5dDuigjiF71KzY0Qn481+nT7A8SE3LfZOwMkccNmGaJALSk1FCZ0w2RMhvJNXtyIYL0Ru9NxaBycirNVJ36PqUOo8ju/95zAjj5LZbHTzoTAxOBfV9p4ZSGpY2Yipxox4iyPGutOUIRXoViWfqB9Kvv/XS+ZUMMvCpA7wcXvmNH4Vqu5csvIEnbGWG4mpNg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Bj3fLapn7xY+BdV96sONz2fX9EzvUkup6IEOMssVztQ=; b=zyV+RV4nB+xbiHdIf8t7Foh0JbqkHUyy3wdfI3eAfxopFtDiLokvYU5tcWQo8OeKHz1bPjinjOwzuRUSjYCYOQNJnFgeXZRHAUZISWDy4C8SKiFMSl04U7AS0pMJ4AdGkFBZUGjDl+HATgT74fM16o42eiNfJ6s8gfJwMVZMCdk= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by BLAPR10MB5044.namprd10.prod.outlook.com (2603:10b6:208:326::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Tue, 5 Oct 2021 01:31:26 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::6d61:54c2:40f0:93a]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::6d61:54c2:40f0:93a%5]) with mapi id 15.20.4566.017; Tue, 5 Oct 2021 01:31:26 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , David Hildenbrand , Douglas Gilbert CC: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Vlastimil Babka , Rik van Riel , Peter Zijlstra Subject: [PATCH v3 58/66] mm/oom_kill: Use maple tree iterators instead of vma linked list Thread-Topic: [PATCH v3 58/66] mm/oom_kill: Use maple tree iterators instead of vma linked list Thread-Index: AQHXuYisFGigQEVdzkGpPBKHaTZEYA== Date: Tue, 5 Oct 2021 01:31:08 +0000 Message-ID: <20211005012959.1110504-59-Liam.Howlett@oracle.com> References: <20211005012959.1110504-1-Liam.Howlett@oracle.com> In-Reply-To: <20211005012959.1110504-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.30.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 5d0088fa-563b-4741-e72f-08d9879fd976 x-ms-traffictypediagnostic: BLAPR10MB5044: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:208; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wOk6gY0L0UNNbRUxEywjnpZxu5OEPXwwu6U0lVPgBWq8qLR4hTaEnEhNpHVC94+JSl+jSngjHpPPRIoiUzpDuTSUN7aQz2A6qGvV5OzgQf9XigOofFihntY2PFb9zOCyuvgY32yB4Mhep/ZGUfhtIsqCjHdrZBef6VGjfbo9d7FM6TCJGZL4ete0ClKe0I2BLMl2rmwpnBPokJzzS7OaXXA++QnTINDVAxdsWfbnZsB+vpUye/eGsIWZovIaUKJbYCgd+ovWB/rn2c2fkZgWqhE1ShFFz07M3E2Vc9Nj1s1d+Lc7NoFBmbUZa9GIPLft154E1mQ2X+/qQ6N9uEbQ3ogoRBaufDrHmqkpO40eZQSbHh2xWgXzeIJ/zvfdXHg2iWnln3SeeIq0RTd4zsKCQseXcKphvPRR1OsHvjkjHTiavvN+jlXu+pcFstfZJLPnUqFQcD10x/Uo7JwAAUopQTnz+lOgNl3Ob3MMM4W+RCiZddgzxO89M2QJLSF4Ok2su5sojhTk7Zlipwzm8WpiLkGKBryXDE0fccRaDW21TZ7J9ZQBJvCOJAxIqSbSW+cAhnXc7KzogixVsRxOGQGkkx1KqeRuPd0KWa4lWT7eCtqGdoa9Uc7Iui6mgxw8xmxOjwy+1BV5t53vekydnIikUohG1sHFWrlI8iqJtN0z1CWtRqcS8bXCdMYLxQvXoBFGW4H+NkCkx+5L6elFI1lJUg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR10MB3011.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(110136005)(71200400001)(8676002)(86362001)(6666004)(6506007)(6512007)(4744005)(36756003)(316002)(8936002)(54906003)(2906002)(83380400001)(186003)(66446008)(122000001)(26005)(7416002)(6486002)(4326008)(508600001)(2616005)(66476007)(44832011)(38070700005)(76116006)(5660300002)(91956017)(64756008)(66556008)(66946007)(1076003)(38100700002);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?ZcTa0Ff2zwAP3p8zaO+OuOa?= =?iso-8859-1?q?BQUsxz8/2gy415/lOlXT+HQBF8PhPgFbd/9CJHV4a7Sk3XHdk99FXD3b4uTQ?= =?iso-8859-1?q?dMiTRJ8yqOSIDTDjC8Hqj4WHIh9vCkN5dNPxMyukYshlE/khvyvUh1KKWW37?= =?iso-8859-1?q?BIg1U3PCWikusjwJjlwgvsRecafPMoevXyH4M9c3dMpkGxx9/ovUYwYOLgt+?= =?iso-8859-1?q?f7rjbvmEmj/uSCKTaPMyJMOesRE6sEDVw6iule5wweZmAYw0m5ematZh0IlF?= =?iso-8859-1?q?auB3ELnYb9gTQVpgozG8HdYVmGdoM2Jl+YdhMgP74uH4Wl2X9AKPQabY5inG?= =?iso-8859-1?q?Vhbf41cd3sR90JBtR7St/C+LMvLo6+yAi/VFD9BhlZHreRNiyoFdfDbN//65?= =?iso-8859-1?q?BUiOjzIvRBc0eQ8eUdBu1L6FjIxH4OzgXBOml3I+LLwwBvOBORg9LDVamtaC?= =?iso-8859-1?q?0ty4ALidwtlaYLR2rIJ8/VoSGyZxNQE4ovQnS1pwALndTq4UhRq48ho8eCfc?= =?iso-8859-1?q?hCwtzKRzM0qpTV1SF/QYk4yqRzzhhaFx09kryo5YSl0+reMUAU7jLBdnjYFz?= =?iso-8859-1?q?1Yyw7ZeyMTpp/dEQhgDLaPPsWxo71hrrlMkXnRYoUxwVZf2js0O3SP7UYwew?= =?iso-8859-1?q?jcxC9DJa6VrIeSXowkhwItDdUUUS2Gt9IxDH6Q2KRquQlXKUdpwJf05WzfpP?= =?iso-8859-1?q?1u5LcoIU5+AlsegyZcz4t6XkbgaOYgTE6RWcbCdTcyTo14ETLLAl7eLnGBC1?= =?iso-8859-1?q?lZRvtIdhiHWb+e+Rzk7W0R2/CK1d8Zq9B2HfSZWI06qlN/+aRf7Bo9NXvPGQ?= =?iso-8859-1?q?6wOY0UbtqtStVmqV8vGsl3eFZ6wIFtKnYcEiwm0EisiSUkNkukEyxj1O/0eQ?= =?iso-8859-1?q?h4fob9rsNV6aLGG4VFin1KlYo3xUYRt3CTROJP2aE3pSlFVswC/G0hiuZRq4?= =?iso-8859-1?q?qzDjcy79WlWnLmWV2fDBkVqsXMFHrp8BuvCLoI8+iAWfcORHWcqoBWXCr3TR?= =?iso-8859-1?q?YPNsRsrK3AmO4k89hQNCki4wuoLxDJMnxpt2y1VmJF1H+qj2Y3h+b02eI+l0?= =?iso-8859-1?q?YkyZi/j94FGkur9G4EfnX8ghkSn2Pyjvt5Q8V6x0hYXbioVXM25N8mh+LAY5?= =?iso-8859-1?q?pgY1ED3rvQ51+43oNDjvL/X6B90HMORe0shltl/HsZan9JFm7PoaRk77g6LY?= =?iso-8859-1?q?IDJucFjFHmNblRMU8k25URsHe6lF5WJwCieRCe73rhwew1Tg/t0vjR2Jr08C?= =?iso-8859-1?q?jI1MpdXyqqsDGqXiMBo0xPEjJh36ZE50i0eXoASWyXFAyidcnHqVW+THUxur?= =?iso-8859-1?q?TdVxf/FB5ewVG6BkQO5o55NrT2UoIpdYuFhCS9kaSJWJIueHiIX50xfonjwP?= =?iso-8859-1?q?F?= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL0PR10MB3011.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d0088fa-563b-4741-e72f-08d9879fd976 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2021 01:31:08.7626 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Y5YF6vBsDBx9Xi7wyx73ErCNL5K3v/OZkfJ/+qXyOT834uremitmCi+REAEbHtTQiIIUMTjjxAYJaE6dTVTcoQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB5044 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 phishscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001 definitions=main-2110050007 X-Proofpoint-GUID: e-H_qXuneRnpKD6uV4m_xYdNxy_KgvDb X-Proofpoint-ORIG-GUID: e-H_qXuneRnpKD6uV4m_xYdNxy_KgvDb Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=fclmqeOx; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=zyV+RV4n; spf=none (imf23.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 8E25990018ED X-Stat-Signature: ossp85wry4tb34unu7kmznggjtgn1a45 X-HE-Tag: 1633397505-669965 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: "Liam R. Howlett" Signed-off-by: Liam R. Howlett --- mm/oom_kill.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 831340e7ad8b..e0334667d36a 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -516,6 +516,7 @@ bool __oom_reap_task_mm(struct mm_struct *mm) { struct vm_area_struct *vma; bool ret = true; + MA_STATE(mas, &mm->mm_mt, 0, 0); /* * Tell all users of get_user/copy_from_user etc... that the content @@ -525,7 +526,8 @@ bool __oom_reap_task_mm(struct mm_struct *mm) */ set_bit(MMF_UNSTABLE, &mm->flags); - for (vma = mm->mmap ; vma; vma = vma->vm_next) { + rcu_read_lock(); + mas_for_each(&mas, vma, ULONG_MAX) { if (!can_madv_lru_vma(vma)) continue; @@ -557,6 +559,7 @@ bool __oom_reap_task_mm(struct mm_struct *mm) tlb_finish_mmu(&tlb); } } + rcu_read_unlock(); return ret; }