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 EBDB3C3DA6E for ; Wed, 3 Jan 2024 23:55:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8033C6B011C; Wed, 3 Jan 2024 18:55:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7B2E26B0120; Wed, 3 Jan 2024 18:55:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6A2D16B011E; Wed, 3 Jan 2024 18:55:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 5AB0A6B02AE for ; Wed, 3 Jan 2024 18:55:43 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D5A5C1C0FAF for ; Wed, 3 Jan 2024 23:55:42 +0000 (UTC) X-FDA: 81639659724.25.3594A15 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf23.hostedemail.com (Postfix) with ESMTP id 26AA2140022 for ; Wed, 3 Jan 2024 23:55:40 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sQ6p+AvM; spf=pass (imf23.hostedemail.com: domain of djwong@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704326141; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=U0Q2g5SP2vrdZJto5mcu26InkGi/7Ga1reGsYh8xz7I=; b=1Z9PfB+a2cSroSIO/l5zKV0RkFj9Ji7TNDHaJgcgk1pJmNnfRzGI3JYn49VGh0nic9CM6y phqthR2ohZTx28s6fUBFHpphut35Dd/cCtm4kmDqpAln/Zt0Qhj/zynBBSp287ZorkOVHx 7o5wElq5sSMvgKgjrVZtM8ijcb1SNB4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704326141; a=rsa-sha256; cv=none; b=L2Ubmn7y1/fdyGd8XCV/3Qp7Ez0wW+G0grcOYz0s3kmsGfcNPcC5Ldu7LcnVaAKkaUpIHo WcBexSaQIOAYbr9yoxbzg4bEuNrlODX6N2euLGXThWHJmrrwzpTisDYiolKOKHtmlc9Q6Q gWB/a8zMDUdHlOwkNQgQsQR8PUcv2fo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=sQ6p+AvM; spf=pass (imf23.hostedemail.com: domain of djwong@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 8DCBDB80AD0; Wed, 3 Jan 2024 23:55:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D55E3C433C8; Wed, 3 Jan 2024 23:55:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704326138; bh=EJSAFOJfk72w4zuiDhQmYeZvUi0r8YsG9q1WbFswCD8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sQ6p+AvMgCzxQNuCbHBclImm9cXZeCde6NGKgvPFQkfr9/jcs158pQDO1avR9X2D4 MvrxuDyWU43RLdTnAA0GrwV3lpHAHJh52XI2g3WHbFw5fBPmZdcSbK93ibiSeIVIta xga0DD9YbmsdyVSIn1gC3cInnWrMa+y4VfdnCp5pSBDckByBMmy9GNS/WjbKJVA/2T yRUnuIDl0hfB5Uv3cMCn30oKY3hIc7obWPJbohb3Kmfa/jS0n4ZRYB63Gn1mp9/Nza se2P/OGvJbzDlL3wBLSehIRCzNVbp2ErbDb7yvHjGjeGTUH62uzCOnTqyW4ytyYlTx Gv2fqz9RSxq0w== Date: Wed, 3 Jan 2024 15:55:38 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Chandan Babu R , Hugh Dickins , Andrew Morton , linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 06/15] xfs: don't try to handle non-update pages in xfile_obj_load Message-ID: <20240103235538.GZ361584@frogsfrogsfrogs> References: <20240103084126.513354-1-hch@lst.de> <20240103084126.513354-7-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240103084126.513354-7-hch@lst.de> X-Rspamd-Queue-Id: 26AA2140022 X-Rspam-User: X-Stat-Signature: b75cqzo58xq8we7kbndigq7ob43nbtq9 X-Rspamd-Server: rspam03 X-HE-Tag: 1704326140-344425 X-HE-Meta: U2FsdGVkX18uEclJOiO8YQaGPmsWI5aUdAekpkjitXa8+EzAyZZkMOQgYE2NHEh2LiCyW3VnSyhhck3GZxGErBKS6v9RyFKXQM22W8eUUhf2t0F8FpKcGCIzHcmbgXl/GB7BIWyYbq7GumfUmixbRRpVYhCeMiuIbAByBf2ePBkkmqhYeTZl2PYr+rbKGUVHx7IdXq2ElnagozzZlXNoHg81M1j+KFu7CGL22jVDnlL4mk+UUMC/sj3j+hrWdSq0dlxIUBspcQIW/UXqTVRa3isFSiW4Igde/QniaiXnuxYy3lttoTGmQj+fddgHDnWTed5jirku+67g27NuR4G+4NFYlHZDeaYVz/6xUQJVrjOxrxKBhSwpnAlvkUzA0jQ4QNOo7XU7Tgc67xdkM6js9hHcFhefzFHsX2CoKzbqePRxPiaAKOoQvMXJHrSQQRtxMneDxM7Q14AvvdjAhbb68ah0ddntwQgLVNRvZ68WfMfPFEa7aozJ4OzDzvoKYJhcawrQcR/2sn8jr7WH+2LPKSQ8ha0wk/aNaOSrvJ5DvAJCfC/pNYLDUr2E+FJ4H0/hWGI1bCVby3j5xCOX0XuLZhqcDiSvTSwlvB78zXD2zPb3/2Pi74d57/gukPfA+bTRZ//Vq+7VKCDx9zYcV8oiJyCJ6nGUlGFcwnkM6hldjvBzyzjAuNFVjv9X2AclX1x/UljwUZIfnQYJ5hIvyeEu7csK+1P7nNqlcDj0+U4fkhVIHdO0bpFkr1FkhMaitqCNCcLdAanUDJS05e2XChDAH4Lb8voQ2fhn9dT+O7TQ9tzOJ31R7OEtb6RKcSVMLLjc164r6RBPhD4VwlcLtVbnIYh80+xvaEX/Ddwt2BuetnyHXmGSfvTz/QzzXqbhDG7BxjfDDXzH/I0YOmS3xIQmQghktUpb+6RLPw7EQ00EWPP8oPP9NY+zGRGIjDv8dIDnCdTS2hEVGZ0uh3+6rzE LfYox2q9 1FRV9K8CAUxL+u4E3LjUz2u8wpaQcd8krEQ7yF+GTeLvYX/tS2dTvZwJnb5cyZGgEFrRVJqFaCNdyiKqPrZSsf1hVSiS5ctCXy7MJT3x39d/9P2TnWgc4CA99hAaJ5R56wh0I/ldGtXHjJdjXo424wZR/ykqEJLkxWBYpoIetQiUjG9nonV5oNDJLmTjXMR3cn5wQeiWsUVUdopPdInIZ3tCT16dXRPk7ycxUfnkjUQpNdgdQxONl7fsZ4/mZ1W19QENmPAgiay/YHCGakLWwsgcQDzXtEzd6g4Z8 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 Wed, Jan 03, 2024 at 08:41:17AM +0000, Christoph Hellwig wrote: > shmem_read_mapping_page_gfp always returns an uptodate page or an > ERR_PTR. Remove the code that tries to handle a non-uptodate page. > > Signed-off-by: Christoph Hellwig Hmm. xfile_pread calls shmem_read_mapping_page_gfp -> shmem_read_folio_gfp -> shmem_get_folio_gfp(..., SGP_CACHE), right? Therefore, if the page is !uptodate then the "clear:" code will mark it uptodate, right? And that's why xfile.c doesn't need to check uptodate? If that's correct, then: Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/scrub/xfile.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c > index 9e25ecf3dc2fec..46f4a06029cd4b 100644 > --- a/fs/xfs/scrub/xfile.c > +++ b/fs/xfs/scrub/xfile.c > @@ -166,18 +166,14 @@ xfile_obj_load( > goto advance; > } > > - if (PageUptodate(page)) { > - /* > - * xfile pages must never be mapped into userspace, so > - * we skip the dcache flush. > - */ > - kaddr = kmap_local_page(page); > - p = kaddr + offset_in_page(pos); > - memcpy(buf, p, len); > - kunmap_local(kaddr); > - } else { > - memset(buf, 0, len); > - } > + /* > + * xfile pages must never be mapped into userspace, so > + * we skip the dcache flush. > + */ > + kaddr = kmap_local_page(page); > + p = kaddr + offset_in_page(pos); > + memcpy(buf, p, len); > + kunmap_local(kaddr); > put_page(page); > > advance: > -- > 2.39.2 > >