From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17BD5C369CF for ; Fri, 18 Apr 2025 17:50:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 88FC76B02AF; Fri, 18 Apr 2025 13:50:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 83E176B02B0; Fri, 18 Apr 2025 13:50:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6B8D3280005; Fri, 18 Apr 2025 13:50:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 4993C6B02AF for ; Fri, 18 Apr 2025 13:50:18 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 723B0120AF3 for ; Fri, 18 Apr 2025 17:50:19 +0000 (UTC) X-FDA: 83347903758.15.64646C6 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf05.hostedemail.com (Postfix) with ESMTP id 8FF8A10000E for ; Fri, 18 Apr 2025 17:50:17 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=o1Bcvjdw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 32JACaAYKCEs574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=32JACaAYKCEs574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744998617; 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=g/gTsaXuJx1lGF+ktcF8yVCekjdFoDtmHyOs+3ik9i4=; b=JIGlbvVpsfwEQ7OZRguDd7RkZLqCnxawEzN/hadEorFjHLF9yk+/NjlgnIzDX89UMVhE6v 8gFAVxtycAyzZRrPBWDqgDZ76UMLVguVD7iDjB5G3IEKXVDDVVoR3NhJ5OG2nX9SKE44w/ Hc+rcSAWveeiOqhM3K6NFqwJunGgHQ8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=o1Bcvjdw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of 32JACaAYKCEs574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=32JACaAYKCEs574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744998617; a=rsa-sha256; cv=none; b=vTiRCiYN40nhbIYpPFKixO40z7luUvjIQuPHV52b1cb3He4La6KmTZvwG9qiwQt1oO8trK OWXOeJiHWE9sznJisTEOZqJYbznSrN8Hzhe2DnWk7MPCjzlnWza7H5iutoCMgx98gtKwF+ qLFtaYqgOfmsZBOhAamKblmO9mV+ti0= Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-2262051205aso16016195ad.3 for ; Fri, 18 Apr 2025 10:50:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744998616; x=1745603416; 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=g/gTsaXuJx1lGF+ktcF8yVCekjdFoDtmHyOs+3ik9i4=; b=o1BcvjdwwkTX1chMDVEj/u2PO51tYusGzAagX8dkE+kgU7yRAhpll4i9XkxZUSl+hb WvtTZhUT3FXZI74PArInbWsZmYwMuuRjWnDbK7TkBV6Y0WDLVTBgjna5HQhlNxUgOx41 wMHwKMHsRxzXvTi/zO5V3SJ/nzPkyHoSPkCdf7QQhlqbkDbfCR8SDCpq0tO15OfuolsW HJ7Gy++81yVg2sFus6qngD3s4Nwfou3V0zU3/uB5MWeibbBF6yAa0lFKdarHgle8/6Hy wDOhunPZi+PT6bAK/DarWBYPACS76Opa49qinmf4613a5DZrQ2DJSVfFVji1i8s5JdmT bG0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744998616; x=1745603416; 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=g/gTsaXuJx1lGF+ktcF8yVCekjdFoDtmHyOs+3ik9i4=; b=vvBHpqoKtvl/LyErI/5CfGAgpKkHX8F2TXxFMFVOqhPGeWCAwwyTxbaFYcdwU1pJZ9 Xzdr2t419bCo25BpduEzd8P+DndPCgYcus7TL3sOMwJlC7yEGI5g+8VK34Ah4xhyp6MO l/dSCckG7SK4s/X2NYpQDg5dMGN06XHqhiM7mBYzvymQhU3F6NdOTNhDpzsKe2sMz8Ez tDX5q0TZKUlWO2PSMAjg5jbvKKox/F/48Cn3kr6+2T2sTvIEoeVm9btPAAbvSi0vvAdB vpnc1NwKB/f+QZnTA8dr9nsgloLDkks1kKMtJFZkzVYEXVN+OzlN+vsRMQhMHNC9POgN rVLw== X-Forwarded-Encrypted: i=1; AJvYcCU3cB6d+a7h+NNEDQP75uGRsZVr159T7PW2XMxBum3C/IanjtBXlwQQIaV/gUnGcmiGAr/5YVMGmA==@kvack.org X-Gm-Message-State: AOJu0Yy7M8pL7aQp+oslN5++BEKODDY0HuxQceIbbqvAGh7NLJU1eQnR 3E/ICUBDQ/0m69N8uxPBYuOPZb6TSjHFQhy3k/sxB4JCo13Ii6Dlt2ZeH1IrjYu3q3f9SKR/MQ2 OqQ== X-Google-Smtp-Source: AGHT+IGjcICUXwS1wYeFYZR+XrM2Xg014/1EfWbXSEfTLiETYQCBjkJqO1ncD1j5guZx5QFaNlxV4IfN5dY= X-Received: from plld7.prod.google.com ([2002:a17:902:7287:b0:223:8244:94f6]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1744:b0:227:e980:919d with SMTP id d9443c01a7336-22c536207dfmr51660975ad.47.1744998616385; Fri, 18 Apr 2025 10:50:16 -0700 (PDT) Date: Fri, 18 Apr 2025 10:49:57 -0700 In-Reply-To: <20250418174959.1431962-1-surenb@google.com> Mime-Version: 1.0 References: <20250418174959.1431962-1-surenb@google.com> X-Mailer: git-send-email 2.49.0.805.g082f7c87e0-goog Message-ID: <20250418174959.1431962-7-surenb@google.com> Subject: [PATCH v3 6/8] mm: make vm_area_struct anon_name field RCU-safe 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, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, surenb@google.com Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: mdfcbq9gufnkhzmzg7z8ont3ajskomun X-Rspamd-Queue-Id: 8FF8A10000E X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1744998617-892644 X-HE-Meta: U2FsdGVkX18scP9/UnRz6qtQ1/c1991spVOSugFZZKoxx61dz7lnOBqkX/gNC7Tw84WQmZeKVMlhpD/Wo1a65u0AhFSwPjAnehptbj10pUhhjrTDDU3dErHEZ7VS3ixQvnY3LJR9+z5Twqt8RHDBVLK+d0TB9G1F/oIE6DmOP/8Vt4luFMsThg8KiSqF2+KbDI6zu/ECfZQ2qHEOfO0RGM+4EZLndUadvP4wRNny4rxzIhq6EJLnD1rRvjfRuxYIXTEijvKr04UxgvMwkwhRjjId2zSqI7epjxfnoUitVHZVB7z9ivqzWAUnixyvyg5V8N8TQRUW+CbOvyV1yueaBLAOC+8jFoZXB1sf4RPfvTur9P16HaajlT2rta0jJp2C3z//yvU05nGPgFOtmVXFr90tM4USnx/aMk5OIdEL8uzqEXug9susmVuLeyw0sVbmj0ohrm/99g8BGp/NEr7DQJO4CWDw3cdiare5lDJWAF4kCXHQ42moP4bwtLyY7fG0cfLb6bcxhsqlj92ygF67lmBMdAsQ1UphBnOTMwXcC0J3VitNi/ZBT18L9+sAMYI9MzOItYZDmltadhhtvniI1/i0pmtpxJUD5u/jiPic6B3iX+wLgINTtGrNyU4OuxV9szwtdlUKuyj/XciSLPKDtZf9s8dfE2JfZHSO85Wg7RuwRGqbXpbAnjHCrXhbjvp9gfoMWd/3/FDWOD0ynmTtjsc1mHexT/gM7W8kunq2I2+P8TYliaJJYN4c3CH/lmOIdu5ODeeC3u4wG2oNDbW3Oe4hoerTQd6Koj9TUHOdiyjv2hckGWWvuDs+cAIkWcdYackEs+bnwFUUvHI0EwmiUkXZ37b4QLeDkNnANOLdrKinaeWLUaWATpwYDW1wWtX7VauAraHURaHO62N4BIC56UPJyZylxwsiX3KqmN6839ElmdxITuxdg+twe/ucOx3LwoD0nrby52z7OqcWRF4 xZpx9Mp8 dtjAcLc816hhBApSFsvyaNgrEMxm5udhSSY2qr9BPxYFAikllxGIEps1Ti2W+5OyAHPX1zfWxMiP/tUWvQDg2upQz2/9BRSfOLjmoAvagmzKRL6n6k0GMaGBiO9MM0m7zMfiR8EzlwcfBWKlv58Vn3wA5atpLZpPPF//mPBAvfnXW7Te+A54Bp+HKtsHOZ/7SlS2bj5i32CNkQdXPwJKkfOd1Lcc45SHeGNWtdUUZbGed6C32ycoiX0qpnjP0e6Y7rflYm3WQqOmVVAYyxvYBpnzHbDzoSGgjhw60149qNJ4KNadxrhhrAp3guI3T/eeffDepaob9FeMad4Uj19qEGkHeOYFsYNqwgp1RP+Wcz6gjHFFrrp9AmfZ5VywF/qQ6T9J4x+vWrRtS8V+eZzUfVG8ZdhscnkWnkQhUdmrcfFk1HPhyAcNOp4FjuSLVLs3+K0y2SGNeWcG0ytS2uoQl0dHAmJK33VFuV4qcZ0kw46RZ8MiEuKh+kQyCPmZWsD0O4XCZmbueXU1XGVSmMDUOLrAQwHQWO1oT8MhdoN0vEKqWWrEWm8vOY7xDyyxL0YDQoxy4rBvWeJ3HsLGraMPkGEFCQQ== 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: For lockless /proc/pid/maps reading we have to ensure all the fields used when generating the output are RCU-safe. The only pointer fields in vm_area_struct which are used to generate that file's output are vm_file and anon_name. vm_file is RCU-safe but anon_name is not. Make anon_name RCU-safe as well. Signed-off-by: Suren Baghdasaryan --- include/linux/mm_inline.h | 10 +++++++++- include/linux/mm_types.h | 3 ++- mm/madvise.c | 30 ++++++++++++++++++++++++++---- 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h index f9157a0c42a5..9ac2d92d7ede 100644 --- a/include/linux/mm_inline.h +++ b/include/linux/mm_inline.h @@ -410,7 +410,7 @@ static inline void dup_anon_vma_name(struct vm_area_struct *orig_vma, struct anon_vma_name *anon_name = anon_vma_name(orig_vma); if (anon_name) - new_vma->anon_name = anon_vma_name_reuse(anon_name); + rcu_assign_pointer(new_vma->anon_name, anon_vma_name_reuse(anon_name)); } static inline void free_anon_vma_name(struct vm_area_struct *vma) @@ -432,6 +432,8 @@ static inline bool anon_vma_name_eq(struct anon_vma_name *anon_name1, !strcmp(anon_name1->name, anon_name2->name); } +struct anon_vma_name *anon_vma_name_get_rcu(struct vm_area_struct *vma); + #else /* CONFIG_ANON_VMA_NAME */ static inline void anon_vma_name_get(struct anon_vma_name *anon_name) {} static inline void anon_vma_name_put(struct anon_vma_name *anon_name) {} @@ -445,6 +447,12 @@ static inline bool anon_vma_name_eq(struct anon_vma_name *anon_name1, return true; } +static inline +struct anon_vma_name *anon_vma_name_get_rcu(struct vm_area_struct *vma) +{ + return NULL; +} + #endif /* CONFIG_ANON_VMA_NAME */ static inline void init_tlb_flush_pending(struct mm_struct *mm) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index 56d07edd01f9..15ec288d4a21 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -700,6 +700,7 @@ struct vm_userfaultfd_ctx {}; struct anon_vma_name { struct kref kref; + struct rcu_head rcu; /* The name needs to be at the end because it is dynamically sized. */ char name[]; }; @@ -874,7 +875,7 @@ struct vm_area_struct { * terminated string containing the name given to the vma, or NULL if * unnamed. Serialized by mmap_lock. Use anon_vma_name to access. */ - struct anon_vma_name *anon_name; + struct anon_vma_name __rcu *anon_name; #endif struct vm_userfaultfd_ctx vm_userfaultfd_ctx; } __randomize_layout; diff --git a/mm/madvise.c b/mm/madvise.c index 8433ac9b27e0..ed03a5a2c140 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -101,14 +101,15 @@ void anon_vma_name_free(struct kref *kref) { struct anon_vma_name *anon_name = container_of(kref, struct anon_vma_name, kref); - kfree(anon_name); + kfree_rcu(anon_name, rcu); } struct anon_vma_name *anon_vma_name(struct vm_area_struct *vma) { mmap_assert_locked(vma->vm_mm); - return vma->anon_name; + return rcu_dereference_protected(vma->anon_name, + rwsem_is_locked(&vma->vm_mm->mmap_lock)); } /* mmap_lock should be write-locked */ @@ -118,7 +119,7 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, struct anon_vma_name *orig_name = anon_vma_name(vma); if (!anon_name) { - vma->anon_name = NULL; + rcu_assign_pointer(vma->anon_name, NULL); anon_vma_name_put(orig_name); return 0; } @@ -126,11 +127,32 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, if (anon_vma_name_eq(orig_name, anon_name)) return 0; - vma->anon_name = anon_vma_name_reuse(anon_name); + rcu_assign_pointer(vma->anon_name, anon_vma_name_reuse(anon_name)); anon_vma_name_put(orig_name); return 0; } + +/* + * Returned anon_vma_name is stable due to elevated refcount but not guaranteed + * to be assigned to the original VMA after the call. + */ +struct anon_vma_name *anon_vma_name_get_rcu(struct vm_area_struct *vma) +{ + struct anon_vma_name __rcu *anon_name; + + WARN_ON_ONCE(!rcu_read_lock_held()); + + anon_name = rcu_dereference(vma->anon_name); + if (!anon_name) + return NULL; + + if (unlikely(!kref_get_unless_zero(&anon_name->kref))) + return NULL; + + return anon_name; +} + #else /* CONFIG_ANON_VMA_NAME */ static int replace_anon_vma_name(struct vm_area_struct *vma, struct anon_vma_name *anon_name) -- 2.49.0.805.g082f7c87e0-goog