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: <d6ee4571-64d6-ebd2-4adb-83f33e5e608d@vivo.com>
Date:   Mon, 10 Jul 2023 11:32:43 +0800
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.11.1
Subject: Re: [PATCH] erofs: fix two loop issues when read page beyond EOF
To:     Gao Xiang <hsiangkao@linux.alibaba.com>,
        "xiang@kernel.org" <xiang@kernel.org>,
        "chao@kernel.org" <chao@kernel.org>
Cc:     "huyue2@coolpad.com" <huyue2@coolpad.com>,
        "jefflexu@linux.alibaba.com" <jefflexu@linux.alibaba.com>,
        "linux-erofs@lists.ozlabs.org" <linux-erofs@lists.ozlabs.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <20230708062432.67344-1-guochunhai@vivo.com>
 <97875049-8df9-e041-61ca-d90723ba6e82@linux.alibaba.com>
From:   Chunhai Guo <guochunhai@vivo.com>
In-Reply-To: <97875049-8df9-e041-61ca-d90723ba6e82@linux.alibaba.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?U3QwbXZpRG53Q3RzdExndy8wOXk3bloyemZWSEpja1dyOXNHZHdJZTMzYVJ4?=
 =?utf-8?B?N0RHc1JYbTZ1dmgxUnpvZEFhdy85aXVIZ0pVVTdvMG5OMVRVYTY4QVpJSGVp?=
 =?utf-8?B?N1R0ZzlVekdrZkdDUEowQisvMXNCM0VxR2s3ZmZ0TGJ4aldBNGRjTVlQZkdV?=
 =?utf-8?B?TVhpYWt4TkZiaVhTR1FuK1hCeDA2aEVERGVveUFFK2dsVytmTjNMaW9uQ0xO?=
 =?utf-8?B?aC9qb1lOMEZadHBxWVpBUUg5bi93TEJUaVAycEZaVmdmNVFnTzhQa3djbWEw?=
 =?utf-8?B?MThheEF4alJaT3ZpZCtvRFl2MnZKQkt3TnVzNDZEZ1djc3Z0MS9Ncyt2ajg3?=
 =?utf-8?B?a2NPcmJvWWYxaldKQkxlYUVFNzFwYmVGR20yMldNb3UrSHpPZU1hcFg3ZXZQ?=
 =?utf-8?B?UHdFRHZSNmJSUDliUWZWUHFQcUEzSWd1d1RrTEhhWGdvUGU1ZVFtOVdmUVhP?=
 =?utf-8?B?SjdEdUpvakhBaDZlbU9LY0NpSVVuazFDOVF4YWYzN1dhcGxWSEVheDRSdGJv?=
 =?utf-8?B?aGk3M2lscUlPTXNNOFRhdHFsMUJmU2FOM09uZVp5MG1sTUVUL0dpaHN4UW80?=
 =?utf-8?B?MHBRc0Z0Y1pJSmFtY0ZvcncyN0ZaK2ptRnVkMWNodG5BVWN1cEdNVDgyTXA5?=
 =?utf-8?B?djQ3aGEyclNVUG1ETTZmU1FTQnp3YkZ1bEZZcFpVeG01Y1EyNFBuaFZWQndL?=
 =?utf-8?B?RkFBczJSalNRNHI1dU1yN0RXSXBWa3U3WkEyYk55UDY5a2toSzBrdnBKaUdx?=
 =?utf-8?B?TGtQeDQxNnUxTHJsUThrYVEwdElIRkRGMWNmOERxdmFPUjVhUkw3Y1h3Tko1?=
 =?utf-8?B?alhHY3hUcTgyWUZIeFJFSyt2ak9xNnRRZWxPY1NZOGx2S0xRQ3A5TjdrRVd5?=
 =?utf-8?B?eEozK0daYkVteFNBTzY0VkJrK0pudytFczUyMy9CTHNnL0d4UVpMMkRNVEhN?=
 =?utf-8?B?ZDRhajJYV1BiZS9HMVNwSUM5RjhQR1dlaWErVmRwWXl1RGZHRlNvbGdldXhG?=
 =?utf-8?B?YWlXOEY5MzV6QjNSdFBzVlZZRHVqVDNab2kvQWw3NjNqWHRiNlRnOGZ2cm96?=
 =?utf-8?B?WlZtU295bUlpVlQ0b3VEaitQUmRHNU51bzFsdXh6L3NublRpKy96VDEvb0px?=
 =?utf-8?B?b1RRK0R6RS9JeUF6L0xyWkVlZG5YKzREc01XOFl2UkxBc1ZsVHF6cHI1dDFI?=
 =?utf-8?B?bk54ZmM3RVdNWEJSVjJmd0VUWEVLTXVTclIwS1hDOXg2cXc5eE96d2daaXJM?=
 =?utf-8?B?REpaTG9kWE82SVhVc2VlMUFUcjFpZnVCempIS3RxNDF5V0FJR2Njb3M1aTdp?=
 =?utf-8?B?VThVZS90eG5pQ0l4QUs2NUZmNGx1YW1NZlE4S0k1TCtqOE9OTGIrT0N4Z2Fj?=
 =?utf-8?B?dlJOOFRqUGFjM2Q1VXJqRFFoWjBFdW9CZm4rcHRMbDUrbFVkQ082Y0pWVkFB?=
 =?utf-8?B?N2t3N1lSbkF5OXpmQXJPays5c0lZZG1tNkR5NGtzM20zMXp5dnltQ0tqUzFs?=
 =?utf-8?B?dW9rT2d0di93MkNHYXdqeTBHajkxazcreUczbTYvOTB4bE9NSHRXWUN3TEY2?=
 =?utf-8?B?UjR3L0Z1M3NrcXpyaU9PWjY4VXllWWE4TkVHOFUzc2hiZnB4ZW5GbnRwVXA5?=
 =?utf-8?B?ZE5HZzFmNy9DZ0dRZk1RYk5GeFNvM20vMkpKNUZrVWdMWlR0aWVyenU5RHhh?=
 =?utf-8?B?elN0RU1qUi92b1V2dDVKdXhucEpqeXFDV09vbFhaNVo1dHZiSnVNZmd3WWIw?=
 =?utf-8?B?V05Pdnc2Q2xSK3EzSlBXMTV5K29MVm5kSW4xUFpoVGsrTUYrY04xRWE2NlZt?=
 =?utf-8?B?cTQ1UHdQZUZaNmdNS2E2TVpqdS8rR2tFaXNWY0Z0WnRSZFArb0R2bG9ack8w?=
 =?utf-8?B?T2NFSC9EVStlQ2RjMlVGMEVod3ZJN3RRV1BtMDZIM1JIbjBac2wzYys0bVRZ?=
 =?utf-8?B?U2x2Y1JMNVBDMXg5TWJNbXJSZGJHamtSS0FOUmhQNHlWOUZFdS9zdjBHVDE2?=
 =?utf-8?B?R0F4ZERkekJtT3FDejl4UW4yOVY0ak1sNVZ0LzdlYlZnT0l2bkZZNkJEWi9I?=
 =?utf-8?B?bWEzOTlSZ2M5VHlSanVya2oxMVkyZXFkT0VYZlZLcnY5RXJTa2pVblo1RDlI?=
 =?utf-8?Q?V8QiqC8092nfkXoo29VCz/0KJ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 927b516e-f471-42c2-d2d3-08db80f654d9
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3338.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jul 2023 03:32:47.8664
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oIonD3z5ysPwK7BhhwAMzT+z0NC1Gbge1DxFjJaWn9ewt4gksR5X/3Vd5Og2ycyFPGzmrdwtbIFZhgxyisEYLg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5127
X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        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

Hi Xiang,

On 2023/7/8 17:00, Gao Xiang wrote:
> Hi Chunhai,
> 
> On 2023/7/8 14:24, Chunhai Guo wrote:
>> When z_erofs_read_folio() reads a page with an offset far beyond EOF, two
>> issues may occur:
>> - z_erofs_pcluster_readmore() may take a long time to loop when the offset
>>     is big enough, which is unnecessary.
>>       - For example, it will loop 4691368 times and take about 27 seconds
>>         with following case.
>>           - offset = 19217289215
>>           - inode_size = 1442672
>> - z_erofs_do_read_page() may loop infinitely due to the inappropriate
>>     truncation in the below statement. Since the offset is 64 bits and
>> min_t() truncates the result to 32 bits. The solution is to replace
>> unsigned int with another 64-bit type, such as erofs_off_t.
>>       cur = end - min_t(unsigned int, offset + end - map->m_la, end);
>>       - For example:
>>           - offset = 0x400160000
>>           - end = 0x370
>>           - map->m_la = 0x160370
>>           - offset + end - map->m_la = 0x400000000
>>           - offset + end - map->m_la = 0x00000000 (truncated as unsigned int)
> 
> Thanks for the catch!
> 
> Could you split these two into two patches?
> 
> how about using:
> cur = end - min_t(erofs_off_t, offend + end - map->m_la, end)
> for this?
> 
> since cur and end are all [0, PAGE_SIZE - 1] for now, and
> folio_size() later.

OK. I will split the patch.

Sorry that I can not understand what is 'offend' refer to and what do 
you mean. Could you please describe it more clearly?

>>       - Expected result:
>>           - cur = 0
>>       - Actual result:
>>           - cur = 0x370
>>
>> Signed-off-by: Chunhai Guo <guochunhai@vivo.com>
>> ---
>>    fs/erofs/zdata.c | 13 ++++++++++---
>>    1 file changed, 10 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
>> index 5f1890e309c6..6abbd4510076 100644
>> --- a/fs/erofs/zdata.c
>> +++ b/fs/erofs/zdata.c
>> @@ -972,7 +972,8 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
>>    	struct erofs_map_blocks *const map = &fe->map;
>>    	const loff_t offset = page_offset(page);
>>    	bool tight = true, exclusive;
>> -	unsigned int cur, end, spiltted;
>> +	erofs_off_t cur, end;
>> +	unsigned int spiltted;
>>    	int err = 0;
>>    
>>    	/* register locked file pages as online pages in pack */
>> @@ -1035,7 +1036,7 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
>>    	 */
>>    	tight &= (fe->mode > Z_EROFS_PCLUSTER_FOLLOWED_NOINPLACE);
>>    
>> -	cur = end - min_t(unsigned int, offset + end - map->m_la, end);
>> +	cur = end - min_t(erofs_off_t, offset + end - map->m_la, end);
>>    	if (!(map->m_flags & EROFS_MAP_MAPPED)) {
>>    		zero_user_segment(page, cur, end);
>>    		goto next_part;
>> @@ -1841,7 +1842,7 @@ static void z_erofs_pcluster_readmore(struct z_erofs_decompress_frontend *f,
>>    	}
>>    
>>    	cur = map->m_la + map->m_llen - 1;
>> -	while (cur >= end) {
>> +	while ((cur >= end) && (cur < i_size_read(inode))) {
>>    		pgoff_t index = cur >> PAGE_SHIFT;
>>    		struct page *page;
>>    
>> @@ -1876,6 +1877,12 @@ static int z_erofs_read_folio(struct file *file, struct folio *folio)
>>    	trace_erofs_readpage(page, false);
>>    	f.headoffset = (erofs_off_t)page->index << PAGE_SHIFT;
>>    
>> +	/* when trying to read beyond EOF, return zero page directly */
>> +	if (f.headoffset >= i_size_read(inode)) {
>> +		zero_user_segment(page, 0, PAGE_SIZE);
>> +		return 0;
>> +	}
> Do we really need to optimize this rare case?
> I guess the follow readmore fix is enough, thoughts? >
> Thanks,
> Gao Xiang

Since the code is constantly being updated and someone may encounter 
this bug again, I think we had better fix it if possible.

Thanks.
Guo Chunhai