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 7EC3EC3DA64 for ; Wed, 31 Jul 2024 09:19:03 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 156CB6B0082; Wed, 31 Jul 2024 05:19:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 108586B0085; Wed, 31 Jul 2024 05:19:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EC2C16B008C; Wed, 31 Jul 2024 05:19:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id CF46E6B0082 for ; Wed, 31 Jul 2024 05:19:02 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 57658801DF for ; Wed, 31 Jul 2024 09:19:02 +0000 (UTC) X-FDA: 82399498524.16.E833762 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf12.hostedemail.com (Postfix) with ESMTP id 048B440021 for ; Wed, 31 Jul 2024 09:18:59 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WwmO5XZB; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1722417466; 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=LjamSx4ZX3PuSrG5CO1N2re3DGJdSybENS1tb0+2zW8=; b=jExciW73Lm/WXGA4DyRc8j9+/S9ikSqtqjFTYacz14Rn6PvV7HbF1D8BWDRVK2jy3xmb+6 eF9dgRGXvxwjZ5JnTO+Q1kljgf1+CxT2LGBOAbb7bWEdy2seuhhBwbmfXjt8NDPNfATbwv MeIOCSVFnJWwT+Yy6Hf3SQ1xUnUNddo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=WwmO5XZB; spf=pass (imf12.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722417466; a=rsa-sha256; cv=none; b=OH+Q5aSh5Crb31MHyJgUXAIfRmmJNC3al0ylEfJJ47QFwXPRZCzqr1JKzfWdBmndm0z45j rnUVTPCKCUCPaJC4lq87Mt+v6LNFu10VIUvA/j0GIT86BlwSrLjt26pYSxojXzzG9lctjM Eg1eLqv4xb0bVBbak5DhWSd2IPVRfFg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722417539; 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=LjamSx4ZX3PuSrG5CO1N2re3DGJdSybENS1tb0+2zW8=; b=WwmO5XZBpPfOhK782ODnajP4hfZuo3RuxY6ModotUXrVqO2ImqRq6NQy8IV1XJffzgTPj+ CGBwjbK/igGfpm6n1fQrmf1YDIMB6PoN/1h6Pid0yESTiF3AjkLlTGtqdPCH3KMW/pMlhE XJdnr6frDPaoXXkeBhQBb+ffmIduws0= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-622-kpGpakD3N1akxVFKA2rFEg-1; Wed, 31 Jul 2024 05:18:56 -0400 X-MC-Unique: kpGpakD3N1akxVFKA2rFEg-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42808685ef0so32326065e9.2 for ; Wed, 31 Jul 2024 02:18:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722417535; x=1723022335; 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=LjamSx4ZX3PuSrG5CO1N2re3DGJdSybENS1tb0+2zW8=; b=e5vLTXXS0ZROqdLUSDr7myc8xKnst7OxtpeP0bet9pjZrXPLgke6TFaQVtXXaGxkIc qt3TlPCgC1cKfVx2G7S2L+pySI6Q/b+/uc6YbHnmXYg3+3rGVtSsbPrV7vT1l6LIonwt snhgKyEURJKCLJCRbDRX5/KGF9qTUKoxVM0nFCyWlP9H6395kra55i83PWitTkAT4cgX rX48n6GT0kz6Z/uDy3JxEZxwbB/kbCfqpMxbkAiWCSNEo9njxK7liaZAyq7vSQ4lkBCp CKj0VLqSDVX6CDf0P9vWObg16trMnIQRDmp3apCnqB9SKxa4kkWsuTbykhAi4mJw7F1E uGwg== X-Forwarded-Encrypted: i=1; AJvYcCXrPbJZhcRw6jgG1hDQ1OjZr4o5+qsuQpVtT+8IqJ38iGhJPZlQDwt4/rgT/qg5MWZn4UrDtUh73e67gTDnYa+HPN4= X-Gm-Message-State: AOJu0Ywm1Nh64zFmrEUUUxkXpNL2sFMoQn5Q8+5Uajw0xR8NOcKgRsiB FlWMAWm/kYH0Xkycvw/wjMBJCYHwP47zAUeKoyTr1NvDzfYlVb2TSKYv6LtHuTshobsMzWHzwao 7+V9XqOuh6osba+QuEk+Z91ApgBjGvYur/ooUxa00IvTOjJtJ X-Received: by 2002:a05:600c:1c02:b0:428:387:79ac with SMTP id 5b1f17b1804b1-42811d8642bmr107803335e9.6.1722417535560; Wed, 31 Jul 2024 02:18:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaHAAYmy1uNdZVjw7UnpaC5Dr4qggZvhNmfYCfT3m5sa/tj/c9j1psXJck+GUyMQ2hE7BR/w== X-Received: by 2002:a05:600c:1c02:b0:428:387:79ac with SMTP id 5b1f17b1804b1-42811d8642bmr107803125e9.6.1722417535136; Wed, 31 Jul 2024 02:18:55 -0700 (PDT) Received: from ?IPV6:2003:cb:c70b:5f00:9b61:28a2:eea1:fa49? (p200300cbc70b5f009b6128a2eea1fa49.dip0.t-ipconnect.de. [2003:cb:c70b:5f00:9b61:28a2:eea1:fa49]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4282bb6405csm14451185e9.34.2024.07.31.02.18.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 31 Jul 2024 02:18:54 -0700 (PDT) Message-ID: Date: Wed, 31 Jul 2024 11:18:53 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] mm: shmem: fix incorrect aligned index when checking conflicts To: Baolin Wang , akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, 21cnbao@gmail.com, ryan.roberts@arm.com, ziy@nvidia.com, gshan@redhat.com, ioworker0@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <117121665254442c3c7f585248296495e5e2b45c.1722404078.git.baolin.wang@linux.alibaba.com> <07433b0f16a152bffb8cee34934a5c040e8e2ad6.1722404078.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: <07433b0f16a152bffb8cee34934a5c040e8e2ad6.1722404078.git.baolin.wang@linux.alibaba.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 048B440021 X-Stat-Signature: wuz5nhthtqqhkbamhjfo57xcccscstb9 X-Rspam-User: X-HE-Tag: 1722417539-154421 X-HE-Meta: U2FsdGVkX1/LTGm8Nya86XRrKktqGdmF7rhEOerXbg0LPRdJWQ9WjSRJYQ44/zIktA0JpiGaZrXNPSYzi5mvz9/ZFxv9O+Z6MYg5o+k0trY6cBezrheErVnlk9WyBGMGmUNSRk9XroobjdjiSF/eB/Dp0mcFHWeOLNOJyPR65SWqR1O5HO6m9gj3GS4hdxJ66m8dkbmwIgw2rpAXxpcymogtET5F+lAJEJcA63RxjCu6UjFAUVjXiVQxRxQJcpt+K5GZmod0R0wAUzqqdDC3/7C9yVIFNDy9HtyRdGkY3Ac/vY6RU7q8T95wGpUawP6sH7K00f89d7AY8734ouXIXBaeY6oMXwNzL58cwZYVuKJakucSakGUeYLsApnKzp2qGGrpK/bC3jov0njbwYelQxpk6S2qyXol1Cdm7A+FqUfSD5DYLZP1CLe68QVATi3WFXWx1x0x4ZqLSw5Rk6ggu/68hO+NbW7TgCirR1ozNr6P9sbbNd+DhyAmtcEMEMRQ6uFSwAgDm1c0FNxzsMCaBLdBJM5mEc30cx5huRE61gY8MEILDdgI4tC3xwvAlk99GyvlKiUtyRx07WTxtA9P3nq3Bg62/owz9vr1SSUeIbPLlNCSiv3EOJ7QqpraybnV8xz9kH7pZULKBi5TmOtP1SYuJ5YIGiCpLZRamLh5sU2WUoOuw0Jupj1VY2EIJXqt2QGGO30aWSohhwNPaEk9fXYaOxQDUQIwEcJXowOQRQYBh0PLhZKfopAtQMRyhIeQRxKtX9QbwhvH4nqoFrZGa3vGwM9Pif8H7UZs9kSFtpAWZ+GMd2mpoIQ6d66/MP56IWkKF82Hz165/U4tomViy703eoSm2vsFsCJq+0fVjLKhgmKguow7FOesAaOv4Mqa1KFG8xVim3g0V6j88wuS3iZkgaHuwTL+R6hcaZynL95/Zk6sYNBEnzar20lF3WsEYsSE2oRqWYFvzs/SgpT qH9frhTe teDMlbqeqEZO2Yuj6cbN13D8EyfFtIGsSrXaPoCV0c8j8YIW47koMJROyHmLC+UaWgrE1w4ciKn1NFCDM7uNbzxaYWT05bA4Gra0XYk6UNp+baC1LNCZw1iv/LdzG5f2VEDaoRY7VHRm467ro1YMWJ8eEYmLQwjE42Ye1XTQq+JmeyLh1WHG67jRqBbxZG8aRzV06HKtzo11GfBi0fYW3GpuhWunHajvh10SAqkpNGfQ2D1Zauh3+3zX8v259KGbvQLSGSeLY78yqipMlq/oG8flBTSsZ2A5rSARyPDgnTg1kFKnDv8H8PCfD/8yMfBKFrIH52D8okG2xnepijewuufwc23efWgZJtuPD2zE3mHRTIG5c6AjWNXnSQL3Ia28TBD/2l3guL1cdnDmp8sexF4wPsvaabO9AuZhF 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 31.07.24 07:46, Baolin Wang wrote: > In the shmem_suitable_orders() function, xa_find() is used to check for > conflicts in the pagecache to select suitable huge orders. However, when > checking each huge order in every loop, the aligned index is calculated > from the previous iteration, which may cause suitable huge orders to be > missed. > > We should use the original index each time in the loop to calculate a > new aligned index for checking conflicts to avoid this issue. > > Fixes: e7a2ab7b3bb5 ("mm: shmem: add mTHP support for anonymous shmem") > Signed-off-by: Baolin Wang > --- > mm/shmem.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index a4332a97558c..6e9836b1bd1d 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1686,6 +1686,7 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault > unsigned long orders) > { > struct vm_area_struct *vma = vmf->vma; > + pgoff_t aligned_index; > unsigned long pages; > int order; > > @@ -1697,9 +1698,9 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault > order = highest_order(orders); > while (orders) { > pages = 1UL << order; > - index = round_down(index, pages); > - if (!xa_find(&mapping->i_pages, &index, > - index + pages - 1, XA_PRESENT)) > + aligned_index = round_down(index, pages); > + if (!xa_find(&mapping->i_pages, &aligned_index, > + aligned_index + pages - 1, XA_PRESENT)) > break; > order = next_order(&orders, order); > } Acked-by: David Hildenbrand -- Cheers, David / dhildenb