From patchwork Wed Jun 5 00:24:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13686017 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 1DAF3C27C50 for ; Wed, 5 Jun 2024 00:25:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9AA686B0099; Tue, 4 Jun 2024 20:25:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 95A0C6B009A; Tue, 4 Jun 2024 20:25:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 785826B009B; Tue, 4 Jun 2024 20:25:23 -0400 (EDT) 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 581C56B0099 for ; Tue, 4 Jun 2024 20:25:23 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D685A1C1A71 for ; Wed, 5 Jun 2024 00:25:22 +0000 (UTC) X-FDA: 82194940884.15.2F7399D Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf04.hostedemail.com (Postfix) with ESMTP id 933404000A for ; Wed, 5 Jun 2024 00:25:20 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=U2n4XMzf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717547121; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=towjlQQhnw/koFFEh69u4b5sbAQUnpTaVsKFKdKxjcQ=; b=m+wMm0OIx9XiPFJEO4fuAgQvVLKDW34RLNSbHeCFLq5kDFL4D7SeckjY3KjJAuuZ0EqZ30 4SASBsg3mlXbl4peY5YNu7sxV5WIdCYVChmfmt1vJWGLMBr+zrZjcPl1inLTOc3l0sHXPk JJjGmIU5W52I3lciMtjSfTmSy+r7B2c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717547121; a=rsa-sha256; cv=none; b=VvDVZVj1PXO3icbrwnClwkeDoFjj931tM7yATXLI5sSIS5DRh/kP/4XZP8OOwU7eIyR645 5h3YnNzkilV11m3+DEfuSE6U133uq8eiG46PUXyfLeGqqmePSQCOxL6thkLFM3gu4v8H08 zUsU50El3wR33ba2j4EU2SJh+H5TQxs= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=U2n4XMzf; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=andrii@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 0AA08CE1387; Wed, 5 Jun 2024 00:25:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E0F9C2BBFC; Wed, 5 Jun 2024 00:25:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717547117; bh=MRe3J2lR02W8fKMz0jOORh8WM6XjEyHtsdoj2x2PKJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U2n4XMzfqQtlHII1pzt80oFo9YPq+fDQa4PXaugpXWcJF4d1I2pk1JT+RuboPqznW WSXGEMTL5blWc5VR6nUNwCIrk7CaRzbzBM5P7G0L0RlKgx3pyNTjuH5cQyw6d+ayJe rp4XqvEIjAxQeYjG5UZH4m3NAPDS1RKlY8tZ2wKqVfcobGVJY8VY4szQLlLQHGJ9ev WkYq9peZRmUxa8FaJZ+a+TZXGGAYdRwyqhrwA8FhDWd92cnQ6hS6NiS5HhispaoK3F OzDpPYsw4203pK+abejqee1NMfjjHnaKRwWsu+r4SXlfLTgXGivRptL5/oF+AOB5kI 9KO1xQQMAGJCg== From: Andrii Nakryiko To: linux-fsdevel@vger.kernel.org, brauner@kernel.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, gregkh@linuxfoundation.org, linux-mm@kvack.org, liam.howlett@oracle.com, surenb@google.com, rppt@kernel.org, Andrii Nakryiko Subject: [PATCH v3 2/9] fs/procfs: extract logic for getting VMA name constituents Date: Tue, 4 Jun 2024 17:24:47 -0700 Message-ID: <20240605002459.4091285-3-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605002459.4091285-1-andrii@kernel.org> References: <20240605002459.4091285-1-andrii@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 16aecoin57m5z8ujxnxo6ninwcai44hj X-Rspamd-Queue-Id: 933404000A X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1717547120-81369 X-HE-Meta: U2FsdGVkX188JetsXpUFNImTO8HHkCXhEM5Pe95Go70eoeRGEd+7Dq7oOxQXqKjKwJ3x+mSNTwZJuM9/llEOfwNg2Onp+wa0ACJcqpzTfO7Tjb+YMYHeIiH34Fig3+v4JAotNShEx1AFDrVkIN2JUaQhPFVssQVtLbAoU1hEWJjRVOOJLKQ2QI6rCbHlz3RSgPMaHICaiRbJbaVZUy4x69ku4c+o+3JCgcfd2WqR1EtJxAgcJ0kaTmdAFiRyAUkZgWxRONrAQzXswCAUwO4hE1qYcivps2AYM65YTvYhFBSiACJef7c+S3/sb5nH86dX/p6h8G8lcSVwjB7gqqWOv1/AmimXJjt3Ib1YmiMGwPtvbkdh/V1wMt7cCd3tKVd1rWI/9gfTw87Eg33QMhtwUzd4QlT0cI1UBZLUwtiO0+57A3FKUBRMTlR0DgUds+zoNCrvrl+m/vC2GSATNMIAsB8KL/LxO7VedGxMQJwVud4C6YmZoMrWwEGqJJ87Ru7sBlq13rLVjFD1y/ISCEfFJkitG73EcRp4C5mFz7X1njdFZdAV1DTEFhSJzH0rj1Hzzn9lNKDsbpH2BL5uMe1Bncp2hFPS+yVb+o4JIHkCWFIFTzjBQNc+ixAMSBDcBQby+QYV3fgXuW+mx9bId2G4VZiSImq+b8Ni4dcWen+sElLfi1q6vCw1M2jNpaQxJS6r4DpysjvbtE+zRiTKA326RpboH4iivdHxHrkfWFUnO8GT9b5Ze8qiRgO5atn3kNsWRg0wPJdiYI4MQb3xJxy/OJTdFCOjrs61uGLXgFqXAVjiAWFPqs2TAlzhZ/D7tdx+Zbiscz2hOKkhcUxMRLbYuVO0TVxUnxaz/NGDwj40lT0lCRD6ut8VLm0UJkMsUYIFxFAp75i3RStN8dK6wG0IQMXqKlEYhnzbURTIOore3DZ1HhQSrCqbg6JS+y2RfKeM5gMRsVMccASHq9uxYeh lW4aHt8q 4mrFNAzXCKPbFNOnjUkx6QCg6zKWQfj+8jQmSATHg47LfRlKiju0T/hv4tlJAdvwdrIXEqR/LWtEn4R6FtxaKPdZ+e/X03Rpe8YoteXoOZMpiwGm3Wuri3DPSwCeQ3KU/WHbOJmQG0K7ziM3ZkizkHWaqTyKjSMqC0dafs7tJcz2sRUA+FvNlBe2eNuFrvzVzN03nRnATspEbyoleheVIpLkTE6V5uHBgHG7sKQTQ38xEVWQ= 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: Extract generic logic to fetch relevant pieces of data to describe VMA name. This could be just some string (either special constant or user-provided), or a string with some formatted wrapping text (e.g., "[anon_shmem:]"), or, commonly, file path. seq_file-based logic has different methods to handle all three cases, but they are currently mixed in with extracting underlying sources of data. This patch splits this into data fetching and data formatting, so that data fetching can be reused later on. There should be no functional changes. Signed-off-by: Andrii Nakryiko --- fs/proc/task_mmu.c | 125 +++++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 54 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index f8d35f993fe5..334ae210a95a 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -239,6 +239,67 @@ static int do_maps_open(struct inode *inode, struct file *file, sizeof(struct proc_maps_private)); } +static void get_vma_name(struct vm_area_struct *vma, + const struct path **path, + const char **name, + const char **name_fmt) +{ + struct anon_vma_name *anon_name = vma->vm_mm ? anon_vma_name(vma) : NULL; + + *name = NULL; + *path = NULL; + *name_fmt = NULL; + + /* + * Print the dentry name for named mappings, and a + * special [heap] marker for the heap: + */ + if (vma->vm_file) { + /* + * If user named this anon shared memory via + * prctl(PR_SET_VMA ..., use the provided name. + */ + if (anon_name) { + *name_fmt = "[anon_shmem:%s]"; + *name = anon_name->name; + } else { + *path = file_user_path(vma->vm_file); + } + return; + } + + if (vma->vm_ops && vma->vm_ops->name) { + *name = vma->vm_ops->name(vma); + if (*name) + return; + } + + *name = arch_vma_name(vma); + if (*name) + return; + + if (!vma->vm_mm) { + *name = "[vdso]"; + return; + } + + if (vma_is_initial_heap(vma)) { + *name = "[heap]"; + return; + } + + if (vma_is_initial_stack(vma)) { + *name = "[stack]"; + return; + } + + if (anon_name) { + *name_fmt = "[anon:%s]"; + *name = anon_name->name; + return; + } +} + static void show_vma_header_prefix(struct seq_file *m, unsigned long start, unsigned long end, vm_flags_t flags, unsigned long long pgoff, @@ -262,17 +323,15 @@ static void show_vma_header_prefix(struct seq_file *m, static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) { - struct anon_vma_name *anon_name = NULL; - struct mm_struct *mm = vma->vm_mm; - struct file *file = vma->vm_file; + const struct path *path; + const char *name_fmt, *name; vm_flags_t flags = vma->vm_flags; unsigned long ino = 0; unsigned long long pgoff = 0; unsigned long start, end; dev_t dev = 0; - const char *name = NULL; - if (file) { + if (vma->vm_file) { const struct inode *inode = file_user_inode(vma->vm_file); dev = inode->i_sb->s_dev; @@ -283,57 +342,15 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) start = vma->vm_start; end = vma->vm_end; show_vma_header_prefix(m, start, end, flags, pgoff, dev, ino); - if (mm) - anon_name = anon_vma_name(vma); - /* - * Print the dentry name for named mappings, and a - * special [heap] marker for the heap: - */ - if (file) { + get_vma_name(vma, &path, &name, &name_fmt); + if (path) { seq_pad(m, ' '); - /* - * If user named this anon shared memory via - * prctl(PR_SET_VMA ..., use the provided name. - */ - if (anon_name) - seq_printf(m, "[anon_shmem:%s]", anon_name->name); - else - seq_path(m, file_user_path(file), "\n"); - goto done; - } - - if (vma->vm_ops && vma->vm_ops->name) { - name = vma->vm_ops->name(vma); - if (name) - goto done; - } - - name = arch_vma_name(vma); - if (!name) { - if (!mm) { - name = "[vdso]"; - goto done; - } - - if (vma_is_initial_heap(vma)) { - name = "[heap]"; - goto done; - } - - if (vma_is_initial_stack(vma)) { - name = "[stack]"; - goto done; - } - - if (anon_name) { - seq_pad(m, ' '); - seq_printf(m, "[anon:%s]", anon_name->name); - } - } - -done: - if (name) { + seq_path(m, path, "\n"); + } else if (name_fmt) { + seq_pad(m, ' '); + seq_printf(m, name_fmt, name); + } else if (name) { seq_pad(m, ' '); seq_puts(m, name); }