Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ae101ca7-2bad-942d-14a3-7a44588d4913@oracle.com>
Date:   Wed, 21 Jun 2023 15:15:09 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.12.0
Subject: Re: [PATCH 1/2] Revert "page cache: fix page_cache_next/prev_miss off
 by one"
To:     Mike Kravetz <mike.kravetz@oracle.com>,
        linux-kernel@vger.kernel.org, linux-mm@kvack.org,
        linux-fsdevel@vger.kernel.org
Cc:     Matthew Wilcox <willy@infradead.org>,
        Ackerley Tng <ackerleytng@google.com>,
        Muchun Song <songmuchun@bytedance.com>,
        Vishal Annapurve <vannapurve@google.com>,
        Erdem Aktas <erdemaktas@google.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        kernel test robot <oliver.sang@intel.com>
References: <20230621212403.174710-1-mike.kravetz@oracle.com>
Content-Language: en-US
From:   Sidhartha Kumar <sidhartha.kumar@oracle.com>
In-Reply-To: <20230621212403.174710-1-mike.kravetz@oracle.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?T2dxTGc2allEVUVob25UVmxzc0taeTRtK1lKeHE0UjNMMjVDc2xGZHQ4M2lF?=
 =?utf-8?B?WklUZS82YnRUMlpDQ0tEcHg1ZmF0Ym4rakpsd05ZOUFkZFNEUTJXYWhJZkVl?=
 =?utf-8?B?R2szYklnQnV5VE5CajlGRE55K29zMWdyTlNObnI5QkdUcWhWOUlzS0l1UmxZ?=
 =?utf-8?B?dlNBbmd5anhQeUpXdU80dFkxQXpra05LeU1NaHZXMGxaU3AzOWMvNi9QNkZZ?=
 =?utf-8?B?U1ovQ3oxU1d0Q0d4UExpNUF6RjEzWlFlQlFZRWhPM0c1SmVzWDlJbDZiRGo4?=
 =?utf-8?B?S3hrQ0NQakUwSlM1bkRZbFQ0Z2tyb0d3cXFoY1dqdTBHc0tCSWVFa1pwamZM?=
 =?utf-8?B?TmNsUDRoR0xnQ2VEb3lDdW1UZzVnNXBteXEya2VHNHRRbzVpWnY4WFMvUitK?=
 =?utf-8?B?eXp3ZTdKVzJDc3ExN1NraWM0VXhBR2lteVhkSkxkcGxjV2tUNWdqVWt2d1VN?=
 =?utf-8?B?Y21uWmxyWnJNdjI1anlPL01uYm5ESXhvZ3NBUkhZeVJqbFpDUnRpMkdUYVhR?=
 =?utf-8?B?SjdXdXVxeCt0YllFcUNReGFaQzJGeERlUURQY1lvTG56cFJlR1hZL1hPbW00?=
 =?utf-8?B?SlhlYjV4SG5qQllwYXdQUkkwN1dNb280ZzlwQk5zRFlpY2NrOFZjNzdzTDI1?=
 =?utf-8?B?M0RIcy9pSk1RSy9zemVjTm9JQzlmUHhSYVZsTGhYZ2NWWWxOSnh1WVZSamhI?=
 =?utf-8?B?eDhBbU5hL2p4V0hzQkxHb25vS3d5bmtWOExhNzNSbktvQ1NXY01aQVEwcU9q?=
 =?utf-8?B?SDdwZ1JKVHdmeUNRR2R2S3VFdWFnZkVaYTBzTS92UThnZGkrK1dOLzhxQ3F6?=
 =?utf-8?B?ckkyWjV6MDAvV3FVNGJDMzcwanV3Ukw1SzB1TUJPZG1kU1dVOUhFNjc1czN4?=
 =?utf-8?B?MkNSL21lM0txNkEyZkNpaUN1Vk9LUmJvTzBIaWpLdkh1NlhTRHVmQ1h3UjVO?=
 =?utf-8?B?YUdUZjU5WHBLcllpNElCeE5BWFZMUHdOYWd2Zmd2VnZxMm5Nemhqak1wdzdX?=
 =?utf-8?B?c0pNS3J3OFJiWUFHZVR0N3N1NkMxbXovVHM2S0FmeGZ4V3p6eVE0MDNTQkF4?=
 =?utf-8?B?ZWJ6RkN5ekpNYWhoNUVIUXlTS1RhNzd3R3JaaTdVV09BZXB4azdUczB4cmJh?=
 =?utf-8?B?V3lCZ0lkeFZNK1hxb05xaVg5Z0VCT3ZXVTZSRWhRVVNxRjNKM0RKY25KN2NK?=
 =?utf-8?B?VHpkQi85VGZpdERJZ3dsOWtwNDZwUDIvKzk4dTVFQTl3cFZVUVhhVk1sMi9M?=
 =?utf-8?B?RE5Jc3U0Q0ttSHRUUXBHTlE0QXd6b3k5ZFVzUjR1KzlPcFBHazZ0bHBvanFo?=
 =?utf-8?B?Q2lLcFpCcVl1ZWxVOW40STBHL1VjcUd5Rnkyd3lOaVdYMW5HNHh6TnZBZi9n?=
 =?utf-8?B?ZUhvZG0vNHhka2RJdk9NcFZaakxFais4L3JjeWJ6MElHa1hkTUtOaFhYTWl1?=
 =?utf-8?B?YlJ0Ulg4T0M0N3VIaVNrb1ZrNzhrbndrUWx5OHNJZ0ZBajNZc2ErWU5uT1JO?=
 =?utf-8?B?M25kNHprUTdGRVpLb1FROVZ5VlNFL1dCMm91eGE5eUVha3duVnJWUlBSNFQ1?=
 =?utf-8?B?ZVhtdWtnRy8vTElDQkpIR21oeWtmQ0xXWmlmK0FsQ0ZjZzlZMndPUG1MVi9X?=
 =?utf-8?B?VjhzS0UzckJEcS9KRlZKWE4xRTd3cTBTYVFDNW1TdnE4YzVzQ3VVNE0zcWZp?=
 =?utf-8?B?N2ZYY0JpRFpLMmVPY3p6U0t6VFp2YVVtZ2grZ3NpV1VrY2Uxa3pib3drbFda?=
 =?utf-8?B?SURTdU54OHRFdDN2Z1VQWnJkRXF6UCtvek5LQjU5cnhZdHlqOFByTDZLSnlj?=
 =?utf-8?B?UVorYVRmM1U3RHJJZVNjSm16Y1hhZnNwaTBOMkM3dXRLNWlaVmpkTmYzVkNz?=
 =?utf-8?B?blBHTVYvNFNXSVJuVnVvVkI4b2ZHcjdHN3lQMng3cEEvVk0xZlNGazQzNjdD?=
 =?utf-8?B?U3VsM3VaSy9YazlveHJDbUNWMTg4NzdTeDcrMlA2anJvdDZRY1MrOE5mTlpU?=
 =?utf-8?B?cmJ3T24wZ1dwNk4weXZYVEVIS2pybGloQ2drMGFpZFRBaFJydDlaREN1cnVj?=
 =?utf-8?B?WWhFam5zWmxld2lETlREcHZiR3RnUkZZU3l4di82VjA2WWJYRkhEY1d2NmMr?=
 =?utf-8?B?MzdrME1BRHYybTNKWUwrL0FEcnA3TkROcGQ5OTZZbHc5bmIxTEJOd1VFZE1T?=
 =?utf-8?Q?HXZQjAgzUXqe7uuMeBCXLMM=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: =?utf-8?B?OFVsRmIybVUrWXE3OFNxZ2tzT29SYkZCdE5WZEFDWHpPT3VaSTdJaVcxKzBt?=
 =?utf-8?B?SUxna2NFMFRHakhDZkRMcnBCYTFjZmFCYW4xU29tOGcwSSsvUElWZUs1aFNr?=
 =?utf-8?B?eDdkL0JNdkNmWjhOQUpxN3dHWmc0Qzd3VEJDQUtOVVN3MlZ4VkFVeWZMRGNp?=
 =?utf-8?B?ZWVMVjFRNERrTmFudVJnZFVkNG1XWnF4TkJ0SGs1TXloM0RCaWVLVlcvdXhz?=
 =?utf-8?B?dXdDMXUrV0dkL0s0QmxLSng0aHhQd2JxckphdHNKWHVuOUViRE5leUtTYVNk?=
 =?utf-8?B?K2hOdHN4bjBTYjZmeWsySDJDSGg1cUMvNlB5Y1d2Qng2NDRndXNwaFcxTTNq?=
 =?utf-8?B?R1RTRitZUkZ4aVAwbU5SNW91c05FSXJXRThxQUtaUjVUUCtUNE1jL1djOHRW?=
 =?utf-8?B?UUJNbElPUUJ0L0JrdzRteWNvYk1mVUpFZ3VBeUxXMzFaMXU0UEo0RUZCR2Ju?=
 =?utf-8?B?OUVRV0JvbVRFMytpRWpUS0xRMjdtc2tKb2JrNjhtVmVrelZWcGg5RklKcTMx?=
 =?utf-8?B?OHo4MFkyNnEyOGM2emRYY2pFMkUyclFCKzh0MUZzTkpwNFA3OVc3RnlxNXda?=
 =?utf-8?B?eUpXNDlwdHpDUDZBTEkvaWZCZmVnWTBqWGJ2SDZrU1prNDFENmZCM2NRazlV?=
 =?utf-8?B?NC9LOHN0bitBK3FWZ0Rzbm5zZkVjcHZKejJ4UEp3TjE4TVdYOVpCSTlGLzVK?=
 =?utf-8?B?MDduak5Mb3Y1VVppTHFwM2VlMlF0YUVPOHZpc1hSTTR5azdXbmFjZDRLeDZi?=
 =?utf-8?B?dFdzRUtaWWpTbjU1ZEtpRmxHdndnRXZCQlIyT1BKOW1IVVJVOXV5L1dTV1Ns?=
 =?utf-8?B?dmFzUExUNzc4VVJ5UVU1YmhpemY1NGNtSmI1UHN2NGRkTHN3RDM4eTIxMnBS?=
 =?utf-8?B?UWZNemNFWGxUdGtSUDk1SDg3NU12dWZUeG52b0l5V2tGUTZOZ0dCU2JKVVRW?=
 =?utf-8?B?cXpzZ05sNEdzVEVWUTB1VGh1RG5TM2xmUTBzbUZwMUsyYm1jRnhFNXpveldD?=
 =?utf-8?B?WEZWL0V6SmllVDVNSHNXdEFENmVSanJsVy9VbDdTeGk0K1dIOUlXZnA0b0hI?=
 =?utf-8?B?UmNRUTF4RlVIRDJvb3g3cDZrd1pvbjhvN2kvdlBBSG0vKzBaVEpaWUFkQVZi?=
 =?utf-8?B?Mk83VjhySWRFeHkyRG93OXh0ZXhUdDQvUFRXLy9DTG41UnhnMHhhTFIxZHZO?=
 =?utf-8?B?VUhjQ01abW5OWnM3QnpvUnp3Qlhxa0QwbTVIMEovTjgyRUQrMy96Ui9IMWxL?=
 =?utf-8?B?bkZ2UmRCb3ZDMHdCMFJxbEgvQXYxcHlhU2d4NVdEdHQrNnhJQUZuZnZKbjgz?=
 =?utf-8?B?dW1BaDFjckhBK0k0Wjk1RVVJK0krUkp5V2JkZHFDSW01SHl1WVlRcDhnckVD?=
 =?utf-8?B?Z2hvN2gwd3hob0E9PQ==?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 90706f38-1306-4b65-bac7-08db72a4fb98
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB5113.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2023 22:15:12.5795
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: U4i9DxQ8dWa90jYDeTEqBbR9qfJ1Jj2DQ7LJIOGfmoCXEXpXrUiNemXxAYBi9N2t3uyEbLVwYz6vQnczj2gu8Z0/3xTr0HOPl++QY9GTbR8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4882
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26
 definitions=2023-06-21_12,2023-06-16_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 suspectscore=0
 adultscore=0 mlxscore=0 mlxlogscore=999 malwarescore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000
 definitions=main-2306210186
X-Proofpoint-ORIG-GUID: 6mVS7Bm-0YJFSTcl6TfTqsEgG0vP54Mu
X-Proofpoint-GUID: 6mVS7Bm-0YJFSTcl6TfTqsEgG0vP54Mu
X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 6/21/23 2:24 PM, Mike Kravetz wrote:
> This reverts commit 9425c591e06a9ab27a145ba655fb50532cf0bcc9
> 
> The reverted commit fixed up routines primarily used by readahead code
> such that they could also be used by hugetlb.  Unfortunately, this
> caused a performance regression as pointed out by the Closes: tag.
> 
> The hugetlb code which uses page_cache_next_miss will be addressed in
> a subsequent patch.
> 
> Reported-by: kernel test robot <oliver.sang@intel.com>
> Closes: https://lore.kernel.org/oe-lkp/202306211346.1e9ff03e-oliver.sang@intel.com
> Fixes: 9425c591e06a ("page cache: fix page_cache_next/prev_miss off by one")
> Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
> ---
>   mm/filemap.c | 26 ++++++++++----------------
>   1 file changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 3b73101f9f86..9e44a49bbd74 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1728,9 +1728,7 @@ bool __folio_lock_or_retry(struct folio *folio, struct mm_struct *mm,
>    *
>    * Return: The index of the gap if found, otherwise an index outside the
>    * range specified (in which case 'return - index >= max_scan' will be true).
> - * In the rare case of index wrap-around, 0 will be returned.  0 will also
> - * be returned if index == 0 and there is a gap at the index.  We can not
> - * wrap-around if passed index == 0.
> + * In the rare case of index wrap-around, 0 will be returned.
>    */
>   pgoff_t page_cache_next_miss(struct address_space *mapping,
>   			     pgoff_t index, unsigned long max_scan)
> @@ -1740,13 +1738,12 @@ pgoff_t page_cache_next_miss(struct address_space *mapping,
>   	while (max_scan--) {
>   		void *entry = xas_next(&xas);
>   		if (!entry || xa_is_value(entry))
> -			return xas.xa_index;
> -		if (xas.xa_index == 0 && index != 0)
> -			return xas.xa_index;
> +			break;
> +		if (xas.xa_index == 0)
> +			break;
>   	}
>   
> -	/* No gaps in range and no wrap-around, return index beyond range */
> -	return xas.xa_index + 1;
> +	return xas.xa_index;
>   }
>   EXPORT_SYMBOL(page_cache_next_miss);
>   
> @@ -1767,9 +1764,7 @@ EXPORT_SYMBOL(page_cache_next_miss);
>    *
>    * Return: The index of the gap if found, otherwise an index outside the
>    * range specified (in which case 'index - return >= max_scan' will be true).
> - * In the rare case of wrap-around, ULONG_MAX will be returned.  ULONG_MAX
> - * will also be returned if index == ULONG_MAX and there is a gap at the
> - * index.  We can not wrap-around if passed index == ULONG_MAX.
> + * In the rare case of wrap-around, ULONG_MAX will be returned.
>    */
>   pgoff_t page_cache_prev_miss(struct address_space *mapping,
>   			     pgoff_t index, unsigned long max_scan)
> @@ -1779,13 +1774,12 @@ pgoff_t page_cache_prev_miss(struct address_space *mapping,
>   	while (max_scan--) {
>   		void *entry = xas_prev(&xas);
>   		if (!entry || xa_is_value(entry))
> -			return xas.xa_index;
> -		if (xas.xa_index == ULONG_MAX && index != ULONG_MAX)
> -			return xas.xa_index;
> +			break;
> +		if (xas.xa_index == ULONG_MAX)
> +			break;
>   	}
>   
> -	/* No gaps in range and no wrap-around, return index beyond range */
> -	return xas.xa_index - 1;
> +	return xas.xa_index;
>   }
>   EXPORT_SYMBOL(page_cache_prev_miss);
>   
Reviewed-by: Sidhartha Kumar <sidhartha.kumar@oracle.com>