From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D9C23AA9EF for ; Thu, 10 Sep 2026 23:47:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084066; cv=none; b=o0LMEZ4ykybhhQ2oFaAPLNSNbm0oJ2gEjgR3F6chjcZ/xwxHuG+i5pSuqpFw2vBjaBUPUeiyd5DAk8v8ElYgYZ8h+fsKq+IXLLjckC5hjDhfbu+FtfCrKfNI3gkr9EItryUxO+OIHNj8xie5biNt6XJ/la7uEvzUBLIYwMvidcM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084066; c=relaxed/simple; bh=hTFVKt75D71OvdXG4pzTXlqYcjNqksLPxYYyQHAZ+yc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=iOTi4RvDzsxvc+uWfCs26s7Asl0ZnE8vkMx2SF5nrN1w7e/OdeXBJwauG/byRkUjwRbv+KEru+ecai5zD5Q++fWm6uYrkFELoyHWHiuaziBjYafErJwIr7lkzxj3zefcnTUq/+doDYDc1zeiMlTWtbzjAfbWTiQbXrAkD4tFRLI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=VGkm5r4N; arc=none smtp.client-ip=209.85.215.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VGkm5r4N" Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-cc4afc810bfso1456667a12.0 for ; Thu, 10 Sep 2026 16:47:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084064; x=1789688864; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=xOFXyMArwtdLkzPinOADoZdNqvQDYiollRghSoVraI0=; b=VGkm5r4N4kTDvC9a2Y4Uy+fzTGCtOw9ZlTzK4nRa5UWMUFXGLsLN7jSEw/uW6/6y8Y tVAVliUd1nj9KTT0Msqj79HkyIyprTabFmPU11klQAFEmwMBoDFuvd3OPP4LBGIJp0uE 8YOYBpX5PAiwoCqMqg+MCZJ1kBSN/jkpm+kH4TEbsz9fIPjilt2fU54GPVX7XO5DRsTl b9Ii8F9fb2awgHY8DVf0cucdIDKb3NHvy3IAp9zRffva+bJoLPcjw5xw2e4V1q5sTzDb qSR1b7Skxd2GHnz/ziKBFw4PJeC0kqeq/gEiJc3H5sIAhHsry8iD5oOm35vamjJgpcyR G5BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084064; x=1789688864; h=content-type: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:content-type; bh=xOFXyMArwtdLkzPinOADoZdNqvQDYiollRghSoVraI0=; b=SfKc1r7VVsWFmyQCKztoW8Q8VAgJSElVeIw1FY9nU0hBZfz/HZ+JXbupRXtiEHLozl ogpoaYFA81s0WoA+0Rtc8XqEnBcYXIcxqMHga5A6ZDqjj/tKRzvZHGLkzGiFcwUjpG/t HIr4Xr/oSJKHCtBFVJd+5xNSWJD3SHROH/8gj1IX+/5oZ4361TKxFUj8tZ+CBrr8MLWr T+Y/1sZigtYezb4Y1rkFhCPJfgOWTcgGkKL9fRVWPDWlHZgoWeDSnkqF/kIC0OAnytuN d8Bms7ugokSBER/i5GVZ8t48yy8wgzjUB92c07P+Synias7ZGT+6GgRypH67Vvc6cXhK pVag== X-Forwarded-Encrypted: i=1; AKwUvBzhO3GZ4pSQ35DUCUMxTbNJ3KwUNP4K3rnmn3diugFx5aS/Dfx5umhAREfN04NvfimE3VEy2nOXfHMWK/U=@vger.kernel.org X-Gm-Message-State: AFuF++mL4Qlvk1BQR24O823VWe3wVGL8l38M+jnd5eNsaDAO+iuxjt2R 1gUvYh+vk3fL/2Ihq0Wp9fbSAXBLf58SuZuxEAh5e2tk10vwiEkm7dxPwUzzhG1oMtaXZcgk6fQ cdEfObw== X-Received: from dlnn5.prod.google.com ([2002:a05:7022:6185:b0:141:4b41:e0d0]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:bb86:b0:39d:8b8c:3781 with SMTP id 98e67ed59e1d1-39d8b8c3efamr3490361a91.28.1789084064165; Thu, 10 Sep 2026 16:47:44 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:31 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-2-surenb@google.com> Subject: [PATCH v3 1/7] proc/task_mmu: remove unnecessary helpers From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com, Usama Arif , "David Hildenbrand (Arm)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When per-vma locks were behind a config option, a number of helper functions were needed to simplify the locking code. Now that these locks are universally available, we can do a little cleanup. Remove lock_vma_range(), unlock_vma_range(), query_vma_setup(), query_vma_teardown() helpers. No functional change intended. Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Acked-by: Usama Arif Acked-by: David Hildenbrand (Arm) --- fs/proc/task_mmu.c | 67 ++++++++++++---------------------------------- 1 file changed, 17 insertions(+), 50 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e671b4fd8ded..2f500d639db5 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -160,25 +160,6 @@ static void unlock_ctx_vma(struct proc_maps_locking_ct= x *lock_ctx) } } =20 -static inline bool lock_vma_range(struct seq_file *m, - struct proc_maps_locking_ctx *lock_ctx) -{ - rcu_read_lock(); - reset_lock_ctx(lock_ctx); - - return true; -} - -static inline void unlock_vma_range(struct proc_maps_locking_ctx *lock_ctx) -{ - if (lock_ctx->mmap_locked) { - unlock_ctx_mm(lock_ctx); - } else { - unlock_ctx_vma(lock_ctx); - rcu_read_unlock(); - } -} - static struct vm_area_struct *get_next_vma(struct proc_maps_private *priv, loff_t last_pos) { @@ -286,13 +267,8 @@ static void *m_start(struct seq_file *m, loff_t *ppos) return NULL; } =20 - if (!lock_vma_range(m, lock_ctx)) { - mmput(mm); - put_task_struct(priv->task); - priv->task =3D NULL; - return ERR_PTR(-EINTR); - } - + rcu_read_lock(); + reset_lock_ctx(lock_ctx); /* * Reset current position if last_addr was set before * and it's not a sentinel. @@ -325,7 +301,12 @@ static void m_stop(struct seq_file *m, void *v) return; =20 release_task_mempolicy(priv); - unlock_vma_range(&priv->lock_ctx); + if (priv->lock_ctx.mmap_locked) { + unlock_ctx_mm(&priv->lock_ctx); + } else { + unlock_ctx_vma(&priv->lock_ctx); + rcu_read_unlock(); + } mmput(mm); put_task_struct(priv->task); priv->task =3D NULL; @@ -518,21 +499,6 @@ static int pid_maps_open(struct inode *inode, struct f= ile *file) PROCMAP_QUERY_VMA_FLAGS \ ) =20 -static int query_vma_setup(struct proc_maps_locking_ctx *lock_ctx) -{ - reset_lock_ctx(lock_ctx); - - return 0; -} - -static void query_vma_teardown(struct proc_maps_locking_ctx *lock_ctx) -{ - if (lock_ctx->mmap_locked) - unlock_ctx_mm(lock_ctx); - else - unlock_ctx_vma(lock_ctx); -} - static struct vm_area_struct *query_vma_find_by_addr(struct proc_maps_lock= ing_ctx *lock_ctx, unsigned long addr) { @@ -653,12 +619,7 @@ static int do_procmap_query(struct mm_struct *mm, void= __user *uarg) if (!mm || !mmget_not_zero(mm)) return -ESRCH; =20 - err =3D query_vma_setup(&lock_ctx); - if (err) { - mmput(mm); - return err; - } - + reset_lock_ctx(&lock_ctx); vma =3D query_matching_vma(&lock_ctx, karg.query_addr, karg.query_flags); if (IS_ERR(vma)) { err =3D PTR_ERR(vma); @@ -732,7 +693,10 @@ static int do_procmap_query(struct mm_struct *mm, void= __user *uarg) vm_file =3D get_file(vma->vm_file); =20 /* unlock vma or mmap_lock, and put mm_struct before copying data to user= */ - query_vma_teardown(&lock_ctx); + if (lock_ctx.mmap_locked) + unlock_ctx_mm(&lock_ctx); + else + unlock_ctx_vma(&lock_ctx); mmput(mm); =20 if (karg.build_id_size) { @@ -773,7 +737,10 @@ static int do_procmap_query(struct mm_struct *mm, void= __user *uarg) return 0; =20 out: - query_vma_teardown(&lock_ctx); + if (lock_ctx.mmap_locked) + unlock_ctx_mm(&lock_ctx); + else + unlock_ctx_vma(&lock_ctx); mmput(mm); out_file: if (vm_file) --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94B283AE1B4 for ; Thu, 10 Sep 2026 23:47:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084069; cv=none; b=obx6Z12z2G5JYklDsLSZoCWSFDlOvjOVh2MSbJzvga1QfIgfZsL+efQPrcYNabRbCN0oi2JWraxbHsvEOUAmH8nSrsl44vh8RhE87LcpbObDKRus/0ZyYnQjRQH6aStxXl00lo9Vw8qG67z9WpTRJ/tljIDurb2FO0v3vQ4OT9c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084069; c=relaxed/simple; bh=QBWzlVcebGow2HXCshas05gLiSw2sEE0N7ro37Gkcnc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Hv07HOjLl+ET+me7yfGwwA5Vg6qZMSQZU6WFNHZ2le3sIxU2nX6lw9z9IXZkW4/PzXpkiMaJncERflDCXYM/F2NxAAFS3nnXsThJw5Ix6IlV43bfgb9LpsQGXqIQ/pkXpxH5byhDQMWZlDRMtlP5TfTCbFNQdMIJQi7IIZdKHik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=uJjScFaq; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="uJjScFaq" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-38e7ff7b375so367015a91.1 for ; Thu, 10 Sep 2026 16:47:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084067; x=1789688867; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=Lxw6b8zPXQDgAgRYnoHPMNyyQwwA39x7dITM8AShmhw=; b=uJjScFaqnLCsGD9FThonqGR01shRwpOTNcNVBrxBNPLiQesOxc1B4dS4HWW2biok1e oNw6P5sGnumTVzV2MzLXrP4uFOmAHOTXGugfbu851GaV4EqvY1Z/fnseQGDT3ktPUNz+ k5JkAaxRCoveRzMd00uvILed94Gtp+VMzSmk58GoLsVcdw1ZTcPIQEMy6ePXVHgNPhKQ rLyJNFHkss9s780ZRJtyFXkCij4wuPd0GiSRJNejEAclwkXMPYdtVNn/M7W4NxB8tG04 LB8tRFgTOYe6dDckJ7GqvM16Vv/HzdwTBkv6MQudBPgByBrjQEUKv4qm/AbD8g+Y6P1R c+kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084067; x=1789688867; h=content-type: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:content-type; bh=Lxw6b8zPXQDgAgRYnoHPMNyyQwwA39x7dITM8AShmhw=; b=kPJIipbRYW3njnyQuNmj38EZGvk3bqoYzmhjhmxKZ5vYf+wjfJJJldAWrUmlfh50iG QZxvBL50rXJY5nwO8q6GZsN4MYN3IL926yTM+n8Q2xOnfV0EQ4TGOLd9Ky8zMqg2A+CK +PL+ZfZ8m6GaV80AUGfENWdSTMxiA39vkoGQUx2c0DfSlw2F72Aq17NYzjVFwwmu078L rthkMnQ1pnsKX6TqiLe7zyFfKQohACuk6yN13ZE9iD0NYro1HcIl3mQJp4dXID0RG/Ua cwm95uW/6GsY82vF3EDu6w7poy184VDHBBzVrikVysoWNZAJQOuoamPVeAdkfHZwRgnW wBDg== X-Forwarded-Encrypted: i=1; AKwUvByQ3Mhz1VLs/w6Aw3ON8FJAQEKvu43OG87guvFA1tg2MSNuyTqsYZ54toby0RxJhtWmvvOjrzO7fd5Ej9c=@vger.kernel.org X-Gm-Message-State: AFuF++lLrVW18/lLPYmaPzT7SHJ8Dd2lfwi4ZeZTOpRruKm5GcgNxwv8 k4y5X1iKNM3Iru1XlvYgxSKuE8hJcGTAcSuJkVvhqFsJO4v+TGwI3QVvRhO6+mf3WwNA/UL//FU UQ5kYwA== X-Received: from dlbbu9.prod.google.com ([2002:a05:7022:2209:b0:140:f8a1:77f7]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:278c:b0:398:e6b6:acc2 with SMTP id 98e67ed59e1d1-39d9c1b4d9amr1874303a91.12.1789084066795; Thu, 10 Sep 2026 16:47:46 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:32 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-3-surenb@google.com> Subject: [PATCH v3 2/7] proc/task_mmu: remove unnecessary inlines in function definitions From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com, Usama Arif Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It was pointed out in the previous reviews of this code that many functions are specified as inline, which is unnecessary as the compile can make that decision by itself. Cleanup these definitions. No change in the resulting binary file size with gcc v15.2.0. No functional change intended. Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett (Oracle) Reviewed-by: Lorenzo Stoakes (ARM) Acked-by: Usama Arif Acked-by: David Hildenbrand (Arm) --- fs/proc/task_mmu.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 2f500d639db5..cfc7af1b551d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -130,7 +130,7 @@ static void release_task_mempolicy(struct proc_maps_pri= vate *priv) } #endif =20 -static inline int lock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) +static int lock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) { int ret =3D mmap_read_lock_killable(lock_ctx->mm); =20 @@ -140,7 +140,7 @@ static inline int lock_ctx_mm(struct proc_maps_locking_= ctx *lock_ctx) return ret; } =20 -static inline void unlock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) +static void unlock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) { mmap_read_unlock(lock_ctx->mm); lock_ctx->mmap_locked =3D false; @@ -177,8 +177,8 @@ static struct vm_area_struct *get_next_vma(struct proc_= maps_private *priv, return vma; } =20 -static inline bool fallback_to_mmap_lock(struct proc_maps_private *priv, - loff_t pos) +static bool fallback_to_mmap_lock(struct proc_maps_private *priv, + loff_t pos) { struct proc_maps_locking_ctx *lock_ctx =3D &priv->lock_ctx; =20 @@ -194,7 +194,7 @@ static inline bool fallback_to_mmap_lock(struct proc_ma= ps_private *priv, return true; } =20 -static inline void drop_rcu(struct proc_maps_private *priv) +static void drop_rcu(struct proc_maps_private *priv) { if (priv->lock_ctx.mmap_locked) return; @@ -202,7 +202,7 @@ static inline void drop_rcu(struct proc_maps_private *p= riv) rcu_read_unlock(); } =20 -static inline void reacquire_rcu(struct proc_maps_private *priv) +static void reacquire_rcu(struct proc_maps_private *priv) { if (priv->lock_ctx.mmap_locked) return; @@ -1230,7 +1230,7 @@ static const struct mm_walk_ops smaps_shmem_walk_vma_= lock_ops =3D { .walk_lock =3D PGWALK_VMA_RDLOCK_VERIFY, }; =20 -static inline const struct mm_walk_ops * +static const struct mm_walk_ops * get_smaps_walk_ops(struct proc_maps_private *priv) { if (priv->lock_ctx.mmap_locked) @@ -1238,7 +1238,7 @@ get_smaps_walk_ops(struct proc_maps_private *priv) return &smaps_walk_vma_lock_ops; } =20 -static inline const struct mm_walk_ops * +static const struct mm_walk_ops * get_smaps_shmem_walk_ops(struct proc_maps_private *priv) { if (priv->lock_ctx.mmap_locked) @@ -1572,7 +1572,7 @@ struct clear_refs_private { enum clear_refs_types type; }; =20 -static inline bool pte_is_pinned(struct vm_area_struct *vma, unsigned long= addr, pte_t pte) +static bool pte_is_pinned(struct vm_area_struct *vma, unsigned long addr, = pte_t pte) { struct folio *folio; =20 @@ -1588,8 +1588,8 @@ static inline bool pte_is_pinned(struct vm_area_struc= t *vma, unsigned long addr, return folio_maybe_dma_pinned(folio); } =20 -static inline void clear_soft_dirty(struct vm_area_struct *vma, - unsigned long addr, pte_t *pte) +static void clear_soft_dirty(struct vm_area_struct *vma, unsigned long add= r, + pte_t *pte) { if (!pgtable_supports_soft_dirty()) return; @@ -1620,7 +1620,7 @@ static inline void clear_soft_dirty(struct vm_area_st= ruct *vma, } =20 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) -static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma, +static void clear_soft_dirty_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { pmd_t old, pmd =3D *pmdp; @@ -1646,7 +1646,7 @@ static inline void clear_soft_dirty_pmd(struct vm_are= a_struct *vma, } } #else -static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma, +static void clear_soft_dirty_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { } @@ -1846,7 +1846,7 @@ struct pagemapread { =20 #define PM_END_OF_BUFFER 1 =20 -static inline pagemap_entry_t make_pme(u64 frame, u64 flags) +static pagemap_entry_t make_pme(u64 frame, u64 flags) { return (pagemap_entry_t) { .pme =3D (frame & PM_PFRAME_MASK) | flags }; } @@ -3388,7 +3388,7 @@ static const struct mm_walk_ops show_numa_vma_lock_op= s =3D { .walk_lock =3D PGWALK_VMA_RDLOCK_VERIFY, }; =20 -static inline const struct mm_walk_ops * +static const struct mm_walk_ops * get_show_numa_ops(struct proc_maps_private *priv) { if (priv->lock_ctx.mmap_locked) --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0756A3A8388 for ; Thu, 10 Sep 2026 23:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084071; cv=none; b=nKfuCnlHVcSp75biM9m7YYSjbj///E8XCo7Pzf1SukEIoZCxvO9d10jDISlB/gekrO1nsq6TclFije3PziwNn1Szcko4p/h0oiFYoWd49/w18rXI4uTtZjrfs86d6HDtXbxKuMUPCh2djkD+sSR489oWSLOXlImR3uuIEzxMF9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084071; c=relaxed/simple; bh=BMzBUmw1fl42znOkNTkCVK4JdAcRIAo9h88IPHF5h7o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ON80zpYstJmH2ZmWY4D8KJB7c2ydY4/KcPr42FQ4n5HvOur4EwRBKgrhF8sBn31dj3YG0SQ+jugDpGYXHtmkXK22IlCHMa5NnyhDtqs+PPZSTjT3Ja9N4tupfAF+xMThmE3czS96REOObRjLZKs8rE1WJAYxi9g8/XLzgJpYJb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=mVwg0pH6; arc=none smtp.client-ip=209.85.214.199 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mVwg0pH6" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2d9057fab9eso3937455ad.1 for ; Thu, 10 Sep 2026 16:47:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084069; x=1789688869; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=9GmwxGnSxtyc3MMcZyUdMtOHBijNkoyl6C3OnmMdL/s=; b=mVwg0pH6V8EqvInUK9mYGaVUzuZwc5CPX579StbzXZqGSBRA2CU/0C7y3VltaIwH6v rJuuJJb8sBQYDUIcZSRzCQPk9o1AWRXP+7xtpSneC9zJTBIXdVmykSg1bAyoJFDU1/Ha oWPQ/TGkWPCZ2C2tDAu5dLzIe5G/mRrV1gwQsmM6VCx9zdGg52B5I2eS0fPhmuirOHCx gSK5GlN7wTafKTiCg+tnk9/geLIAIknxkS5WO4qjGBvb2q3EQibvd2ZdMGXbTjHhB1ZY M7aiG5NZjNeDJn7+aWSLGlZ6plLU8RrS2qKYOx6dsSMF4iElfmQJNKpNa4MtIkwbBHyK H/0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084069; x=1789688869; h=content-type: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:content-type; bh=9GmwxGnSxtyc3MMcZyUdMtOHBijNkoyl6C3OnmMdL/s=; b=DuiM+WGfhxIpVKu7j6R1VnVUp3kE8Y8ONgHmg4ZDojB5tubOXIx3NFecwXPfjq/eKo m+LU8ozWmzBTE04Is9tmf6kMk9Z8urNjz38NQF/YecRMYvoYQgzwCCgh9lHAe45hklV2 0Aj8Wbu98s/eNFBUmFoG/JcRtsj4oTYm8TTw9pL94bp2QzjwAFXsvYIF11te9a10vNCJ RcI56IrUZvJktcnHvLyLU/5/TN64kJ1W/wTV+Tq3gKn1UeVeoSqUcLIrQjcxMVjvUoCb WhYCJKaBcD6R+n8DaOIu6Tp9ZyS/1fePv8NzRZ8ktUpHNodK/0z4BBwNweaeuK4+3q/P HUdw== X-Forwarded-Encrypted: i=1; AKwUvBxMTTF8Vv1jW9OSr7p4gNRD/LdfsEIvVbejF6rqg/teE9IK/LRR4ElqFC5HhurWImC4FFXd4BHGePcm4fE=@vger.kernel.org X-Gm-Message-State: AFuF++kF4fHwy9X8geao3VvQwVQyto8P/WYNol/N6BIvYLM3X310KPZR fYvksBMc6gY0mSndAv9yBNx/868Y6Z+zCHYdRndWIC6GsVe2f/YvmzbRR5cwPppsPzk1OwRktlg 6k5hzKg== X-Received: from dlbek20.prod.google.com ([2002:a05:7022:c94:b0:141:4abc:f12d]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4990:b0:396:4cbf:45a2 with SMTP id 98e67ed59e1d1-39d9c0acc23mr1884695a91.14.1789084069193; Thu, 10 Sep 2026 16:47:49 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:33 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-4-surenb@google.com> Subject: [PATCH v3 3/7] proc/task_mmu: clarify shmem mapping walk conditions in smap_gather_stats() From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" smap_gather_stats() optimizes stats gathering by skipping the walk for shmem mappings in certain conditions. Update the comment to clarify these conditions and use vma_is_cow_mapping() for COW identification instead of open-coding it. Instead of using (start !=3D 0) condition to identify partial walks, use more semantically correct (start > vma->vm_start) check. No functional change intended. Suggested by: David Hildenbrand (Arm) Signed-off-by: Suren Baghdasaryan Acked-by: David Hildenbrand (Arm) --- fs/proc/task_mmu.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index cfc7af1b551d..3c40c9cbb9c9 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1257,6 +1257,7 @@ static void smap_gather_stats(struct proc_maps_privat= e *priv, struct mem_size_stats *mss, unsigned long start) { const struct mm_walk_ops *ops =3D get_smaps_walk_ops(priv); + const bool is_partial =3D start > vma->vm_start; =20 /* Invalid start */ if (start >=3D vma->vm_end) @@ -1270,23 +1271,18 @@ static void smap_gather_stats(struct proc_maps_priv= ate *priv, =20 if (vma->vm_file && shmem_mapping(vma->vm_file->f_mapping)) { /* - * For shared or readonly shmem mappings we know that all - * swapped out pages belong to the shmem object, and we can - * obtain the swap value much more efficiently. For private - * writable mappings, we might have COW pages that are - * not affected by the parent swapped out pages of the shmem - * object, so we have to distinguish them during the page walk. - * Unless we know that the shmem object (or the part mapped by - * our VMA) has no swapped out pages at all. + * CoW mappings might map anon folios that do not belong to + * shmem. Perform a less efficient page table walk in this + * situation, unless we know that the shmem object (or the + * part mapped by our VMA) has no swapped out pages at all. */ - unsigned long shmem_swapped =3D shmem_swap_usage(vma); + const unsigned long shmem_swapped =3D shmem_swap_usage(vma); + const bool is_cow =3D vma_is_cow_mapping(vma); =20 - if (!start && (!shmem_swapped || (vma->vm_flags & VM_SHARED) || - !(vma->vm_flags & VM_WRITE))) { - mss->swap +=3D shmem_swapped; - } else { + if (is_partial || (shmem_swapped && is_cow)) ops =3D get_smaps_shmem_walk_ops(priv); - } + else + mss->swap +=3D shmem_swapped; } =20 if (!start) --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C5E23ABD8E for ; Thu, 10 Sep 2026 23:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.71 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084073; cv=none; b=reDQDL/DnoRXPW9UcpcQTMFJau5+V6Spu6vQfGwQ4lQSEQA4PXT8qARpye2SJx3BEY0PDuWCYD4kSfU1NBSItZ1Q96eS+asJ9JhWuegw57f+MBAmiqUyt8p3bjSNEB6fyFCUXUOnZCFTbIzakckXavax9NUy+8qSVD3NLSGUDJo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084073; c=relaxed/simple; bh=nxUjcuynGltbYuaJwcnnVoLQs4OJN0lo92nfhwCqV2U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=l3xs21lA6Mg0SOBQuhlACNifowzTDPl3oBjXYl9navbyHAHI8VXu3z3wOSCIQ/fuMSc4QJ3gG62hTRguev24C4CKMPQ83ldqmfqnO1Qx0ykwMXH9k5CvbyTY40qc8/VJR3909xc9VdYthSkbvoR85WAIxd6yQ9JRbDa30lhCDrg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=PX4sK0E1; arc=none smtp.client-ip=209.85.216.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PX4sK0E1" Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-398dc3d8f0fso1754742a91.0 for ; Thu, 10 Sep 2026 16:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084072; x=1789688872; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=qU0KV0gIPZqolm93iR//P4qXqNLqAOfvp4joEi9Yvyk=; b=PX4sK0E1kYNezqddwB+TVCJRphZqDqvvh4wSGGWcPjJMGaqxSNlb97M2kKMt/wV75P LnNxbip7o4QGQsazWM5PN3fzn29GhCnlrwsX10TXNqOG51Z+sUt62YDKpKDQqZPQYJlS hdaFUmgBpuW7xexRbpI8NTxyEFx3KpyHnTlu/VjTWmgbRYfkAT5gMyndK3pMV04rjdKa HInEGQoJISd8kwEd2qA6xcTIyOkvj+r/K9eGY0DBCR5yhhgtA4ZEJlLFJ0DtOI4agU/Q UnyTtwrVQe5eJjVdxTq9Mqx0AO5BGFcBw++KRJc0Q589wM5cVNu9lTyMBPHcsTTKVeAi Aslw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084072; x=1789688872; h=content-type: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:content-type; bh=qU0KV0gIPZqolm93iR//P4qXqNLqAOfvp4joEi9Yvyk=; b=Uwmu7pn+TI7RqjvX24UZbgObhyS48fcpGwK4Dh8Mk78SeqmUhaJhFTaZdH/dXSb/OE ueKtU/jsYqkTS+E8otjzXdxvE9NEd8RWiXd3xJKx3R3cbDZQi13eB7eOQd992CaH1Vfz fmxu2FE5hRHguawY8dQjxdac3k2PClw9cDjmG2veg/Wknu5dA8QutU2k1gjK9pA2q0K/ n4vbarZIIiHkgZE/2X29zjTNWKCsuQwIsWqGnWrooj4wBdNRKLAcHj2QBmXqskjlNGdH rgKWiCkV4bbjymKiL4BvudgzqYLeXISvYbgbpmqieUrStLQaxEYu0RjszrN6Xo8iAJXw yzUg== X-Forwarded-Encrypted: i=1; AKwUvBz6klV2k4fyTFHhR8ZlyH0Jd7QnbIcRkKUqeU1+cWtfkGVJt9DEdCBKSkhUHVdgZTXmaTmESFQcSsIKAUs=@vger.kernel.org X-Gm-Message-State: AFuF++n5fHzXqUFBMQH+YNT6eF7JhrmvXxLlqADz5GbEd7DaKGNBYvJv BjYdC0BBZlW16j/uQQZ2fJ5sJAZh8taVNNNq/yzcfx2UHT662uucS5t8WfV2QxWiVmE9drrHzaO UuLyLYA== X-Received: from dlbbq8.prod.google.com ([2002:a05:7022:6708:b0:143:6807:5e3b]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:4c85:b0:38f:cfe2:fd3a with SMTP id 98e67ed59e1d1-39d77b1c383mr8988591a91.15.1789084071601; Thu, 10 Sep 2026 16:47:51 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:34 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-5-surenb@google.com> Subject: [PATCH v3 4/7] proc/task_mmu: remove special-casing of smap_gather_stats() start parameter From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" smap_gather_stats() interprets its start parameter to mean vma->vm_start when it's set to 0. Eliminate this special interpretation and pass vma->vm_start explicitly when needed. Since smap_gather_stats() operates within a single VMA, we can replace walk_page_vma()/walk_page_range() calls with walk_page_range_vma() which is simpler and also can be called while holding per-VMA lock. No functional change intended. Suggested by: Lorenzo Stoakes Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett (Oracle) Acked-by: David Hildenbrand (Arm) --- fs/proc/task_mmu.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 3c40c9cbb9c9..ecce7ce116cb 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1246,21 +1246,27 @@ get_smaps_shmem_walk_ops(struct proc_maps_private *= priv) return &smaps_shmem_walk_vma_lock_ops; } =20 -/* - * Gather mem stats from @vma with the indicated beginning - * address @start, and keep them in @mss. +/** + * smap_gather_stats() - Gather mem stats from @vma. + * @priv: proc maps private state. + * @vma: The VMA to gather stats for. + * @mss: The accumulated stats. + * @start: The address from which to start. * - * Use vm_start of @vma as the beginning address if @start is 0. + * This gathers stats for the whole of the VMA unless the lock was dropped + * and VMA grew or got merged and we found it again, in which case we only + * gather stats for the remainder of the VMA range. */ static void smap_gather_stats(struct proc_maps_private *priv, struct vm_area_struct *vma, - struct mem_size_stats *mss, unsigned long start) + struct mem_size_stats *mss, + unsigned long start) { const struct mm_walk_ops *ops =3D get_smaps_walk_ops(priv); const bool is_partial =3D start > vma->vm_start; =20 /* Invalid start */ - if (start >=3D vma->vm_end) + if (start < vma->vm_start || start >=3D vma->vm_end) return; =20 if (vma =3D=3D get_gate_vma(priv->lock_ctx.mm)) @@ -1285,10 +1291,7 @@ static void smap_gather_stats(struct proc_maps_priva= te *priv, mss->swap +=3D shmem_swapped; } =20 - if (!start) - walk_page_vma(vma, ops, mss); - else - walk_page_range(vma->vm_mm, start, vma->vm_end, ops, mss); + walk_page_range_vma(vma, start, vma->vm_end, ops, mss); =20 reacquire_rcu(priv); } @@ -1343,7 +1346,7 @@ static int show_smap(struct seq_file *m, void *v) struct vm_area_struct *vma =3D v; struct mem_size_stats mss =3D {}; =20 - smap_gather_stats(priv, vma, &mss, 0); + smap_gather_stats(priv, vma, &mss, vma->vm_start); =20 show_map_vma(m, vma); =20 @@ -1396,7 +1399,7 @@ static int show_smaps_rollup(struct seq_file *m, void= *v) =20 vma_start =3D vma->vm_start; do { - smap_gather_stats(priv, vma, &mss, 0); + smap_gather_stats(priv, vma, &mss, vma->vm_start); last_vma_end =3D vma->vm_end; =20 /* @@ -1455,7 +1458,7 @@ static int show_smaps_rollup(struct seq_file *m, void= *v) =20 /* Case 1 and 2 above */ if (vma->vm_start >=3D last_vma_end) { - smap_gather_stats(priv, vma, &mss, 0); + smap_gather_stats(priv, vma, &mss, vma->vm_start); last_vma_end =3D vma->vm_end; continue; } --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0265B3ACF1F for ; Thu, 10 Sep 2026 23:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084076; cv=none; b=FZbN8K2aB8JHrI9pf6v1NHBtFdfrd4sLWZ0CJZf1XNmenO6M2TpWOk8Q0d81pKHmY3+dZldW4LAcapV2mYXDA01kqjUtC7fvzUp/DnS02qI3VicOxNRX8x7rHe8lSpmKHzYHFCcVyiQnIWaYNLu7LZb/KuXRpZBGUYOXoKT7M/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084076; c=relaxed/simple; bh=KhRCJzmke+4iaURyvggRPxbo/5drXC/+C8xLYAdIcD8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=g6k0J/k6wM66w4VQ5E+JqPYawzYvJAr+F2o5Ld6fGYjtjdHJlmBOrmkGf/njm1JR5jPM3lkiGaE5Igvqf/u5GfE55b+awwuUDmxe86n7MeySrbSJER0mSYKGghpqk7RcaL7wYFAjs/mHLOKNkgaS/xu7X4rSOTKWPvCubwplj1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=TxzcKceL; arc=none smtp.client-ip=209.85.215.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TxzcKceL" Received: by mail-pg1-f197.google.com with SMTP id 41be03b00d2f7-cb6cf425e86so451738a12.1 for ; Thu, 10 Sep 2026 16:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084074; x=1789688874; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=MfCQoIF9r6drT2/q6iU4FW+cbq+J7ShlN3xdWU35XRs=; b=TxzcKceLM7asScqwsrJkgFvfAKa+hDieijvzctqFL2WrzGorzaYthmZGgfO7bFK04o pnGQa8D3OHAqPIH4/hheinblOT6NUaPeBi5BHBVdroZrk+0J4yfZ/YZRbAILmrGs3aT5 vd2Q9OqR5/XxV046N3uPlL2nlBKiMEQ4+36QEJemfPiZZJ2UyR448Z5132oEKZUo79Fm zk97j3igXDZhvPI23Ycd+1nvQnuEUAzqzKm07mIt2FeKe1mnlEjw8Y4GbgZy1Q267fes MyItsmIfcKJ4JV7eO+ray7Zs35lrJn+0ahB58+0+m4wYr87iZMAlXQCA6ZB1BIiRJPxu Pl8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084074; x=1789688874; h=content-type: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:content-type; bh=MfCQoIF9r6drT2/q6iU4FW+cbq+J7ShlN3xdWU35XRs=; b=OuKnYiIzXjpZd8kXVt6wMlLHxZWkMMeurgt3CgGjFZYbgreqjqM8wQme/rSvFzmnuc kZ5OwemfnEs8CkkSVHxo9uVG7zH+KEFn+GVa9uSTrwnLIRCXjv/PkloRIqq0l6FeJpSr V/kuswy6I713hrMdBWElLQmeUwglOR2+lBlNF6I7nvT/hxcrTe/kmYwdkl9Ala+SiSxR 6A6qzBkDMwfqsLKbEToiXDJUqDvz6UtEe+OOraEWkuV1dvGEcmk6TOueSYrBittkcAPd NwecWeyzvltAsSAoPwAcmFCBSw4NWiSjyEy0t44kHHw9Zoexjt7ClU3VuZr3mL30u2TG i2gQ== X-Forwarded-Encrypted: i=1; AKwUvBwrZ8j/er40VRTghyzcbUGa0d/BgzqfsANN1ADsy6mGRvyUQMO0nE/Gbsef+nKrwQomtI3KXrVH5HU2OMw=@vger.kernel.org X-Gm-Message-State: AFuF++keMFCJH88g59J+yG+1U1M+Fulj2QM7c/CrqMRjLsZdGNv/twTr GLi7DKI2v0W2IWazNgWeKiPAXFWMZNaBj6mTvxqFcB2j2TJ6SEeeanEpj2t4LI5K5fUhpN1/9fM JdVQDsg== X-Received: from dlk12.prod.google.com ([2002:a05:7022:10c:b0:143:54dd:1d39]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4309:b0:3da:1e7b:ea27 with SMTP id adf61e73a8af0-3daed3b7eaemr2196858637.21.1789084073982; Thu, 10 Sep 2026 16:47:53 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:35 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-6-surenb@google.com> Subject: [PATCH v3 5/7] proc/task_mmu: change proc_get_vma() to stop returning gate VMA at the end From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" proc_get_vma() returning gate VMA at the end is desirable for the its current m_start/m_next callers, as they need to report a gate VMA at the end of the address space. This behavior is very specific to these callers and makes proc_get_vma() hard to use for other purposes. Move this usage-specific behavior into the callers themselves so that proc_get_vma() returns either a valid VMA, an error or a NULL when no more VMAs are available. This makes it more generic, simpler and usable in the later patches. Signed-off-by: Suren Baghdasaryan Acked-by: David Hildenbrand (Arm) Reviewed-by: Lorenzo Stoakes (ARM) --- fs/proc/task_mmu.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index ecce7ce116cb..9a3c996c1d61 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -236,9 +236,6 @@ static struct vm_area_struct *proc_get_vma(struct seq_f= ile *m, loff_t *ppos) * found the extended vma with the same vm_start. */ *ppos =3D vma->vm_end; - } else { - *ppos =3D SENTINEL_VMA_GATE; - vma =3D get_gate_vma(priv->lock_ctx.mm); } =20 return vma; @@ -248,6 +245,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos) { struct proc_maps_private *priv =3D m->private; struct proc_maps_locking_ctx *lock_ctx; + struct vm_area_struct *vma; loff_t last_addr =3D *ppos; struct mm_struct *mm; =20 @@ -280,16 +278,31 @@ static void *m_start(struct seq_file *m, loff_t *ppos) if (last_addr =3D=3D SENTINEL_VMA_GATE) return get_gate_vma(mm); =20 - return proc_get_vma(m, ppos); + vma =3D proc_get_vma(m, ppos); + if (vma) + return vma; + + /* Return gate VMA at the end */ + *ppos =3D SENTINEL_VMA_GATE; + return get_gate_vma(mm); } =20 static void *m_next(struct seq_file *m, void *v, loff_t *ppos) { + struct proc_maps_private *priv =3D m->private; + struct vm_area_struct *vma; + if (*ppos =3D=3D SENTINEL_VMA_GATE) { *ppos =3D SENTINEL_VMA_END; return NULL; } - return proc_get_vma(m, ppos); + vma =3D proc_get_vma(m, ppos); + if (vma) + return vma; + + /* Return gate VMA at the end */ + *ppos =3D SENTINEL_VMA_GATE; + return get_gate_vma(priv->lock_ctx.mm); } =20 static void m_stop(struct seq_file *m, void *v) --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 23FCB3B2FD0 for ; Thu, 10 Sep 2026 23:47:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.70 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084078; cv=none; b=J4Y7UiR0jydjI9Ln9I1zzdhFxmDZh24QbJ8HC7QMPRHE4PG9u9UlpLZLX8zVjmukaQ3uYKPtSA1RY5dMVJcqFWmUbLtw9Nsjkg6sM/6YPJLWZDIcfwDLRJkR4UL36g5vNpJMEBKra4eK2RE7RimhbzyMCtMceG97hHXiGlxX2bA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084078; c=relaxed/simple; bh=fzJ4mq+XIyRQpS9OR9S/Jsq3hBniXQdj+ylfg1W0jgk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=WU6FOoD2ZE05i+u9NU3w5JUsD37pD9KmLD5WbrA6HM3XBgzX5Ml8FSOyqtDraNy09XuY1LNen5TdPjiOVhacSPUtRrlD7KtRLs73cPr387LTH7kIMVEBDZCeweRV4s767Kcq/qXNxxy7qia4vXuzii0BjbL7PPLUJ4PBugx93D4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=DBUOUZGY; arc=none smtp.client-ip=209.85.216.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="DBUOUZGY" Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-39af92138f9so600420a91.0 for ; Thu, 10 Sep 2026 16:47:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084076; x=1789688876; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=8UPlg4KrV740Rib8wJaNrr1K8hSvsKhdw/jziCdqQZY=; b=DBUOUZGYtEChgwqiNI4MlTq/iyI2O6RTf2Im/K3ZqjXhMbBkUvmWR7V7AG/Ye1YWMK gmzjuY2XS1xzMY5pU2HEDJB9hjxMUfE6zdUEYP5E8HC6vKZVDfjE0TJvQGMRNQgl/uZy h13fuApgJgjtkkBwFsaq0Mqgk+7DevHWw8XBZxE9lEha3otx19eFVmx93QFo4L9LvuBE 0NBnNXpC2brZ6O0IWNjePzZLpZh5hdmmj3Dw9zfjPxaTjRwVSeMiHC9wd6W8+M7wYphh zc9RkrNZovwctO2q169NHhHHGCRc2TgwPJlHAInFk35Ag28l07iYArHTtyQ69n9P3sPp LUqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084076; x=1789688876; h=content-type: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:content-type; bh=8UPlg4KrV740Rib8wJaNrr1K8hSvsKhdw/jziCdqQZY=; b=P+XXIfe8l7IWZ8kW7P0RsL+LqYTTgxg2MIbTdxrbXXhc7Vy41AZ5fsS03F5FG57/t6 5LQlT69S1HoHq4OFSH8Cv/0bIGzvcOiUIYNFfzy+9Hx717eaSPppIL/9p03WwCikRPeM 5jdlOM6mbvLRVUFxSFtJi7EPHVQJRYVOhv1U2mcpuIOXR09np1UvaV8dpoM5Esfg1YQr FvAIGR9Nw1FP16AgUTRF3K3p5vgfdK2HFrEU2nMoiaPVmArG4hyOXL6nANyNtSHVJK1M JztNg1Rqwl1SytWc309AYrkPh01x+AvTiPRwTfqfWGLntzrbIHODgK3gZDaXwdCIkBcO gSTw== X-Forwarded-Encrypted: i=1; AKwUvBz6z0KtERCCsvdDZDQfnrI5OtN65X+Z+atqmvDbcDyHZyVoICY2PtMHLsm9ZmF9pDOx0E33kphwDHCv+Qc=@vger.kernel.org X-Gm-Message-State: AFuF++k9YLzHOIeBJrh2ceMYd58xKBk7X+2cI28oA2IwijtGqgtojnLL S5TghKWHru+rvrut6Ht643JvQ/mk3Diekh6Liqmu0e/I6DCxhdyjRDv8cmeEJ7xkDaEO1qJ2qn8 RrxtWlA== X-Received: from dybdo17.prod.google.com ([2002:a05:7300:bc11:b0:339:79b6:13ec]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:288e:b0:39b:5622:d645 with SMTP id 98e67ed59e1d1-39d9782102dmr1952912a91.0.1789084076389; Thu, 10 Sep 2026 16:47:56 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:36 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-7-surenb@google.com> Subject: [PATCH v3 6/7] proc/task_mmu: read proc/pid/smaps_rollup under per-vma lock From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" proc/pid/smaps_rollup can be read using the combination of RCU and VMA read locks, similar to proc/pid/{maps|smaps|numa_maps}. RCU is required to safely traverse the VMA tree and VMA lock stabilizes the VMA being processed and the pagetable walk. Note that we have to keep the logic to drop mmap_lock on contention because even when using per-VMA locks we might have to fall back to holding the mmap_lock. Running Paul's contention benchmark [1] shows considerable improvement both in median and in the worst case latencies: Execution command: run-proc-vs-map.sh --nsamples 20 --rawdata -- \ --busyduration 2 --procfile smaps_rollup Baseline: Median Minimum Maximum 0.174 0.161 2.553 0.174 0.164 2.663 0.174 0.165 2.664 0.174 0.166 2.679 0.174 0.167 2.691 0.174 0.168 2.704 0.174 0.169 2.729 0.174 0.172 2.741 0.174 0.174 2.745 0.174 0.174 2.755 0.174 0.175 2.790 0.174 0.177 2.809 0.174 0.179 3.096 0.174 0.183 3.144 0.174 0.184 3.158 0.174 0.185 3.175 0.174 0.185 4.568 0.174 0.198 4.821 0.174 0.214 5.143 0.174 0.251 5.220 Patched: Median Minimum Maximum 0.007 0.007 1.952 0.007 0.007 1.955 0.007 0.007 1.955 0.007 0.007 1.955 0.007 0.007 1.957 0.007 0.007 1.969 0.007 0.007 2.065 0.007 0.007 2.075 0.007 0.007 2.146 0.007 0.007 2.195 0.007 0.007 2.223 0.007 0.007 2.259 0.007 0.007 2.488 0.007 0.007 2.562 0.007 0.007 2.599 0.007 0.007 2.697 0.007 0.007 3.030 0.007 0.007 3.075 0.007 0.007 3.145 0.007 0.007 3.225 Remove now unused lock_ctx_mm() and move unlock_ctx_vma() next to unlock_ctx_mm() as they are logically related. Remove a long comment about 4 cases that we handle when dropping the mmap lock in the middle of VMA walk due to contention. The first 3 cases explained there are handled naturally and only case 4 needs to be handled in a special way, which is done in smap_gather_stats() by gathering stats from the portion of the VMA that has not yet been processed. For posterity, moving this comment here: After dropping the lock, there are four cases to consider. See the following example for explanation. +------+------+-----------+ | VMA1 | VMA2 | VMA3 | +------+------+-----------+ | | | | 4k 8k 16k 400k Suppose we drop the lock after reading VMA2 due to contention, then we get: last_vma_end =3D 16k 1) VMA2 is freed, but VMA3 exists: vma_next(vmi) will return VMA3. In this case, just continue from VMA3. 2) VMA2 still exists: vma_next(vmi) will return VMA3. In this case, just continue from VMA3. 3) No more VMAs can be found: vma_next(vmi) will return NULL. No more things to do, just break. 4) (last_vma_end - 1) is the middle of a vma (VMA'): vma_next(vmi) will return VMA' whose range contains last_vma_end. Iterate VMA' from last_vma_end. [1] https://github.com/paulmckrcu/proc-mmap_sem-test Signed-off-by: Suren Baghdasaryan Reviewed-by: Lorenzo Stoakes (ARM) --- fs/proc/task_mmu.c | 159 +++++++++++++++++++-------------------------- 1 file changed, 66 insertions(+), 93 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 9a3c996c1d61..6fee40bdd736 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -130,28 +130,12 @@ static void release_task_mempolicy(struct proc_maps_p= rivate *priv) } #endif =20 -static int lock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) -{ - int ret =3D mmap_read_lock_killable(lock_ctx->mm); - - if (!ret) - lock_ctx->mmap_locked =3D true; - - return ret; -} - static void unlock_ctx_mm(struct proc_maps_locking_ctx *lock_ctx) { mmap_read_unlock(lock_ctx->mm); lock_ctx->mmap_locked =3D false; } =20 -static void reset_lock_ctx(struct proc_maps_locking_ctx *lock_ctx) -{ - lock_ctx->locked_vma =3D NULL; - lock_ctx->mmap_locked =3D false; -} - static void unlock_ctx_vma(struct proc_maps_locking_ctx *lock_ctx) { if (lock_ctx->locked_vma) { @@ -160,6 +144,12 @@ static void unlock_ctx_vma(struct proc_maps_locking_ct= x *lock_ctx) } } =20 +static void reset_lock_ctx(struct proc_maps_locking_ctx *lock_ctx) +{ + lock_ctx->locked_vma =3D NULL; + lock_ctx->mmap_locked =3D false; +} + static struct vm_area_struct *get_next_vma(struct proc_maps_private *priv, loff_t last_pos) { @@ -1384,12 +1374,14 @@ static int show_smap(struct seq_file *m, void *v) static int show_smaps_rollup(struct seq_file *m, void *v) { struct proc_maps_private *priv =3D m->private; + struct proc_maps_locking_ctx *lock_ctx =3D &priv->lock_ctx; + struct mm_struct *mm =3D lock_ctx->mm; struct mem_size_stats mss =3D {}; - struct mm_struct *mm =3D priv->lock_ctx.mm; + unsigned long last_vma_end =3D 0; + unsigned long vma_start =3D 0; struct vm_area_struct *vma; - unsigned long vma_start =3D 0, last_vma_end =3D 0; + loff_t pos =3D 0; int ret =3D 0; - VMA_ITERATOR(vmi, mm, 0); =20 priv->task =3D get_proc_task(priv->inode); if (!priv->task) @@ -1400,89 +1392,66 @@ static int show_smaps_rollup(struct seq_file *m, vo= id *v) goto out_put_task; } =20 - ret =3D lock_ctx_mm(&priv->lock_ctx); - if (ret) - goto out_put_mm; - hold_task_mempolicy(priv); - vma =3D vma_next(&vmi); + rcu_read_lock(); + reset_lock_ctx(lock_ctx); =20 + vma_iter_init(&priv->iter, mm, 0); + vma =3D proc_get_vma(m, &pos); if (unlikely(!vma)) goto empty_set; =20 - vma_start =3D vma->vm_start; - do { - smap_gather_stats(priv, vma, &mss, vma->vm_start); + if (!IS_ERR(vma)) + vma_start =3D vma->vm_start; + + while (vma) { + unsigned long start; + + if (IS_ERR(vma)) { + ret =3D PTR_ERR(vma); + goto out_unlock; + } + + if (vma->vm_start < last_vma_end) { + /* + * After retaking the lock, already reported VMA grew + * or got merged with the next one and we found it + * again. Gather stats for the remaining portion by + * starting at last_vma_end. + */ + start =3D last_vma_end; + } else { + /* Found next unreported VMA, start from its beginning */ + start =3D vma->vm_start; + } + smap_gather_stats(priv, vma, &mss, start); last_vma_end =3D vma->vm_end; =20 /* - * Release mmap_lock temporarily if someone wants to - * access it for write request. + * If the VMA lock is not taken, we hold the often contended + * mmap lock. This can happen if we had to fall back to the + * mmap lock. + * + * To relieve pressure, check if it is indeed contended, then + * temporarily release it. */ - if (mmap_lock_is_contended(mm)) { - vma_iter_invalidate(&vmi); - unlock_ctx_mm(&priv->lock_ctx); - ret =3D lock_ctx_mm(&priv->lock_ctx); - if (ret) { - release_task_mempolicy(priv); - goto out_put_mm; - } - + if (lock_ctx->mmap_locked && + mmap_lock_is_contended(lock_ctx->mm)) { + unlock_ctx_mm(lock_ctx); /* - * After dropping the lock, there are four cases to - * consider. See the following example for explanation. - * - * +------+------+-----------+ - * | VMA1 | VMA2 | VMA3 | - * +------+------+-----------+ - * | | | | - * 4k 8k 16k 400k - * - * Suppose we drop the lock after reading VMA2 due to - * contention, then we get: - * - * last_vma_end =3D 16k - * - * 1) VMA2 is freed, but VMA3 exists: - * - * vma_next(vmi) will return VMA3. - * In this case, just continue from VMA3. - * - * 2) VMA2 still exists: - * - * vma_next(vmi) will return VMA3. - * In this case, just continue from VMA3. - * - * 3) No more VMAs can be found: - * - * vma_next(vmi) will return NULL. - * No more things to do, just break. - * - * 4) (last_vma_end - 1) is the middle of a vma (VMA'): - * - * vma_next(vmi) will return VMA' whose range - * contains last_vma_end. - * Iterate VMA' from last_vma_end. + * Even though we previously fell back to mmap lock, + * we try taking VMA lock for the next VMA, since it + * might not be under modification. In the worst case + * we will fall back to mmap lock again. */ - vma =3D vma_next(&vmi); - /* Case 3 above */ - if (!vma) - break; - - /* Case 1 and 2 above */ - if (vma->vm_start >=3D last_vma_end) { - smap_gather_stats(priv, vma, &mss, vma->vm_start); - last_vma_end =3D vma->vm_end; - continue; - } - - /* Case 4 above */ - if (vma->vm_end > last_vma_end) { - smap_gather_stats(priv, vma, &mss, last_vma_end); - last_vma_end =3D vma->vm_end; - } + rcu_read_lock(); + reset_lock_ctx(lock_ctx); + /* Resume from the last position. */ + pos =3D last_vma_end; + vma_iter_init(&priv->iter, mm, pos); } - } for_each_vma(vmi, vma); + vma =3D proc_get_vma(m, &pos); + } =20 empty_set: show_vma_header_prefix(m, vma_start, last_vma_end, 0, 0, 0, 0); @@ -1491,10 +1460,14 @@ static int show_smaps_rollup(struct seq_file *m, vo= id *v) =20 __show_smap(m, &mss, true); =20 +out_unlock: + if (lock_ctx->mmap_locked) { + unlock_ctx_mm(lock_ctx); + } else { + unlock_ctx_vma(lock_ctx); + rcu_read_unlock(); + } release_task_mempolicy(priv); - unlock_ctx_mm(&priv->lock_ctx); - -out_put_mm: mmput(mm); out_put_task: put_task_struct(priv->task); --=20 2.55.0.1007.g17ff1f9808-goog From nobody Fri Sep 25 15:13:46 2026 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E81D23AF644 for ; Thu, 10 Sep 2026 23:48:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.72 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084082; cv=none; b=kR3RE0oXG4KP+NDTLr4LEDyGOm7FZamVoZ5ZRDeE02uGlDU4mx+xmxRnkeGNrZTPfK6UG35wv1l6w4cta2uV1/yNWaInVL8sPcWuira1/gkDly/69YVzQcWpeuR66pbNyr4/7kIp1sbARg4sznIo0Awdu2UwaYCZh/R7cdrIz7M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789084082; c=relaxed/simple; bh=qtIcYZmy0fUqL6VApkt0TqfeQRyWNDrlMmg6j9snlDA=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GoVTv7lB1rQmYJnY0AzjlJT1R+O42UjTa8xF1UkNnVLSAyLYZPWaagWw6kjkJTXy3txBDAiQM2WsZdsee07vI/oWIpWuw25stoaqwDRG9ojFlWi59iiM3WeAEcdvyJZwd6kwZ5cgJ0tPnZ3We7bDyGicgiFXMzBfeMl58TPFAD8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=IGJSMKWz; arc=none smtp.client-ip=209.85.216.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IGJSMKWz" Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-38f57e31b6eso359089a91.1 for ; Thu, 10 Sep 2026 16:48:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1789084080; x=1789688880; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1DhSZHjG6hjqVTewVLZe8gYlSfZPhEo21Ej3YTenr/Y=; b=IGJSMKWzDYYZ1AO9lTkiY4sA6Rcbn0eCifWZsM9Py3XJkmBrbfAXDiys99rMJ01gyX DTZzKgOTbPyq5ff14eTVoeAo7fxiG27jlZwFDRBYDwwKayYemfvS23IsXji+FLVWRiyI oDlNoGScLt6mjUb5nQ0aHSBFv62mD/idokrFZCcayGj32185cUMu7n5OSIhDblrbRILT zPWydLPNaDU9fpg+LNvrkkRfg1rsu0Kq0YGtnY6a6Bp0W6KGXky4y9KQinj+NYSWWOkf WzTZW+X4hHe1k6YxZ1jNhv5nUdtbHt0R8OPybz8QglhEdv1JzuvxMc0xdxaUFdAHFDdD LCVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789084080; x=1789688880; h=content-type: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:content-type; bh=1DhSZHjG6hjqVTewVLZe8gYlSfZPhEo21Ej3YTenr/Y=; b=GT2mMv7TT6eWhvzaCZdJXEu4o9p1ahQTlYDuXhcY8kiReYjCO67kWQiDtr4FlN/zCX 7han17Q5/UDj+WDC2p3i4eiLamVyh/b3V7zAnOF2yW9i0KyYT1+lbUNbv5o+1jjuX4Ob adDUxQLFHOZ0I55pqhE0yjuNXThu6Cpnolf0+aSMpxG6JSIs6cMQ95nEGZE+FJ1ek1Ga CsS9QoDvnJDDLuGP33jlS/PLDTnvQ4Amb8BDUsTNxq4MvJW9O74/q8uOVjTkzK2Affmf h166suq6KGa3833aXy5wC5xMvLMaKqhb4EPDHfd399mRW11o6jcSxP8EMTQNKZ/vWg5n yohw== X-Forwarded-Encrypted: i=1; AKwUvBwgFgC/oAPWvC77pL4UCW9RsjMzxHIJcHSrlcs0L3rLwhxAfxS5JBZhTYPZ69B04BjPYTTafipo5k8NZxk=@vger.kernel.org X-Gm-Message-State: AFuF++kwTQSr0ZWmeAE6ATitbw0ze7rAZi0jhJ1tpJpiKYpXnl9LtUeq 9zwJmfGD7mUZRj6ymsSn94kwulsjHrjoQfv4utCCxlsAyzRoSOx79+mhqt5kdv9kh8Y2Fyor6PJ kyOAHpw== X-Received: from dlbrj7.prod.google.com ([2002:a05:7022:f407:b0:143:5fe6:4e1a]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2b44:b0:398:bd37:6a49 with SMTP id 98e67ed59e1d1-39d9c1bf032mr1926105a91.12.1789084078931; Thu, 10 Sep 2026 16:47:58 -0700 (PDT) Date: Thu, 10 Sep 2026 16:47:37 -0700 In-Reply-To: <20260910234737.1340642-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260910234737.1340642-1-surenb@google.com> X-Mailer: git-send-email 2.55.0.1007.g17ff1f9808-goog Message-ID: <20260910234737.1340642-8-surenb@google.com> Subject: [PATCH v3 7/7] selftests/proc: add /proc/pid/smaps_rollup tearing tests From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: liam@infradead.org, ljs@kernel.org, vbabka@kernel.org, david@redhat.com, willy@infradead.org, jannh@google.com, paulmck@kernel.org, pfalcato@suse.de, xueyuan.chen21@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" During tearing tests, smaps_rollup Pss* metrics should stay constant. Extend /proc/pid/smaps tearing tests to also check for smaps_rollup consistency. Signed-off-by: Suren Baghdasaryan Acked-by: Lorenzo Stoakes (ARM) --- tools/testing/selftests/proc/proc-maps-race.c | 187 +++++++++++++++++- 1 file changed, 182 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/proc/proc-maps-race.c b/tools/testing/= selftests/proc/proc-maps-race.c index 415eccb70468..8d00d7db1c65 100644 --- a/tools/testing/selftests/proc/proc-maps-race.c +++ b/tools/testing/selftests/proc/proc-maps-race.c @@ -80,6 +80,61 @@ enum maps_file { =20 struct vma_modifier_info; =20 +enum smaps_rollup_stat { + Rss, + Pss, + Pss_Dirty, + Pss_Anon, + Pss_File, + Pss_Shmem, + Shared_Clean, + Shared_Dirty, + Private_Clean, + Private_Dirty, + Referenced, + Anonymous, + KSM, + LazyFree, + AnonHugePages, + ShmemPmdMapped, + FilePmdMapped, + Shared_Hugetlb, + Private_Hugetlb, + Swap, + SwapPss, + Locked, + RollupFieldCount +}; + +static const char *smaps_rollup_stat_names[RollupFieldCount] =3D { + "Rss", + "Pss", + "Pss_Dirty", + "Pss_Anon", + "Pss_File", + "Pss_Shmem", + "Shared_Clean", + "Shared_Dirty", + "Private_Clean", + "Private_Dirty", + "Referenced", + "Anonymous", + "KSM", + "LazyFree", + "AnonHugePages", + "ShmemPmdMapped", + "FilePmdMapped", + "Shared_Hugetlb", + "Private_Hugetlb", + "Swap", + "SwapPss", + "Locked", +}; + +struct smaps_rollup_stats { + unsigned long values[RollupFieldCount]; +}; + FIXTURE(proc_maps_race) { struct vma_modifier_info *mod_info; @@ -91,6 +146,7 @@ FIXTURE(proc_maps_race) enum maps_file maps_file; int shared_mem_size; int skip_pages; + int rollup_fd; int page_size; int vma_count; bool verbose; @@ -132,12 +188,12 @@ struct vma_modifier_info { void *child_mapped_addr[]; }; =20 -static bool read_page(FIXTURE_DATA(proc_maps_race) *self, +static bool read_page(FIXTURE_DATA(proc_maps_race) *self, int fd, struct page_content *page) { ssize_t bytes_read; =20 - bytes_read =3D read(self->maps_fd, page->data, self->page_size); + bytes_read =3D read(fd, page->data, self->page_size); if (bytes_read <=3D 0) return false; =20 @@ -175,7 +231,7 @@ static int locate_containing_page(FIXTURE_DATA(proc_map= s_race) *self, char *curr_pos; char *end_pos; =20 - if (!read_page(self, &self->page1)) + if (!read_page(self, self->maps_fd, &self->page1)) return -1; =20 curr_pos =3D self->page1.data; @@ -205,10 +261,11 @@ static bool read_two_pages(FIXTURE_DATA(proc_maps_rac= e) *self) return false; =20 for (int i =3D 0; i < self->skip_pages; i++) - if (!read_page(self, &self->page1)) + if (!read_page(self, self->maps_fd, &self->page1)) return false; =20 - return read_page(self, &self->page1) && read_page(self, &self->page2); + return read_page(self, self->maps_fd, &self->page1) && + read_page(self, self->maps_fd, &self->page2); } =20 static void copy_line(const char *line_start, const char *line_end, @@ -317,6 +374,61 @@ static bool read_boundary_lines(FIXTURE_DATA(proc_maps= _race) *self, &first_line->end_addr) =3D=3D 2; } =20 +static bool parse_smaps_rollup(FIXTURE_DATA(proc_maps_race) *self, + struct smaps_rollup_stats *stats) +{ + unsigned int dev_maj, dev_min, inode; + unsigned long start, end, offs; + unsigned long value; + char name[32], perm[5]; + char *curr_pos; + char *end_pos; + char *line_end; + + if (lseek(self->rollup_fd, 0, SEEK_SET) < 0) + return false; + + if (!read_page(self, self->rollup_fd, &self->page1)) + return false; + + curr_pos =3D self->page1.data; + end_pos =3D self->page1.data + self->page1.size; + + line_end =3D strchr(curr_pos, '\n'); + if (!line_end) + return false; + + if (sscanf(curr_pos, "%lx-%lx %4s %lx %u:%u %u %31s", + &start, &end, perm, &offs, &dev_maj, &dev_min, &inode, name) !=3D 8) + return false; + + if (strcmp(name, "[rollup]")) + return false; + + for (int stat =3D 0; stat < ARRAY_SIZE(smaps_rollup_stat_names); stat++) { + int len; + + curr_pos =3D line_end + 1; + if (curr_pos >=3D end_pos) + return false; + + line_end =3D strchr(curr_pos, '\n'); + if (!line_end) + return false; + + if (sscanf(curr_pos, "%31s %lu kB", name, &value) !=3D 2) + return false; + + len =3D strlen(name); + if (name[len - 1] !=3D ':' || strncmp(name, smaps_rollup_stat_names[stat= ], len - 1)) + return false; + + stats->values[stat] =3D value; + } + + return true; +} + /* Thread synchronization routines */ static void wait_for_state(struct vma_modifier_info *mod_info, enum test_s= tate state) { @@ -397,6 +509,41 @@ static bool print_boundaries_on(bool condition, const = char *title, return condition; } =20 +static void print_smaps_rollup_stats(const char *title, FIXTURE_DATA(proc_= maps_race) *self, + struct smaps_rollup_stats *stats) +{ + printf("%s", title); + for (int stat =3D 0; stat < ARRAY_SIZE(smaps_rollup_stat_names); stat++) + printf("%64s %lu kB\n", smaps_rollup_stat_names[stat], stats->values[sta= t]); +} + +static bool cmp_smaps_rollup_stat(struct smaps_rollup_stats *s1, + struct smaps_rollup_stats *s2, + enum smaps_rollup_stat stat) +{ + return s1->values[stat] =3D=3D s2->values[stat]; +} + +static bool compare_smaps_rollup(FIXTURE_DATA(proc_maps_race) *self, + struct smaps_rollup_stats *expected, + struct smaps_rollup_stats *actual) +{ + /* + * Clean/dirty metrics might change but Pss-related ones + * should stay constant. + */ + if (cmp_smaps_rollup_stat(expected, actual, Pss) && + cmp_smaps_rollup_stat(expected, actual, Pss_Anon) && + cmp_smaps_rollup_stat(expected, actual, Pss_File) && + cmp_smaps_rollup_stat(expected, actual, Pss_Shmem)) + return true; + + print_smaps_rollup_stats("Expected stats:", self, expected); + print_smaps_rollup_stats("Actual stats:", self, actual); + + return false; +} + static void report_test_start(const char *name, bool verbose) { if (verbose) @@ -572,6 +719,7 @@ FIXTURE_SETUP(proc_maps_race) unsigned long first_map_addr; unsigned long last_map_addr; unsigned long duration_sec; + char rollup_fname[32]; char fname[32]; =20 self->page_size =3D (unsigned long)sysconf(_SC_PAGESIZE); @@ -649,6 +797,9 @@ FIXTURE_SETUP(proc_maps_race) break; case SMAPS: sprintf(fname, "/proc/%d/smaps", self->pid); + sprintf(rollup_fname, "/proc/%d/smaps_rollup", self->pid); + self->rollup_fd =3D open(rollup_fname, O_RDONLY); + ASSERT_NE(self->rollup_fd, -1); break; default: ksft_exit_fail(); @@ -711,6 +862,8 @@ FIXTURE_TEARDOWN(proc_maps_race) for (int i =3D 0; i < self->vma_count; i++) munmap(self->mod_info->child_mapped_addr[i], self->page_size); close(self->maps_fd); + if (self->maps_file =3D=3D SMAPS) + close(self->rollup_fd); waitpid(self->pid, &status, 0); munmap(self->mod_info, self->shared_mem_size); } @@ -723,6 +876,7 @@ TEST_F(proc_maps_race, test_maps_tearing_from_split) struct line_content split_first_line; struct line_content restored_last_line; struct line_content restored_first_line; + struct smaps_rollup_stats orig_stats; =20 wait_for_state(mod_info, SETUP_READY); =20 @@ -736,6 +890,8 @@ TEST_F(proc_maps_race, test_maps_tearing_from_split) report_test_start("Tearing from split", self->verbose); ASSERT_TRUE(capture_mod_pattern(self, &split_last_line, &split_first_line, &restored_last_line, &restored_first_line)); + if (self->maps_file =3D=3D SMAPS) + ASSERT_TRUE(parse_smaps_rollup(self, &orig_stats)); =20 /* Now start concurrent modifications for self->duration_sec */ signal_state(mod_info, TEST_READY); @@ -799,6 +955,11 @@ TEST_F(proc_maps_race, test_maps_tearing_from_split) vma_end =3D=3D self->last_line.end_addr) || (vma_start =3D=3D split_first_line.start_addr && vma_end =3D=3D split_first_line.end_addr)); + } else { + struct smaps_rollup_stats stats; + + ASSERT_TRUE(parse_smaps_rollup(self, &stats)); + ASSERT_TRUE(compare_smaps_rollup(self, &orig_stats, &stats)); } clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts); end_test_iteration(&end_ts, self->verbose); @@ -817,6 +978,7 @@ TEST_F(proc_maps_race, test_maps_tearing_from_resize) struct line_content shrunk_first_line; struct line_content restored_last_line; struct line_content restored_first_line; + struct smaps_rollup_stats orig_stats; =20 wait_for_state(mod_info, SETUP_READY); =20 @@ -830,6 +992,8 @@ TEST_F(proc_maps_race, test_maps_tearing_from_resize) report_test_start("Tearing from resize", self->verbose); ASSERT_TRUE(capture_mod_pattern(self, &shrunk_last_line, &shrunk_first_li= ne, &restored_last_line, &restored_first_line)); + if (self->maps_file =3D=3D SMAPS) + ASSERT_TRUE(parse_smaps_rollup(self, &orig_stats)); =20 /* Now start concurrent modifications for self->duration_sec */ signal_state(mod_info, TEST_READY); @@ -880,6 +1044,11 @@ TEST_F(proc_maps_race, test_maps_tearing_from_resize) ASSERT_TRUE(vma_start =3D=3D self->last_line.start_addr && (vma_end - vma_start =3D=3D self->page_size * 3 || vma_end - vma_start =3D=3D self->page_size)); + } else { + struct smaps_rollup_stats stats; + + ASSERT_TRUE(parse_smaps_rollup(self, &stats)); + ASSERT_TRUE(compare_smaps_rollup(self, &orig_stats, &stats)); } clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts); end_test_iteration(&end_ts, self->verbose); @@ -898,6 +1067,7 @@ TEST_F(proc_maps_race, test_maps_tearing_from_remap) struct line_content remapped_first_line; struct line_content restored_last_line; struct line_content restored_first_line; + struct smaps_rollup_stats orig_stats; =20 wait_for_state(mod_info, SETUP_READY); =20 @@ -911,6 +1081,8 @@ TEST_F(proc_maps_race, test_maps_tearing_from_remap) report_test_start("Tearing from remap", self->verbose); ASSERT_TRUE(capture_mod_pattern(self, &remapped_last_line, &remapped_firs= t_line, &restored_last_line, &restored_first_line)); + if (self->maps_file =3D=3D SMAPS) + ASSERT_TRUE(parse_smaps_rollup(self, &orig_stats)); =20 /* Now start concurrent modifications for self->duration_sec */ signal_state(mod_info, TEST_READY); @@ -963,6 +1135,11 @@ TEST_F(proc_maps_race, test_maps_tearing_from_remap) vma_end - vma_start =3D=3D self->page_size * 3) || (vma_start =3D=3D self->last_line.start_addr + self->page_size && vma_end - vma_start =3D=3D self->page_size)); + } else { + struct smaps_rollup_stats stats; + + ASSERT_TRUE(parse_smaps_rollup(self, &stats)); + ASSERT_TRUE(compare_smaps_rollup(self, &orig_stats, &stats)); } clock_gettime(CLOCK_MONOTONIC_COARSE, &end_ts); end_test_iteration(&end_ts, self->verbose); --=20 2.55.0.1007.g17ff1f9808-goog