From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E3BD1C5AD49 for ; Sat, 7 Jun 2025 00:46:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 02F016B007B; Fri, 6 Jun 2025 20:46:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F21E56B0088; Fri, 6 Jun 2025 20:46:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E104F6B0089; Fri, 6 Jun 2025 20:46:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B6ABA6B007B for ; Fri, 6 Jun 2025 20:46:42 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 02464C0D63 for ; Sat, 7 Jun 2025 00:46:41 +0000 (UTC) X-FDA: 83526764244.05.91B7C30 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf29.hostedemail.com (Postfix) with ESMTP id 180AC120002 for ; Sat, 7 Jun 2025 00:46:39 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ndg9+eLg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749257200; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=+NTbezXYT2I3Zh4qQvGzv6Nq8w36gHJX4feDoc57xJo=; b=XCp/dPGL38YI0D2qYZoyzIZiy3NFPksP/hy/UPkkuhFEib8B2yHg06OTQjSem+RR7EZD9y 2LgTFc7tn8vjZ5jjyhC/M8n5zfi/+0j4AhIy3Wmyfes8an0zuYN1ftRLpjYcLAQjnm8U8A fdOhvOIst603xHf4iq/qwDr5KuVetqU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749257200; a=rsa-sha256; cv=none; b=X3Dxokjb5osGhMdlx912vOGDVdTo95OuhHgiVbT7IKut56HXVKAyelCXtJyHvRLuvirez5 L0LtubIO8A4mOHr8TOFFbnkYelvNK/Tm8dh/xdwsdP+5yIGlBYkumG5sMGDmfZqgkzghfX V5khenQPX/KdZC2/JZKd4DC58XjcCmw= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Ndg9+eLg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf29.hostedemail.com: domain of 21cnbao@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=21cnbao@gmail.com Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-af6a315b491so2087091a12.1 for ; Fri, 06 Jun 2025 17:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749257199; x=1749861999; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+NTbezXYT2I3Zh4qQvGzv6Nq8w36gHJX4feDoc57xJo=; b=Ndg9+eLgjbubyzvmwZI2GQ2DiWs9WwjZAAujDlMtojUK9GIt0+/cluwMnpyyg+vAkq fH0odGbxIn3zjlheiSSK+xbU4z/CUK1H4gzGCdEoJJsO1BAeE/ldE8C49RJD/UWmT5ol odwNZvs0JMJSFXo3zuJ47S4iKmhArORxRtSCxyAnWtNVi0WpIt7QkXqWAXQJcHWG6qoQ lJ8bfNvf/kdji42K0vWgOXgTcu5M5e7q/PH13yWR5Z2UfL74thfe3UXvG0B9u2RZT1S2 OV73fB+JwytMs5RM+/91uHsxx/b0ae48q1rG5saZBNoXW2q0eeCyE5yrgkUppVWIb/uX 7y8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749257199; x=1749861999; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+NTbezXYT2I3Zh4qQvGzv6Nq8w36gHJX4feDoc57xJo=; b=NvzTqhMeWREFGXyO94wi/H4unrLIg0ZLdShw8MZqxB8wban0Sa0SG5S/78F8V33pHX NW+ErUzaypBRl9DddtK84SsSQG4K3ugo8E2EYqe/MbQxtAauiKNGifxGJxhKXZUHXTO3 yK4HcY7Q4ZZScckPM6lHt7/XvJ5Vb1i1wOCjeJnmkIRaADu868oGC9VyCN1caoV4gdL7 oPSu/OaL2DMer02Ez+SyhsoOpZ1TTlNGUjs5QDI/5M98u7G6P/QyVosHmkvy/HAsuc7K WPhkw31lnOiS3zRlp9HpTcR+fcObFysCAZHfcCam7Uw7Pk1mZMt3eZ7Z5DgVGG/3QkNK tnvA== X-Forwarded-Encrypted: i=1; AJvYcCVfo5GRPP305jcIUm4N1dGw5lk1OKkdjh8xlXQUv0NRBrXaBl6KDS4YHo0p7hFSrVx7xAanS7xakA==@kvack.org X-Gm-Message-State: AOJu0Yyp8vs8dQJpR04GZcB+3cb4INkldLVtGTtF7/IXTlA32i8AlGDx Lzw762YFKbSBtJjRlTEl39M0A3br6rscEaEXWyFmkIe32lA7bKDkl4pH X-Gm-Gg: ASbGncuamaAB2td0B9gmU/ntVH2pS8ozPWzNt3YnUOxp2MPGA7BYrjsBCKmuuh8WsXb yx1GRyis/JDmTmYZS6Ri+GQ7CGpZhKOk6U7/De/NnH+qbNJt/KeTCaW6CpBh+1vQkQGeYSVUKGU Hm/3G+V92cup38FqPjSgHitRCEP+ZzhKWMP1pWnQtB9/S3Y0fa1hspZXmsOWu8PcM8WR7sEko/l o257MpvV+VPduR1cEG9edRM8NjuWhqOiKBlPn8zzefeljI+qnOayyystNUjLUbsEgNFSlLz+OM0 mQx/4tgxAqJRnxthUyLUSE8Mpb6tiEb3kjojEwKviyHZ39Gpm202pZnJ+5xox2CnAShm X-Google-Smtp-Source: AGHT+IECtxSfDrxpaToFuZZSN8DXxz4LgZkbcCWrmXZT8bOIoJsv1bYfa29JHoMA4rQu3yENpUj6AA== X-Received: by 2002:a05:6a21:2d4c:b0:215:f519:e2dc with SMTP id adf61e73a8af0-21ee68a460amr7796056637.14.1749257198738; Fri, 06 Jun 2025 17:46:38 -0700 (PDT) Received: from Barrys-MBP.hub ([118.92.145.159]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7482b0c5f73sm1847985b3a.126.2025.06.06.17.46.33 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 06 Jun 2025 17:46:38 -0700 (PDT) From: Barry Song <21cnbao@gmail.com> To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Barry Song , "Liam R. Howlett" , Lorenzo Stoakes , David Hildenbrand , Vlastimil Babka , Jann Horn , Suren Baghdasaryan , Lokesh Gidra , Tangquan Zheng , Qi Zheng Subject: [PATCH v3] mm: use per_vma lock for MADV_DONTNEED Date: Sat, 7 Jun 2025 12:46:23 +1200 Message-Id: <20250607004623.8896-1-21cnbao@gmail.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 180AC120002 X-Stat-Signature: apqjo1o4ikbc9tez4eukscbc8h9jxwcm X-Rspam-User: X-HE-Tag: 1749257199-263876 X-HE-Meta: U2FsdGVkX19b43QnaJrYitKXJtzx2PzFgwj2m7RpFfW/0GbAriQerjDCP19iNH9Rg9883evGV51Z8VqJS30doGdJzr6szQbTju4XGT/rt0d58K5UmZgQyChHtIYvkIpHd7ZC9MxLIacIhVzIGSx1gaebKxutfODn19noNHzVIllFjBFhZl0V1hjeMMQ+BWHahE7L/+XmO60wsv60uOgXIOBy2U46FkQuPmWkGlAhIUw1AoZrOfwc7L1muRQPGRPtakMv/e2zxtpqK8cPPPeiw2pmDV6lXxNLyd63z2tDBRFmNsN0pSSJBIf1jDN9OXYlimf/T4HWOP+oxChc1SdwdZaj9vdxbsuRKF/C8VPTNXx/D9g8BawAhS3XVvf6xeccS3v4tFxo9ooXpb+8QAekhj7pI1OuNc7dF+iZAzTNxBW+RTtN2qfycyZBB86AYKGK1e5zARRiON8oUCkcnpRbi+4vY7yiIfsL5dVxJsPT+GkBKpl63f6EHCDgIXRp3MKpgjvcidrNF04TDuPnFUNzY7+QDK75XaC87S0vq+SFgYKPxnAjAavYv/j79lGxN9akT5MdhJ/dYvgtQywgd0AVfqCBQF1x4IOBrAz1nR+E8e3M8GnWMsOO2M4I66MiZ3Z6vYu5L48mxzKgrB6Q23+lqs3vx+IgKw4No7KyuFJokBGQ6zKnZN/ppzDMhJY2TDcvyQb9cRfSsaWczl4qW7xYiPLSRSK63an7zNBaw1j1gKhoEWccOFRO7dmOdJK7V+TNH+/51GEBTvpawY/HhVM07smdmyxzX+QZxtcj96QTDR8/wgUpapu85WLfmDO7K9hf5VyEGNpAkab7RkdsJzrXBZEeAA6flDG1CQ5PsI39BbfbcwfA0QlxmmWGUI9V0zYVodEd5sftxE8+MOg0E4KeXAwAYliPnQWYf/r3Xv1eqw4vsQalsLuZCy5VO/y5yt5P1F9LtEmYdPfZoMY4FDy +W6T2v+s X7sy6K1K8ST3z/LeA+sykioV23HgQqpxqGupa3TZNuG390CTCsoQJxLo0XYKLup5blm8/jxhgX/rqxSJmon2vu6dmcDp+kdZdapRwdhwsNvHAwGyxr5RLlF9E1WdqBDZvp1Wd2fpitMrAvy2CkzCgp/kvgF/Fhre+GYcP56/fp9g+i2ZAOoEzSHws/oydTVN0RVXqCGKdgLtQgPGmd76okOpeXoxkT7ANbNHJQ/cGVi5ZYN6isem5wvhq7Wh2rnk82lHNtm6TV8zxmz6dBojajdKy1KNS1gtiwm4kI81Jk1vw6qghCn0sFzbbQuOgQdgpzX1tlmYDYSyaVEDuEdBKxHBxVZb0eB5syT5cTwa9CbR4dhwQ+IDl6pahrpbUGY44sf1ZSObhKe4eK6wmbEBcvkDAfJBbXbeO4wpjrJwvIZZCncEdW9WdFGpmqLUCqKj2ZJSLlJ/ue7ANGU1l5X75taqbdQwYk1SKI7H5LbfqhlFO6EDKiFZmQ/gTSNQP5GF9V+waRfElLFJ7tMU+jjCYSQ2FYKDo/ibacW62nE0uIyMtqQabAlEohmtQJKtGAmyYJzRQq3enjaDpPU72iadPez0UBbWAJjKBG70z 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: List-Subscribe: List-Unsubscribe: From: Barry Song Certain madvise operations, especially MADV_DONTNEED, occur far more frequently than other madvise options, particularly in native and Java heaps for dynamic memory management. Currently, the mmap_lock is always held during these operations, even when unnecessary. This causes lock contention and can lead to severe priority inversion, where low-priority threads—such as Android's HeapTaskDaemon— hold the lock and block higher-priority threads. This patch enables the use of per-VMA locks when the advised range lies entirely within a single VMA, avoiding the need for full VMA traversal. In practice, userspace heaps rarely issue MADV_DONTNEED across multiple VMAs. Tangquan’s testing shows that over 99.5% of memory reclaimed by Android benefits from this per-VMA lock optimization. After extended runtime, 217,735 madvise calls from HeapTaskDaemon used the per-VMA path, while only 1,231 fell back to mmap_lock. To simplify handling, the implementation falls back to the standard mmap_lock if userfaultfd is enabled on the VMA, avoiding the complexity of userfaultfd_remove(). Many thanks to Lorenzo's work[1] on: "Refactor the madvise() code to retain state about the locking mode utilised for traversing VMAs. Then use this mechanism to permit VMA locking to be done later in the madvise() logic and also to allow altering of the locking mode to permit falling back to an mmap read lock if required." One important point, as pointed out by Jann[2], is that untagged_addr_remote() requires holding mmap_lock. This is because address tagging on x86 and RISC-V is quite complex. Until untagged_addr_remote() becomes atomic—which seems unlikely in the near future—we cannot support per-VMA locks for remote processes. So for now, only local processes are supported. Link: https://lore.kernel.org/all/0b96ce61-a52c-4036-b5b6-5c50783db51f@lucifer.local/ [1] Link: https://lore.kernel.org/all/CAG48ez11zi-1jicHUZtLhyoNPGGVB+ROeAJCUw48bsjk4bbEkA@mail.gmail.com/ [2] Cc: "Liam R. Howlett" Cc: Lorenzo Stoakes Cc: David Hildenbrand Cc: Vlastimil Babka Cc: Jann Horn Cc: Suren Baghdasaryan Cc: Lokesh Gidra Cc: Tangquan Zheng Cc: Qi Zheng Signed-off-by: Barry Song --- mm/madvise.c | 196 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 148 insertions(+), 48 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 56d9ca2557b9..a94e6a7ee387 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -48,38 +48,19 @@ struct madvise_walk_private { bool pageout; }; +enum madvise_lock_mode { + MADVISE_NO_LOCK, + MADVISE_MMAP_READ_LOCK, + MADVISE_MMAP_WRITE_LOCK, + MADVISE_VMA_READ_LOCK, +}; + struct madvise_behavior { int behavior; struct mmu_gather *tlb; + enum madvise_lock_mode lock_mode; }; -/* - * Any behaviour which results in changes to the vma->vm_flags needs to - * take mmap_lock for writing. Others, which simply traverse vmas, need - * to only take it for reading. - */ -static int madvise_need_mmap_write(int behavior) -{ - switch (behavior) { - case MADV_REMOVE: - case MADV_WILLNEED: - case MADV_DONTNEED: - case MADV_DONTNEED_LOCKED: - case MADV_COLD: - case MADV_PAGEOUT: - case MADV_FREE: - case MADV_POPULATE_READ: - case MADV_POPULATE_WRITE: - case MADV_COLLAPSE: - case MADV_GUARD_INSTALL: - case MADV_GUARD_REMOVE: - return 0; - default: - /* be safe, default to 1. list exceptions explicitly */ - return 1; - } -} - #ifdef CONFIG_ANON_VMA_NAME struct anon_vma_name *anon_vma_name_alloc(const char *name) { @@ -1486,6 +1467,44 @@ static bool process_madvise_remote_valid(int behavior) } } +/* + * Try to acquire a VMA read lock if possible. + * + * We only support this lock over a single VMA, which the input range must + * span either partially or fully. + * + * This function always returns with an appropriate lock held. If a VMA read + * lock could be acquired, we return the locked VMA. + * + * If a VMA read lock could not be acquired, we return NULL and expect caller to + * fallback to mmap lock behaviour. + */ +static struct vm_area_struct *try_vma_read_lock(struct mm_struct *mm, + struct madvise_behavior *madv_behavior, + unsigned long start, unsigned long end) +{ + struct vm_area_struct *vma; + + vma = lock_vma_under_rcu(mm, start); + if (!vma) + goto take_mmap_read_lock; + /* + * Must span only a single VMA; uffd and remote processes are + * unsupported. + */ + if (end > vma->vm_end || current->mm != mm || + userfaultfd_armed(vma)) { + vma_end_read(vma); + goto take_mmap_read_lock; + } + return vma; + +take_mmap_read_lock: + mmap_read_lock(mm); + madv_behavior->lock_mode = MADVISE_MMAP_READ_LOCK; + return NULL; +} + /* * Walk the vmas in range [start,end), and call the visit function on each one. * The visit function will get start and end parameters that cover the overlap @@ -1496,7 +1515,8 @@ static bool process_madvise_remote_valid(int behavior) */ static int madvise_walk_vmas(struct mm_struct *mm, unsigned long start, - unsigned long end, void *arg, + unsigned long end, struct madvise_behavior *madv_behavior, + void *arg, int (*visit)(struct vm_area_struct *vma, struct vm_area_struct **prev, unsigned long start, unsigned long end, void *arg)) @@ -1505,6 +1525,21 @@ int madvise_walk_vmas(struct mm_struct *mm, unsigned long start, struct vm_area_struct *prev; unsigned long tmp; int unmapped_error = 0; + int error; + + /* + * If VMA read lock is supported, apply madvise to a single VMA + * tentatively, avoiding walking VMAs. + */ + if (madv_behavior && madv_behavior->lock_mode == MADVISE_VMA_READ_LOCK) { + vma = try_vma_read_lock(mm, madv_behavior, start, end); + if (vma) { + error = madvise_vma_behavior(vma, &prev, start, end, + madv_behavior); + vma_end_read(vma); + return error; + } + } /* * If the interval [start,end) covers some unmapped address @@ -1516,8 +1551,6 @@ int madvise_walk_vmas(struct mm_struct *mm, unsigned long start, prev = vma; for (;;) { - int error; - /* Still start < end. */ if (!vma) return -ENOMEM; @@ -1598,34 +1631,86 @@ int madvise_set_anon_name(struct mm_struct *mm, unsigned long start, if (end == start) return 0; - return madvise_walk_vmas(mm, start, end, anon_name, + return madvise_walk_vmas(mm, start, end, NULL, anon_name, madvise_vma_anon_name); } #endif /* CONFIG_ANON_VMA_NAME */ -static int madvise_lock(struct mm_struct *mm, int behavior) + +/* + * Any behaviour which results in changes to the vma->vm_flags needs to + * take mmap_lock for writing. Others, which simply traverse vmas, need + * to only take it for reading. + */ +static enum madvise_lock_mode get_lock_mode(struct madvise_behavior *madv_behavior) { + int behavior = madv_behavior->behavior; + if (is_memory_failure(behavior)) - return 0; + return MADVISE_NO_LOCK; - if (madvise_need_mmap_write(behavior)) { + switch (behavior) { + case MADV_REMOVE: + case MADV_WILLNEED: + case MADV_COLD: + case MADV_PAGEOUT: + case MADV_FREE: + case MADV_POPULATE_READ: + case MADV_POPULATE_WRITE: + case MADV_COLLAPSE: + case MADV_GUARD_INSTALL: + case MADV_GUARD_REMOVE: + return MADVISE_MMAP_READ_LOCK; + case MADV_DONTNEED: + case MADV_DONTNEED_LOCKED: + return MADVISE_VMA_READ_LOCK; + default: + return MADVISE_MMAP_WRITE_LOCK; + } +} + +static int madvise_lock(struct mm_struct *mm, + struct madvise_behavior *madv_behavior) +{ + enum madvise_lock_mode lock_mode = get_lock_mode(madv_behavior); + + switch (lock_mode) { + case MADVISE_NO_LOCK: + break; + case MADVISE_MMAP_WRITE_LOCK: if (mmap_write_lock_killable(mm)) return -EINTR; - } else { + break; + case MADVISE_MMAP_READ_LOCK: mmap_read_lock(mm); + break; + case MADVISE_VMA_READ_LOCK: + /* We will acquire the lock per-VMA in madvise_walk_vmas(). */ + break; } + + madv_behavior->lock_mode = lock_mode; return 0; } -static void madvise_unlock(struct mm_struct *mm, int behavior) +static void madvise_unlock(struct mm_struct *mm, + struct madvise_behavior *madv_behavior) { - if (is_memory_failure(behavior)) + switch (madv_behavior->lock_mode) { + case MADVISE_NO_LOCK: return; - - if (madvise_need_mmap_write(behavior)) + case MADVISE_MMAP_WRITE_LOCK: mmap_write_unlock(mm); - else + break; + case MADVISE_MMAP_READ_LOCK: mmap_read_unlock(mm); + break; + case MADVISE_VMA_READ_LOCK: + /* We will drop the lock per-VMA in madvise_walk_vmas(). */ + break; + } + + madv_behavior->lock_mode = MADVISE_NO_LOCK; } static bool madvise_batch_tlb_flush(int behavior) @@ -1710,6 +1795,21 @@ static bool is_madvise_populate(int behavior) } } +/* + * untagged_addr_remote() assumes mmap_lock is already held. On + * architectures like x86 and RISC-V, tagging is tricky because each + * mm may have a different tagging mask. However, we might only hold + * the per-VMA lock (currently only local processes are supported), + * so untagged_addr is used to avoid the mmap_lock assertion for + * local processes. + */ +static inline unsigned long get_untagged_addr(struct mm_struct *mm, + unsigned long start) +{ + return current->mm == mm ? untagged_addr(start) : + untagged_addr_remote(mm, start); +} + static int madvise_do_behavior(struct mm_struct *mm, unsigned long start, size_t len_in, struct madvise_behavior *madv_behavior) @@ -1721,7 +1821,7 @@ static int madvise_do_behavior(struct mm_struct *mm, if (is_memory_failure(behavior)) return madvise_inject_error(behavior, start, start + len_in); - start = untagged_addr_remote(mm, start); + start = get_untagged_addr(mm, start); end = start + PAGE_ALIGN(len_in); blk_start_plug(&plug); @@ -1729,7 +1829,7 @@ static int madvise_do_behavior(struct mm_struct *mm, error = madvise_populate(mm, start, end, behavior); else error = madvise_walk_vmas(mm, start, end, madv_behavior, - madvise_vma_behavior); + madv_behavior, madvise_vma_behavior); blk_finish_plug(&plug); return error; } @@ -1817,13 +1917,13 @@ int do_madvise(struct mm_struct *mm, unsigned long start, size_t len_in, int beh if (madvise_should_skip(start, len_in, behavior, &error)) return error; - error = madvise_lock(mm, behavior); + error = madvise_lock(mm, &madv_behavior); if (error) return error; madvise_init_tlb(&madv_behavior, mm); error = madvise_do_behavior(mm, start, len_in, &madv_behavior); madvise_finish_tlb(&madv_behavior); - madvise_unlock(mm, behavior); + madvise_unlock(mm, &madv_behavior); return error; } @@ -1847,7 +1947,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, total_len = iov_iter_count(iter); - ret = madvise_lock(mm, behavior); + ret = madvise_lock(mm, &madv_behavior); if (ret) return ret; madvise_init_tlb(&madv_behavior, mm); @@ -1880,8 +1980,8 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, /* Drop and reacquire lock to unwind race. */ madvise_finish_tlb(&madv_behavior); - madvise_unlock(mm, behavior); - ret = madvise_lock(mm, behavior); + madvise_unlock(mm, &madv_behavior); + ret = madvise_lock(mm, &madv_behavior); if (ret) goto out; madvise_init_tlb(&madv_behavior, mm); @@ -1892,7 +1992,7 @@ static ssize_t vector_madvise(struct mm_struct *mm, struct iov_iter *iter, iov_iter_advance(iter, iter_iov_len(iter)); } madvise_finish_tlb(&madv_behavior); - madvise_unlock(mm, behavior); + madvise_unlock(mm, &madv_behavior); out: ret = (total_len - iov_iter_count(iter)) ? : ret; -- 2.39.3 (Apple Git-146)