From patchwork Thu Jan 9 02:30:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13931822 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 25D8CE77188 for ; Thu, 9 Jan 2025 02:31:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A8ECE6B00A9; Wed, 8 Jan 2025 21:31:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A16AB6B00AA; Wed, 8 Jan 2025 21:31:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81E666B00AB; Wed, 8 Jan 2025 21:31:04 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 5E09E6B00A9 for ; Wed, 8 Jan 2025 21:31:04 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 199B745996 for ; Thu, 9 Jan 2025 02:31:04 +0000 (UTC) X-FDA: 82986336048.17.424A5DB Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf19.hostedemail.com (Postfix) with ESMTP id 4C43C1A000E for ; Thu, 9 Jan 2025 02:31:02 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZFXiyyNs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of 35DR_ZwYKCI09B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=35DR_ZwYKCI09B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736389862; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0mp5dFwezEdO/jOng82s8ZxmFNIgL5tGd8iP4GBRZps=; b=043erS22wUgnScifPWSR/042aLr7+S9SqZyUQhZt4GO5ZbevNVdvVvaeB9SMRxWOa2+oCK NWCvjGk8F4A63raUoH5xnBQKfsW7SRta5hZJZE+4jInX6j20InKu1RCYkNiRF/ei5WZVuX 2Cm68mFMiwM5kICLBLV1moZilpOiB5Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736389862; a=rsa-sha256; cv=none; b=U6ISzcYz7BfjBprZlbYGk9rEFRopdckz2PXldFLonfeiOQGRWQTmEPukyxpUd+ifGwH11N 6VMb4NSknDw1SLnMYsjexCtEHBWQNUYfp9FDJdYGHu4mzxTeOEFpPrnDhxJE+O+hfNyThg SiIeZcfJbovLfsl/grycgyyKDip35co= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=ZFXiyyNs; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf19.hostedemail.com: domain of 35DR_ZwYKCI09B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=35DR_ZwYKCI09B8v4sx55x2v.t532z4BE-331Crt1.58x@flex--surenb.bounces.google.com Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-2ee46799961so1167868a91.2 for ; Wed, 08 Jan 2025 18:31:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736389861; x=1736994661; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=0mp5dFwezEdO/jOng82s8ZxmFNIgL5tGd8iP4GBRZps=; b=ZFXiyyNsiU6eiEBLf19yijTi+Fqg+z0kmidt5EjQeJRH3iZ3kOnqj7ku88OXGvQ8Fz 5ZZRWl2M+nIJX+XlJNbRcXg5J28yHqd3CKDtR8lR2afj9p++sND4i1mfq8LSzws1ZYwB Z9szNExvN+bOq/myFeOLn4LVDDlnkREvJ2WYFMnncTfMR7u1pdSylvksV8KR4ynCv8jF 3D5P3NHoKlPXlGS8fpaHzpXB8I1QH0LR0Oiu5ZBOo7YMp8OCCgAGRd4kb9olnvDztctP /sWW87O81IIm3ira0DrIWMqEjifqO6PPS4djDfR6V3owzNQwV9BFiwJ1e6o5zIpXtcqc /KtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736389861; x=1736994661; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0mp5dFwezEdO/jOng82s8ZxmFNIgL5tGd8iP4GBRZps=; b=mQxbR414Gshb1TteZlqgepiGu81P+Cik7bTL1/1KR9CRJgZsrAEPZYWv1zyEZyU+fm XuOEi9rLk7NDVdSYBE0uP+vK8h4UySeh3JREBOX94ywkBL+tTZDwKz8PJ63i+/9kFX3j oeqa6XCLSFXZEb3P0Lzzl1QU/goD7wR7QogLQ7cyETwUH+rZBX8d4KUUBl9uBh87Hcyv AJiPlKnjGa3HV/2z/CjgSA3aSOuEziiLOqmUgm4qmaaom59y8uFix2Yucjf8gTB6ZCzO ZyFLNgEG2xbACH81WG4NwMAva17LJHsg/ynv8WK5mEWCCKwijn5J57RZV1H4lwV72zgZ nMSQ== X-Forwarded-Encrypted: i=1; AJvYcCUH+2z8ViW+oo+P/GvEDt8CGFhlxJEM/UC5YUf0FQ7vzJ52gYoVyU7bX8MKgbrsU97WFUz/vD4DdQ==@kvack.org X-Gm-Message-State: AOJu0YzTTtz/AKKvtx2mNy7tO9qg85yKv1GSXUr8FgjYr1wxg7GjgrRj 1Dy5z+usUBfMrXcVoGuY+cuUhBuY23PLr0KQf9gpfAeo14J1eJzwD0meVvvCZRZne8992pyrBeP wKA== X-Google-Smtp-Source: AGHT+IEZRV1/vQ9FjpK7xNQnInX31Kc2+w8+X4QP91iZvzjqZarVksUTQcCfVUNTQlhwPAY/KfocNKNXlgE= X-Received: from pjbsz8.prod.google.com ([2002:a17:90b:2d48:b0:2e9:38ea:ca0f]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2747:b0:2f2:a664:df1a with SMTP id 98e67ed59e1d1-2f548e9c9bcmr7618672a91.2.1736389860840; Wed, 08 Jan 2025 18:31:00 -0800 (PST) Date: Wed, 8 Jan 2025 18:30:24 -0800 In-Reply-To: <20250109023025.2242447-1-surenb@google.com> Mime-Version: 1.0 References: <20250109023025.2242447-1-surenb@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Message-ID: <20250109023025.2242447-16-surenb@google.com> Subject: [PATCH v8 15/16] mm: make vma cache SLAB_TYPESAFE_BY_RCU From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: peterz@infradead.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, lokeshgidra@google.com, minchan@google.com, jannh@google.com, shakeel.butt@linux.dev, souravpanda@google.com, pasha.tatashin@soleen.com, klarasmodin@gmail.com, richard.weiyang@gmail.com, corbet@lwn.net, linux-doc@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-team@android.com, surenb@google.com X-Stat-Signature: uf5smi7nknz7h93msgm7ksw681nqaify X-Rspamd-Queue-Id: 4C43C1A000E X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1736389862-228969 X-HE-Meta: U2FsdGVkX1+dvIVps1Vuv4Np8tA2PWNvx67EBkAAmrGXOezxZg+eZVRwXFrBKho5gT/fmdAi62ut7qXjsvVUFdaWjDzYDUeRkBGZjkNvWr1WFSTmhjSq7OkWSTn+OKCtulbF4IkXBsMQlKdWyClTyFHC0MC/JLiSx2ZAXksEEbuAv3txEm23WC9+OPLg1OlXx+pkWgtNL7GxtViYTU8kh1gAe8tH5d/pY/MLheWm2vgY6cZ3lmdy1WVbwTwiGnhl6tydNhgQSIOTaahaqUcyERgFoLfegpJTj3WR32OwgP75EhUXte/jKQ1W5mO2qBnLhHOx8iCNFm4N5p5kMka92hD5g8gH7d2NSGOUNCHPgArrOHNYmjJ5KiiIJAtoMhWMWq0C7J34MkTZQ7EUnr5BF/84SieHz2uDd+gM7F7Y0yXi7Lpcxv5D54vM0nzpsQz+8CCWJkcD0wh4//TjL25N97xVhr+PDIDeknetmRWwEvYWr52+KP0tP1ulq2GetSulZxsQO7aljHt1uB+hqcutvKyTp+mn7zfHrN8u/h1yw1q/i3hcbg/Yc2hV/oqwUUPs4NrOAulCZJXnQBNDYZd032zbyggfUto/I8C13qE9eUF+8UMflFRqWdv4A1JndzKNrgHW2whcKz3FreMxQoGpENVS2loGoVS/xvgGWexPfCdga0y8oHXhGaAPytW5bPUBHhv1vv8ifJNrmd4ulzwvQVf/r4XxGRczOJW84e7lqii3GKFXANXIzjHoIecA+OCYsXt/rfp7c6wIG8WGkGtVwGqtOXzWwdaYdZjNR5mVfpTbdg1Yv5C9WicuLbK51xAybswgOloqu+busG6WgDCzWpbRWjj7NNMmchWorouaZrHPUgijndK3RhawZqce0PrPPghrpo/lXPaske4zhLi8CmbQ6S/3+BCXp5aofYsgQM3SoEy8xie76bjZFPH7eD6AY1ZM8H8V8mTTcdhekCR BA+vcarn oh3dGbg77xjEof0TJ0y94jxMia1AHUXPdJX63v1JzHeVGrbd60r7US+dBSVj0s3H65SisV0XLOUofl7zh4lMyLxteZeVyAYwhqY4f4Gu4o/i3aQ6KWW98HQ88bfoOlrPXFge0EX1JSQIa4vTB2DHuL7dwdVyyS7TiRKS9zqzWwjQrxvwYHc1X7KXzHSeWhpgSNW+BhkUJtHa2L1lJIO9S6jKxrkfLVlgcCJgmPJ58ogK5uMALm/k8htoiL/tvtIL+0WjEaB1QZB6udXK301wUT/+CPgwuaZIkOJxk6Bq1qZKdOLKVNzzwMmvplCHSWqq8uXZ6xFuU0KNn/yNxQmpoej+n9V1GKc1zOC0O3zm/WmBpi0T01g7y1SX2w3QRBsFjXl1G9EWUaO0M48KWUDBsxNInk9uFZ0zYDDaoV/WLe3lQs3vBXVqnkFaFPyhImEoiTqmix3ARMT/+ntnjw7e5toACzYJOusQ6c51ytqerN4dtWtv+vfkCVLdeJgF54wbATAOFlpn7J3gM6eAgmgVrQHsLlKoudYqZdfXdl6cgWU29Zxk+vtdVSuaL0+uNWRDjheo2R0tCAxKGJGhgxVWBRWiRyev4OYMZHbFyfYqugAMUjMp001mjCMo7PWlBFQT+n/tmdvxjV52MVr/6SYfWAyqnigLcDWPpyjfo 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: 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 by lock_vma_under_rcu(). Current checks are sufficient as long as vma is detached before it is freed. The only place this is not currently happening is in exit_mmap(). Add the missing vma_mark_detached() in exit_mmap(). Another issue which might trick lock_vma_under_rcu() during vma reuse is vm_area_dup(), which copies the entire content of the vma into a new one, overriding new vma's vm_refcnt and temporarily making it appear as attached. This might trick a racing lock_vma_under_rcu() to operate on a reused vma if it found the vma before it got reused. To prevent this situation, we should ensure that vm_refcnt stays at detached state (0) when it is copied and advances to attached state only after it is added into the vma tree. Introduce vma_copy() which preserves new vma's vm_refcnt and use it in vm_area_dup(). Since all vmas are in detached state with no current readers when they are freed, lock_vma_under_rcu() will not be able to take vm_refcnt after vma got detached even if vma is reused. Finally, make vm_area_cachep SLAB_TYPESAFE_BY_RCU. This will facilitate vm_area_struct reuse and will minimize the number of call_rcu() calls. Signed-off-by: Suren Baghdasaryan --- include/linux/mm.h | 2 - include/linux/mm_types.h | 10 +++-- include/linux/slab.h | 6 --- kernel/fork.c | 72 ++++++++++++++++++++------------ mm/mmap.c | 3 +- mm/vma.c | 11 ++--- mm/vma.h | 2 +- tools/testing/vma/vma_internal.h | 7 +--- 8 files changed, 59 insertions(+), 54 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 1d6b1563b956..a674558e4c05 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -258,8 +258,6 @@ void setup_initial_init_mm(void *start_code, void *end_code, struct vm_area_struct *vm_area_alloc(struct mm_struct *); 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); #ifndef CONFIG_MMU extern struct rb_root nommu_region_tree; diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 2d83d79d1899..93bfcd0c1fde 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -582,6 +582,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 encoded + * 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 NOMMU * conditions. These are held in a global tree and are pinned by the VMAs that @@ -695,9 +701,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 encoded - * 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 9d9275783cf8..770b973a099c 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -449,6 +449,41 @@ struct vm_area_struct *vm_area_alloc(struct mm_struct *mm) return vma; } +static void vma_copy(const struct vm_area_struct *src, struct vm_area_struct *dest) +{ + dest->vm_mm = src->vm_mm; + dest->vm_ops = src->vm_ops; + dest->vm_start = src->vm_start; + dest->vm_end = src->vm_end; + dest->anon_vma = src->anon_vma; + dest->vm_pgoff = src->vm_pgoff; + dest->vm_file = src->vm_file; + dest->vm_private_data = 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)); + /* + * src->shared.rb may be modified concurrently, but the clone + * will be reinitialized. + */ + data_race(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 = 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 = src->vm_region; +#endif +#ifdef CONFIG_NUMA + dest->vm_policy = src->vm_policy; +#endif +} + struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig) { struct vm_area_struct *new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); @@ -458,11 +493,7 @@ 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_copy(orig, new); vma_lock_init(new, true); INIT_LIST_HEAD(&new->anon_vma_chain); vma_numab_state_init(new); @@ -471,7 +502,7 @@ struct vm_area_struct *vm_area_dup(struct vm_area_struct *orig) return new; } -void __vm_area_free(struct vm_area_struct *vma) +void vm_area_free(struct vm_area_struct *vma) { /* The vma should be detached while being destroyed. */ vma_assert_detached(vma); @@ -480,25 +511,6 @@ void __vm_area_free(struct vm_area_struct *vma) kmem_cache_free(vm_area_cachep, vma); } -#ifdef CONFIG_PER_VMA_LOCK -static void vm_area_free_rcu_cb(struct rcu_head *head) -{ - struct vm_area_struct *vma = container_of(head, struct vm_area_struct, - vm_rcu); - - __vm_area_free(vma); -} -#endif - -void vm_area_free(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 -} - static void account_kernel_stack(struct task_struct *tsk, int account) { if (IS_ENABLED(CONFIG_VMAP_STACK)) { @@ -3144,6 +3156,11 @@ void __init mm_cache_init(void) void __init proc_caches_init(void) { + struct kmem_cache_args args = { + .use_freeptr_offset = true, + .freeptr_offset = offsetof(struct vm_area_struct, vm_freeptr), + }; + sighand_cachep = kmem_cache_create("sighand_cache", sizeof(struct sighand_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RCU| @@ -3160,8 +3177,9 @@ void __init proc_caches_init(void) sizeof(struct fs_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_ACCOUNT, NULL); - vm_area_cachep = KMEM_CACHE(vm_area_struct, - SLAB_HWCACHE_ALIGN|SLAB_NO_MERGE|SLAB_PANIC| + vm_area_cachep = kmem_cache_create("vm_area_struct", + sizeof(struct vm_area_struct), &args, + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_TYPESAFE_BY_RCU| SLAB_ACCOUNT); mmap_init(); nsproxy_cache_init(); diff --git a/mm/mmap.c b/mm/mmap.c index cda01071c7b1..7aa36216ecc0 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1305,7 +1305,8 @@ void exit_mmap(struct mm_struct *mm) do { if (vma->vm_flags & VM_ACCOUNT) nr_accounted += vma_pages(vma); - remove_vma(vma, /* unreachable = */ true); + vma_mark_detached(vma); + remove_vma(vma); count++; cond_resched(); vma = vma_next(&vmi); diff --git a/mm/vma.c b/mm/vma.c index 93ff42ac2002..0a5158d611e3 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -406,19 +406,14 @@ static bool can_vma_merge_right(struct vma_merge_struct *vmg, /* * Close a vm structure and free it. */ -void remove_vma(struct vm_area_struct *vma, bool unreachable) +void remove_vma(struct vm_area_struct *vma) { might_sleep(); vma_close(vma); if (vma->vm_file) fput(vma->vm_file); mpol_put(vma_policy(vma)); - if (unreachable) { - vma_mark_detached(vma); - __vm_area_free(vma); - } else { - vm_area_free(vma); - } + vm_area_free(vma); } /* @@ -1201,7 +1196,7 @@ static void vms_complete_munmap_vmas(struct vma_munmap_struct *vms, /* Remove and clean up vmas */ mas_set(mas_detach, 0); mas_for_each(mas_detach, vma, ULONG_MAX) - remove_vma(vma, /* unreachable = */ false); + remove_vma(vma); vm_unacct_memory(vms->nr_accounted); validate_mm(mm); diff --git a/mm/vma.h b/mm/vma.h index 63dd38d5230c..f51005b95b39 100644 --- a/mm/vma.h +++ b/mm/vma.h @@ -170,7 +170,7 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm, unsigned long start, size_t len, struct list_head *uf, bool unlock); -void remove_vma(struct vm_area_struct *vma, bool unreachable); +void remove_vma(struct vm_area_struct *vma); void unmap_region(struct ma_state *mas, struct vm_area_struct *vma, struct vm_area_struct *prev, struct vm_area_struct *next); diff --git a/tools/testing/vma/vma_internal.h b/tools/testing/vma/vma_internal.h index 2ce032943861..49a85ce0d45a 100644 --- a/tools/testing/vma/vma_internal.h +++ b/tools/testing/vma/vma_internal.h @@ -697,14 +697,9 @@ static inline void mpol_put(struct mempolicy *) { } -static inline void __vm_area_free(struct vm_area_struct *vma) -{ - free(vma); -} - static inline void vm_area_free(struct vm_area_struct *vma) { - __vm_area_free(vma); + free(vma); } static inline void lru_add_drain(void)