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 F402FC3ABBC for ; Fri, 9 May 2025 09:45:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 794E48E0009; Fri, 9 May 2025 05:45:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71D968E0007; Fri, 9 May 2025 05:45:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 571388E0009; Fri, 9 May 2025 05:45:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 354558E0007 for ; Fri, 9 May 2025 05:45:24 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CC83B1C8B27 for ; Fri, 9 May 2025 09:45:25 +0000 (UTC) X-FDA: 83422886610.13.093FAB6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id BE8C520003 for ; Fri, 9 May 2025 09:45:21 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KprdP5Td; spf=pass (imf03.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=1746783923; 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=YOAa0bozgxCI+CKgyYl1eiLYjIKKrO+Xq6cJ11SS5lc=; b=BvzvV+yvxTAnPnCdXUen/85lPUkYytRL2U1pc1xKc0IYisMTo807TAnua7DLh/Z+sXM/58 PBfB6E/VWHKX9qD8F8pvZkaZK8AjtQZyNZTpI06FbNlWQIKUkwqZjbPbhYezP7cFRShvWK gwpbIUc0s+Fxae3XElulkWZ85S6BKGI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746783923; a=rsa-sha256; cv=none; b=tt1OF8WOslM3XUiLcjSdw+GcSirgJglh5btlfdE0/BOGF/kR5HZg3gHCPU2zxRpMfvwTp3 b91IwTkYGP0c0ZgtQISjxDDobvLnEP73SFSq2UMazxmtsm34dxpv/MPAj3njVVnwJSbqp1 7Tj4ahujYXfg8e9ZdHz3l6Ic+nI0ZPk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KprdP5Td; spf=pass (imf03.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=1746783921; 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=YOAa0bozgxCI+CKgyYl1eiLYjIKKrO+Xq6cJ11SS5lc=; b=KprdP5TdTIo7MgCAcHuemxeWEAXst41kldEgLFCDoEHXGbafX4bIMMAozWctbNDLJE2lZ2 TuAMQlt8FujdCxW9PviqrJ6GXvSRdAMDddFwTnK/KIbIKTVP8AVrEIJuZzUMmSFgT1VplC gGEXj8TYqAEzeSNm9zYAETbnRXukVfU= 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-64-urAqp663NXeRM9Cu25OEoA-1; Fri, 09 May 2025 05:45:19 -0400 X-MC-Unique: urAqp663NXeRM9Cu25OEoA-1 X-Mimecast-MFC-AGG-ID: urAqp663NXeRM9Cu25OEoA_1746783919 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43cf172ffe1so13328175e9.3 for ; Fri, 09 May 2025 02:45:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746783918; x=1747388718; 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=YOAa0bozgxCI+CKgyYl1eiLYjIKKrO+Xq6cJ11SS5lc=; b=tFLVgZ7ix0xXZkZ8wE59KosPtHpyMCj45Q08bK5WJYCwrXEDYIb5E8oW5PFkAjNS8d ZjdXGy4s6pwqP65twCUeyzr4nky/jQlz03f6g5WWhPw7qAa18pBb1DyyecsNElVi2MEW KKLoFcNr75ikbeWNmm5DzLtdKs/Jl6/eyx9OKhVnsrfeEVT/VBez9zYn+f8tlfMyBI13 JQx7+/LciAP61tskhMvD7duGofZP0KpcM7VqUI8NcHaPURCZazZYfxKH8ly0AdSS8zlO Da5R3IySG+9oJpWnWrdEWfRKknPcrrxfpIoFeO1dnRH55rTWWLue8VxU7FHgqJnTO/jZ 0XPA== X-Forwarded-Encrypted: i=1; AJvYcCUtCGdX9HpQa2hhpzd0Y8eUX6NXQrd1CaCCWZl3yccM4f043V6Ri00iSkdCCzKhMo/eJrPTmlsByQ==@kvack.org X-Gm-Message-State: AOJu0YxO+ZzLxBIfeE93J6xLD5mxYVjjY4P2Yjw7zjTsh4qsMvdEa612 eAThx47cdOG8BwwlC7IC581mJogZy9zCPWE9zkFz+6FfFL/R94vifkoNVQ5AagJyM7r/h/vcpCE azpASwCWc9nCJozqkI81VcdeskxsDO4OdRX5IR/mfSf6dJTAs X-Gm-Gg: ASbGnctyuslE+nKt71A1myGKdJduKtX/APu512fO6cmZj1593v/nNch+zQtDgMVFqlW isEVnPDTq8XvFqAH/9MdzqhUTIwAr5Mk1RsDJyQfyVs8ulHNMqaA5XJHNdUTmje0jjBOQkqwoZL IVoUNRmFTUv3Y8QI+O7V0kukwNcwkF/DTKIxYMdzkFnxtaQeVzlQ6Q69N3zUUQK4f61BO08B5Gk 7X9gLFJIR5n8RyHzm02az1+6Oh3ZZa3o9p4y/oBf1m5XIXrxDcWw7/QupYcmIDBRPSRqAB8AXoV OdDW4kn5vUvOMwEA4n1qVLTr/qZIH3Qn76DG8zj5tUe7THA2BWcx8JVq/jkjzENvMbXR5YfFfz7 6vBvE3tHk/YBFSxSqhTs8spqUigliwD3r3MgyvoQ= X-Received: by 2002:a05:600c:46c7:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-442d6d3e373mr24938135e9.10.1746783918615; Fri, 09 May 2025 02:45:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE7MVL7mZihpcEEvitceu+2xXiJhCmERZKrpRflwNsBVodW0DJCdrtEiUUSzs5CTgr1OXV/hA== X-Received: by 2002:a05:600c:46c7:b0:43c:ec28:d31b with SMTP id 5b1f17b1804b1-442d6d3e373mr24937855e9.10.1746783918180; Fri, 09 May 2025 02:45:18 -0700 (PDT) Received: from ?IPV6:2003:d8:2f45:5500:8267:647f:4209:dedd? (p200300d82f4555008267647f4209dedd.dip0.t-ipconnect.de. [2003:d8:2f45:5500:8267:647f:4209:dedd]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f5a4d21esm2725998f8f.99.2025.05.09.02.45.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 May 2025 02:45:17 -0700 (PDT) Message-ID: <708b6b1b-54a0-43b8-b6ec-a2dbb089d432@redhat.com> Date: Fri, 9 May 2025 11:45:16 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/3] mm: secretmem: convert to .mmap_prepare() hook To: Lorenzo Stoakes , Andrew Morton Cc: "Liam R . Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Jann Horn , Pedro Falcato , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Alexander Viro , Christian Brauner , Jan Kara , Matthew Wilcox References: From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: NiFhkYukjD_yTuK8TUMRWFT3x3xbdf7FeXwN1ttwoZU_1746783919 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: eadxnp7kp3fuift7ypcr1ipqcghxzski X-Rspamd-Queue-Id: BE8C520003 X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1746783921-893300 X-HE-Meta: U2FsdGVkX1+TIk0usQ4mG4BcNJFLfczSSdPhHa/mFwrbqyNpMuX5Asz2S/tANMph9XbrFn2laXoWhjJg0qBwbXNn53Iydj09r0mh36zpAvXc5ZYzwIsUhgKZU/AmwHNKfKtTQ7hfhKpbvYIA3XA70ZYXXqFZF+GEE/71ayzX8HqpdyEMXqleO3DmSFkANlWV/FVCVY8NEnenTaalqdVZAty2aVrutIjz+0n2e18rLF+GSYWdqYggnOnNT9Z9mODv8CBIIfnXzr1ddsDMxM+F7nSX0FAuUtrpY5Cv8fVzLmUW60edwC0JDtVACEGyxRFyQeQYnB4PYYBZtg/rjk7xPR/b8iEDZFA/PX0W6NKFg2Ot2r99LfMuWUsaq3EbjioGqryiRbbd1Jrwj6g7oZ3l+NbMPxEmi/3aFFA7IQlJVwUz/du84eeIRRXfQDBlWM6n0HocXEb0NfjR1TsE5VNtcUzhb04hqpU8hkhsj0vcHTbPnZjEgrgodsk0z60pRypKRCUIhD1SC/kFTkFqdW+EKqDQzBWVufikPRF2N/irw+oPrkeHS1Mokq1fEOW427YL5sfDMcizsG4BmhA1IKX9zHTbdEwFcmxD2XMag8A61nc3lGOAZqlPcQP6GKLDZ3c6Cof4NshzznwlBvg5hs8mgM+uRYDsv1L79FDJUSEeZjP3SWpXKqIDMerQh8MiGf/b8pRhuCpnuzC02pHNg2R3Wq6mt1LeHmY0f/RnribVEELcl+1aqFWV76td4jQfkJqkE6Uh2x9AtNIKPa6SuocjbRn7nhRxM5/XLU6miKlOUEQkeaw0+4T1Q+tr/k2W9nm2GzHWCCO+2g1kDX1eLxz2GRcyB1UlnSnVuysZqrjxMO8vr7oAAP5gqtVG9FEBMIJ87XDwHh/kkBJsw/WZbvN02Q2Gf6o4vPPJBj36s8EB3X65mZjr/EhJWgSCRF1DiniGoGtFh6QCpUyTdqe1Iip uPmjbdAd qwqUa5QYxLmZKtBN/+SO0VhiMHmN6GhFqVBYWkM1EmJT2foD0gmn1wBTp7cXBSeDkSllxtnXT2SxFPDfI6J0NY/40iAFyC8KBPNTKA1XA47DGTryEOKGdG9XqkSKKWNKEtENInvONBYApcnm3nsRjVx2BNJYlONt6uhRO+3fvrJtQZezVIhESIAZ7kOs5mWVdgVAW/2nWQwFYFJvIiY5VXH0ZLdC4l0EWt53qvavBoojXlmbxQQNNiYki3eY6b+/fJn+me7vzZ7nLjieAvo1p96T5XkLLCFR2jlnNjxwDuvXnJxbgrfhZIsPtDsPm1XaQcv9mhxGJJ1rCZ0h0XPj++dWbgHuuQ9ybjiznmbDEQn6jIP/U+upQ0esN5Dy3gL9sU6XoyosFo0zWjGvBjgu0maLXM6ghNZdWw+67Z7uxH77T+VCs1LVsEMQD8jMrmkDXT0UNAmHkb2ED2WTN+ZR8/gFKeJ3eZyzj9VcnQfyWT4d4JoSwU7ahy7THMbM7/VGlL/0cGezkcA9gYe4= 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 07.05.25 13:03, Lorenzo Stoakes wrote: > Secretmem has a simple .mmap() hook which is easily converted to the new > .mmap_prepare() callback. > > Importantly, it's a rare instance of an driver that manipulates a VMA which > is mergeable (that is, not a VM_SPECIAL mapping) while also adjusting VMA > flags which may adjust mergeability, meaning the retry merge logic might > impact whether or not the VMA is merged. > > By using .mmap_prepare() there's no longer any need to retry the merge > later as we can simply set the correct flags from the start. > > This change therefore allows us to remove the retry merge logic in a > subsequent commit. > > Signed-off-by: Lorenzo Stoakes > Acked-by: Mike Rapoport (Microsoft) > --- > mm/secretmem.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/mm/secretmem.c b/mm/secretmem.c > index 1b0a214ee558..f98cf3654974 100644 > --- a/mm/secretmem.c > +++ b/mm/secretmem.c > @@ -120,18 +120,18 @@ static int secretmem_release(struct inode *inode, struct file *file) > return 0; > } > > -static int secretmem_mmap(struct file *file, struct vm_area_struct *vma) > +static int secretmem_mmap_prepare(struct vm_area_desc *desc) > { > - unsigned long len = vma->vm_end - vma->vm_start; > + unsigned long len = desc->end - desc->start; I'd have marked that const while touching it. > > - if ((vma->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0) > + if ((desc->vm_flags & (VM_SHARED | VM_MAYSHARE)) == 0) > return -EINVAL; > > - if (!mlock_future_ok(vma->vm_mm, vma->vm_flags | VM_LOCKED, len)) > + if (!mlock_future_ok(desc->mm, desc->vm_flags | VM_LOCKED, len)) > return -EAGAIN; > > - vm_flags_set(vma, VM_LOCKED | VM_DONTDUMP); > - vma->vm_ops = &secretmem_vm_ops; > + desc->vm_flags |= VM_LOCKED | VM_DONTDUMP; > + desc->vm_ops = &secretmem_vm_ops; Yeah, that looks much better. Acked-by: David Hildenbrand -- Cheers, David / dhildenb