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 B159AC3DA6E for ; Thu, 4 Jan 2024 00:04:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 410E76B0112; Wed, 3 Jan 2024 19:04:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C1236B0206; Wed, 3 Jan 2024 19:04:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28A286B0205; Wed, 3 Jan 2024 19:04:28 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 185FA8D006C for ; Wed, 3 Jan 2024 19:04:28 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D637B80268 for ; Thu, 4 Jan 2024 00:04:27 +0000 (UTC) X-FDA: 81639681774.29.11DEA9E Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf02.hostedemail.com (Postfix) with ESMTP id 467D68001B for ; Thu, 4 Jan 2024 00:04:25 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SGGMmxyW; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704326665; a=rsa-sha256; cv=none; b=jD6VbC+Ow8NiAUgAAfbolulj2jpvfIZ2kOUkUCgftRIyKOr3Gt2gkxRxMOVIJ/Kh7bBcRA debDDtgjKi5rsPt6vr8sYIC4Xxpf5MuYAbYnSgAn7h4JAwkM1+jCxN6Ba1HX7PX2Fv5/uK dTggAiWiGh7hg723yEAwRS+PNQDlpPc= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=SGGMmxyW; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf02.hostedemail.com: domain of djwong@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=djwong@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704326665; 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=6M/RNXbSZhC+FUSE84gP/TBYlaCH8r8U2qhrc9z9Zc8=; b=VNyodJoeEM3wK+L+wpXxk4LbsLRzx9XScc7XvtLc5qQ8s6SLNIyl4ZQ8KRhpoX9otbGkZd J54uqv+A6cY0cOgS1PTmoBAuwOJt3KCy3GfNWcVIVKOfbPInmoPYzrX9rkQk7Y04K5mjOp /C9emqGN6fjhE1ppcpFHMffmQ82mgC8= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6381960C0D; Thu, 4 Jan 2024 00:04:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0851EC433C8; Thu, 4 Jan 2024 00:04:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704326664; bh=nzTd/eHPThDk7kMu+BEjnfqbKdVEGlEHsJQ3k+kmID4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SGGMmxyWXoXuu1VDa1x4eDvhh7hQp0Ns2C50aT/NNUo4NQjjXaS1vsOow5adYfj2V y8fYrjHEoQwlOgGFAQLPIwsv/bM9bKjrqYJ5lgP8ShqLln+cyQbFzLrp4PBKVXSxi8 qFMBHm8SbW7BFoHH1jtLgKVJ68/VrpcIHM7GNv5hcOWz9tFO+q1hbuYzkI+hqzC7Up KSrZETpeHPd4mcBs79Jawej+3AiCYFTzJftyNXjWZW9HwZZVtnsZX7ZWJV/woOW0/F L5IaSvBjGobg9X2XMsXGlvhR2misp1FGqNFaw2MusRdV5ehgkXxLStZ943sEUeIZDZ bC5tW8NGJ60cQ== Date: Wed, 3 Jan 2024 16:04:23 -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 10/15] xfs: remove xfarray_sortinfo.page_kaddr Message-ID: <20240104000423.GD361584@frogsfrogsfrogs> References: <20240103084126.513354-1-hch@lst.de> <20240103084126.513354-11-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240103084126.513354-11-hch@lst.de> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 467D68001B X-Stat-Signature: tonsqwodsqr1w6q79oubyxhp3hu18q74 X-HE-Tag: 1704326665-958286 X-HE-Meta: U2FsdGVkX1/iN8pflIQmzCQQD7iFsrp/8mNaOdIpZtKu05txFh2MtDMB6FrpJ2gJchaxp99cWZM225eDtOh0EJXNOgJUHn7DUKaIkqktbdJQYJx5bfaGedqie0jqo2TAz/rBaygnbzBBxGuTZnMlxsIe3uB2c2r8nl0KNGDUSDfUWqC+j+Q81S7xomZ9f+G057/fzkskWQaiGq99bOwLzRcgnxdi7Uhql4ELamoP7xOBOrL/ksoh2L0NsHS1+nnw6PJVbG+YTBEKGZquJiGd/K5tIBYK/oSP6Q2QnRjxWzI7e4pmtNcnnrEx9EAyuIQVZnzm8B6kLULDVHPLBvIId2lm3vj2t7FsKnDbK6ffj+5QuZHU0z5J7kG9L5L1Jg7LoNpLrP0QmPa6kQsV1xGU1odEtjx1FQqKKBZVWBa5HSMmElD4Ib6BEEFVmdORJjXl7KBOe4PoStVUu54Yaf3ZyOZSANKj0ZpgeM9CP2V0mvSZ2CwjZNrM9k4X+SMIJFyxEBXA/LH5K8JmTLNo7LgwVobfWRYkhW+rD+vfEUs3fkfj3CDaDj5meBuwn7/JLStL6UAns5c25UKh98dmbzIuWoaDZr3tA8qIzRNCQjQ5l/vJbEOOGOMiO+WLF5fC4gNHEb4/h1mdLqmFZMpZedyyhVERFUMg1wSz88hb4aHz9Bh50kUrVfTkI9WRbzJrgdEHgsbaYbfQPy72pVBdi+RKZzOUbOohfNTgGNYEzOCaciL5qYe2JvETRzCPP778pb+ZWYDC/xem3sXh2cXrFJ+AEaQdT+hLq6w8NUK7+ZwB+HX8UqkVSXW3k10q1FusE8B6RRVa83ph0EFDx06efv7Q/2aHhHeqFmCQIpyEgjg+whpbeGRCShWrpqkmxn3p02WSqLRjza8ykoUo7uN0EfxqOoNBZLu+AHa96oFdAYnwIPKJhLdSvbGG3FwgC0GaiA4p3ACT0W96bYyAFycNiyg Fon7A0Kl jNcg79lfl+La0LLaeNFGBT5caiKliCto6GuHzI+k9+32RFHOIkhhWiOYE4/95BfiD9JB9r1cdVItIup2/CwUQFusIxrjUTDvUpHVyDtdGXtIAukWiKwMxNFV9fP/ndEk081y1wR4ShnDVoKiLZQ6K4/nTe2O2gAZzd+Kp2zjczpMXxhLoE0dW2xVVcHkETlQOBtL04TAobRerSEW+FkHU1s3iEvxExufgnD+y0ynIm/9HdLQ5TIu4dhbpbntVpiAVOTcv4k5LpQ2L2EQ+VvIis1A/TEP3KIraO8oV 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:21AM +0000, Christoph Hellwig wrote: > Now that xfile pages don't need kmapping, there is no need to cache > the kernel virtual address for them. > > Signed-off-by: Christoph Hellwig LGTM! Reviewed-by: Darrick J. Wong --D > --- > fs/xfs/scrub/xfarray.c | 22 ++++------------------ > fs/xfs/scrub/xfarray.h | 1 - > 2 files changed, 4 insertions(+), 19 deletions(-) > > diff --git a/fs/xfs/scrub/xfarray.c b/fs/xfs/scrub/xfarray.c > index 3a44700037924b..c29a240d4e25f4 100644 > --- a/fs/xfs/scrub/xfarray.c > +++ b/fs/xfs/scrub/xfarray.c > @@ -570,18 +570,7 @@ xfarray_sort_get_page( > loff_t pos, > uint64_t len) > { > - int error; > - > - error = xfile_get_page(si->array->xfile, pos, len, &si->xfpage); > - if (error) > - return error; > - > - /* > - * xfile pages must never be mapped into userspace, so we skip the > - * dcache flush when mapping the page. > - */ > - si->page_kaddr = page_address(si->xfpage.page); > - return 0; > + return xfile_get_page(si->array->xfile, pos, len, &si->xfpage); > } > > /* Release a page we grabbed for sorting records. */ > @@ -589,11 +578,8 @@ static inline int > xfarray_sort_put_page( > struct xfarray_sortinfo *si) > { > - if (!si->page_kaddr) > + if (!xfile_page_cached(&si->xfpage)) > return 0; > - > - si->page_kaddr = NULL; > - > return xfile_put_page(si->array->xfile, &si->xfpage); > } > > @@ -636,7 +622,7 @@ xfarray_pagesort( > return error; > > xfarray_sort_bump_heapsorts(si); > - startp = si->page_kaddr + offset_in_page(lo_pos); > + startp = page_address(si->xfpage.page) + offset_in_page(lo_pos); > sort(startp, hi - lo + 1, si->array->obj_size, si->cmp_fn, NULL); > > xfarray_sort_bump_stores(si); > @@ -883,7 +869,7 @@ xfarray_sort_load_cached( > return error; > } > > - memcpy(ptr, si->page_kaddr + offset_in_page(idx_pos), > + memcpy(ptr, page_address(si->xfpage.page) + offset_in_page(idx_pos), > si->array->obj_size); > return 0; > } > diff --git a/fs/xfs/scrub/xfarray.h b/fs/xfs/scrub/xfarray.h > index 62b9c506fdd1b7..6f2862054e194d 100644 > --- a/fs/xfs/scrub/xfarray.h > +++ b/fs/xfs/scrub/xfarray.h > @@ -107,7 +107,6 @@ struct xfarray_sortinfo { > > /* Cache a page here for faster access. */ > struct xfile_page xfpage; > - void *page_kaddr; > > #ifdef DEBUG > /* Performance statistics. */ > -- > 2.39.2 > >