From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DB6D13A41F for ; Thu, 19 Dec 2024 15:36:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734622566; cv=none; b=Vt7yJbvXOtOAVpFBN/9U0rH6HnsUeLsRSBkVcY2j1WrtB/jJWGoKkLRb1ADEEW8Le7CPnMI6RnOWR/r4moZjyCLniaGMR/CUtM5BxwQIRxMeyROPh4mpDfAvscfVg3kktapZ48EENUPRW5iPeYGiznq6MoodvhXiXAJhkky7X1M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734622566; c=relaxed/simple; bh=gr7aISwjaCR0I+yQDlAZcqpN1blu1wxXUBQwl+2JBRU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=k8ThsW2ASJiPAGVUsHSGiA+zc1VQgex5VPgRB0BUTMv7VG+DlPrPoyGK2a+OXf52BY9GcqlIFGcrLPzp17z1kVvzLMaOkSdGCckoCD6zJgkf28wJJ7wlaOaryc1pLJS4Jhi3iAPAcYTrO5t77EykI3r3RuqAYvTi7jFgs0UrEZo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=EkXGYwM2; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="EkXGYwM2" 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-85-RsYnbSTmMv6M4LL1NNOUdw-1; Thu, 19 Dec 2024 10:36:02 -0500 X-MC-Unique: RsYnbSTmMv6M4LL1NNOUdw-1 X-Mimecast-MFC-AGG-ID: RsYnbSTmMv6M4LL1NNOUdw Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43631d8d9c7so5629415e9.1 for ; Thu, 19 Dec 2024 07:36:02 -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=A+YplR6FtPTQrDyoNqc5zhnRDCLhyxaJ7c3IoHkiqjX2bjx1i1CSNVyS2xIR0SDrsV qGok1PBP5xzsfHGSekji0wmgJKBOlGmFcGRrs1FNamyXx9FiiKCGpSmDFAOMdn4mN1xm DybvJHJ8O9v8F05UcuoiAJdGdr01t1nw9rW45CKfFFBgkPa/nlWH192/d8m77FsNWfXs WyivISM2/7agyxAM7bzabedx6gy2P7uHu9GIUzGxQvsFIyqXHfqsCk3iewMZRYKZTDed FLUEMzec4+Lo44xNJwxkmwE53s3WaE8ev3IXijN7fAAQjVYE4CJrM7iu1TJyguiv7lhi TziQ== X-Forwarded-Encrypted: i=1; AJvYcCVOeDQt5H+Kka/Eb8mX6GOythY7xZfeC6SkvUCJ3zLv3w1PlnXDI/K08he9cl1DTMjaYY2xU2VzH5NRnZg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/8W3njl+RKsmGZv3KKY2eW1o0Vp9CFlYDHvMVsDbGrhsax/62 jJTrVRZY8M008IgMIOgo0/pVXBXNPCcbDWuAi5C6OHKwUhXZARblNSqZWLvD/vCCSOMaI5lpuY8 zNGtFvEzKy4TrmV3tsR4kjhPAYQMZZfiRb7XY9aohjU1YtYRivq0pR8JvXYRjPHYPJqWnlCQW X-Gm-Gg: ASbGncutnNIeT2vvM4l7NxWKRvZBdAZ+H57eDdXfA+1d1A6P023NERy+q6k30dYGioh j5aejv3LbHILxPURChZMMQZAWVeB455lI0nrvyiOpOWqNRXBUiVsWZt221nJkV7BPrUkdzFUfhF /BfpDqX/+SCkT2nBtpUYr7aF3tEA0R/WNszRjCylQCw6i6rAhOh/resaiSrBEVox9abQqLM0p4Z +bkORNtG6IOsTmwkVSAxApPPWcj1o0kSEux5aCYRjrYUP4DDFk9kd+6Qc/z8SL9eyhxy9dWMTAj XziUKvgYEtddMVdu26FK8rFBtViEKh5kSO7Q3jy/WlYn7WUXjfL0hF53p9QgF+ZeJjKkDEyq83d lGqUm0g== X-Received: by 2002:a05:600c:1ca5:b0:434:fe3c:c662 with SMTP id 5b1f17b1804b1-4365c77e417mr32606975e9.12.1734622561108; 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 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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 Content-Language: en-US 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> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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