From patchwork Tue Sep 13 18:01:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 12975142 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 77D3BECAAD8 for ; Tue, 13 Sep 2022 18:37:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231407AbiIMShr (ORCPT ); Tue, 13 Sep 2022 14:37:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49554 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232106AbiIMShb (ORCPT ); Tue, 13 Sep 2022 14:37:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22088883FE for ; Tue, 13 Sep 2022 11:02:05 -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 ams.source.kernel.org (Postfix) with ESMTPS id A62E5B81098 for ; Tue, 13 Sep 2022 18:01:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB5D8C433C1; Tue, 13 Sep 2022 18:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1663092113; bh=EI8E2BTkndQwavwySJDazDxus1g7WbH0ort5W1AHzcM=; h=From:To:Cc:Subject:Date:From; b=GhBxjeSD+q76D5F6/4LRrAqWYIIAExNGqlW/UhjrDVyeCo1hpW8liyaIBWuMpUOUH uuSKAtH5BCsA4gKP1tfbREGVcSYBH9O8gC1L+cIt/55g3PWpY/pfFYe2tkSFLzqM/T PWs6qNaDLD61lgfk4KDXh6pJFRwvcv9/alS0y7HAO1QrXpeF95eQoZNLcdi+X3ExYj XIBCIHk/ze1GDzdl0WfMvTAHY4X54nlmnJwSgZ2W7GgLapf0rd8czsPKQSqgECqviO gB4eB5Bz9V4bnU9qKaNIeZm4vCgLBgG2/ji8fn6e2lTU61bRGzROGcFQOzqBZ76HHH VBvkaaE3v7zZQ== From: Anna Schumaker To: linux-nfs@vger.kernel.org, chuck.lever@oracle.com Cc: anna@kernel.org Subject: [PATCH v4 0/2] NFSD: Simplify READ_PLUS Date: Tue, 13 Sep 2022 14:01:49 -0400 Message-Id: <20220913180151.1928363-1-anna@kernel.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker When we left off with READ_PLUS, Chuck had suggested reverting the server to reply with a single NFS4_CONTENT_DATA segment essentially mimicing how the READ operation behaves. Then, a future sparse read function can be added and the server modified to support it without needing to rip out the old READ_PLUS code at the same time. This patch takes that first step. I was even able to re-use the nfsd4_encode_readv() and nfsd4_encode_splice_read() functions to remove some duuplicate code. Below is some performance data comparing the READ and READ_PLUS operations with v4.2. I tested reading 2G files with various hole lengths including 100% data, 100% hole, and a handful of mixed hole and data files. For the mixed files, a notation like "1d" means every-other-page is data, and the first page is data. "4h" would mean alternating 4 pages data and 4 pages hole, beginning with hole. I also used the 'vmtouch' utility to make sure the file is either evicted from the server's pagecache ("Uncached on server") or present in the server's page cache ("Cached on server"). 2048M-data :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.555 s, 712 MB/s, 0.74 s kern, 24% cpu : :........................... Cached on server ..... 1.346 s, 1.6 GB/s, 0.69 s kern, 52% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.596 s, 690 MB/s, 0.72 s kern, 23% cpu :........................... Cached on server ..... 1.394 s, 1.6 GB/s, 0.67 s kern, 48% cpu 2048M-hole :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 4.934 s, 762 MB/s, 1.86 s kern, 29% cpu : :........................... Cached on server ..... 1.328 s, 1.6 GB/s, 0.72 s kern, 54% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 4.823 s, 739 MB/s, 1.88 s kern, 28% cpu :........................... Cached on server ..... 1.399 s, 1.5 GB/s, 0.70 s kern, 50% cpu 2048M-mixed-1d :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 4.480 s, 598 MB/s, 0.76 s kern, 21% cpu : :........................... Cached on server ..... 1.445 s, 1.5 GB/s, 0.71 s kern, 50% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 4.774 s, 559 MB/s, 0.75 s kern, 19% cpu :........................... Cached on server ..... 1.514 s, 1.4 GB/s, 0.67 s kern, 44% cpu 2048M-mixed-1h :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.568 s, 633 MB/s, 0.78 s kern, 23% cpu : :........................... Cached on server ..... 1.357 s, 1.6 GB/s, 0.71 s kern, 53% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.580 s, 641 MB/s, 0.74 s kern, 22% cpu :........................... Cached on server ..... 1.396 s, 1.5 GB/s, 0.67 s kern, 48% cpu 2048M-mixed-2d :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.159 s, 708 MB/s, 0.78 s kern, 26% cpu : :........................... Cached on server ..... 1.410 s, 1.5 GB/s, 0.70 s kern, 50% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.093 s, 712 MB/s, 0.74 s kern, 25% cpu :........................... Cached on server ..... 1.474 s, 1.4 GB/s, 0.67 s kern, 46% cpu 2048M-mixed-2h :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.043 s, 722 MB/s, 0.78 s kern, 26% cpu : :........................... Cached on server ..... 1.374 s, 1.6 GB/s, 0.72 s kern, 53% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 2.913 s, 756 MB/s, 0.74 s kern, 26% cpu :........................... Cached on server ..... 1.349 s, 1.6 GB/s, 0.67 s kern, 50% cpu 2048M-mixed-4d :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.275 s, 680 MB/s, 0.75 s kern, 24% cpu : :........................... Cached on server ..... 1.391 s, 1.5 GB/s, 0.71 s kern, 52% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.470 s, 626 MB/s, 0.72 s kern, 21% cpu :........................... Cached on server ..... 1.456 s, 1.5 GB/s, 0.67 s kern, 46% cpu 2048M-mixed-4h :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.035 s, 743 MB/s, 0.74 s kern, 26% cpu : :........................... Cached on server ..... 1.345 s, 1.6 GB/s, 0.71 s kern, 53% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 2.848 s, 779 MB/s, 0.73 s kern, 26% cpu :........................... Cached on server ..... 1.421 s, 1.5 GB/s, 0.68 s kern, 48% cpu 2048M-mixed-8d :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.262 s, 687 MB/s, 0.74 s kern, 24% cpu : :........................... Cached on server ..... 1.366 s, 1.6 GB/s, 0.69 s kern, 51% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.195 s, 709 MB/s, 0.72 s kern, 24% cpu :........................... Cached on server ..... 1.414 s, 1.5 GB/s, 0.67 s kern, 48% cpu 2048M-mixed-8h :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 2.899 s, 789 MB/s, 0.73 s kern, 27% cpu : :........................... Cached on server ..... 1.338 s, 1.6 GB/s, 0.69 s kern, 52% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 2.910 s, 772 MB/s, 0.72 s kern, 26% cpu :........................... Cached on server ..... 1.438 s, 1.5 GB/s, 0.67 s kern, 47% cpu 2048M-mixed-16d :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 3.416 s, 661 MB/s, 0.73 s kern, 23% cpu : :........................... Cached on server ..... 1.345 s, 1.6 GB/s, 0.70 s kern, 53% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 3.177 s, 713 MB/s, 0.70 s kern, 23% cpu :........................... Cached on server ..... 1.447 s, 1.5 GB/s, 0.68 s kern, 47% cpu 2048M-mixed-16h :... v6.0-rc4 (w/o Read Plus) ... Uncached on server ... 2.919 s, 780 MB/s, 0.73 s kern, 26% cpu : :........................... Cached on server ..... 1.363 s, 1.6 GB/s, 0.70 s kern, 51% cpu :... v6.0-rc4 (w/ Read Plus) .... Uncached on server ... 2.934 s, 773 MB/s, 0.70 s kern, 25% cpu :........................... Cached on server ..... 1.435 s, 1.5 GB/s, 0.67 s kern, 47% cpu - v4: - Change READ and READ_PLUS to return nfserr_serverfault if the splice splice check fails. Thanks, Anna Anna Schumaker (2): NFSD: Return nfserr_serverfault if splice_ok but buf->pages have data NFSD: Simplify READ_PLUS fs/nfsd/nfs4xdr.c | 141 +++++++++++----------------------------------- 1 file changed, 33 insertions(+), 108 deletions(-)