Message ID | 20210428153542.2814175-82-Liam.Howlett@Oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=wPXd=JZ=kvack.org=owner-linux-mm@kernel.org> X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,PDS_BAD_THREAD_QP_64,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 612F5C433B4 for <linux-mm@archiver.kernel.org>; Wed, 28 Apr 2021 15:39:17 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id CCD9C6023C for <linux-mm@archiver.kernel.org>; Wed, 28 Apr 2021 15:39:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CCD9C6023C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DA6A3940019; Wed, 28 Apr 2021 11:37:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7D70940015; Wed, 28 Apr 2021 11:37:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3475940019; Wed, 28 Apr 2021 11:37:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0095.hostedemail.com [216.40.44.95]) by kanga.kvack.org (Postfix) with ESMTP id 90928940015 for <linux-mm@kvack.org>; Wed, 28 Apr 2021 11:37:45 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 3AD4A180AD811 for <linux-mm@kvack.org>; Wed, 28 Apr 2021 15:37:45 +0000 (UTC) X-FDA: 78082180890.18.5041CD1 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf06.hostedemail.com (Postfix) with ESMTP id 84BA0C0007DE for <linux-mm@kvack.org>; Wed, 28 Apr 2021 15:37:47 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 13SFOV0O009944; Wed, 28 Apr 2021 15:37:32 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-2020-01-29; bh=wMfp4WppIg35KUBZ9tIzY5+Ltn3vQE/1TlJhDKw2cQw=; b=I/Z96fsaN8eqvN39+hYElfRG6u0e8c6bzG5oKlFFUwzwWwLv6StQsY8B9aM6XA/87f7o i8kRfTAgmd4/kcdlMYYCPibnMXuo2kNa92VmG0alyozg1licU6yQ/0lc1uG0wxHb5EJa JHFfju8E8I4lvLclp40NLaBJGMs0fX64VV7boH+gfFWshrqPKwFX2tqNVTl8QvtCKera /Gybm98iJmLfAjnYJSEBSz0BKFg6tT+1en1bNusinUZ7UEM5IAELegxIGpe/km2pSzgh i9dG/Hm4LdvHl0QHe8KWwwUIpH/IyzCCL5bYZ2K0kanx2LNXB4/a0q7DLQlobZsMXJ07 qg== Received: from oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 387a2mr0vw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Apr 2021 15:37:32 +0000 Received: from aserp3020.oracle.com (aserp3020.oracle.com [127.0.0.1]) by pps.podrdrct (8.16.0.36/8.16.0.36) with SMTP id 13SFbScs033031; Wed, 28 Apr 2021 15:37:31 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2172.outbound.protection.outlook.com [104.47.58.172]) by aserp3020.oracle.com with ESMTP id 384b58qpxp-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Apr 2021 15:37:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RmQ2YHbFPX9EDq6NfCrK1kPoswv/qEBRheFxXLDViINyDmZamNmI4AEAqMjjoT3kOhrIzSATlFKPxcUy6udSneeadFm5SczSmnh2qd3TPdMwbmAMQQq5eVIAG8Sg4P/MzBqDnJ2uLCaT5V/nbWqwcR7freA/14m3OTqFlRC+oUTJDdhfLLh7wVpTfaR1MGA0m9F/HV4Rp+fAtB0chZdsldGAuGklYzoZXpcnqiVzUokSZoMkXM/ifwtLGUNgrNjKzmm9FwqvtpaOwPjXZfru3OrUpXzhJ2eyBS/gB4kyZvjUzdZcp25XYg5x8guRY7HPd9uzeDwPTtwi3jPZ5zK1ug== 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-SenderADCheck; bh=wMfp4WppIg35KUBZ9tIzY5+Ltn3vQE/1TlJhDKw2cQw=; b=LR8g8CyEqdakH/k6wFbffRgYk1DSLqrvxqsV1yh1Dw5G5nvQ5bLxuAvdsJRxjO06LS398D+J8W66pWjQlY/u6OJvRUipu3TJl8lVIUy98oxdtx3dd1nrMvGV5FTJcJN0bYeMlBO1QZKTmZlQdNkdOgYTwVVjy+RldME7PnNGDP+A3w/zrJz4wpf7KL9v+RC6dxgFFQzw77b52vUvNp4oYqGU4uYfMyuu9TdZ8KAfW28pdcAXK3Lc+mr1bl5TvkZTbJJpkpV3x71UiThJyJmlEYMdDg4uHlQlvmr+OQ2qE2KVhnNi2YPMBPnhDgf3jsFUUr5fnhelSoIKob3sZCsPaQ== 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=wMfp4WppIg35KUBZ9tIzY5+Ltn3vQE/1TlJhDKw2cQw=; b=YwhYYkeUlMknEUAAzMlZfPn/O1Dokmt1Lkn6RUCIbhFitqtXgBl6xM+HjbG8bB7w/rtibg/JdnS4OIQnq1sf+h25NIgoIDwMirw8cdhz36jxZhYiUjnH16F3kB1JI+w65Nc9WcfGnT2lHBEdgw3/JFnTmim43O/e5gMtqlbloDQ= Received: from MWHPR10MB1582.namprd10.prod.outlook.com (2603:10b6:300:22::8) by CO1PR10MB4548.namprd10.prod.outlook.com (2603:10b6:303:97::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.20; Wed, 28 Apr 2021 15:37:26 +0000 Received: from MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811]) by MWHPR10MB1582.namprd10.prod.outlook.com ([fe80::353a:1802:6e91:1811%8]) with mapi id 15.20.4065.027; Wed, 28 Apr 2021 15:37:26 +0000 From: Liam Howlett <liam.howlett@oracle.com> To: "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>, "linux-mm@kvack.org" <linux-mm@kvack.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Andrew Morton <akpm@linux-foundation.org> CC: Song Liu <songliubraving@fb.com>, Davidlohr Bueso <dave@stgolabs.net>, "Paul E . McKenney" <paulmck@kernel.org>, Matthew Wilcox <willy@infradead.org>, Laurent Dufour <ldufour@linux.ibm.com>, David Rientjes <rientjes@google.com>, Axel Rasmussen <axelrasmussen@google.com>, Suren Baghdasaryan <surenb@google.com>, Vlastimil Babka <vbabka@suse.cz>, Rik van Riel <riel@surriel.com>, Peter Zijlstra <peterz@infradead.org>, Michel Lespinasse <walken.cr@gmail.com>, Liam Howlett <liam.howlett@oracle.com> Subject: [PATCH 81/94] mm/mlock: Use maple tree iterators instead of vma linked list Thread-Topic: [PATCH 81/94] mm/mlock: Use maple tree iterators instead of vma linked list Thread-Index: AQHXPERAPgLmUqJ3Y0SZvfyMIeh0Cw== Date: Wed, 28 Apr 2021 15:36:27 +0000 Message-ID: <20210428153542.2814175-82-Liam.Howlett@Oracle.com> References: <20210428153542.2814175-1-Liam.Howlett@Oracle.com> In-Reply-To: <20210428153542.2814175-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 authentication-results: lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=none action=none header.from=oracle.com; x-originating-ip: [23.233.25.87] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 568bf43e-4a9b-400e-0493-08d90a5b86ac x-ms-traffictypediagnostic: CO1PR10MB4548: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: <CO1PR10MB4548E4F348AC7AEAD7A8D121FD409@CO1PR10MB4548.namprd10.prod.outlook.com> x-ms-oob-tlc-oobclassifiers: OLM:2331; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: uxyq4E1RPDbXQ/NolVgIXbFJq6LKEjDj2HUEoqP2thQgzc2lLF4pXW5VCSJWznXraakLpjOQtuX5/DSu/VynXNva/AvudqbQqqZ3SKgB86btNLfK8DC8E9Q1KHl31dsqg4GJoV92tTPz6j70uWA8fZUo1dZMbeMcDNv6aTTzqWZP42CNJPD1aqFm0mciMY2Ef8EaF+zC5baZTHHpyPw7J+RjmMW5R6OmAo5E6a9HqU2DqYiG5NxiTuf6RS7qy4ALnqVgcVs7uod6Sa07J/ENwnCGxo4NCoLq5YOsNawSV6Ieeak2nnoydUX0gIk4lnDdwmxOk2sVu0eer3XESMQssIbCNQTIhUPI/abKGWy8JHa8K9ilZyqJT4ykJAolAMU+BB1k995gX7jevjHkipju3FDIFs44lz6H0g3Y7HOEhHxBsgk05oSFVlVcgfn6Bap/VavaCgjYkGxiJ4HmOb8DmHGTZkWDI3Y+2cqIRD/9EVF8c+ay9YmJ/TXMRGHrpR4pJgpop4rmmZdoEjvTpdbf305Kc0YYpk5QCpSyRUSvYAyX+WDAX1S5QX6EeK5Xgplrixr/5ujgTz7LBpAuq0hPpIQrzuMAqL096kuCWMbJG1E= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR10MB1582.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(366004)(136003)(396003)(346002)(39860400002)(6512007)(66946007)(8936002)(186003)(83380400001)(54906003)(86362001)(478600001)(122000001)(4326008)(76116006)(1076003)(107886003)(7416002)(110136005)(38100700002)(26005)(2906002)(2616005)(8676002)(66446008)(6486002)(71200400001)(5660300002)(316002)(44832011)(64756008)(91956017)(66476007)(66556008)(36756003)(6506007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?jiT2q4wtOWEwAqD9cI5WeRhLm?= =?iso-8859-1?q?798flVw1OaZBV3/iqYFqveFC3SmhmOfcB+wzglVMAVtkc/Cyl4kjwcUD+jWd?= =?iso-8859-1?q?AbwvDgUSfnSLCpVvAHDIAwh993RYz1fH5t931fgwR/cRDjN46ZKyT5h3HTaE?= =?iso-8859-1?q?UKlvwXafqRnt4dgptv5w123AUK6M6R5vTtEMSM9bVeiatkUdvtrd/1ojmEA1?= =?iso-8859-1?q?dt6icUXpSXkISK6K0VuvrGA4aIASbM+adJCjTnw4/1e5D5vaj2vNCd8zZfS/?= =?iso-8859-1?q?+Dr47Mgg2Kb1i0C3muXIazp0NihEcJJljm8yBOwnoirUTRAHrKhSVkIsAXud?= =?iso-8859-1?q?cLz2CraGx/YksInvU5Esgghr4UChjyNR3NeadsdSNLIww7SZgI47USTzvuMz?= =?iso-8859-1?q?9rNvLH98BiKMFdIe4CgLdTsZCCI3wZcTIf8MgrXGv7oIPVi2MGGaSHuUrHuO?= =?iso-8859-1?q?pXm6Pwo+hbXv5MGtIRX8/kx3KRmb8HZYjaQWmCzXAQv/yggzYE4fNn/KPFyP?= =?iso-8859-1?q?fcJqy+wkbg9z8e9IarUAODkReUotxYQizS005l+vpOvCeGW/tiAPY2JuJDGX?= =?iso-8859-1?q?o3uSYMWwAzPLAQjpttblJ85qjBag+NTAEjIRIm9CsIGvBZthz5EX7i2XC8pj?= =?iso-8859-1?q?IHfjlyUfyv+u1rcRJF0F06+443Fqq/HL+q1z6utAl8+Xy+Rd3UTyqkhAftYB?= =?iso-8859-1?q?XtDSvSStET0B2m1ql4KfDIWJJ352FQdPO245K7avp7wGwn5tqnjzX5ItaoRn?= =?iso-8859-1?q?vqNyPpCuDP3w/8kuRIv2BQx6F2z5IKwShMrcVSDdxLYhVvd+xQXx0rYekJNC?= =?iso-8859-1?q?rXxwT0ymkvsKcdHTPh8vY75YTKyyIdXhEOgKreiTmnvqNvuk8x6XJ/G1ar/o?= =?iso-8859-1?q?K5xULimWVYtVo0gq+njxn2cvR7Rxv8WVgfhRxbp+aki1V4ecEafv700WcGWN?= =?iso-8859-1?q?LObhwtquqiNYgTsMEDf/oSp3rtSDW91Zc9ZqAAij2j9bs6PWOA5O/H5xNJVM?= =?iso-8859-1?q?pYxOUxN16kNsMcrSQJQ1TMSHbqxahGudq4HLR/rJLZCViHX2cwl0jPliWKNk?= =?iso-8859-1?q?9fN51tdyowY0Nsjv0cIJdJIQmdiuTGfL5mLjxpnfoOigGh/J2AFYlMaH9imL?= =?iso-8859-1?q?Z++3N/nfxjjf8LfV1UjdC7sK4Lzd6qbRgAllNr8yuFTHbQlgRmyIq0uZtFjN?= =?iso-8859-1?q?pK9Z6F/NKTi2HP8FgotHp9MuG4jhRU6/39qfH4FnYqh14Tn0SyPgO+bSxFzy?= =?iso-8859-1?q?jheR64EMfoW1jELRoMF1rgEptH87Do8i5k+jKMh7s0sUKhrGnHfJTglZVkxy?= =?iso-8859-1?q?MCO9blSx6Bkp3AUvBG6EnZRC9zjlQkdK/Hd+a6acIFqookGbDSHkQofH0bR?= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR10MB1582.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 568bf43e-4a9b-400e-0493-08d90a5b86ac X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Apr 2021 15:36:27.4190 (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: PQUMR2RIdwnAwZnM9SthXVfb3Z/8eSkC4kMf85ILRUsnPip2z33EWEeGAoydcE5M83J9CAoxzxsAOtjBi/G04Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR10MB4548 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9968 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxlogscore=999 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2104280101 X-Proofpoint-ORIG-GUID: YzhuiqPgsm7UjRDPGhJq10kF9RH1AbeZ X-Proofpoint-GUID: YzhuiqPgsm7UjRDPGhJq10kF9RH1AbeZ X-Stat-Signature: 86cy87btrzumb8qgcd4fj16riqwwt39p X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 84BA0C0007DE Received-SPF: none (oracle.com>: No applicable sender policy available) receiver=imf06; identity=mailfrom; envelope-from="<liam.howlett@oracle.com>"; helo=mx0a-00069f02.pphosted.com; client-ip=205.220.165.32 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619624267-717131 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: <linux-mm.kvack.org> |
Series |
Introducing the Maple Tree
|
expand
|
diff --git a/mm/mlock.c b/mm/mlock.c index 5e9f4dea4e96..c2ba408852f9 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -562,6 +562,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, unsigned long nstart, end, tmp; struct vm_area_struct *vma, *prev; int error; + MA_STATE(mas, ¤t->mm->mm_mt, start, start); VM_BUG_ON(offset_in_page(start)); VM_BUG_ON(len != PAGE_ALIGN(len)); @@ -570,11 +571,11 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, return -EINVAL; if (end == start) return 0; - vma = find_vma(current->mm, start); - if (!vma || vma->vm_start > start) + vma = mas_walk(&mas); + if (!vma) return -ENOMEM; - prev = vma->vm_prev; + prev = mas_prev(&mas, 0); if (start > vma->vm_start) prev = vma; @@ -596,7 +597,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, if (nstart >= end) break; - vma = prev->vm_next; + vma = vma_next(prev->vm_mm, prev); if (!vma || vma->vm_start != nstart) { error = -ENOMEM; break; @@ -617,15 +618,13 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, { struct vm_area_struct *vma; unsigned long count = 0; + MA_STATE(mas, &mm->mm_mt, start, start); if (mm == NULL) mm = current->mm; - vma = find_vma(mm, start); - if (vma == NULL) - return 0; - - for (; vma ; vma = vma->vm_next) { + rcu_read_lock(); + mas_for_each(&mas, vma, start + len) { if (start >= vma->vm_end) continue; if (start + len <= vma->vm_start) @@ -640,6 +639,7 @@ static unsigned long count_mm_mlocked_page_nr(struct mm_struct *mm, count += vma->vm_end - vma->vm_start; } } + rcu_read_unlock(); return count >> PAGE_SHIFT; } @@ -740,6 +740,7 @@ static int apply_mlockall_flags(int flags) { struct vm_area_struct *vma, *prev = NULL; vm_flags_t to_add = 0; + MA_STATE(mas, ¤t->mm->mm_mt, 0, 0); current->mm->def_flags &= VM_LOCKED_CLEAR_MASK; if (flags & MCL_FUTURE) { @@ -758,7 +759,8 @@ static int apply_mlockall_flags(int flags) to_add |= VM_LOCKONFAULT; } - for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { + rcu_read_lock(); + mas_for_each(&mas, vma, ULONG_MAX) { vm_flags_t newflags; newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK; @@ -766,8 +768,12 @@ static int apply_mlockall_flags(int flags) /* Ignore errors */ mlock_fixup(vma, &prev, vma->vm_start, vma->vm_end, newflags); + rcu_read_unlock(); + mas_pause(&mas); cond_resched(); + rcu_read_lock(); } + rcu_read_unlock(); out: return 0; }
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com> --- mm/mlock.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-)