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 51B11C77B7C for ; Tue, 24 Jun 2025 13:58:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DF96A6B00BA; Tue, 24 Jun 2025 09:58:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D82716B00BD; Tue, 24 Jun 2025 09:58:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C22916B00BE; Tue, 24 Jun 2025 09:58:49 -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 A7E786B00BA for ; Tue, 24 Jun 2025 09:58:49 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5A8081D79D4 for ; Tue, 24 Jun 2025 13:58:49 +0000 (UTC) X-FDA: 83590449978.16.068B4E9 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf22.hostedemail.com (Postfix) with ESMTP id E067AC0008 for ; Tue, 24 Jun 2025 13:58:46 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=crJapZjC; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750773527; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=do7xolh+n7ZDTTjkYvfnEj8eQ9HN2pJMkNxgs8hBa7c=; b=aHYb0Ig0tFTd9B6sh2mhpXxvfMVsldiSuZNnDq06USWgx8lnoXXom6Oeb785/pnOddGRP7 hJONt9ys7Nlkk2sPxiPIFsh09gDtYJe1mk0C9NBIlyJQ1oguMFNAP2/zzsvbvMt2YgJzpU q2R8a2rtQAvxYygYetxtYTQmzFEzdXI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750773527; a=rsa-sha256; cv=none; b=qdJx8qXWJ6CK7jRg7ln5qqaLAkG1tCUtScVTXozAFODiplCK3T2Qwd6OLUy7LDUWOJr6eN 8Zj0X5CJc17L04Ga/91QE5fOQivGgDQ/1wzqfdD+lJ8Js7fbCkZmMPtWQZNoCZKz1LIj1r 7Me8/2X+A4nlcTPxfJ6TrFPMJu+VtDg= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=crJapZjC; spf=pass (imf22.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750773526; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=do7xolh+n7ZDTTjkYvfnEj8eQ9HN2pJMkNxgs8hBa7c=; b=crJapZjCC04E3kGEnWQfRdwAzoZbQwmYaIe3jvmC/sEr/WzMMGlM6MWqU4osA6fGsX5KrV ePNMU5TAJixU/t6pTYiUlcG46fpLicd4EekJwX7Q63VWI3gt3/Cv2BWGxfJI3yuaFPHAZu ARuYxMiYQ8hwcYgdpIRKZsdyBay8U3U= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-80-6mps5k_IN4uf29ztx8S_JQ-1; Tue, 24 Jun 2025 09:58:44 -0400 X-MC-Unique: 6mps5k_IN4uf29ztx8S_JQ-1 X-Mimecast-MFC-AGG-ID: 6mps5k_IN4uf29ztx8S_JQ_1750773524 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-450d244bfabso43079625e9.0 for ; Tue, 24 Jun 2025 06:58:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750773523; x=1751378323; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=do7xolh+n7ZDTTjkYvfnEj8eQ9HN2pJMkNxgs8hBa7c=; b=NQqfutLRdgOw1DVfLpZq78tR9jnPxXD2rDkGO9JZ+X9txpKzrNjRAYBNCesgrIO8SD JZjg4wE76HB/Tuvdkhdh21cZLuDuc++J2M9mtzt8yyNL3WWIbk/7ts2knzQ469zCf8Ox f/JYtxcUQgQSomg2NfZkvOiYQS4MQ3975Emr7cAtFMA9Wt046FPUAZjiwFzPPuG4hBzE w2YFhOo1BQSrxSkLxXR7MPmjJOObFVPbNNoXanJpxtm3OzMEHe7e4/xq3odvehuhbPNM +XJqP3JArJjAzO2Vy83I/rg2AsWc2zlmJKhjb0K6h/hcbMYT4cE6TwOmAzKe1RQnNvOH fFxA== X-Gm-Message-State: AOJu0Yz4iNr5jGjmEjo0pns2ORedOY97nx9wwrBGARMPOQu9gvBgyUBJ tUd1SUDirWNzppAL3EwBxv30yagRuSdjR1HXNx7tTn8ZYVG1Z9iB9KxcQFZ85yMhOIZzY7snQfG Qv2J3i27Bi/LHtddHfietKokpkx2A7ekRcAiAvz70kRg+TFT80ROP X-Gm-Gg: ASbGncszV2fT9E8/9QiyF7ecp3iU90dwZSwDIwgs8auIE6olmn58eA7afLfed0Vsbkh dkKxkqzXzyY2Km8AJ9beWan+u6pW24o/b6cwt8EH5OqocrCpzB4nKRiT/ACK20ESEq3xbPro8u1 /jY8u5Znojibe8PwYz4Pm53OiG7KA7dZOYbH6alqQBMXt1/0VYPGoP3TV+1VrhPj0t2sVcpxxdb Bt0eV+joJ4bDlqoEDj8ZoX7KNgmWrabISWiltcpNo/ybbMwtbBFhyyD4iFLA9sVIsnd8ftX3w3+ w83YZZczAPi+Oj214NM+N5rNF0TSpnQ85XB6Ips4Ki1pyJ0sPKAdFBc= X-Received: by 2002:a05:600c:138e:b0:453:6150:de41 with SMTP id 5b1f17b1804b1-453659ccfafmr171023105e9.17.1750773523572; Tue, 24 Jun 2025 06:58:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFTVtMD9TDbpb2clIdQ7As+1c0S2YPRV6Ex1Dat+6mQ8VVibEFezYD225fY43gmnIFL0Ftmzg== X-Received: by 2002:a05:600c:138e:b0:453:6150:de41 with SMTP id 5b1f17b1804b1-453659ccfafmr171022855e9.17.1750773523151; Tue, 24 Jun 2025 06:58:43 -0700 (PDT) Received: from ?IPV6:2a09:80c0:192:0:5dac:bf3d:c41:c3e7? ([2a09:80c0:192:0:5dac:bf3d:c41:c3e7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4535fdf82f9sm171243685e9.29.2025.06.24.06.58.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 Jun 2025 06:58:42 -0700 (PDT) Message-ID: Date: Tue, 24 Jun 2025 15:58:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 1/4] mm, madvise: simplify anon_name handling To: Vlastimil Babka , Andrew Morton , "Liam R. Howlett" , Lorenzo Stoakes , Jann Horn , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Colin Cross Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20250624-anon_name_cleanup-v2-0-600075462a11@suse.cz> <20250624-anon_name_cleanup-v2-1-600075462a11@suse.cz> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250624-anon_name_cleanup-v2-1-600075462a11@suse.cz> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: RJYM51Lv7MBnIYeN2mGHWznITf20HU3UbWwKWdFfDro_1750773524 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: E067AC0008 X-Stat-Signature: hutn5gm18qz9z59qeke569miqye3nnm1 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1750773526-261004 X-HE-Meta: U2FsdGVkX19oHH5UkPxGxLE6WS4jvtL/+BsW9/24CIvWqN0rMlpdpIAtp4iQWYmTZbxJ6b2qqUtc7wcBDCe+GmkHBbSbXoMVaYz5gLEIZVhzql86JxkW7VEMz9Y8IcxcamPVKdxwGBK4C637nLJ4Q0kIHWYok7j6XgMB6beA+l51pAJpl2JnwrOPhEeaT3s9X31K7Zqeixf7p5akENaOvFez0Nioow3Ou0S3Zh1Tzbl06x3dvLBwtaugX2JqNmxsJNp+w1xIzZZ98jiB3qgbtcdzl4sGcsq33mfa1RUbH3iCpaJ+F3O36c9PuXg0eIopfVJSPeIGxN3IaQJ4iW0cKh1qs1iOK+xZNM40ln+U0HnlyOrm0Vm9wxLQKUi/6o1Y4JevCWCkBqh52pfab0MUacoux99h+zJbFc0KLxjLZD8+XTmCUzr3M9or+0aWbPCZDWYNDjpHv0hXOWl0QKtIq+SsJ9RWc5UCy88U+NboQZ1+tgjh0DSh4y4nAb7F0NOHCqiCy6qgH9fTyKHibbQZxtWS068kkFe7xu0I7/yl5aYe6NfShosIdWCB0oJn52k9tzvhmkSO4gkVsiDfouFOseyt61qlMxgzruRDu5t/nFOBsl4oivJhnqsPrP8GhwI7sCbJqNv7Kp4PFo72ifv9vFQrm+kyjEcxkEopFrW+bHTRbnd9F3kqG8mt6GgAEAefNOOioDrKQmj+YHQonATInoV6NBNIvQAPKFLogvcVy53msILpCktjXcletSAeyGKBGE1ttaFPPiGmNr84bj2ot6HL8VcIpVXsNx/El2VZ5WkOtO7BFmaQ6VF0Jmd/JOYEP7SYmrjOSRBMA7bmK5WhuewvxbZMaAOd9pKWZiDdCs6yCpbm+APt9XMS1yQ4GwYoT30X5iQCqMVKcneJc2r/u1WjHmGLsncfysgS3nYsNQNAVE/sSzGeyP16S1nbMvTxrqOM3/i9XUk1C4gVj+w CalnXjcq S1j5fbzvn7NxRuJxJpc6lhlIFLB2KJX6xd1H5jY+maAT2pBq3H/KQB33euR9jxdNvjnV58H8P9TuMM1qd9sQMQMEdpp4jXn13+2DclMBSrZ2zVMt02Rqn4aHki36XHLmWjWV/YyZiV/MIyE+/js5UgDpP7xJj4OfVe+uVnQFtMzUIsP09sMCxby5MF8qDp3wt/G3XVGsCQ4lbwyCp6B+snlkgi5xuf1n1Um26QkzGnadnov6mFVmCj8aajrOPzIuONGjRYrnXFqKc6BDe+MK0HbyV4pnv7b4MolKhAT9wJnxAiQqqZwZOaX1nu0B8D0rC8YSB4epFMNsNAxiRezHYvBoQjjOMeTF3S6/gndU9GS4jJJyMaJPcn5y7whGPvqw3MBfKKTLg5Aj8FKaBZocWFWC+bHcfBvb3zJ3/FTQ88tQheqtdCGqUCLCdax2j6L0nI7eWaUpMX7i+7o3hJ8Gij/TX8dNBwedeZ/rrTNSCLvvkSOxzGHYUxjPmzA== 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: On 24.06.25 15:03, Vlastimil Babka wrote: > Since the introduction in 9a10064f5625 ("mm: add a field to store names > for private anonymous memory") the code to set anon_name on a vma has > been using madvise_update_vma() to call replace_anon_vma_name(). Since > the former is called also by a number of other madvise behaviours that > do not set a new anon_name, they have been passing the existing > anon_name of the vma to make replace_vma_anon_name() a no-op. > > This is rather wasteful as it needs anon_vma_name_eq() to determine the > no-op situations, and checks for when replace_vma_anon_name() is allowed > (the vma is anon/shmem) duplicate the checks already done earlier in > madvise_vma_behavior(). It has also lead to commit 942341dcc574 ("mm: > fix use-after-free when anon vma name is used after vma is freed") > adding anon_name refcount get/put operations exactly to the cases that > actually do not change anon_name - just so the replace_vma_anon_name() > can keep safely determining it has nothing to do. > > The recent madvise cleanups made this suboptimal handling very obvious, > but happily also allow for an easy fix. madvise_update_vma() now has the > complete information whether it's been called to set a new anon_name, so > stop passing it the existing vma's name and doing the refcount get/put > in its only caller madvise_vma_behavior(). > > In madvise_update_vma() itself, limit calling of replace_anon_vma_name() > only to cases where we are setting a new name, otherwise we know it's a > no-op. We can rely solely on the __MADV_SET_ANON_VMA_NAME behaviour and > can remove the duplicate checks for vma being anon/shmem that were done > already in madvise_vma_behavior(). > > Additionally, by using vma_modify_flags() when not modifying the > anon_name, avoid explicitly passing the existing vma's anon_name and > storing a pointer to it in struct madv_behavior or a local variable. > This prevents the danger of accessing a freed anon_name after vma > merging, previously fixed by commit 942341dcc574. > > Signed-off-by: Vlastimil Babka > --- > mm/madvise.c | 37 +++++++++++++------------------------ > 1 file changed, 13 insertions(+), 24 deletions(-) > > diff --git a/mm/madvise.c b/mm/madvise.c > index 4491bf080f55d6d1aeffb2ff0b8fdd28904af950..fca0e9b3e844ad766e83ac04cc0d7f4099c74005 100644 > --- a/mm/madvise.c > +++ b/mm/madvise.c > @@ -176,25 +176,29 @@ static int replace_anon_vma_name(struct vm_area_struct *vma, > } > #endif /* CONFIG_ANON_VMA_NAME */ > /* > - * Update the vm_flags on region of a vma, splitting it or merging it as > - * necessary. Must be called with mmap_lock held for writing; > - * Caller should ensure anon_name stability by raising its refcount even when > - * anon_name belongs to a valid vma because this function might free that vma. > + * Update the vm_flags and/or anon_name on region of a vma, splitting it or > + * merging it as necessary. Must be called with mmap_lock held for writing. > */ > static int madvise_update_vma(vm_flags_t new_flags, > struct madvise_behavior *madv_behavior) > { > - int error; > struct vm_area_struct *vma = madv_behavior->vma; > struct madvise_behavior_range *range = &madv_behavior->range; > struct anon_vma_name *anon_name = madv_behavior->anon_name; > + bool set_new_anon_name = madv_behavior->behavior == __MADV_SET_ANON_VMA_NAME; > VMA_ITERATOR(vmi, madv_behavior->mm, range->start); > > - if (new_flags == vma->vm_flags && anon_vma_name_eq(anon_vma_name(vma), anon_name)) > + if (new_flags == vma->vm_flags && (!set_new_anon_name || > + anon_vma_name_eq(anon_vma_name(vma), anon_name))) > return 0; > > - vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, > + if (set_new_anon_name) > + vma = vma_modify_flags_name(&vmi, madv_behavior->prev, vma, > range->start, range->end, new_flags, anon_name); > + else > + vma = vma_modify_flags(&vmi, madv_behavior->prev, vma, > + range->start, range->end, new_flags); > + > if (IS_ERR(vma)) > return PTR_ERR(vma); > > @@ -203,11 +207,8 @@ static int madvise_update_vma(vm_flags_t new_flags, > /* vm_flags is protected by the mmap_lock held in write mode. */ > vma_start_write(vma); > vm_flags_reset(vma, new_flags); > - if (!vma->vm_file || vma_is_anon_shmem(vma)) { > - error = replace_anon_vma_name(vma, anon_name); > - if (error) > - return error; > - } > + if (set_new_anon_name) > + return replace_anon_vma_name(vma, anon_name); Took me a second to find where this is already checked (-> madvise_vma_behavior()). :) Acked-by: David Hildenbrand -- Cheers, David / dhildenb