From patchwork Fri Oct 1 20:56:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 12531681 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2741C43217 for ; Fri, 1 Oct 2021 20:57:08 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 94D9061037 for ; Fri, 1 Oct 2021 20:57:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 94D9061037 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 23C4C940149; Fri, 1 Oct 2021 16:57:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C4A1940121; Fri, 1 Oct 2021 16:57:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0164E940149; Fri, 1 Oct 2021 16:57:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0125.hostedemail.com [216.40.44.125]) by kanga.kvack.org (Postfix) with ESMTP id E2F7F940121 for ; Fri, 1 Oct 2021 16:57:07 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 91BC318446BD1 for ; Fri, 1 Oct 2021 20:57:07 +0000 (UTC) X-FDA: 78649078494.08.99E147F Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf26.hostedemail.com (Postfix) with ESMTP id 4E9122001706 for ; Fri, 1 Oct 2021 20:57:07 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id e8-20020a0cf348000000b0037a350958f2so14256287qvm.7 for ; Fri, 01 Oct 2021 13:57:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=z8v1DZU38wPzEfaPMEQtWnD2dYyHJRJPqgiOSckBTzw=; b=PpTkjjcQNe1RxRDJRmZ1z4reN4nnk7PKKsM3AToSoI1yveU9TCiVXqeI9mc0IDsQIr s29QaDQb8l6W3gPt7ujgjW0xg+Ps/z4EiiBO4QgGObpv7kuwaDJLUletR2dlXFOhp5dD aE67EGha/yvLbTmwCFHKu9GEQQN/z8FBi4w/wRoPPlDKOm09VTCHjIWaxOuCartZ8MFz 9dMZ4e9R2KVCMhM19EZSc/i7ZZLDV57C3K3u5TXtkeqPrz7RdQgRw1oSejMytMuGEBBm qhRXsd8tqAS/9B7BxIfK61kXbTS5cQrv+Rc8+kw7mKZuGLOCvgd+oP9YRFppZwUrcni0 T1Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=z8v1DZU38wPzEfaPMEQtWnD2dYyHJRJPqgiOSckBTzw=; b=r83ZKXfWDGEodiPovjDV3TJ0Q/eVk1mRbzhYK7dE/va70vq5dIYFlZAPC+djbd6Z6/ ZWcOCIR4EztRp/Bh4XAmrp4OAKk2JSJhmcRbHWWTXMmpRoGCyRpOIJdlK1AFho3y7+2o C6e/fd7c5k9ZY9IDEPaWiWznJ7oTY4f9uGGOALINSD8U2KjYF7HOJakBVBDfe+h4lSr1 qZpxuPVUDJOonpAGPGmtYnyUaAKCURDscZvGVbbwOSwgrpOGoXDwgXVsNEnDkM4rOuJP G8AGi3n7IWqv16BQzcV+yQrBC9rIIzDpg0/0Ki5jN0LK9gWFOLnFbcYwd33h3wQ6ok3F KyOg== X-Gm-Message-State: AOAM531z9NUKdSDXdFE+s5OYd8UJvBeGlcpVHRjua0X3SDxQsaaluRF/ EpuF7Fjw+5adIp7rJMTWFB4nHLxl/FQ= X-Google-Smtp-Source: ABdhPJzDd8N1bY00kgE20gIg97ih/EjnLN1aGuSpz6shr/dqTpTgnoute4EW2CDkdqpumhG1M4W2lJKAqdY= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:fbba:6ac8:d071:dcc]) (user=surenb job=sendgmr) by 2002:a05:6214:151:: with SMTP id x17mr11096796qvs.38.1633121826593; Fri, 01 Oct 2021 13:57:06 -0700 (PDT) Date: Fri, 1 Oct 2021 13:56:57 -0700 In-Reply-To: <20211001205657.815551-1-surenb@google.com> Message-Id: <20211001205657.815551-3-surenb@google.com> Mime-Version: 1.0 References: <20211001205657.815551-1-surenb@google.com> X-Mailer: git-send-email 2.33.0.800.g4c38ced690-goog Subject: [PATCH v10 3/3] mm: add anonymous vma name refcounting From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: ccross@google.com, sumit.semwal@linaro.org, mhocko@suse.com, dave.hansen@intel.com, keescook@chromium.org, willy@infradead.org, kirill.shutemov@linux.intel.com, vbabka@suse.cz, hannes@cmpxchg.org, corbet@lwn.net, viro@zeniv.linux.org.uk, rdunlap@infradead.org, kaleshsingh@google.com, peterx@redhat.com, rppt@kernel.org, peterz@infradead.org, catalin.marinas@arm.com, vincenzo.frascino@arm.com, chinwen.chang@mediatek.com, axelrasmussen@google.com, aarcange@redhat.com, jannh@google.com, apopple@nvidia.com, jhubbard@nvidia.com, yuzhao@google.com, will@kernel.org, fenghua.yu@intel.com, thunder.leizhen@huawei.com, hughd@google.com, feng.tang@intel.com, jgg@ziepe.ca, guro@fb.com, tglx@linutronix.de, krisman@collabora.com, chris.hyser@oracle.com, pcc@google.com, ebiederm@xmission.com, axboe@kernel.dk, legion@kernel.org, eb@emlix.com, gorcunov@gmail.com, pavel@ucw.cz, songmuchun@bytedance.com, viresh.kumar@linaro.org, thomascedeno@google.com, sashal@kernel.org, cxfcosmos@gmail.com, linux@rasmusvillemoes.dk, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-doc@vger.kernel.org, linux-mm@kvack.org, kernel-team@android.com, surenb@google.com X-Rspamd-Queue-Id: 4E9122001706 X-Stat-Signature: s6x8o9kd364xouxf5cqdib3ndgtj9arh Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=PpTkjjcQ; spf=pass (imf26.hostedemail.com: domain of 3InZXYQYKCH0tvsfochpphmf.dpnmjovy-nnlwbdl.psh@flex--surenb.bounces.google.com designates 209.85.219.74 as permitted sender) smtp.mailfrom=3InZXYQYKCH0tvsfochpphmf.dpnmjovy-nnlwbdl.psh@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam06 X-HE-Tag: 1633121827-185888 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: While forking a process with high number (64K) of named anonymous vmas the overhead caused by strdup() is noticeable. Experiments with ARM64 Android device show up to 40% performance regression when forking a process with 64k unpopulated anonymous vmas using the max name lengths vs the same process with the same number of anonymous vmas having no name. Introduce anon_vma_name refcounted structure to avoid the overhead of copying vma names during fork() and when splitting named anonymous vmas. When a vma is duplicated, instead of copying the name we increment the refcount of this structure. Multiple vmas can point to the same anon_vma_name as long as they increment the refcount. The name member of anon_vma_name structure is assigned at structure allocation time and is never changed. If vma name changes then the refcount of the original structure is dropped, a new anon_vma_name structure is allocated to hold the new name and the vma pointer is updated to point to the new structure. With this approach the fork() performance regressions is reduced 3-4x times and with usecases using more reasonable number of VMAs (a few thousand) the regressions is not measurable. Signed-off-by: Suren Baghdasaryan Reviewed-by: Kees Cook --- previous version at: https://lore.kernel.org/linux-mm/20210902231813.3597709-3-surenb@google.com/ changes in v10 - Changed anon_vma_name_alloc() to use struct_size() and avoid strcpy(), per Kees Cook include/linux/mm_types.h | 9 ++++++++- mm/madvise.c | 42 ++++++++++++++++++++++++++++++++++------ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index f1896c9b2da9..30c571b4f8d3 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -5,6 +5,7 @@ #include #include +#include #include #include #include @@ -310,6 +311,12 @@ struct vm_userfaultfd_ctx { struct vm_userfaultfd_ctx {}; #endif /* CONFIG_USERFAULTFD */ +struct anon_vma_name { + struct kref kref; + /* The name needs to be at the end because it is dynamically sized. */ + char name[]; +}; + /* * This struct describes a virtual memory area. There is one of these * per VM-area/task. A VM area is any part of the process virtual memory @@ -361,7 +368,7 @@ struct vm_area_struct { unsigned long rb_subtree_last; } shared; /* Serialized by mmap_sem. */ - char *anon_name; + struct anon_vma_name *anon_name; }; /* diff --git a/mm/madvise.c b/mm/madvise.c index 69729930dde1..2f1ec13faaaa 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -63,6 +63,29 @@ static int madvise_need_mmap_write(int behavior) } } +static struct anon_vma_name *anon_vma_name_alloc(const char *name) +{ + struct anon_vma_name *anon_name; + size_t count; + + /* Add 1 for NUL terminator at the end of the anon_name->name */ + count = strlen(name) + 1; + anon_name = kmalloc(struct_size(anon_name, name, count), GFP_KERNEL); + if (anon_name) { + kref_init(&anon_name->kref); + memcpy(anon_name->name, name, count); + } + + return anon_name; +} + +static void vma_anon_name_free(struct kref *kref) +{ + struct anon_vma_name *anon_name = + container_of(kref, struct anon_vma_name, kref); + kfree(anon_name); +} + static inline bool has_vma_anon_name(struct vm_area_struct *vma) { return !vma->vm_file && vma->anon_name; @@ -75,7 +98,7 @@ const char *vma_anon_name(struct vm_area_struct *vma) mmap_assert_locked(vma->vm_mm); - return vma->anon_name; + return vma->anon_name->name; } void dup_vma_anon_name(struct vm_area_struct *orig_vma, @@ -84,34 +107,41 @@ void dup_vma_anon_name(struct vm_area_struct *orig_vma, if (!has_vma_anon_name(orig_vma)) return; - new_vma->anon_name = kstrdup(orig_vma->anon_name, GFP_KERNEL); + kref_get(&orig_vma->anon_name->kref); + new_vma->anon_name = orig_vma->anon_name; } void free_vma_anon_name(struct vm_area_struct *vma) { + struct anon_vma_name *anon_name; + if (!has_vma_anon_name(vma)) return; - kfree(vma->anon_name); + anon_name = vma->anon_name; vma->anon_name = NULL; + kref_put(&anon_name->kref, vma_anon_name_free); } /* mmap_lock should be write-locked */ static int replace_vma_anon_name(struct vm_area_struct *vma, const char *name) { + const char *anon_name; + if (!name) { free_vma_anon_name(vma); return 0; } - if (vma->anon_name) { + anon_name = vma_anon_name(vma); + if (anon_name) { /* Same name, nothing to do here */ - if (!strcmp(name, vma->anon_name)) + if (!strcmp(name, anon_name)) return 0; free_vma_anon_name(vma); } - vma->anon_name = kstrdup(name, GFP_KERNEL); + vma->anon_name = anon_vma_name_alloc(name); if (!vma->anon_name) return -ENOMEM;