From patchwork Tue May 2 16:35:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 89421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp762112vqo; Tue, 2 May 2023 09:59:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6x1OfCWwVVf9PqsF8k+oCwLw7m4GHX9GweEYEjAuk1mzRfb4UF3rjvFRC3l6tCf5wYp3XF X-Received: by 2002:a17:903:244f:b0:1a9:b977:81c7 with SMTP id l15-20020a170903244f00b001a9b97781c7mr22562749pls.62.1683046763047; Tue, 02 May 2023 09:59:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683046763; cv=none; d=google.com; s=arc-20160816; b=fY/LMHmRl2uQVs4X+sTkjsPhNNpusCf8qr9oHRwwwMv+b3IaVkpWfulrQkFAvKkWsF mcaP6217g2wCxsRL21F7e6i43bCUeklwcdHbJbt6RjsWcAKw3dvmjkWuTUu2EiI6WCtI Oh/Up6wi25jqW/fPU2hHGsdCtVjO3vA2d2dElWyth5HxKozwMI+3uRHAdp2sGI6IC3k6 NU7EdIDkqtTIh6LuEUWnQbplEi4m2zDnIxh6jovVNRLlbVsV1cUzX3I8HrAaN09SzEGe hvUO+mBj12l9gYKTMVvSiG97Pk5bqw4ecSY7zbiDh360zslG4AllNqy0dJZ+vTJSX2wl 7H+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=CZoekTna0zWXws8EaTSEoCtu55gwMy5uNJXIGmQIy0w=; b=nJi68MLlpsg7+SZ+rapDbVbbCyvvZ1tHSmLCTGa6fQWrKsN6FFFdSBvzCibgCqzx+v AvYG5IhzcUPJ/yA2/my32z8uVKlvaCYJyTf9Xz7PPGRd/g3G7iDg3/GxAbbFTS1C8gpk GoAATPDS7QXpdaasmhp1wibSVZ/PZjam4rHeAh10foAk6Pfq2Dkw3J5U0w/dB4sF/GKn ToM13H7U2Z6KajdDpxl4OV8M/mxXbuQehD60eH/JVNglixxjwxpcmPiRjSWbtHExkzxK vaQJuwhJHTHAe+0dHss/WBvTsV+7P92HnvNElHG3f2VFK6EeMCbT6HzfeH/PmqDSrxLC mMcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dAAh1kWh; 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 t63-20020a638142000000b0052883b4cfd7si17290568pgd.177.2023.05.02.09.59.10; Tue, 02 May 2023 09:59:23 -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=dAAh1kWh; 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 S234288AbjEBQhq (ORCPT + 99 others); Tue, 2 May 2023 12:37:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234364AbjEBQhS (ORCPT ); Tue, 2 May 2023 12:37:18 -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 C20484222 for ; Tue, 2 May 2023 09:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683045343; 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=CZoekTna0zWXws8EaTSEoCtu55gwMy5uNJXIGmQIy0w=; b=dAAh1kWhrDuanGZJQvwD1dIbOP18YmGjEU54b//kMloX73Rx65z0iQxdtFyXAXrotmo5yO GdcxHXO6E0llMjie/GyfHlgsFR01uAqlz+/rLy8SiJ40arOtcsnY6C4JLEirDe/ZXGxnBB kwKs40k3ptn65XRdNiFDb959NEZZFeY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-NezWOwQXMZa1ygaArBVR1g-1; Tue, 02 May 2023 12:35:41 -0400 X-MC-Unique: NezWOwQXMZa1ygaArBVR1g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 429371C0432C; Tue, 2 May 2023 16:35:41 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 346DA2166B26; Tue, 2 May 2023 16:35:40 +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 Subject: [PATCH 3/3] afs: Avoid endless loop if file is larger than expected Date: Tue, 2 May 2023 17:35:28 +0100 Message-Id: <20230502163528.1564398-4-dhowells@redhat.com> In-Reply-To: <20230502163528.1564398-1-dhowells@redhat.com> References: <20230502163528.1564398-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Spam-Status: No, score=-2.3 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_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham 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?1764802442699950909?= X-GMAIL-MSGID: =?utf-8?q?1764802442699950909?= From: Marc Dionne afs_read_dir fetches an amount of data that's based on what the inode size is thought to be. If the file on the server is larger than what was fetched, the code rechecks i_size and retries. If the local i_size was not properly updated, this can lead to an endless loop of fetching i_size from the server and noticing each time that the size is larger on the server. If it is known that the remote size is larger than i_size, bump up the fetch size to that size. Fixes: f3ddee8dc4e2 ("afs: Fix directory handling") Signed-off-by: Marc Dionne Signed-off-by: David Howells cc: linux-afs@lists.infradead.org --- fs/afs/dir.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/afs/dir.c b/fs/afs/dir.c index f92b9e62d567..4dd97afa536c 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -275,6 +275,7 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) loff_t i_size; int nr_pages, i; int ret; + loff_t remote_size = 0; _enter(""); @@ -289,6 +290,8 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) expand: i_size = i_size_read(&dvnode->netfs.inode); + if (i_size < remote_size) + i_size = remote_size; if (i_size < 2048) { ret = afs_bad(dvnode, afs_file_error_dir_small); goto error; @@ -364,6 +367,7 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) * buffer. */ up_write(&dvnode->validate_lock); + remote_size = req->file_size; goto expand; }