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 8A5ADE77184 for ; Thu, 19 Dec 2024 15:36:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C418B6B0082; Thu, 19 Dec 2024 10:36:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BF1196B0083; Thu, 19 Dec 2024 10:36:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6AAE6B0085; Thu, 19 Dec 2024 10:36:08 -0500 (EST) 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 890936B0082 for ; Thu, 19 Dec 2024 10:36:08 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E984FB0D56 for ; Thu, 19 Dec 2024 15:36:07 +0000 (UTC) X-FDA: 82912108650.12.D6E0F5D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf29.hostedemail.com (Postfix) with ESMTP id C48B4120025 for ; Thu, 19 Dec 2024 15:35:18 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EkXGYwM2; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734622534; a=rsa-sha256; cv=none; b=s3qeUhhuCRqMcRaAwY5Nvugb/0lhirN63NKr5R+coMoEa64F0TFh3lLO4Fq0bwf3/NzUy/ 8xqHH45rlTLja8XTTUMmjpc484Aova2wDYK+Y0Gsx2ADhQmpPU0o+oTvAi9W4zHfOo3kIh fs2EBNESHioX0hGEko9Kevge1E9AY+s= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EkXGYwM2; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf29.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734622534; 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=/kqAQ4E8SZtfqexBWu2dwyOHivGBD0nN04XHbnpO1KQ=; b=a+/znJpJHh2Jl7ikBqx3m3PKC9FOd3jZG7QpmKXaYLgDyfulL4Q+tj+jE6fUdQEiF6Ag8q O+Xf5/i51UZNOXOjlesVo6qJjB/YKLGvLrndo6tGK6nsjA1iKcWKuyMdiBTHHbvbvWaYdx 5MJfgdQxom3FQxPlP8FA2oNwrHVKpG4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734622564; 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=/kqAQ4E8SZtfqexBWu2dwyOHivGBD0nN04XHbnpO1KQ=; b=EkXGYwM2AD3bi/qp1cszKpSEKWHzf/D+I1v/SeZ7LOJKgkDekMvOfZFE09r8XFU0VSVseW YjWzjJjaAZQRwe9TFcTfCmiG2/0gCkWIrkaXgPQVEyn/hCwFOCzCycmIfw2Wsdegkk+99D ueFWZk4TnV1a1rTNXM7d+fDerI8b/UA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-17-WopUo9NTOoGTjOaAyipE0Q-1; Thu, 19 Dec 2024 10:36:03 -0500 X-MC-Unique: WopUo9NTOoGTjOaAyipE0Q-1 X-Mimecast-MFC-AGG-ID: WopUo9NTOoGTjOaAyipE0Q Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-436225d4389so10496145e9.1 for ; Thu, 19 Dec 2024 07:36:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734622561; x=1735227361; 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=/kqAQ4E8SZtfqexBWu2dwyOHivGBD0nN04XHbnpO1KQ=; b=K1TU2VXuYRgP2fAj0QL59Mv2m8LZIfPxeHkutA3MBANH8V3FAVUeSqnkCSiHX7KXHa JQOBxrwOSroCRhp1CSkS/KjBQueZlXKE+vbED4ui48wwpCTmfUaCA5A4iZQLoRXoeIj0 A0K5yGxUQmZjNnZPOpQGOAiw45F7NWjWhTB4dP/qs0xXV/QQtA0AEiolowlwm2tuXIxA K6VfQBQ6lg910aF9zRHtkiUE1mCQowVUFlnYRWK5/xkkDYl5ejwZhUs4qENwgSayl99Z es50ogPGw5pkjkRnccJXLi0AVRfs523hmOJJdN5iyxH1QCqsEmslJDypltFtj2tem6vI 6vMg== X-Gm-Message-State: AOJu0YwKtUt4nAmOE4udJ484/40EhaCG+m9WAGWmFsEIXEP7j3LVOU9k /RDRZ9+RIZkEyQuf2S8mNWOcfEYCI8QysY/BZfbzwIuiq6hN3VS6LbprW+U5ghFX7XhOa2eF9Ga gnRVC1t0thmZxwrlN9fJ9Q6Ax6x6a5gwagcZUVeo38kz5kuHb X-Gm-Gg: ASbGncs2oYvk9PcpYqoJ/i5RK3pZhAOvdK1+DPbymLPp4axJi7P/yFmi9eSm093GODz fSH0GsfZD74SiZLBwN+RktswC7vcypS5xL0qGXXbSI9gPVsT1dKy+aQHqtAKJY2RDzD2zPF6ZuN LBvuSyCrTN0g4dG+Zr1cfoj1CvO3Y599HhmTNcQL2cZ0okg1398dVXoWwkyAk1zPBGOX5tPnqE6 1oS19XwBxQSqT0kf5GQ8iWTcOm/oOJ1A5am6yPz9luUS1vNrQ5WDdPlg77PdcqWA0S/CMiggAF6 ppGnk9SD9zsrg9GvInVl5XYB4edbkFYcpQOr0TINHgPcGHWR7lsbfYJaxf/xD2uzRQZqewQvwlj F/V8cVA== X-Received: by 2002:a05:600c:1ca5:b0:434:fe3c:c662 with SMTP id 5b1f17b1804b1-4365c77e417mr32606945e9.12.1734622561106; Thu, 19 Dec 2024 07:36:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IFhrHyWGfpFmCsVcn6FluiHgnW7wqt5x92cGdbRZhtKucIGBAmO+c4x77hdzLosWfXDTgfBBw== X-Received: by 2002:a05:600c:1ca5:b0:434:fe3c:c662 with SMTP id 5b1f17b1804b1-4365c77e417mr32606515e9.12.1734622560386; Thu, 19 Dec 2024 07:36:00 -0800 (PST) Received: from ?IPV6:2003:cb:c749:6600:b73a:466c:e610:686? (p200300cbc7496600b73a466ce6100686.dip0.t-ipconnect.de. [2003:cb:c749:6600:b73a:466c:e610:686]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4364b053e91sm88664885e9.1.2024.12.19.07.35.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Dec 2024 07:35:59 -0800 (PST) Message-ID: Date: Thu, 19 Dec 2024 16:35:59 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/2] mm: shmem: fix incorrect index alignment for within_size policy To: Baolin Wang , akpm@linux-foundation.org, hughd@google.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <77d8ef76a7d3d646e9225e9af88a76549a68aab1.1734593154.git.baolin.wang@linux.alibaba.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <77d8ef76a7d3d646e9225e9af88a76549a68aab1.1734593154.git.baolin.wang@linux.alibaba.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: xDNY-rYnUOWWCdvxBMJRX4GIFj3qW7ahIawxm1Hmagk_1734622562 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: 47wur6z58ygw7ktxj9pwx8rgj3hygk7d X-Rspam-User: X-Rspamd-Queue-Id: C48B4120025 X-Rspamd-Server: rspam08 X-HE-Tag: 1734622518-712384 X-HE-Meta: U2FsdGVkX19xvnUhuk+tVIVcmFFlBN6x7H0Xwx8d1o32To8G+JAkifuRDWvoZP/ajVAgoep21MSRa8tKxYp3BykA3IpcbhaxucMTpHECSsJkvba3RnxsOF1R9CEsvCa1KVaQrq7SKnhPQATrfTQfr1I8dHrmJm3eE5P9q0nJOi6nmm3eZ4yFxDsZwp9PjGNvTFheKOXolXKQyGzmeAT2xoJD02CzqVVyS46v8CnZkqZGEImngGgJHuqQHbOeZ8U7IIeKakUlH5SgLkt5tDxVuFhkXEN73gUSuexe06aJH4AIaNcK9mfCbGf4Eq38BBiuTrisg57lbPwnSD0ahWr38yY1rpsINED6ZUqNIpyRX9U+RwIXZeGKSwGi0MmTtbHSuMcc3DK6d9dE+tnYv9/fni36zgxtm5AqSpVoSBxdWgDd3xDiJuYTi1D+OojEBZNTRgKdXPwCM3FRjkIu5dk3LRDtdLn4lnLUvvTEQ5q6KZCQ2BbCgtLOhCUksBAxKF2A3XUclYDsbzULT0URBRGN/51orCx+0L0vpKW3gtQQGorKh66mt9bEAGUYhDtR1igYd/2lZVTWs5mv9QH7US2RVNid0hB9bj6jaYVWHgW6ojs63VpJWyuTe3Q2YWP8wRRscIwtYMY+n3k/vYT+A4FBrjUXMtoLryxHQw8l2frjNA1I12yGDo87FbgMVa5Tf7DQEAs3cK0pCUp06ktBSgRYcIyVgfJf4CpuhOZlm+xT6qep1Kq8RL3OeFoBIq2kC9rQRmC/imqQYtWsiT/3931su49JkahXKLgAf3btpX+AzsTi4ho5rPMLRsyAU4L9g4TV3FOp6HYtGEAIW+H/5bY3P/YfU7x5cZwstlRg2CNLnY2eAz8TGOcGMffp7bJ41qtgQ8Kspd0bfDJQp0xCfu21xjs/K1oVuGEaLhWdxQehKYyr78/OysSTPRQao6SlFvnb5ggx/a9/WZwX2w3ngsm rtflusYt ZFujZYL2674FgIpIswSWjA+jnRvRCiXoGjw/5wI4/BsXgn1SJsQQdOBi8BM3G6zpLwtiA+aRXutyFoimXbhT7E0ZCnfxYVz6+4QRlRjLSkL+SqG82JMrKvLqlRPW1/czZiFkspuPkmjmqc6aCW0ti7pUpnIedXCkFkf9rLf86GUPu46+Zj3RjcIbNM1iXkHwBcv+iEdfIOPjLKV8FzeexU6uWCW71nj+SwsBs7MBzW1GUXL7ANOWAu7Stt+Ohufn4pCIqSW1M+awQp50BSuC2QP9dPwLfh/2ZxnAlRDvEO+xE6opWpTQuo4EM8fFTAym/Ed5thaxTRjuBTQty6ar93j7RoZksHLZLYJCXoyT9rlMQaSV5sPcx/93gNOJvfVPfUwCmTGA7UGiNwwo5Zrl9iSQRFr0apJix0ab+KNB1STNMtJP5DoMWUqUnOk2y5zqqbSgC1u3OEruq9/zYe4QUaCBeEjrGuaCg5gfM8EyHZSKcUgA= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000058, 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 19.12.24 08:30, Baolin Wang wrote: > With enabling the shmem per-size within_size policy, using an incorrect > 'order' size to round_up() the index can lead to incorrect i_size checks, > resulting in an inappropriate large orders being returned. > > Changing to use '1 << order' to round_up() the index to fix this issue. > Additionally, adding an 'aligned_index' variable to avoid affecting the > index checks. > > Fixes: e7a2ab7b3bb5 ("mm: shmem: add mTHP support for anonymous shmem") > Signed-off-by: Baolin Wang > --- > Hi Andrew, > > These two bugfix patches are based on the mm-hotfixes-unstable branch, > and this patch has a slight conflict with my previous patch set: > "Support large folios for tmpfs". However, I think the conflicts are > easy to resolve. If you need me to rebase and resend the > "Support large folios for tmpfs" patch set, please let me know. > Sorry for the troubles :) > --- > mm/shmem.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index f6fb053ac50d..dec659e84562 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1689,6 +1689,7 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, > unsigned long mask = READ_ONCE(huge_shmem_orders_always); > unsigned long within_size_orders = READ_ONCE(huge_shmem_orders_within_size); > unsigned long vm_flags = vma ? vma->vm_flags : 0; > + pgoff_t aligned_index; > bool global_huge; > loff_t i_size; > int order; > @@ -1723,9 +1724,9 @@ unsigned long shmem_allowable_huge_orders(struct inode *inode, > /* Allow mTHP that will be fully within i_size. */ > order = highest_order(within_size_orders); > while (within_size_orders) { > - index = round_up(index + 1, order); > + aligned_index = round_up(index + 1, 1 << order); > i_size = round_up(i_size_read(inode), PAGE_SIZE); > - if (i_size >> PAGE_SHIFT >= index) { > + if (i_size >> PAGE_SHIFT >= aligned_index) { > mask |= within_size_orders; > break; > } Yes, that matches the logic in shmem_huge_global_enabled(). Acked-by: David Hildenbrand Was wondering if one can factor that out into a helper where one could pass an optional write_end ... -- Cheers, David / dhildenb