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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3EB2C83F14 for ; Mon, 28 Aug 2023 01:22:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229574AbjH1BWF (ORCPT ); Sun, 27 Aug 2023 21:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjH1BWB (ORCPT ); Sun, 27 Aug 2023 21:22:01 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AB13107 for ; Sun, 27 Aug 2023 18:21:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693185679; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xmja/1PLodDJgYWKao/T5BYA/P9CEUYhsXxvzaEDO84=; b=ERJ4Cnpg4rUjZlxMO11kIcu4Y2fmG66VK30Sz/ZIw392vH7ZY5j/xnTzecHUxyV195sMXK YY6SkQYw7nX583AS6sgWt6HK9ll/Xr1F+YWepbTG5vB5UcqA6zR6ef9ScKP+EBeW6s14wc ZkpIYCE1tlxDucto4rdP19Mb4Cbjr2c= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-LepiybCZMZypyvvWKdrHAw-1; Sun, 27 Aug 2023 21:21:18 -0400 X-MC-Unique: LepiybCZMZypyvvWKdrHAw-1 Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-26d4ca4ba09so2966918a91.3 for ; Sun, 27 Aug 2023 18:21:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693185677; x=1693790477; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=xmja/1PLodDJgYWKao/T5BYA/P9CEUYhsXxvzaEDO84=; b=LY0N07K/qwCRY+eiIID74pS5luHK7oEojODPSF/eTcpaa6FOtE0VlLjF2dX3HEx94E P8/eO+0Pjy7BjfbjMUw0PX7QTanfEYGWu90h0yZE480+h12QKSeZ/odVb6rwpYEqpVR2 4nat5ARLKKMPNvx07UdDltCqDHB1xDVTXcEge8Abxwdr7fep03z5ZDwX0fYfTMawniOn NxIyBEg3TAHJ+30v1/fJl9NobxKpVHXZmj42D0fL3g1bHTCNWwNsF+kIH/dQ0wUML+H1 AlMyu97F2qb82OX8+kIhWz3cMUHVNGSrxWtVLQguU0Z/sYVDgjs9xWdLCj+zjQY5nGex +lLg== X-Gm-Message-State: AOJu0Yx5WeMfE71hi636/TzroK7AlzlKuaPKL/4FQq7NOxigt3/NB0dH k7r6roipsnDiP5c7p+AbVnDl2OABx5j2Tk1GxqvK6nh+v3easmIX4sSylYXGXZR5VdrIu+XonCq 97gNkzfZfvaslrguxMQKKlw== X-Received: by 2002:a17:902:7c94:b0:1bb:cf58:531d with SMTP id y20-20020a1709027c9400b001bbcf58531dmr24304264pll.10.1693185677418; Sun, 27 Aug 2023 18:21:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFk7z2kv2pO70y4enOxW6mKR03gcRasV88Uo9MokFbyZ79hWpRSjOtbgeIVRTN8HiEMpDLkug== X-Received: by 2002:a17:902:7c94:b0:1bb:cf58:531d with SMTP id y20-20020a1709027c9400b001bbcf58531dmr24304256pll.10.1693185677109; Sun, 27 Aug 2023 18:21:17 -0700 (PDT) Received: from [10.72.112.71] ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id d20-20020a170902c19400b001bd41b70b65sm5918115pld.49.2023.08.27.18.21.14 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 27 Aug 2023 18:21:16 -0700 (PDT) Message-ID: Date: Mon, 28 Aug 2023 09:21:13 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 02/15] ceph: Convert ceph_page_mkwrite() to use a folio Content-Language: en-US To: "Matthew Wilcox (Oracle)" , Ilya Dryomov Cc: Jeff Layton , ceph-devel@vger.kernel.org, David Howells , linux-fsdevel@vger.kernel.org References: <20230825201225.348148-1-willy@infradead.org> <20230825201225.348148-3-willy@infradead.org> From: Xiubo Li In-Reply-To: <20230825201225.348148-3-willy@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org On 8/26/23 04:12, Matthew Wilcox (Oracle) wrote: > Operate on the entire folio instead of just the page. There was an > earlier effort to do this with thp_size(), but it had the exact type > confusion between head & tail pages that folios are designed to avoid. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > fs/ceph/addr.c | 35 +++++++++++++++++------------------ > 1 file changed, 17 insertions(+), 18 deletions(-) > > diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c > index 9a0a79833eb0..7c7dfcd63cd1 100644 > --- a/fs/ceph/addr.c > +++ b/fs/ceph/addr.c > @@ -1677,8 +1677,8 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) > struct ceph_inode_info *ci = ceph_inode(inode); > struct ceph_file_info *fi = vma->vm_file->private_data; > struct ceph_cap_flush *prealloc_cf; > - struct page *page = vmf->page; > - loff_t off = page_offset(page); > + struct folio *folio = page_folio(vmf->page); > + loff_t pos = folio_pos(folio); > loff_t size = i_size_read(inode); > size_t len; > int want, got, err; > @@ -1695,50 +1695,49 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) > sb_start_pagefault(inode->i_sb); > ceph_block_sigs(&oldset); > > - if (off + thp_size(page) <= size) > - len = thp_size(page); > - else > - len = offset_in_thp(page, size); > + len = folio_size(folio); > + if (pos + folio_size(folio) > size) s/folio_size(folio)/len/ ? > + len = size - pos; > > dout("page_mkwrite %p %llx.%llx %llu~%zd getting caps i_size %llu\n", > - inode, ceph_vinop(inode), off, len, size); > + inode, ceph_vinop(inode), pos, len, size); > if (fi->fmode & CEPH_FILE_MODE_LAZY) > want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO; > else > want = CEPH_CAP_FILE_BUFFER; > > got = 0; > - err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_WR, want, off + len, &got); > + err = ceph_get_caps(vma->vm_file, CEPH_CAP_FILE_WR, want, pos + len, &got); > if (err < 0) > goto out_free; > > dout("page_mkwrite %p %llu~%zd got cap refs on %s\n", > - inode, off, len, ceph_cap_string(got)); > + inode, pos, len, ceph_cap_string(got)); > > - /* Update time before taking page lock */ > + /* Update time before taking folio lock */ > file_update_time(vma->vm_file); > inode_inc_iversion_raw(inode); > > do { > struct ceph_snap_context *snapc; > > - lock_page(page); > + folio_lock(folio); > > - if (page_mkwrite_check_truncate(page, inode) < 0) { > - unlock_page(page); > + if (folio_mkwrite_check_truncate(folio, inode) < 0) { > + folio_unlock(folio); > ret = VM_FAULT_NOPAGE; > break; > } > > - snapc = ceph_find_incompatible(page); > + snapc = ceph_find_incompatible(&folio->page); > if (!snapc) { > - /* success. we'll keep the page locked. */ > - set_page_dirty(page); > + /* success. we'll keep the folio locked. */ > + folio_mark_dirty(folio); > ret = VM_FAULT_LOCKED; > break; > } > > - unlock_page(page); > + folio_unlock(folio); > > if (IS_ERR(snapc)) { > ret = VM_FAULT_SIGBUS; > @@ -1762,7 +1761,7 @@ static vm_fault_t ceph_page_mkwrite(struct vm_fault *vmf) > } > > dout("page_mkwrite %p %llu~%zd dropping cap refs on %s ret %x\n", > - inode, off, len, ceph_cap_string(got), ret); > + inode, pos, len, ceph_cap_string(got), ret); > ceph_put_cap_refs_async(ci, got); > out_free: > ceph_restore_sigs(&oldset);