From patchwork Fri Dec 13 13:50:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13907060 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 87FABE7717D for ; Fri, 13 Dec 2024 13:50:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 206156B0092; Fri, 13 Dec 2024 08:50:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B6A26B0093; Fri, 13 Dec 2024 08:50:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 030CA6B0095; Fri, 13 Dec 2024 08:50:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id D5BF16B0092 for ; Fri, 13 Dec 2024 08:50:58 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 695F5160E0C for ; Fri, 13 Dec 2024 13:50:58 +0000 (UTC) X-FDA: 82890070620.19.07A6A51 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 5B3522000B for ; Fri, 13 Dec 2024 13:50:31 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N7L+xOIG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734097832; a=rsa-sha256; cv=none; b=UnKWbqBAv8K5Tc3te8B4fHoVYDBl2+kujxs+DPaQ5cD9i6pFqh/paxACD+kLCWdSwddshu PP/TCSY7P/bkO9F6eYOIcFREPuCpF3vNwdEB6W/4lplaf6x5WHal5+xBS01FEETluGSX8e b8eHBZA8/hhPevdso8h80c1GqNemqVo= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=N7L+xOIG; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734097832; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5M1ENZFbO/mNMn248U1qss6F8q2hwKZC+45ijoUGNaQ=; b=1cHUBx2O9pVFlXX6oyHDW+L0G6p7AWwWRQfzKPa92uLwuqdszgJvRhBUMZq/6FTlSzoqD6 /j7o1IW/Nua65QaoIQ/QwmBeJs1ZfNmr/CJPqR/j/H3YxagLo4n4SqFd1WZRVQK+kHrQto qmraysvajXR8dz7jDI0kubzbrwMvxd4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734097856; 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=5M1ENZFbO/mNMn248U1qss6F8q2hwKZC+45ijoUGNaQ=; b=N7L+xOIGH6ysdQd2KxR6lkiNo5uPiOh3+urZJUvItES5v3fQj/vjDAcMk65AgupWn0NI/Q 0X4wOlXh5Y0/H4q/nv/p+Uh869DFAedja0jeKJNEHQrozOycl6e0BwNaZ7EXbDg5nBfA+E Xojz8pUQkCYgbRma8Mcp9EoxpawHsEc= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-492-komwBIjYNoKdH0VnGk57oA-1; Fri, 13 Dec 2024 08:50:52 -0500 X-MC-Unique: komwBIjYNoKdH0VnGk57oA-1 X-Mimecast-MFC-AGG-ID: komwBIjYNoKdH0VnGk57oA Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D61E71956056; Fri, 13 Dec 2024 13:50:49 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.48]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id EC2561956052; Fri, 13 Dec 2024 13:50:44 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Max Kellermann , Ilya Dryomov , Xiubo Li , Trond Myklebust , Jeff Layton , Matthew Wilcox , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Anna Schumaker , Dave Wysochanski Subject: [PATCH 04/10] nfs: Fix oops in nfs_netfs_init_request() when copying to cache Date: Fri, 13 Dec 2024 13:50:04 +0000 Message-ID: <20241213135013.2964079-5-dhowells@redhat.com> In-Reply-To: <20241213135013.2964079-1-dhowells@redhat.com> References: <20241213135013.2964079-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5B3522000B X-Stat-Signature: 11381gcwzod9jgp9qmxfst8neuczq5g9 X-Rspam-User: X-HE-Tag: 1734097831-327727 X-HE-Meta: U2FsdGVkX1+jkHDcez8pYSOtn4DmFChcn730pjgBowzw7JyHB0tKwAzLdNCI0JNUTw2KUldWxDp6DLjwqomSNsSm7Lt94/cgSGl66ej2oxLD2gXbKfHAcU89j5tIwLL3C1m/jiIrZdE27e8qn1duDkmVcaMcl+HnPX/+kRQ2f22p5SbvtXLUWffZRzCpBOAidzDaogbkM+jdm8Rs+xD3gmgBbk7/G1RCDM8Wh8s9q3GL0YiApTiU60kUACmNmOGcA3+6bSpsRB1hC4I8zV/y/FT2Bl9jjoUqzPcnlPQTt87A8xP9md/S+xYX+ND0slbX275hIJgTfspZVTL4rUlMIqwf0YdgQvZ9b+te77srxU5mJtZtoHpIdnUiKVrmBbLZ7R7GhtbRf+DoCROCgZe+rJJyY8tpPG3bpQK+2jondLBksNeBXgsIrflOP4tsiiz+hrJibwuNioXJE6oEqMG5PwbQflVM8T8HrquvYR2S+CwLr+b0Gg20UgzP3xN10jyH/ETmxUf5EivfeJmvqKENsiCPg0x8mhwW7snGIdlCzrRwGtZ2cmilHlFatX5BUEwZlR7IB6dlGOkzQ+0+AJl03BIV8/OnNcFRbfXQtQkqbvlcMYz/cYOEyQyKDvISfQtt10BfOYz8yPHM1HMfXujOhNjDoB3imGh9cLyjKSQHNW1kNwCNu9e8DCL6ezmhAj0OmmZBQlAp/BdEPPIBeY+Tv+lVUD207NRe1mDmfKgk6B9h4k2Is3vc9KSOBz4xCmTqwbTAX4034EicNUL+bty/OkNOpBEtj1/9O0YljOnkssVGK1ZCFLiCSbZGQwteOCi1l534TfazHd7hLgTM2yWyh1ulLVPEI6ZrFjKk2M82pKTtzFExguN28Stak3n8WPkJyT+kP8plt3i5ay75oSB9a80nfMhnWV7GywBTyMraZlUQ1Sw6uWHrDLpmbkWBSlHXubSKGXYoAx7dUBXI/nN x5RV964W Fh28R+bsmOeJI28V0mXFzGPGDFbiUt4dA4tQhpcfNVM3KkkHLs4Kgdo9VhbXSKWqe7ONZtP8A3xsnZED0HOwR/eieFfzfci+KtaoyDqIREKz2982CQLyDvMI52aI5b6/0h50MkFdXysWVWFeZ7/ExZbVX7oxHt23WAhSzIkXnSCW/meZVbX54zbprOPynpBaZhlnrVRQ09hSPNsChpI4Z0V5chRPxXKH4A/eKt+m9vlp0IHiuJEDwFfvzt/q6ifl+/nZXl1AD5QrPfyg7j/YupsGLATJVs3pCfRjRJalXub/wkUWcTQc1maPlcW7MOMDigxs8/Ccz68+xLm51Zl13HvnFMmx3fPJeCMnk01FS/8pF64xprFFPB4Gi3XUVbxeJa8bL7kVKlhilf21sB3Iyvppm6aNYO9UZzMLrmGIY9LMBnJKIfcMZyVLMqa2/awkvURR+CyyRjQkvsdHAutGJ6VlpH8/wWTCtZ1UJ1yaMGkTsdKQqfJf3DrDW5N7aQDFXBbgt 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: When netfslib wants to copy some data that has just been read on behalf of nfs, it creates a new write request and calls nfs_netfs_init_request() to initialise it, but with a NULL file pointer. This causes nfs_file_open_context() to oops - however, we don't actually need the nfs context as we're only going to write to the cache. Fix this by just returning if we aren't given a file pointer and emit a warning if the request was for something other than copy-to-cache. Further, fix nfs_netfs_free_request() so that it doesn't try to free the context if the pointer is NULL. Fixes: ee4cdf7ba857 ("netfs: Speed up buffered reading") Reported-by: Max Kellermann Closes: https://lore.kernel.org/r/CAKPOu+9DyMbKLhyJb7aMLDTb=Fh0T8Teb9sjuf_pze+XWT1VaQ@mail.gmail.com/ Signed-off-by: David Howells cc: Trond Myklebust cc: Anna Schumaker cc: Dave Wysochanski cc: Jeff Layton cc: linux-nfs@vger.kernel.org cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org --- fs/nfs/fscache.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/fs/nfs/fscache.c b/fs/nfs/fscache.c index 810269ee0a50..d49e4ce27999 100644 --- a/fs/nfs/fscache.c +++ b/fs/nfs/fscache.c @@ -263,6 +263,12 @@ int nfs_netfs_readahead(struct readahead_control *ractl) static atomic_t nfs_netfs_debug_id; static int nfs_netfs_init_request(struct netfs_io_request *rreq, struct file *file) { + if (!file) { + if (WARN_ON_ONCE(rreq->origin != NETFS_PGPRIV2_COPY_TO_CACHE)) + return -EIO; + return 0; + } + rreq->netfs_priv = get_nfs_open_context(nfs_file_open_context(file)); rreq->debug_id = atomic_inc_return(&nfs_netfs_debug_id); /* [DEPRECATED] Use PG_private_2 to mark folio being written to the cache. */ @@ -274,7 +280,8 @@ static int nfs_netfs_init_request(struct netfs_io_request *rreq, struct file *fi static void nfs_netfs_free_request(struct netfs_io_request *rreq) { - put_nfs_open_context(rreq->netfs_priv); + if (rreq->netfs_priv) + put_nfs_open_context(rreq->netfs_priv); } static struct nfs_netfs_io_data *nfs_netfs_alloc(struct netfs_io_subrequest *sreq)