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 BBAD3E7717D for ; Mon, 9 Dec 2024 20:28:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0D4D86B00AE; Mon, 9 Dec 2024 15:28:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 084516B00B0; Mon, 9 Dec 2024 15:28:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3F776B00B1; Mon, 9 Dec 2024 15:28:49 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B6D8B6B00AE for ; Mon, 9 Dec 2024 15:28:49 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5B81641A17 for ; Mon, 9 Dec 2024 20:28:49 +0000 (UTC) X-FDA: 82876558758.11.670418B Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by imf26.hostedemail.com (Postfix) with ESMTP id 7E639140003 for ; Mon, 9 Dec 2024 20:28:31 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=t05QF6uL; spf=pass (imf26.hostedemail.com: domain of surenb@google.com designates 209.85.160.176 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1733776105; 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:in-reply-to:references:references:dkim-signature; bh=pXFCh/BkxSwMU2YyHf4Y49waw1Ba8Dy8qbuqTxSO5LY=; b=jIjyKzGVloKi/ZHPP94b1Dn22igqIVEJ3x/Bm33HPxPr+IPqfG/GjnR+8Ly3yTk1vhsULl nP69B77cgp0jWxyu+5CfxZYO86M0UvK6AdeQ8p1gcg+XS5bqbD5YPGAn8oPOOaFTxo/gxG 871P8l2Q+bmfU4icrmbSLqTnkMBP/UY= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=t05QF6uL; spf=pass (imf26.hostedemail.com: domain of surenb@google.com designates 209.85.160.176 as permitted sender) smtp.mailfrom=surenb@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1733776105; a=rsa-sha256; cv=none; b=EPxpewby6Ee++e1GRM1ATzjPz4e7ahDdozgNE5XWYgKT8QxQUS9884rOIlhmcDGlz4Yzrh f1TixxBJ5X4RnSnBQbh1cY58HPG5wITQdpFg4StH9ut+6zqTdyTa2i6Ak92DTCCK79x7Up vWeiWTf6QZtY/3q3yw7eSG1UayRFW3E= Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-4674c22c4afso14581cf.1 for ; Mon, 09 Dec 2024 12:28:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733776126; x=1734380926; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=pXFCh/BkxSwMU2YyHf4Y49waw1Ba8Dy8qbuqTxSO5LY=; b=t05QF6uLTbMA1X4WMQ1dftYYaZ45n0i/z7bCggg/XaQyRhpYwCS5496zUiOI97CTdV xp2NObbigtZt02yKTCo7ucdeEqyz/6G9qTtJ2t/gzfc0fkrOMhw0c+iEcqDOO7RocJR8 k1Kk2jnT0w2LRKwdrrLy/H1KVh/vosxi33Ut2R/2DkET+ilouLgiCSLU5pO+EPqgzqX7 c3QIcZ20OIOgm5YZBXo8pb/S1I/5NqpmN9TV4YEGAYilqvjT6glTo/j3LNk5GXeJwuQ5 b4zySNfcPUvrBIb8ZAKNM2nEkbACuAIQk1s42YyPKNyqnLYUTOXp8X3JM49dZUoBCwKV 5UtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733776126; x=1734380926; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pXFCh/BkxSwMU2YyHf4Y49waw1Ba8Dy8qbuqTxSO5LY=; b=FXkJL2vsOtnjKCP49dj4zlfde2Pmw33sced4fgjnGe1u5UQf8A+tFKRtPpkd+r1uCC Pcss6RRSUZu3InyekmaMjSh36lLRH0xFUNpWlF2ASaVULEDBIvJJW2B4194wR5TPhw0f 2Vwu4iCC7Cx3F7+kWybpEwWQIsArW/I0uAZbOAR0xmlgr6HFMGgf60gBmPNMDFiNRaQH u64aKD6kKkB3fTQCLPfWCyaLfZzE1WU1CXuE/HcaL+oEoKomdXCfQtSARV7zAK91ySPR f6d2lk4Arym+y94lV9GzcjfUOX4ZwMSXXrwZIcLzay7KMwa0uRE8HamASbBsROX5pAxX 9a8Q== X-Forwarded-Encrypted: i=1; AJvYcCWdlGYeN8IE1JkaMPEmO9pVdFBy2vC6WDxRFtDp40vGYBT4gEKU9VfPQ6Bi/3A7zygm5r6WVyPGZw==@kvack.org X-Gm-Message-State: AOJu0YzK336bo6DsSKuvYOMlfs3JXBFc4Y7XB7C5Kwyqpm5bMn1smAU1 KduQ9U5tEvkQJO7pSnNSaJnm0/w4Wf2nrUqnHJP8ghEksboVPDCjoHeH+R496vrtGwtE2THmjHf DYWj98IyvzZlMtRbTiSLET5TFdPI+8vHJ64Vi X-Gm-Gg: ASbGnctbg4Ece0dqpWVa3C3A58//IfUmc43kpWycKNlauypZzaNU53Ir39Okn8z9iLf jEwXF/+FtrxRjV1cMVDN7Dr94NMyNgjbVmOQ= X-Google-Smtp-Source: AGHT+IGMDnw/UdS7fXihyomcpjwqctj6P7ccP9lo2rOBHOiUSSV2B7ilnhQh2pfJUkG7pc04fxV3ZcPDvKypZDSZSoA= X-Received: by 2002:a05:622a:5e0f:b0:461:70cc:3799 with SMTP id d75a77b69052e-4677653cdc2mr412131cf.21.1733776126053; Mon, 09 Dec 2024 12:28:46 -0800 (PST) MIME-Version: 1.0 References: <20241206225204.4008261-1-surenb@google.com> <20241206225204.4008261-5-surenb@google.com> In-Reply-To: From: Suren Baghdasaryan Date: Mon, 9 Dec 2024 12:28:35 -0800 Message-ID: Subject: Re: [PATCH v5 4/6] mm: make vma cache SLAB_TYPESAFE_BY_RCU To: Klara Modin Cc: akpm@linux-foundation.org, willy@infradead.org, liam.howlett@oracle.com, lorenzo.stoakes@oracle.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mjguzik@gmail.com, oliver.sang@intel.com, mgorman@techsingularity.net, david@redhat.com, peterx@redhat.com, oleg@redhat.com, dave@stgolabs.net, paulmck@kernel.org, brauner@kernel.org, dhowells@redhat.com, hdanton@sina.com, hughd@google.com, minchan@google.com, jannh@google.com, shakeel.butt@linux.dev, souravpanda@google.com, pasha.tatashin@soleen.com, corbet@lwn.net, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@android.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 7E639140003 X-Rspam-User: X-Stat-Signature: mpc56efzqk6qdozgqiomsxau3oosky9z X-HE-Tag: 1733776111-601583 X-HE-Meta: U2FsdGVkX19oGNgoegsjrgz20nls0nIpcmZ24nLrwKD98naS1ewTxSRQf+0AH2htYA3sTOjCsiHOmnFC96zEQoZOmIU2S1IePb6RkjgYFyjF7grZAStiAMmVuT5X7iYVOUPtUr6mRbAa1XMylgx4hmY+VfoB1GYB1DP0LAzbWBAubepAbCOLSlipbt/swXTKpWTrmqyR1iMpA6Q4rvgZbXNMeBr6zOMOB/D1C3Gz+1H6x1/vmBkEc1+skaL3gFlyBEgh2CYRnFvpIviFMTNZeu+oY4rSwyjgy5zRQ88e6l7UGL0MnsE9Ir697zN+3O0hGF59N6KgyPF8waZKsGOwIS4EFnCez0G5YQYvidPOxKTsaqfnn30vyBgi/aOPqt1PtQh9CCUKPKeSEbMsyI27u27wpAciyPXgcZO1ZUNE1QNI9hQDvVPhs+04/siqMakM53L73zJDMeO6S7j5Dc99JG1c8XQk8q/IJU269hhfzFUFcUxooCItuNC/IXxq+el05QN5xi75Qhul12+uzzwTSjwJT+EXICdsjD86r6nnTHaXGERJJdxhNmvHwQHRZHzfg7UrTFwFA4hvNMaJznHuRmZr07GCf0gv8pB+P3jn5yuqsjl65x/6q3TZ0ZwCwP0B5iAQRqvNDMHxek12ZZWJJBzmH156k3uD6JKMPT/u2Z1Y6oXFihD88IfxbFeWeVcTtZH/nWDMx7u/vPM8dYxMLACITdre6buGvh43Haq8xkfvMu/oOZEJFeNiNW6rr0sAo6elkFZNoJFs/26VPS9GdCGUfRWVd+vQRn+OdgkLgI5Dw7z7iPXdKTiWE5YuhhmYV5YAzmqcmPxWczeoHUr24UWW27W57jgpkyg7slENjDBjmmTWiCwZ5Bdc438OfDQEuU/itjvhu0gVWW3xAduqt8fnil2qqtbbVYwsDBDFhnb820YFPPd1DifnEnK2Ha8+3gtUykCG2ztTi+E9dBo DoMfe4R3 bhzyaK97yM4Hy7djZsyYbTGsoFKps0O397sq60RnTSt/PxnQxSqfUdHjMpvl6ik1MFFrNAUCPvpInfvt//OG7WdcTemc/BSfWNqypjzuQupISHJAdyJd7hHDByFxInTqcVg3L4Bpl1ki7B5h1A6FBknKVTVKaPNNCekS01LUi+Zcugnf2q5Xi7xI6BGlFx7G7mLVwztLrOCp1sgWd1ZMZ2EJ6U6D0NyStdhgNbEVsdu9X425+Otlxz//z/2BEOEuHB7JIT6gH+C1y5fk3X/h68EtrGKJiCTpAu86dFZSC3blEdnQ1f1DxCMQ9mXoh8R3cKaCkNYlWhJAe9kO5YaYyt+zUJA== 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: On Mon, Dec 9, 2024 at 9:35=E2=80=AFAM Klara Modin = wrote: > > Hi, > > On 2024-12-06 23:52, Suren Baghdasaryan wrote: > > To enable SLAB_TYPESAFE_BY_RCU for vma cache we need to ensure that > > object reuse before RCU grace period is over will be detected inside > > lock_vma_under_rcu(). > > lock_vma_under_rcu() enters RCU read section, finds the vma at the > > given address, locks the vma and checks if it got detached or remapped > > to cover a different address range. These last checks are there > > to ensure that the vma was not modified after we found it but before > > locking it. > > vma reuse introduces several new possibilities: > > 1. vma can be reused after it was found but before it is locked; > > 2. vma can be reused and reinitialized (including changing its vm_mm) > > while being locked in vma_start_read(); > > 3. vma can be reused and reinitialized after it was found but before > > it is locked, then attached at a new address or to a new mm while > > read-locked; > > For case #1 current checks will help detecting cases when: > > - vma was reused but not yet added into the tree (detached check) > > - vma was reused at a different address range (address check); > > We are missing the check for vm_mm to ensure the reused vma was not > > attached to a different mm. This patch adds the missing check. > > For case #2, we pass mm to vma_start_read() to prevent access to > > unstable vma->vm_mm. This might lead to vma_start_read() returning > > a false locked result but that's not critical if it's rare because > > it will only lead to a retry under mmap_lock. > > For case #3, we ensure the order in which vma->detached flag and > > vm_start/vm_end/vm_mm are set and checked. vma gets attached after > > vm_start/vm_end/vm_mm were set and lock_vma_under_rcu() should check > > vma->detached before checking vm_start/vm_end/vm_mm. This is required > > because attaching vma happens without vma write-lock, as opposed to > > vma detaching, which requires vma write-lock. This patch adds memory > > barriers inside is_vma_detached() and vma_mark_attached() needed to > > order reads and writes to vma->detached vs vm_start/vm_end/vm_mm. > > After these provisions, SLAB_TYPESAFE_BY_RCU is added to vm_area_cachep= . > > This will facilitate vm_area_struct reuse and will minimize the number > > of call_rcu() calls. > > This patch (85ad413389aec04cfaaba043caa8128b76c6e491 in next-20241209) > seems to cause an oops on a MIPS board of mine (Cavium Octeon III) > (abbreviated, full attached): Thanks! This is really helpful because both errors are reported on architectures which don't set CONFIG_PER_VMA_LOCK. This is a great clue. I'm investigating it and will post a fix asap. Thanks, Suren. > > CPU 2 Unable to handle kernel paging request at virtual address > 0000000000000000, epc =3D=3D ffffffff813a85a0, ra =3D=3D ffffffff81390438 > Oops[#1]: > CPU: 2 UID: 0 PID: 1 Comm: init Not tainted > 6.13.0-rc1-00162-g85ad413389ae #156 > Call Trace: > unlink_anon_vmas (mm/rmap.c:408) > free_pgtables (mm/memory.c:393) > vms_clear_ptes (mm/vma.c:1143) > vms_complete_munmap_vmas (include/linux/mm.h:2737 mm/vma.c:1187) > do_vmi_align_munmap (mm/vma.c:1452) > __vm_munmap (mm/vma.c:2892) > sys_munmap (mm/mmap.c:1053) > syscall_common (arch/mips/kernel/scall64-n64.S:62) > > I saw that there's already a report, but maybe another arch can be > useful for tracking this down. > > Please let me know if there's anything else you need. > > Regards, > Klara Modin > > Link: https://lore.kernel.org/all/202412082208.db1fb2c9-lkp@intel.com > > > > > Signed-off-by: Suren Baghdasaryan > > --- > > include/linux/mm.h | 36 +++++-- > > include/linux/mm_types.h | 10 +- > > include/linux/slab.h | 6 -- > > kernel/fork.c | 157 +++++++++++++++++++++++++-----= - > > mm/memory.c | 15 ++- > > mm/vma.c | 2 +- > > tools/testing/vma/vma_internal.h | 7 +- > > 7 files changed, 179 insertions(+), 54 deletions(-) > > > > diff --git a/include/linux/mm.h b/include/linux/mm.h > > index 2bf38c1e9cca..3568bcbc7c81 100644 > > --- a/include/linux/mm.h > > +++ b/include/linux/mm.h > > @@ -257,7 +257,7 @@ struct vm_area_struct *vm_area_alloc(struct mm_stru= ct *); > > struct vm_area_struct *vm_area_dup(struct vm_area_struct *); > > void vm_area_free(struct vm_area_struct *); > > /* Use only if VMA has no other users */ > > -void __vm_area_free(struct vm_area_struct *vma); > > +void vm_area_free_unreachable(struct vm_area_struct *vma); > > > > #ifndef CONFIG_MMU > > extern struct rb_root nommu_region_tree; > > @@ -706,8 +706,10 @@ static inline void vma_lock_init(struct vm_area_st= ruct *vma) > > * Try to read-lock a vma. The function is allowed to occasionally yi= eld false > > * locked result to avoid performance overhead, in which case we fall= back to > > * using mmap_lock. The function should never yield false unlocked re= sult. > > + * False locked result is possible if mm_lock_seq overflows or if vma = gets > > + * reused and attached to a different mm before we lock it. > > */ > > -static inline bool vma_start_read(struct vm_area_struct *vma) > > +static inline bool vma_start_read(struct mm_struct *mm, struct vm_area= _struct *vma) > > { > > /* > > * Check before locking. A race might cause false locked result. > > @@ -716,7 +718,7 @@ static inline bool vma_start_read(struct vm_area_st= ruct *vma) > > * we don't rely on for anything - the mm_lock_seq read against w= hich we > > * need ordering is below. > > */ > > - if (READ_ONCE(vma->vm_lock_seq) =3D=3D READ_ONCE(vma->vm_mm->mm_l= ock_seq.sequence)) > > + if (READ_ONCE(vma->vm_lock_seq) =3D=3D READ_ONCE(mm->mm_lock_seq.= sequence)) > > return false; > > > > if (unlikely(down_read_trylock(&vma->vm_lock.lock) =3D=3D 0)) > > @@ -733,7 +735,7 @@ static inline bool vma_start_read(struct vm_area_st= ruct *vma) > > * after it has been unlocked. > > * This pairs with RELEASE semantics in vma_end_write_all(). > > */ > > - if (unlikely(vma->vm_lock_seq =3D=3D raw_read_seqcount(&vma->vm_m= m->mm_lock_seq))) { > > + if (unlikely(vma->vm_lock_seq =3D=3D raw_read_seqcount(&mm->mm_lo= ck_seq))) { > > up_read(&vma->vm_lock.lock); > > return false; > > } > > @@ -822,7 +824,15 @@ static inline void vma_assert_locked(struct vm_are= a_struct *vma) > > > > static inline void vma_mark_attached(struct vm_area_struct *vma) > > { > > - vma->detached =3D false; > > + /* > > + * This pairs with smp_rmb() inside is_vma_detached(). > > + * vma is marked attached after all vma modifications are done an= d it > > + * got added into the vma tree. All prior vma modifications shoul= d be > > + * made visible before marking the vma attached. > > + */ > > + smp_wmb(); > > + /* This pairs with READ_ONCE() in is_vma_detached(). */ > > + WRITE_ONCE(vma->detached, false); > > } > > > > static inline void vma_mark_detached(struct vm_area_struct *vma) > > @@ -834,7 +844,18 @@ static inline void vma_mark_detached(struct vm_are= a_struct *vma) > > > > static inline bool is_vma_detached(struct vm_area_struct *vma) > > { > > - return vma->detached; > > + bool detached; > > + > > + /* This pairs with WRITE_ONCE() in vma_mark_attached(). */ > > + detached =3D READ_ONCE(vma->detached); > > + /* > > + * This pairs with smp_wmb() inside vma_mark_attached() to ensure > > + * vma->detached is read before vma attributes read later inside > > + * lock_vma_under_rcu(). > > + */ > > + smp_rmb(); > > + > > + return detached; > > } > > > > static inline void release_fault_lock(struct vm_fault *vmf) > > @@ -859,7 +880,7 @@ struct vm_area_struct *lock_vma_under_rcu(struct mm= _struct *mm, > > #else /* CONFIG_PER_VMA_LOCK */ > > > > static inline void vma_lock_init(struct vm_area_struct *vma) {} > > -static inline bool vma_start_read(struct vm_area_struct *vma) > > +static inline bool vma_start_read(struct mm_struct *mm, struct vm_area= _struct *vma) > > { return false; } > > static inline void vma_end_read(struct vm_area_struct *vma) {} > > static inline void vma_start_write(struct vm_area_struct *vma) {} > > @@ -893,6 +914,7 @@ static inline void assert_fault_locked(struct vm_fa= ult *vmf) > > > > extern const struct vm_operations_struct vma_dummy_vm_ops; > > > > +/* Use on VMAs not created using vm_area_alloc() */ > > static inline void vma_init(struct vm_area_struct *vma, struct mm_str= uct *mm) > > { > > memset(vma, 0, sizeof(*vma)); > > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > > index be3551654325..5d8779997266 100644 > > --- a/include/linux/mm_types.h > > +++ b/include/linux/mm_types.h > > @@ -543,6 +543,12 @@ static inline void *folio_get_private(struct folio= *folio) > > > > typedef unsigned long vm_flags_t; > > > > +/* > > + * freeptr_t represents a SLUB freelist pointer, which might be encode= d > > + * and not dereferenceable if CONFIG_SLAB_FREELIST_HARDENED is enabled= . > > + */ > > +typedef struct { unsigned long v; } freeptr_t; > > + > > /* > > * A region containing a mapping of a non-memory backed file under NO= MMU > > * conditions. These are held in a global tree and are pinned by the= VMAs that > > @@ -657,9 +663,7 @@ struct vm_area_struct { > > unsigned long vm_start; > > unsigned long vm_end; > > }; > > -#ifdef CONFIG_PER_VMA_LOCK > > - struct rcu_head vm_rcu; /* Used for deferred freeing. */ > > -#endif > > + freeptr_t vm_freeptr; /* Pointer used by SLAB_TYPESAFE_BY= _RCU */ > > }; > > > > /* > > diff --git a/include/linux/slab.h b/include/linux/slab.h > > index 10a971c2bde3..681b685b6c4e 100644 > > --- a/include/linux/slab.h > > +++ b/include/linux/slab.h > > @@ -234,12 +234,6 @@ enum _slab_flag_bits { > > #define SLAB_NO_OBJ_EXT __SLAB_FLAG_UNUSED > > #endif > > > > -/* > > - * freeptr_t represents a SLUB freelist pointer, which might be encode= d > > - * and not dereferenceable if CONFIG_SLAB_FREELIST_HARDENED is enabled= . > > - */ > > -typedef struct { unsigned long v; } freeptr_t; > > - > > /* > > * ZERO_SIZE_PTR will be returned for zero sized kmalloc requests. > > * > > diff --git a/kernel/fork.c b/kernel/fork.c > > index 71990f46aa4e..e7e76a660e4c 100644 > > --- a/kernel/fork.c > > +++ b/kernel/fork.c > > @@ -436,6 +436,98 @@ static struct kmem_cache *vm_area_cachep; > > /* SLAB cache for mm_struct structures (tsk->mm) */ > > static struct kmem_cache *mm_cachep; > > > > +static void vm_area_ctor(void *data) > > +{ > > + struct vm_area_struct *vma =3D (struct vm_area_struct *)data; > > + > > +#ifdef CONFIG_PER_VMA_LOCK > > + /* vma is not locked, can't use vma_mark_detached() */ > > + vma->detached =3D true; > > +#endif > > + INIT_LIST_HEAD(&vma->anon_vma_chain); > > + vma_lock_init(vma); > > +} > > + > > +#ifdef CONFIG_PER_VMA_LOCK > > + > > +static void vma_clear(struct vm_area_struct *vma, struct mm_struct *mm= ) > > +{ > > + vma->vm_mm =3D mm; > > + vma->vm_ops =3D &vma_dummy_vm_ops; > > + vma->vm_start =3D 0; > > + vma->vm_end =3D 0; > > + vma->anon_vma =3D NULL; > > + vma->vm_pgoff =3D 0; > > + vma->vm_file =3D NULL; > > + vma->vm_private_data =3D NULL; > > + vm_flags_init(vma, 0); > > + memset(&vma->vm_page_prot, 0, sizeof(vma->vm_page_prot)); > > + memset(&vma->shared, 0, sizeof(vma->shared)); > > + memset(&vma->vm_userfaultfd_ctx, 0, sizeof(vma->vm_userfaultfd_ct= x)); > > + vma_numab_state_init(vma); > > +#ifdef CONFIG_ANON_VMA_NAME > > + vma->anon_name =3D NULL; > > +#endif > > +#ifdef CONFIG_SWAP > > + memset(&vma->swap_readahead_info, 0, sizeof(vma->swap_readahead_i= nfo)); > > +#endif > > +#ifndef CONFIG_MMU > > + vma->vm_region =3D NULL; > > +#endif > > +#ifdef CONFIG_NUMA > > + vma->vm_policy =3D NULL; > > +#endif > > +} > > + > > +static void vma_copy(const struct vm_area_struct *src, struct vm_area_= struct *dest) > > +{ > > + dest->vm_mm =3D src->vm_mm; > > + dest->vm_ops =3D src->vm_ops; > > + dest->vm_start =3D src->vm_start; > > + dest->vm_end =3D src->vm_end; > > + dest->anon_vma =3D src->anon_vma; > > + dest->vm_pgoff =3D src->vm_pgoff; > > + dest->vm_file =3D src->vm_file; > > + dest->vm_private_data =3D src->vm_private_data; > > + vm_flags_init(dest, src->vm_flags); > > + memcpy(&dest->vm_page_prot, &src->vm_page_prot, > > + sizeof(dest->vm_page_prot)); > > + memcpy(&dest->shared, &src->shared, sizeof(dest->shared)); > > + memcpy(&dest->vm_userfaultfd_ctx, &src->vm_userfaultfd_ctx, > > + sizeof(dest->vm_userfaultfd_ctx)); > > +#ifdef CONFIG_ANON_VMA_NAME > > + dest->anon_name =3D src->anon_name; > > +#endif > > +#ifdef CONFIG_SWAP > > + memcpy(&dest->swap_readahead_info, &src->swap_readahead_info, > > + sizeof(dest->swap_readahead_info)); > > +#endif > > +#ifndef CONFIG_MMU > > + dest->vm_region =3D src->vm_region; > > +#endif > > +#ifdef CONFIG_NUMA > > + dest->vm_policy =3D src->vm_policy; > > +#endif > > +} > > + > > +#else /* CONFIG_PER_VMA_LOCK */ > > + > > +static void vma_clear(struct vm_area_struct *vma, struct mm_struct *mm= ) > > +{ > > + vma_init(vma, mm); > > +} > > + > > +static void vma_copy(const struct vm_area_struct *src, struct vm_area_= struct *dest) > > +{ > > + /* > > + * orig->shared.rb may be modified concurrently, but the clone > > + * will be reinitialized. > > + */ > > + data_race(memcpy(dest, src, sizeof(*dest))); > > +} > > + > > +#endif /* CONFIG_PER_VMA_LOCK */ > > + > > struct vm_area_struct *vm_area_alloc(struct mm_struct *mm) > > { > > struct vm_area_struct *vma; > > @@ -444,7 +536,7 @@ struct vm_area_struct *vm_area_alloc(struct mm_stru= ct *mm) > > if (!vma) > > return NULL; > > > > - vma_init(vma, mm); > > + vma_clear(vma, mm); > > > > return vma; > > } > > @@ -458,49 +550,46 @@ struct vm_area_struct *vm_area_dup(struct vm_area= _struct *orig) > > > > ASSERT_EXCLUSIVE_WRITER(orig->vm_flags); > > ASSERT_EXCLUSIVE_WRITER(orig->vm_file); > > - /* > > - * orig->shared.rb may be modified concurrently, but the clone > > - * will be reinitialized. > > - */ > > - data_race(memcpy(new, orig, sizeof(*new))); > > - vma_lock_init(new); > > - INIT_LIST_HEAD(&new->anon_vma_chain); > > -#ifdef CONFIG_PER_VMA_LOCK > > - /* vma is not locked, can't use vma_mark_detached() */ > > - new->detached =3D true; > > -#endif > > + vma_copy(orig, new); > > vma_numab_state_init(new); > > dup_anon_vma_name(orig, new); > > > > return new; > > } > > > > -void __vm_area_free(struct vm_area_struct *vma) > > +static void __vm_area_free(struct vm_area_struct *vma, bool unreachabl= e) > > { > > +#ifdef CONFIG_PER_VMA_LOCK > > + /* > > + * With SLAB_TYPESAFE_BY_RCU, vma can be reused and we need > > + * vma->detached to be set before vma is returned into the cache. > > + * This way reused object won't be used by readers until it's > > + * initialized and reattached. > > + * If vma is unreachable, there can be no other users and we > > + * can set vma->detached directly with no risk of a race. > > + * If vma is reachable, then it should have been already detached > > + * under vma write-lock or it was never attached. > > + */ > > + if (unreachable) > > + vma->detached =3D true; > > + else > > + VM_BUG_ON_VMA(!is_vma_detached(vma), vma); > > + vma->vm_lock_seq =3D UINT_MAX; > > +#endif > > + VM_BUG_ON_VMA(!list_empty(&vma->anon_vma_chain), vma); > > vma_numab_state_free(vma); > > free_anon_vma_name(vma); > > kmem_cache_free(vm_area_cachep, vma); > > } > > > > -#ifdef CONFIG_PER_VMA_LOCK > > -static void vm_area_free_rcu_cb(struct rcu_head *head) > > +void vm_area_free(struct vm_area_struct *vma) > > { > > - struct vm_area_struct *vma =3D container_of(head, struct vm_area_= struct, > > - vm_rcu); > > - > > - /* The vma should not be locked while being destroyed. */ > > - VM_BUG_ON_VMA(rwsem_is_locked(&vma->vm_lock.lock), vma); > > - __vm_area_free(vma); > > + __vm_area_free(vma, false); > > } > > -#endif > > > > -void vm_area_free(struct vm_area_struct *vma) > > +void vm_area_free_unreachable(struct vm_area_struct *vma) > > { > > -#ifdef CONFIG_PER_VMA_LOCK > > - call_rcu(&vma->vm_rcu, vm_area_free_rcu_cb); > > -#else > > - __vm_area_free(vma); > > -#endif > > + __vm_area_free(vma, true); > > } > > > > static void account_kernel_stack(struct task_struct *tsk, int account= ) > > @@ -3141,6 +3230,12 @@ void __init mm_cache_init(void) > > > > void __init proc_caches_init(void) > > { > > + struct kmem_cache_args args =3D { > > + .use_freeptr_offset =3D true, > > + .freeptr_offset =3D offsetof(struct vm_area_struct, vm_fr= eeptr), > > + .ctor =3D vm_area_ctor, > > + }; > > + > > sighand_cachep =3D kmem_cache_create("sighand_cache", > > sizeof(struct sighand_struct), 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RC= U| > > @@ -3157,9 +3252,11 @@ void __init proc_caches_init(void) > > sizeof(struct fs_struct), 0, > > SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, > > NULL); > > - vm_area_cachep =3D KMEM_CACHE(vm_area_struct, > > - SLAB_HWCACHE_ALIGN|SLAB_NO_MERGE|SLAB_PANIC| > > + vm_area_cachep =3D kmem_cache_create("vm_area_struct", > > + sizeof(struct vm_area_struct), &args, > > + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RC= U| > > SLAB_ACCOUNT); > > + > > mmap_init(); > > nsproxy_cache_init(); > > } > > diff --git a/mm/memory.c b/mm/memory.c > > index b252f19b28c9..6f4d4d423835 100644 > > --- a/mm/memory.c > > +++ b/mm/memory.c > > @@ -6368,10 +6368,16 @@ struct vm_area_struct *lock_vma_under_rcu(struc= t mm_struct *mm, > > if (!vma) > > goto inval; > > > > - if (!vma_start_read(vma)) > > + if (!vma_start_read(mm, vma)) > > goto inval; > > > > - /* Check if the VMA got isolated after we found it */ > > + /* > > + * Check if the VMA got isolated after we found it. > > + * Note: vma we found could have been recycled and is being reatt= ached. > > + * It's possible to attach a vma while it is read-locked, however= a > > + * read-locked vma can't be detached (detaching requires write-lo= cking). > > + * Therefore if this check passes, we have an attached and stable= vma. > > + */ > > if (is_vma_detached(vma)) { > > vma_end_read(vma); > > count_vm_vma_lock_event(VMA_LOCK_MISS); > > @@ -6385,8 +6391,9 @@ struct vm_area_struct *lock_vma_under_rcu(struct = mm_struct *mm, > > * fields are accessible for RCU readers. > > */ > > > > - /* Check since vm_start/vm_end might change before we lock the VM= A */ > > - if (unlikely(address < vma->vm_start || address >=3D vma->vm_end)= ) > > + /* Check if the vma we locked is the right one. */ > > + if (unlikely(vma->vm_mm !=3D mm || > > + address < vma->vm_start || address >=3D vma->vm_end)= ) > > goto inval_end_read; > > > > rcu_read_unlock(); > > diff --git a/mm/vma.c b/mm/vma.c > > index cdc63728f47f..648784416833 100644 > > --- a/mm/vma.c > > +++ b/mm/vma.c > > @@ -414,7 +414,7 @@ void remove_vma(struct vm_area_struct *vma, bool un= reachable) > > fput(vma->vm_file); > > mpol_put(vma_policy(vma)); > > if (unreachable) > > - __vm_area_free(vma); > > + vm_area_free_unreachable(vma); > > else > > vm_area_free(vma); > > } > > diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_i= nternal.h > > index 0cdc5f8c3d60..3eeb1317cc69 100644 > > --- a/tools/testing/vma/vma_internal.h > > +++ b/tools/testing/vma/vma_internal.h > > @@ -685,14 +685,15 @@ static inline void mpol_put(struct mempolicy *) > > { > > } > > > > -static inline void __vm_area_free(struct vm_area_struct *vma) > > +static inline void vm_area_free(struct vm_area_struct *vma) > > { > > free(vma); > > } > > > > -static inline void vm_area_free(struct vm_area_struct *vma) > > +static inline void vm_area_free_unreachable(struct vm_area_struct *vma= ) > > { > > - __vm_area_free(vma); > > + vma->detached =3D true; > > + vm_area_free(vma); > > } > > > > static inline void lru_add_drain(void)