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 95458C63797 for ; Thu, 12 Jan 2023 17:20:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1149E8E0002; Thu, 12 Jan 2023 12:20:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0F5A08E0001; Thu, 12 Jan 2023 12:20:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF6168E0002; Thu, 12 Jan 2023 12:20:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id E364E8E0001 for ; Thu, 12 Jan 2023 12:20:03 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id B2F8D806C1 for ; Thu, 12 Jan 2023 17:20:03 +0000 (UTC) X-FDA: 80346809886.13.7C347E7 Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) by imf19.hostedemail.com (Postfix) with ESMTP id 022481A0012 for ; Thu, 12 Jan 2023 17:20:01 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Pc/Xg/kv"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673544002; 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=E+c881Dpe/85Aq62y2qtNDOsySQkmPy3VHLSOKalLuM=; b=Ks8a3cNL120G5H5dTMpNjjD4OaTzTiximjEbmwdFQVP6/CevoOjEOrUZl1GEUB/W7ZPA0m qEzxeipmrUzUTf2ZA3rgmHFKTl60Buys9jsii3XmjPGpCG8QUTUuB4IHg2etx1Vr9lDa7Z eMntla3Bdt0J7dEgDbipjTIKIcjIBeA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Pc/Xg/kv"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf19.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673544002; a=rsa-sha256; cv=none; b=XI1nSYm3kxk/7MlGLvNwH1dL0ox6aqOMlg2ztooGbilH7lAx/N6SLm++EKR63H2LHU3UPS 3wFIDVgKtm/sRHbfK3zJUhgoapS3fqD9EQQK1X7EqACxsDyA5VQ9jhi37rq2Bb4IUYuqp7 UgvRMh17Z07u/R8hk7cJdMV0eAbr+nY= Received: by mail-yb1-f173.google.com with SMTP id a9so2815407ybb.3 for ; Thu, 12 Jan 2023 09:20:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=E+c881Dpe/85Aq62y2qtNDOsySQkmPy3VHLSOKalLuM=; b=Pc/Xg/kvl8DhMy2mV5DSv0JY0A6VI9FAm0F9VYc/dWZQyf9ydWoM7408OMWs2Kt4+S eCo3wgwd+MlvDDhfoUGkDIHkrJCrglJGkVPgM1Oz/eqrjqRxIUt6ATz63+Zu6orRFNgG FQGLvnnrHoT7dPPaTZzgvM7ZMRU4T4kxqvK2dz+jrBacryTz+KXjnEm1lE9Im5xoXhH6 uaeXjEyPwqRZI6/5GVgzLBgcQ8qcs+by+yaLr7atp5Urs68114vwsX10TNqGRNH04pMs QclnYeakKcSogdPbUF9XgR9U7I3ZKCshjFY/gZue60/KZOW51I77izQ6dwI6z0pu5/hK x6BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=E+c881Dpe/85Aq62y2qtNDOsySQkmPy3VHLSOKalLuM=; b=U5oOGI3YD+PrtgFxQeNfNvphvA0Z/s/A3DzRReFXTTCH5ivXxrLQK6UILk7UZYpWeU v+yED+qSAhqSCrscYBm/z+vjgvwCw5yA1AzdJIajfoa02OrJhMtt1tvHergdQ9yzE67r JqAXXKwSNlcjZexxvC7x75pm6rfIPo34BzFdqKWsMBnSURgSeVehMgDCS7rQlItCqs/d KGF+tL5rUQzgYJ8PF5g33SwVHUCEWKhL/TVh+DNDNYR+IQa3KeQ89dWiqLAb0NWX1taK +6KZQVImAQz1Mpr33FyYNOHupJbFL0rHMOEh2E/oWvt28qeXQcLrVEIbodbxmFGRWONN PnMA== X-Gm-Message-State: AFqh2kpqXZldA05BYrIXb7t+2KiMbCo+8koYv4Tn/++beq8RizYr4aZ3 DkGuj40PHmkOMk9qjSx/CIopuYm5I83Z8ocUjrQ= X-Google-Smtp-Source: AMrXdXsAU7a6oM1sLrHI9+oxo29VzkKN9mlRylNCqKeDfYmz3uqWRlBtx5f1lx9/AgauD4UB5gGLFmj2h4TGKEvLRKQ= X-Received: by 2002:a25:8a:0:b0:7ca:7f22:5c15 with SMTP id 132-20020a25008a000000b007ca7f225c15mr196720yba.219.1673544001120; Thu, 12 Jan 2023 09:20:01 -0800 (PST) MIME-Version: 1.0 References: <20230104211448.4804-1-vishal.moola@gmail.com> <20230104211448.4804-10-vishal.moola@gmail.com> In-Reply-To: <20230104211448.4804-10-vishal.moola@gmail.com> From: Vishal Moola Date: Thu, 12 Jan 2023 09:19:50 -0800 Message-ID: Subject: Re: [PATCH v5 09/23] cifs: Convert wdata_alloc_and_fillpages() to use filemap_get_folios_tag() To: linux-fsdevel@vger.kernel.org, pc@cjr.nz, tom@talpey.com Cc: linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, linux-cifs@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, cluster-devel@redhat.com, linux-nilfs@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 022481A0012 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: x6x44f6aph1m3tgpk1dnudpcma8aa6ey X-HE-Tag: 1673544001-83051 X-HE-Meta: U2FsdGVkX1+u3r9ZNh8HlBGdqKBMxwTvLtsEpwMusea2NMSd7IWGEfiOf6bZ4Xlde/a+9S58kIhlGwFkEogXNExEOe3HnFYNmKRtvX9zipBk+55Nih+g1kvf6Cg+wDYIirRI9NziZ8dxatnBQw85xYGaAbh5Zv9eJSAHLrkMGVeVUAQCcbwjarIdp7Y0RVczhVzHk0t9+KAr+qhTEmjNnYDet3vc0BLwwLEyEKy/NqSippeXggcC97wHNpDpyZbGGSk4h4YglaAPsGHnlgItu7M24oWjvvCPDKHRI9/2mzBSSuRaRkolQWd3tgcHCeSqP6b09ztzPaHcr7MPLDXW4KrenQvOrSkuW0uAumD7yN2EE7hhw+zAKm6y96BN9RjiCixoCGYXjIzyMoYN5bEb2qXe4KSMSLhmrEj78TtBhJM6Aok/R40QvI3+Hv9lE6POSBhF3u+hWCxaFVv2fmzX95YbhhnNKBiOUd3P0x/wn/4I7nelUBtv4fK6rOFmu8uIGMh4OtUjzvMB4LLyMem1K1kZvSulZEo/Feto/N3a36a/V/1B6i6BLcmOr7WwJJr88p/CN+WIvqkHTglykeYgmMtOwaWyG+odVu8p+4Vfn/Ml8sjjWr4jKfgfxvz44keVXggnMkntMzz02nYIdska5lK2akI0jiEgw9T0yv2LZuTAV0UqWAR+jqg/NwKC2vHgxQNzW7EWddT8bO4LUf7WEZj1cL6H3XlcFtUvzpWlAP2nDgb+hqqVDUsLjIDBeNUNn5kLkQMze3gvcA3wGOj2DXv+/DCsLyogqagYEkKPOaOCgqauRaxF/0r4lmOR+E6rXoPtyzZfqtpPZHt2k/IbRPP7ZOCxhtEIyKbQluSkta9t34Vk3qXJMInrQn08+V7r5UZcopPp15ypC8kaAyjCP5A47RuXkkA4XtuxvldE1jspREuX46wgyXJOA3+ViE1zKfts5fabIjB+N2Y56Xh qh5VmH7l KuAzsBEChC3PfqNvPAtFYqyCRMp+j/Q1yYwrRfKZUuPFLrCbLwda30Y+E25O7ofYIuHxzapANSqUo+N1j5GE7UKYGIS4RZOkjqfCZygw77ZFz+W4xtfan3jRLrIi3vb3ptjOe 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: On Wed, Jan 4, 2023 at 1:15 PM Vishal Moola (Oracle) wrote: > > This is in preparation for the removal of find_get_pages_range_tag(). Now also > supports the use of large folios. > > Since tofind might be larger than the max number of folios in a > folio_batch (15), we loop through filling in wdata->pages pulling more > batches until we either reach tofind pages or run out of folios. > > This function may not return all pages in the last found folio before > tofind pages are reached. > > Signed-off-by: Vishal Moola (Oracle) > --- > fs/cifs/file.c | 32 +++++++++++++++++++++++++++++--- > 1 file changed, 29 insertions(+), 3 deletions(-) > > diff --git a/fs/cifs/file.c b/fs/cifs/file.c > index 22dfc1f8b4f1..8cdd2f67af24 100644 > --- a/fs/cifs/file.c > +++ b/fs/cifs/file.c > @@ -2527,14 +2527,40 @@ wdata_alloc_and_fillpages(pgoff_t tofind, struct address_space *mapping, > unsigned int *found_pages) > { > struct cifs_writedata *wdata; > - > + struct folio_batch fbatch; > + unsigned int i, idx, p, nr; > wdata = cifs_writedata_alloc((unsigned int)tofind, > cifs_writev_complete); > if (!wdata) > return NULL; > > - *found_pages = find_get_pages_range_tag(mapping, index, end, > - PAGECACHE_TAG_DIRTY, tofind, wdata->pages); > + folio_batch_init(&fbatch); > + *found_pages = 0; > + > +again: > + nr = filemap_get_folios_tag(mapping, index, end, > + PAGECACHE_TAG_DIRTY, &fbatch); > + if (!nr) > + goto out; /* No dirty pages left in the range */ > + > + for (i = 0; i < nr; i++) { > + struct folio *folio = fbatch.folios[i]; > + > + idx = 0; > + p = folio_nr_pages(folio); > +add_more: > + wdata->pages[*found_pages] = folio_page(folio, idx); > + folio_get(folio); > + if (++*found_pages == tofind) { > + folio_batch_release(&fbatch); > + goto out; > + } > + if (++idx < p) > + goto add_more; > + } > + folio_batch_release(&fbatch); > + goto again; > +out: > return wdata; > } > > -- > 2.38.1 > Could someone review this cifs patch, please? This is one of the 2 remaining patches that need to be looked at in the series.