From patchwork Mon Jun 19 13:42:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 110027 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3024088vqr; Mon, 19 Jun 2023 06:57:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ70sbo80rgBZYHABj3+KDTXTx1cUqP3DL2nbKVf4v3uloUaSBb1scxN2feBqCKUfZFAfEV3 X-Received: by 2002:a05:6a21:99a5:b0:121:cff2:a443 with SMTP id ve37-20020a056a2199a500b00121cff2a443mr3166540pzb.30.1687183036005; Mon, 19 Jun 2023 06:57:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687183035; cv=none; d=google.com; s=arc-20160816; b=DA5HFsaLfqC0VSf6KEYS2fKrhWDGLb81qhvgvtvO2I459eMLEJUuSFNEHOWylvU0zN G8DsqpyrEHz+Ms3+/OqYHgwUPhdYjO+aeIq3FbIHqpxCg+NlsT/9XiD8AeJ6WvgItlZY 1q5TEimusNYbKRlfTYf526uvJCSC9oRMuJJMdJqE3QqoaEnrE08qDtEPVp98wlPFhoDB hPcldClZLH6GqslhHJ9bbW40N1RWORkxDRBbFNLM/Poe4cLQMIKqXkZ0j/Hq3F+GGTZN Uv5T67p4gP1edcU6GyzqeQ5tHPZB5Z6L8tB7cgSndterhQ+KYEaAPKPpvaPKa7S5e1s6 p35w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D31vA8JX9DN+/zyM3aRK1TEDXyUSGbv3rJjPwoSWc28=; b=kXRZ7msRndBDdoPi11ztorlkEjLbKRfcXDNVnXQRVJogGcl40fHgAd3yvMw7gRPSBr HQjPP29eCY1UksvrIsYdynjSv0jg9JsPweupNf1Lq3Dvvpjfaw9PRlWw6soOBzSh/wfm 2GDa3pgmgUe+lBnGuMlOuIKm+CX1kL70dgv2UJsR5CzV+a5Z7CVA/2/9svJmoOnNgHMx hnAug7DVAy+YuMvePLMWm63UY2YuKW9kxIUPA3mf5XDiMEPHZzapQ0EoVvqKmDH+yIt1 wxLFP0tIQdA1gm10bgOuKSRiCYUvYOfAD4UoZSHUl/e2LbZJ51dWyeXzc2rsNMcZghKm qnNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SFmz8hgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p24-20020a637418000000b00553b02a9a1dsi3321352pgc.217.2023.06.19.06.56.34; Mon, 19 Jun 2023 06:57:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=SFmz8hgr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232032AbjFSNnH (ORCPT + 99 others); Mon, 19 Jun 2023 09:43:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42540 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232006AbjFSNnF (ORCPT ); Mon, 19 Jun 2023 09:43:05 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B89D4E78 for ; Mon, 19 Jun 2023 06:42:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687182136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=D31vA8JX9DN+/zyM3aRK1TEDXyUSGbv3rJjPwoSWc28=; b=SFmz8hgrAcfjQSm1FuOqHfFArCiF8CiefNdqRuzWGo9o0gYNzR4pLd+7IGOkUJeIWTXj+9 EvCBaj/lCCkmmr2bhPRYcFnKAYpsy5w89BW2a8v6yzHgk9Zs2gYXznZTjyOaIw7BXQNbBa p4y9oUtYO9NBHV1vBnrRMnN09oZXkNY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-292-Lf93kQWeN1uQcqW1Z8TCFA-1; Mon, 19 Jun 2023 09:42:10 -0400 X-MC-Unique: Lf93kQWeN1uQcqW1Z8TCFA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 080D785A59D; Mon, 19 Jun 2023 13:42:10 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 272D040C6E8E; Mon, 19 Jun 2023 13:42:09 +0000 (UTC) From: David Howells To: Linus Torvalds Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH 1/2] afs: Fix dangling folio ref counts in writeback Date: Mon, 19 Jun 2023 14:42:03 +0100 Message-ID: <20230619134204.922713-2-dhowells@redhat.com> In-Reply-To: <20230619134204.922713-1-dhowells@redhat.com> References: <20230619134204.922713-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769139639355112792?= X-GMAIL-MSGID: =?utf-8?q?1769139639355112792?= From: "Vishal Moola (Oracle)" Commit acc8d8588cb7 converted afs_writepages_region() to write back a folio batch. If writeback needs rescheduling, the function exits without dropping the references to the folios in fbatch. This patch fixes that. [DH: Moved the added line before the _leave()] Fixes: acc8d8588cb7 ("afs: convert afs_writepages_region() to use filemap_get_folios_tag()") Signed-off-by: Vishal Moola (Oracle) Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org Link: https://lore.kernel.org/r/20230607204120.89416-1-vishal.moola@gmail.com/ --- fs/afs/write.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/afs/write.c b/fs/afs/write.c index c822d6006033..fd433024070e 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -763,6 +763,7 @@ static int afs_writepages_region(struct address_space *mapping, if (wbc->sync_mode == WB_SYNC_NONE) { if (skips >= 5 || need_resched()) { *_next = start; + folio_batch_release(&fbatch); _leave(" = 0 [%llx]", *_next); return 0; } From patchwork Mon Jun 19 13:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 110030 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3030856vqr; Mon, 19 Jun 2023 07:06:07 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ41qqwtZobyE5zhfthsI708q53KFAjl7OV8pXzmAOlJ3c5EftteU6OzoNQ/Aec2yd+RnPMP X-Received: by 2002:a92:c0c8:0:b0:342:766:7b1b with SMTP id t8-20020a92c0c8000000b0034207667b1bmr6003459ilf.7.1687183566795; Mon, 19 Jun 2023 07:06:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687183566; cv=none; d=google.com; s=arc-20160816; b=DPtddvHiD9VHY/9MBVnP6qEdRO0hP1sc8bhNi3iBltWGXuAsLpJQpkwZac+76UHSx/ TVxtjKvcDYl+k0xLGKGJ08Y2l9Q/ociKFaoSAdZ+n9XZDJ75hlZOEP+6BZgwo88qoxdm kWbox+Zov3ymVEXtpaDW44C6SRcTOL7VkOSJtr08MHpq8cH/7eWFvy9UdDxbZfLfjK4w VsQqFVzJ35q/aiIX5I7RSnU+jTv3J2qQgXk/G534XgTCn3AxC7HihUBDmCfQJAQADZNR m1PbFOVtFw9TS47YHFGLrsA27FxQWi7qQ6L1A5hmAYSG8x/9/NUP+aj+5ysu/n4tAQOB eD+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tmhBzVk04OxjQU7+mvQb9QjdfMiM2IPBAE5pRAjvCBI=; b=vKgf4x4tBvDUUAtKU+cHn2ME7/D7qRuU0ZqFhwFiPuWmH2vBXhsR11CWuvmmvvzJTz wyMHASqdYj4S4xXGO/o04sm6+Kljs3YuwEZJDfnaMwedpB7NqfBYIvp4vYZ1JLqQqX7i w1p91IGuDX8cb3xbG/CweKdHyP/VoU7NWWV995H2X9/RoKlX8HkEAa9JxTuIe8bVgyvP R/I2qvbPE2cVagBT6WbOEr4ATMAxz2W/1SKLqAZNz/Pt3ZZzf0N7gBw9RV2PnC9Oq9Pz bX0DqyzZR1zdJu/KHQSeyC248nEXTFBZ8QgfMN3GAum5Tab9ZhfvadpfQa/fQC/zwAja x8Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Iy1fh8dX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v16-20020a63d550000000b00543a6cf2b5csi20144645pgi.662.2023.06.19.07.05.53; Mon, 19 Jun 2023 07:06:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Iy1fh8dX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232035AbjFSNnL (ORCPT + 99 others); Mon, 19 Jun 2023 09:43:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232010AbjFSNnF (ORCPT ); Mon, 19 Jun 2023 09:43:05 -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 F1C3AE63 for ; Mon, 19 Jun 2023 06:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1687182137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tmhBzVk04OxjQU7+mvQb9QjdfMiM2IPBAE5pRAjvCBI=; b=Iy1fh8dXS/0t22BInAub8YC+oI8WenROAbdPlINjeDlFdJ3fCp8u4++aoAxHBgs4vKcpZ/ +7ao7h4eiITrlBQYJoQZCBqBmJ+l4jddGbdH+kJfeZOR7zhtVWG9yo03dNY0t+wMXZlm+T iII+J4w32SjEmnTO3hthdh926oqJZIs= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-401-cY5mjncINvWwWGUMnL5--g-1; Mon, 19 Jun 2023 09:42:11 -0400 X-MC-Unique: cY5mjncINvWwWGUMnL5--g-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6D65685A58C; Mon, 19 Jun 2023 13:42:11 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 906D8C1603B; Mon, 19 Jun 2023 13:42:10 +0000 (UTC) From: David Howells To: Linus Torvalds Cc: David Howells , Marc Dionne , linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH 2/2] afs: Fix waiting for writeback then skipping folio Date: Mon, 19 Jun 2023 14:42:04 +0100 Message-ID: <20230619134204.922713-3-dhowells@redhat.com> In-Reply-To: <20230619134204.922713-1-dhowells@redhat.com> References: <20230619134204.922713-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769140195377016269?= X-GMAIL-MSGID: =?utf-8?q?1769140195377016269?= From: "Vishal Moola (Oracle)" Commit acc8d8588cb7 converted afs_writepages_region() to write back a folio batch. The function waits for writeback to a folio, but then proceeds to the rest of the batch without trying to write that folio again. This patch fixes has it attempt to write the folio again. [DH: Also remove an 'else' that adding a goto makes redundant] Fixes: acc8d8588cb7 ("afs: convert afs_writepages_region() to use filemap_get_folios_tag()") Signed-off-by: Vishal Moola (Oracle) Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org Link: https://lore.kernel.org/r/20230607204120.89416-2-vishal.moola@gmail.com/ --- fs/afs/write.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/afs/write.c b/fs/afs/write.c index fd433024070e..8750b99c3f56 100644 --- a/fs/afs/write.c +++ b/fs/afs/write.c @@ -731,6 +731,7 @@ static int afs_writepages_region(struct address_space *mapping, * (changing page->mapping to NULL), or even swizzled * back from swapper_space to tmpfs file mapping */ +try_again: if (wbc->sync_mode != WB_SYNC_NONE) { ret = folio_lock_killable(folio); if (ret < 0) { @@ -757,9 +758,10 @@ static int afs_writepages_region(struct address_space *mapping, #ifdef CONFIG_AFS_FSCACHE folio_wait_fscache(folio); #endif - } else { - start += folio_size(folio); + goto try_again; } + + start += folio_size(folio); if (wbc->sync_mode == WB_SYNC_NONE) { if (skips >= 5 || need_resched()) { *_next = start;