Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp2549998rwd; Fri, 9 Jun 2023 13:02:08 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6YrdMOR6xGFfRlqkTHmHzygFrPCTE3UW7q9Mj/S3d2TnIRPCB/AhBb/B1mX5qLhzbM4IrE X-Received: by 2002:a17:90a:6f46:b0:255:c061:9e5b with SMTP id d64-20020a17090a6f4600b00255c0619e5bmr2315385pjk.37.1686340928006; Fri, 09 Jun 2023 13:02:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686340927; cv=none; d=google.com; s=arc-20160816; b=Jp3XNbuePPNrKKt2kXBrB/n6K4mejme5GIBGh75oXEKuXSwL4hJmoz2d2JgxnKjxwt 1vOWSqfqaVCWfcc54IEJ5vXv4DYFWvpB/CI4i1160oV9HbxlIS86urhZYKvOs0IgtgFS AOR8PCcAdtAlCprXKy7mrkKBipxu7sPCtzwgrVLAuJ7VlbvSqXj3hAkrlWaThqvsRYAQ ppwG8rDwknpKa4U74nAVzxXdF7A/PObGBT/1bu3/KghHRrLvCuvySP/SI7ip+/Fpl55m /uJPKDkfgvgIkxePz+LgaKywdckvP44pdTD0d8RH8nuRU910DKBucY8jnYUEO+5WteeO UFnQ== 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=nDI/pxrg6um9BjrV+noZSHTNdChHnp0NoYedAX6zNGo=; b=NJM0I6EWAor4yAB6rkjCmzsTl0/ypdkWwi0B0RDebOq/V3zf88fmxb4gUTrurvRKj2 J/WI4YR9Hf3DeWfaLSY2oPA7wV61EOzUCBJVRbLpsYydvDADn3dtITqf6lAx72+JbSRw Pw2XjfL/ZMrp22aF0DfTTxvzGUdzeTl7rfOoa1Rdes8JR+iHWl8mUVsfScB3J7X5RN6W o6Gt+LB3+DzwNcIive/kH3RqOjA99sgHQgubjIekGAy/uOi6DhpkeslREjYTEvknNPel H1bJZE5KAonJ0jMy6TRDdpj7Y6OHNZQe0p90iiS7GEF4FCk5ArczP44PjNs8d4xoaVky WKxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pzbFwi35; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t3-20020a17090aae0300b002533ea2ad58si4740343pjq.140.2023.06.09.13.01.55; Fri, 09 Jun 2023 13:02:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-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=@kernel.org header.s=k20201202 header.b=pzbFwi35; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229537AbjFIUAT (ORCPT + 99 others); Fri, 9 Jun 2023 16:00:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbjFIUAS (ORCPT ); Fri, 9 Jun 2023 16:00:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51D483595 for ; Fri, 9 Jun 2023 13:00:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DBC8861D2B for ; Fri, 9 Jun 2023 20:00:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E304EC433EF; Fri, 9 Jun 2023 20:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1686340816; bh=dWah2v2J5pYS5s+td2rHcg1oMXOdxqDRwj7voPWeCj8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pzbFwi35bYQSWomrG43lB05TJTd2eaoj+Z04S2wSiVaXe/2T+9LDAJ8NFxJDg1Zw6 FU6RmbpP+v2zDQikQ3elVk8xoqKAWnVRtJ2aer5K7rKuE29Y9HPNk9AbKFtN0OFo1J R7bKl0rno6oglcl8MjE47ug+ol8yg4ujcR8agLOeJxpzT1Pw/W1N6hoyJipSOAwP1Y a1LYS0jJV6Hf5A0jVAg6uWQ1/p2ORhRQfKbVlbFG0PqAPM3O0CrangwrFslqZ2Fiv6 yPAHDpMz5vo9PMMBOEmnCEPTXHAjF2WJl9WPGlj+pOZuYHPRcZyB4sAg3VTQALYIoS NmP1z1kWAZ3Eg== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org, krzysztof.kozlowski@linaro.org Subject: [PATCH v3 3/3] NFSv4.2: Rework scratch handling for READ_PLUS (again) Date: Fri, 9 Jun 2023 16:00:13 -0400 Message-ID: <20230609200013.849882-3-anna@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230609200013.849882-1-anna@kernel.org> References: <20230609200013.849882-1-anna@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,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-nfs@vger.kernel.org From: Anna Schumaker I found that the read code might send multiple requests using the same nfs_pgio_header, but nfs4_proc_read_setup() is only called once. This is how we ended up occasionally double-freeing the scratch buffer, but also means we set a NULL pointer but non-zero length to the xdr scratch buffer. This results in an oops the first time decoding needs to copy something to scratch, which frequently happens when decoding READ_PLUS hole segments. I fix this by moving scratch handling into the pageio read code. I provide a function to allocate scratch space for decoding read replies, and free the scratch buffer when the nfs_pgio_header is freed. Krzysztof Kozlowski hit a bug a while ago with similar symptoms, and I'm hopeful that this patch fixes his issue. Reported-by: Krzysztof Kozlowski Fixes: fbd2a05f29a9 (NFSv4.2: Rework scratch handling for READ_PLUS) Signed-off-by: Anna Schumaker --- v3: Remove accidentally copy-and-pasted line from the commit message --- fs/nfs/internal.h | 1 + fs/nfs/nfs42.h | 1 + fs/nfs/nfs42xdr.c | 2 +- fs/nfs/nfs4proc.c | 13 +------------ fs/nfs/read.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h index 3cc027d3bd58..1607c23f68d4 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h @@ -489,6 +489,7 @@ extern const struct nfs_pgio_completion_ops nfs_async_read_completion_ops; extern void nfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode, bool force_mds, const struct nfs_pgio_completion_ops *compl_ops); +extern bool nfs_read_alloc_scratch(struct nfs_pgio_header *hdr, size_t size); extern int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio, struct nfs_open_context *ctx, struct folio *folio); diff --git a/fs/nfs/nfs42.h b/fs/nfs/nfs42.h index 0fe5aacbcfdf..b59876b01a1e 100644 --- a/fs/nfs/nfs42.h +++ b/fs/nfs/nfs42.h @@ -13,6 +13,7 @@ * more? Need to consider not to pre-alloc too much for a compound. */ #define PNFS_LAYOUTSTATS_MAXDEV (4) +#define READ_PLUS_SCRATCH_SIZE (16) /* nfs4.2proc.c */ #ifdef CONFIG_NFS_V4_2 diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c index 75765382cc0e..20aa5e746497 100644 --- a/fs/nfs/nfs42xdr.c +++ b/fs/nfs/nfs42xdr.c @@ -1351,7 +1351,7 @@ static int nfs4_xdr_dec_read_plus(struct rpc_rqst *rqstp, struct compound_hdr hdr; int status; - xdr_set_scratch_buffer(xdr, res->scratch, sizeof(res->scratch)); + xdr_set_scratch_buffer(xdr, res->scratch, READ_PLUS_SCRATCH_SIZE); status = decode_compound_hdr(xdr, &hdr); if (status) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d3665390c4cb..73dc8a793ae9 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -5437,18 +5437,8 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task, return false; } -static inline void nfs4_read_plus_scratch_free(struct nfs_pgio_header *hdr) -{ - if (hdr->res.scratch) { - kfree(hdr->res.scratch); - hdr->res.scratch = NULL; - } -} - static int nfs4_read_done(struct rpc_task *task, struct nfs_pgio_header *hdr) { - nfs4_read_plus_scratch_free(hdr); - if (!nfs4_sequence_done(task, &hdr->res.seq_res)) return -EAGAIN; if (nfs4_read_stateid_changed(task, &hdr->args)) @@ -5468,8 +5458,7 @@ static bool nfs42_read_plus_support(struct nfs_pgio_header *hdr, /* Note: We don't use READ_PLUS with pNFS yet */ if (nfs_server_capable(hdr->inode, NFS_CAP_READ_PLUS) && !hdr->ds_clp) { msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS]; - hdr->res.scratch = kmalloc(32, GFP_KERNEL); - return hdr->res.scratch != NULL; + return nfs_read_alloc_scratch(hdr, READ_PLUS_SCRATCH_SIZE); } return false; } diff --git a/fs/nfs/read.c b/fs/nfs/read.c index f71eeee67e20..7dc21a48e3e7 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -47,6 +47,8 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void) static void nfs_readhdr_free(struct nfs_pgio_header *rhdr) { + if (rhdr->res.scratch != NULL) + kfree(rhdr->res.scratch); kmem_cache_free(nfs_rdata_cachep, rhdr); } @@ -108,6 +110,14 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio) } EXPORT_SYMBOL_GPL(nfs_pageio_reset_read_mds); +bool nfs_read_alloc_scratch(struct nfs_pgio_header *hdr, size_t size) +{ + WARN_ON(hdr->res.scratch != NULL); + hdr->res.scratch = kmalloc(size, GFP_KERNEL); + return hdr->res.scratch != NULL; +} +EXPORT_SYMBOL_GPL(nfs_read_alloc_scratch); + static void nfs_readpage_release(struct nfs_page *req, int error) { struct folio *folio = nfs_page_to_folio(req); -- 2.41.0