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 X-Spam-Level: X-Spam-Status: No, score=-24.8 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00F8EC4360C for ; Thu, 22 Apr 2021 00:39:20 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 84DB961445 for ; Thu, 22 Apr 2021 00:39:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 84DB961445 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B9E9C6B006C; Wed, 21 Apr 2021 20:39:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B4F726B006E; Wed, 21 Apr 2021 20:39:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9A2486B0070; Wed, 21 Apr 2021 20:39:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0095.hostedemail.com [216.40.44.95]) by kanga.kvack.org (Postfix) with ESMTP id 7AE456B006C for ; Wed, 21 Apr 2021 20:39:18 -0400 (EDT) Received: from smtpin36.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 384F918097A48 for ; Thu, 22 Apr 2021 00:39:18 +0000 (UTC) X-FDA: 78058143996.36.3C7BC52 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by imf19.hostedemail.com (Postfix) with ESMTP id 41FBF90009FB for ; Thu, 22 Apr 2021 00:38:54 +0000 (UTC) Received: by mail-qt1-f180.google.com with SMTP id u8so32580176qtq.12 for ; Wed, 21 Apr 2021 17:39:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version; bh=7i3jgTFMgSvDDCvaM/z3dZrqsQ7aoX20W1+zrU4bC9A=; b=cYmtc9W0OisFwodZq+YMaQ5sdbzZ/dQA3o03OF3rzbtnjrJU7alFKYG+oCHrfcyqzu kqD//2oRwaiOSkrEikSGLP4Z/xoOFm2vGexS/FdGw0ODgbaP/v9HEXOeXxeT4STG/DZu xj1uXLAAlfjhE1NkzxuDcYRLZ8aWdH7hwtvsBJsF/0IP47cTo8mwajMlw5g51ymOIeT/ J+di8TSFsA/30iBnurEbpjMPKJ1fvziHdujGmsGazeWJd2YZVgU8Q8ISgc7Wczn8rMXE qcuEYVkffuhPSfe5sghURh8aRX6EolLzfur43tAgomfo8XqpXmudWHThAwG42MDpIgaz bWlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:in-reply-to:message-id :references:user-agent:mime-version; bh=7i3jgTFMgSvDDCvaM/z3dZrqsQ7aoX20W1+zrU4bC9A=; b=FdshFLu+ckh5WiPUA14EPgpJAdFU38r+Ct0hlze4x0ls48Nrmrn3cV+Kl4LXEC9pTW j11b9oY0Dl//BL7E4cJXDwa3Mz6022bWQUr1bsR8lk/MQu7K5T9DuohOMto+G0jsoFbV G3/Slqp41JAsYYqgr6/Sk65/Fsz+34lIdovSkERSMjyroEFD9EybbITwP9NsZesapjRm IOXu+mn059O7kRBWIRlNP4vB223/qktPQHK1B1Pq38ibnqw1ygW2L+iJtEkz29c68glH irUDX1Cabs0cd7yBlTBVsQs9dpE5OXVnTq9vmkTIQHcQKHyTYUY+ZS5CP4qov6Xuaw6Y JalA== X-Gm-Message-State: AOAM533YooPkjnOGqqHWn1cHdgJqmVF9Dz5RD3kiwMZelA50ijGZjLK9 jqnPgflmYVEOI0j0e8X/mzIHaA== X-Google-Smtp-Source: ABdhPJxyK80llc+AABNVsntc/Os39N9486kEwBMS9LuEx4w7eCu0ZjsQZO2CgxQ+NLgYQ2hVhC1Deg== X-Received: by 2002:a05:622a:1449:: with SMTP id v9mr531639qtx.324.1619051957003; Wed, 21 Apr 2021 17:39:17 -0700 (PDT) Received: from eggly.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id a30sm1269538qtn.4.2021.04.21.17.39.15 (version=TLS1 cipher=ECDHE-ECDSA-AES128-SHA bits=128/128); Wed, 21 Apr 2021 17:39:16 -0700 (PDT) Date: Wed, 21 Apr 2021 17:39:14 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@eggly.anvils To: Andrew Morton cc: Hugh Dickins , Matthew Wilcox , William Kucharski , Christoph Hellwig , Jan Kara , Dave Chinner , Johannes Weiner , "Kirill A. Shutemov" , Yang Shi , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/2] mm/filemap: fix mapping_seek_hole_data on THP & 32-bit In-Reply-To: Message-ID: References: User-Agent: Alpine 2.11 (LSU 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Stat-Signature: oniza7otowq1s6eeqzpafu54n5qqenfy X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 41FBF90009FB Received-SPF: none (google.com>: No applicable sender policy available) receiver=imf19; identity=mailfrom; envelope-from=""; helo=mail-qt1-f180.google.com; client-ip=209.85.160.180 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1619051934-83708 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: No problem on 64-bit without huge pages, but xfstests generic/285 and other SEEK_HOLE/SEEK_DATA tests have regressed on huge tmpfs, and on 32-bit architectures, with the new mapping_seek_hole_data(). Several different bugs turned out to need fixing. u64 casts added to stop unfortunate sign-extension when shifting (and let's use shifts throughout, rather than mixed with * and /). Use round_up() when advancing pos, to stop assuming that pos was already THP-aligned when advancing it by THP-size. (But I believe this use of round_up() assumes that any THP must be THP-aligned: true while tmpfs enforces that alignment, and is the only fs with FS_THP_SUPPORT; but might need to be generalized in the future? If I try to generalize it right now, I'm sure to get it wrong!) Use xas_set() when iterating away from a THP, so that xa_index stays in synch with start, instead of drifting away to return bogus offset. Check start against end to avoid wrapping 32-bit xa_index to 0 (and to handle these additional cases, seek_data or not, it's easier to break the loop than goto: so rearrange exit from the function). Fixes: 41139aa4c3a3 ("mm/filemap: add mapping_seek_hole_data") Signed-off-by: Hugh Dickins --- mm/filemap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) --- 5.12-rc8/mm/filemap.c 2021-02-26 19:42:39.812156085 -0800 +++ linux/mm/filemap.c 2021-04-20 23:20:20.509464440 -0700 @@ -2671,8 +2671,8 @@ unsigned int seek_page_size(struct xa_st loff_t mapping_seek_hole_data(struct address_space *mapping, loff_t start, loff_t end, int whence) { - XA_STATE(xas, &mapping->i_pages, start >> PAGE_SHIFT); - pgoff_t max = (end - 1) / PAGE_SIZE; + XA_STATE(xas, &mapping->i_pages, (u64)start >> PAGE_SHIFT); + pgoff_t max = (u64)(end - 1) >> PAGE_SHIFT; bool seek_data = (whence == SEEK_DATA); struct page *page; @@ -2681,7 +2681,8 @@ loff_t mapping_seek_hole_data(struct add rcu_read_lock(); while ((page = find_get_entry(&xas, max, XA_PRESENT))) { - loff_t pos = xas.xa_index * PAGE_SIZE; + loff_t pos = (u64)xas.xa_index << PAGE_SHIFT; + unsigned int seek_size; if (start < pos) { if (!seek_data) @@ -2689,25 +2690,25 @@ loff_t mapping_seek_hole_data(struct add start = pos; } - pos += seek_page_size(&xas, page); + seek_size = seek_page_size(&xas, page); + pos = round_up((u64)pos + 1, seek_size); start = page_seek_hole_data(&xas, mapping, page, start, pos, seek_data); if (start < pos) goto unlock; + if (start >= end) + break; + if (seek_size > PAGE_SIZE) + xas_set(&xas, (u64)pos >> PAGE_SHIFT); if (!xa_is_value(page)) put_page(page); } - rcu_read_unlock(); - if (seek_data) - return -ENXIO; - goto out; - + start = -ENXIO; unlock: rcu_read_unlock(); - if (!xa_is_value(page)) + if (page && !xa_is_value(page)) put_page(page); -out: if (start > end) return end; return start;