From nobody Sun Oct 5 18:19:15 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 85F982701DF for ; Thu, 31 Jul 2025 22:00:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753999234; cv=none; b=PdISgFbIuTfEyTio4bWvUXMekFgt/6dZbIYzQSf9MgBUhxfnxeLFmjd22CtNUoVZB8JO3ZOTt8bjFsfKehao8ELC6I2YlJK9p7ckAokDCsjIOUGK1sMPhAfNHMSqCyl2KRahB9XeCfMpjvPttHAfXaSiZkawLYJW5h2n0YD4pn8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753999234; c=relaxed/simple; bh=yhEtd1ka8mErusKeRqx/I8nXNg9UEifaYYnXhvMlSKc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=p+uX/R5m5Hl6pvUiCzEJTQ2Kylkh2ZYnolhr/nGupY4p8UfQqwj1DbNs/ytIG6//OUazS+fHtt/M3aIx4ZAwMv3J4nHLEqytfMpLPG9mviH1cHxmRAhS8qUSAbDf0jrDeA1HHR6Vt32IxbJXKN8hKeU+rpKtZCXC+GoWujqIZ+M= 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=xo7OSuw+; arc=none smtp.client-ip=209.85.214.201 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="xo7OSuw+" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2369dd58602so2782205ad.1 for ; Thu, 31 Jul 2025 15:00:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1753999232; x=1754604032; darn=vger.kernel.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=c3nszwvCvPWAmHYDsSOEe6+RDYFjtctgvzjemTCKIEM=; b=xo7OSuw+0JbLwCAXadDhWLSr1R6eVL/CuqCdT5bgUUKxS90sKUqc7nJ2wGjdG4dNeW Vj4J15Q98xxdZieZGPLd29bFWtIBxtPA1ZZ4UgtsJ4VYY9ZZIs/sZWm5A2els0DQ6OHy tgqkY32pQxo6sgZau7OVT87Ka5+fE4PbUYG0XX8Yxgh7B5roqmWCAp+SR7dhi40sxGd0 OcJ++o7Eo515vM+hk3Mke7DICCKCPo9WuhueRjBPuEkalNItSBX9ceU+ASDAf7e9LPlS zlDe9XH8/LpsowmnHA1H2i9SrOV015SfLoljkPJ8mp7uUPQcr5FYGNZs8qVbbR+d9zt1 53Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753999232; x=1754604032; 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=c3nszwvCvPWAmHYDsSOEe6+RDYFjtctgvzjemTCKIEM=; b=HcxMFKRLtSPKbJBwLSy39btvj8vsEyq7y5TF53gmKsbJf8IL5lX+5IwHVXR/+1PkbP rizss4XOya3sX44iUkfQVZ3MJ+DnxXErC887sTYcIr0rXEx4v8VgsxR3y0BqxUnNzvaj bUGLXnqMIlkUQmEukdkZTxTVaF/4qki9OabtRoVmtrDcc7iSfE3Tb1SPx/en7Jwt7rmw ZYEM5QVmtnednatOayBHQy+lhwx63RZVYjNIRgNWQbQB9LaomvfaDmAVH6vn37YHgDLM w6a2i/3QtJ4Cnem0rTkLjlCSAw/Hr3uyHKGB0g9XhsHL0wqNGXFIiOowyPQo7cN5IWwU xonw== X-Forwarded-Encrypted: i=1; AJvYcCVlprzf/tkqUrWoi8QmtjQfz6xajJ8vHA/dqapvujbhd+h6dAypDP18mp6hjjHOxlPB3l03IQuMrU5N9Mc=@vger.kernel.org X-Gm-Message-State: AOJu0Yz5c3MQizo5omcRWzUSwb6ASv15J0oDSx4eQEKPtpr4fuCzQlf8 tT6A9rfa5AkFNY9KZG8R46uO522Nm3DXv+COSdzdhvjbNIDPpZNpmiupZHjSuZ8p9EbKWz/UKFh /P0n6iw== X-Google-Smtp-Source: AGHT+IEe6D0EDOa4VLSLQnNt443QGZdBsTsucswGzk0sXMtaRnOh2OfcwLIsh8g7TBhjLjlnLUKia1iuw4c= X-Received: from plbka16.prod.google.com ([2002:a17:903:3350:b0:240:9ca:fc49]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:fc50:b0:234:ef42:5d65 with SMTP id d9443c01a7336-24096c0dcf7mr124221755ad.52.1753999231880; Thu, 31 Jul 2025 15:00:31 -0700 (PDT) Date: Thu, 31 Jul 2025 15:00:23 -0700 In-Reply-To: <20250731220024.702621-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: <20250731220024.702621-1-surenb@google.com> X-Mailer: git-send-email 2.50.1.565.gc32cd1483b-goog Message-ID: <20250731220024.702621-3-surenb@google.com> Subject: [PATCH 2/3] fs/proc/task_mmu: factor out proc_maps_private fields used by PROCMAP_QUERY From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: Liam.Howlett@oracle.com, lorenzo.stoakes@oracle.com, david@redhat.com, vbabka@suse.cz, peterx@redhat.com, jannh@google.com, hannes@cmpxchg.org, mhocko@kernel.org, paulmck@kernel.org, shuah@kernel.org, adobriyan@gmail.com, brauner@kernel.org, josef@toxicpanda.com, yebin10@huawei.com, linux@weissschuh.net, willy@infradead.org, osalvador@suse.de, andrii@kernel.org, ryan.roberts@arm.com, christophe.leroy@csgroup.eu, tjmercier@google.com, kaleshsingh@google.com, aha310510@gmail.com, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Refactor struct proc_maps_private so that the fields used by PROCMAP_QUERY ioctl are moved into a separate structure. In the next patch this allows ioctl to reuse some of the functions used for reading /proc/pid/maps without using file->private_data. This prevents concurrent modification of file->private_data members by ioctl and /proc/pid/maps readers. The change is pure code refactoring and has no functional changes. Signed-off-by: Suren Baghdasaryan --- fs/proc/internal.h | 15 ++++++---- fs/proc/task_mmu.c | 70 +++++++++++++++++++++++----------------------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 7c235451c5ea..e2447b22592e 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -379,16 +379,21 @@ extern void proc_self_init(void); * task_[no]mmu.c */ struct mem_size_stats; -struct proc_maps_private { - struct inode *inode; - struct task_struct *task; + +struct proc_maps_query_data { struct mm_struct *mm; - struct vma_iterator iter; - loff_t last_pos; #ifdef CONFIG_PER_VMA_LOCK bool mmap_locked; struct vm_area_struct *locked_vma; #endif +}; + +struct proc_maps_private { + struct inode *inode; + struct task_struct *task; + struct vma_iterator iter; + loff_t last_pos; + struct proc_maps_query_data query; #ifdef CONFIG_NUMA struct mempolicy *task_mempolicy; #endif diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 3d6d8a9f13fc..509fa162760a 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -132,11 +132,11 @@ static void release_task_mempolicy(struct proc_maps_p= rivate *priv) =20 #ifdef CONFIG_PER_VMA_LOCK =20 -static void unlock_vma(struct proc_maps_private *priv) +static void unlock_vma(struct proc_maps_query_data *query) { - if (priv->locked_vma) { - vma_end_read(priv->locked_vma); - priv->locked_vma =3D NULL; + if (query->locked_vma) { + vma_end_read(query->locked_vma); + query->locked_vma =3D NULL; } } =20 @@ -151,14 +151,14 @@ static inline bool lock_vma_range(struct seq_file *m, * walking the vma tree under rcu read protection. */ if (m->op !=3D &proc_pid_maps_op) { - if (mmap_read_lock_killable(priv->mm)) + if (mmap_read_lock_killable(priv->query.mm)) return false; =20 - priv->mmap_locked =3D true; + priv->query.mmap_locked =3D true; } else { rcu_read_lock(); - priv->locked_vma =3D NULL; - priv->mmap_locked =3D false; + priv->query.locked_vma =3D NULL; + priv->query.mmap_locked =3D false; } =20 return true; @@ -166,10 +166,10 @@ static inline bool lock_vma_range(struct seq_file *m, =20 static inline void unlock_vma_range(struct proc_maps_private *priv) { - if (priv->mmap_locked) { - mmap_read_unlock(priv->mm); + if (priv->query.mmap_locked) { + mmap_read_unlock(priv->query.mm); } else { - unlock_vma(priv); + unlock_vma(&priv->query); rcu_read_unlock(); } } @@ -179,13 +179,13 @@ static struct vm_area_struct *get_next_vma(struct pro= c_maps_private *priv, { struct vm_area_struct *vma; =20 - if (priv->mmap_locked) + if (priv->query.mmap_locked) return vma_next(&priv->iter); =20 - unlock_vma(priv); - vma =3D lock_next_vma(priv->mm, &priv->iter, last_pos); + unlock_vma(&priv->query); + vma =3D lock_next_vma(priv->query.mm, &priv->iter, last_pos); if (!IS_ERR_OR_NULL(vma)) - priv->locked_vma =3D vma; + priv->query.locked_vma =3D vma; =20 return vma; } @@ -193,14 +193,14 @@ static struct vm_area_struct *get_next_vma(struct pro= c_maps_private *priv, static inline bool fallback_to_mmap_lock(struct proc_maps_private *priv, loff_t pos) { - if (priv->mmap_locked) + if (priv->query.mmap_locked) return false; =20 rcu_read_unlock(); - mmap_read_lock(priv->mm); + mmap_read_lock(priv->query.mm); /* Reinitialize the iterator after taking mmap_lock */ vma_iter_set(&priv->iter, pos); - priv->mmap_locked =3D true; + priv->query.mmap_locked =3D true; =20 return true; } @@ -210,12 +210,12 @@ static inline bool fallback_to_mmap_lock(struct proc_= maps_private *priv, static inline bool lock_vma_range(struct seq_file *m, struct proc_maps_private *priv) { - return mmap_read_lock_killable(priv->mm) =3D=3D 0; + return mmap_read_lock_killable(priv->query.mm) =3D=3D 0; } =20 static inline void unlock_vma_range(struct proc_maps_private *priv) { - mmap_read_unlock(priv->mm); + mmap_read_unlock(priv->query.mm); } =20 static struct vm_area_struct *get_next_vma(struct proc_maps_private *priv, @@ -258,7 +258,7 @@ static struct vm_area_struct *proc_get_vma(struct seq_f= ile *m, loff_t *ppos) *ppos =3D vma->vm_end; } else { *ppos =3D SENTINEL_VMA_GATE; - vma =3D get_gate_vma(priv->mm); + vma =3D get_gate_vma(priv->query.mm); } =20 return vma; @@ -278,7 +278,7 @@ static void *m_start(struct seq_file *m, loff_t *ppos) if (!priv->task) return ERR_PTR(-ESRCH); =20 - mm =3D priv->mm; + mm =3D priv->query.mm; if (!mm || !mmget_not_zero(mm)) { put_task_struct(priv->task); priv->task =3D NULL; @@ -318,7 +318,7 @@ static void *m_next(struct seq_file *m, void *v, loff_t= *ppos) static void m_stop(struct seq_file *m, void *v) { struct proc_maps_private *priv =3D m->private; - struct mm_struct *mm =3D priv->mm; + struct mm_struct *mm =3D priv->query.mm; =20 if (!priv->task) return; @@ -339,9 +339,9 @@ static int proc_maps_open(struct inode *inode, struct f= ile *file, return -ENOMEM; =20 priv->inode =3D inode; - priv->mm =3D proc_mem_open(inode, PTRACE_MODE_READ); - if (IS_ERR_OR_NULL(priv->mm)) { - int err =3D priv->mm ? PTR_ERR(priv->mm) : -ESRCH; + priv->query.mm =3D proc_mem_open(inode, PTRACE_MODE_READ); + if (IS_ERR_OR_NULL(priv->query.mm)) { + int err =3D priv->query.mm ? PTR_ERR(priv->query.mm) : -ESRCH; =20 seq_release_private(inode, file); return err; @@ -355,8 +355,8 @@ static int proc_map_release(struct inode *inode, struct= file *file) struct seq_file *seq =3D file->private_data; struct proc_maps_private *priv =3D seq->private; =20 - if (priv->mm) - mmdrop(priv->mm); + if (priv->query.mm) + mmdrop(priv->query.mm); =20 return seq_release_private(inode, file); } @@ -610,7 +610,7 @@ static int do_procmap_query(struct proc_maps_private *p= riv, void __user *uarg) if (!!karg.build_id_size !=3D !!karg.build_id_addr) return -EINVAL; =20 - mm =3D priv->mm; + mm =3D priv->query.mm; if (!mm || !mmget_not_zero(mm)) return -ESRCH; =20 @@ -1307,7 +1307,7 @@ static int show_smaps_rollup(struct seq_file *m, void= *v) { struct proc_maps_private *priv =3D m->private; struct mem_size_stats mss =3D {}; - struct mm_struct *mm =3D priv->mm; + struct mm_struct *mm =3D priv->query.mm; struct vm_area_struct *vma; unsigned long vma_start =3D 0, last_vma_end =3D 0; int ret =3D 0; @@ -1452,9 +1452,9 @@ static int smaps_rollup_open(struct inode *inode, str= uct file *file) goto out_free; =20 priv->inode =3D inode; - priv->mm =3D proc_mem_open(inode, PTRACE_MODE_READ); - if (IS_ERR_OR_NULL(priv->mm)) { - ret =3D priv->mm ? PTR_ERR(priv->mm) : -ESRCH; + priv->query.mm =3D proc_mem_open(inode, PTRACE_MODE_READ); + if (IS_ERR_OR_NULL(priv->query.mm)) { + ret =3D priv->query.mm ? PTR_ERR(priv->query.mm) : -ESRCH; =20 single_release(inode, file); goto out_free; @@ -1472,8 +1472,8 @@ static int smaps_rollup_release(struct inode *inode, = struct file *file) struct seq_file *seq =3D file->private_data; struct proc_maps_private *priv =3D seq->private; =20 - if (priv->mm) - mmdrop(priv->mm); + if (priv->query.mm) + mmdrop(priv->query.mm); =20 kfree(priv); return single_release(inode, file); --=20 2.50.1.565.gc32cd1483b-goog