From patchwork Sat Apr 24 19:27:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve French X-Patchwork-Id: 12222753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FED1C433ED for ; Sat, 24 Apr 2021 19:27:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0EF5261362 for ; Sat, 24 Apr 2021 19:27:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232690AbhDXT2C (ORCPT ); Sat, 24 Apr 2021 15:28:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232546AbhDXT2C (ORCPT ); Sat, 24 Apr 2021 15:28:02 -0400 Received: from mail-lf1-x133.google.com (mail-lf1-x133.google.com [IPv6:2a00:1450:4864:20::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4101C061574 for ; Sat, 24 Apr 2021 12:27:23 -0700 (PDT) Received: by mail-lf1-x133.google.com with SMTP id 4so22447926lfp.11 for ; Sat, 24 Apr 2021 12:27:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to:cc; bh=9TafZZCACpCRtSvhSAerIpCkbH9jTjGMYVjadug67J0=; b=TJxf4IKC3sv6y+vfJXCw0RGyBbbccAInPnbLyaz24Bl3VXDkeku+RPOumjbwPW9rvv zuPbhwl4xv7/DxjXZtsPXxaiTRFWtR/x4S1uJPG+u0kcqB0pdunRpdbh5GsBSAsBRiGX DWaU5+HypMIX8Qzi/2YTHjnsgzNxHZOQuNB56Fnw7Zqe/UaqgMRGCWXwYt3DlIpfqxum dP0ux36mWMqjrLtTVP25zTtlLfG9XSJMRYt6uCP7wFW2pikjZSfin2VylvrAua4lgIx+ Al9kNfRsukFWg1/LbUbY8ylflEMqrSySQZqgCY6nQwDx0Dg1uzmc3wyK4USUOIaQNJff //6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=9TafZZCACpCRtSvhSAerIpCkbH9jTjGMYVjadug67J0=; b=mrz0bzs24CfZudMPuF0zdrQlh79LdyN4/RjWYHOWPLeAr4D0ErSFcgkmdGmSsd0CC2 j1mMaMP2dDS/AiREv2GOXEBZG0ASOqUcIQU3TdlBgorqgyaFN973TyBK5XvuUOZcV0nz GdwWIBD2d4mVQ9fWsvyBYL59Xb8Deir0BApDkTiZYryfz0dpyglUwqQG+CEtw90BLogL 7pdRHD+Qj1HM2xhHf81A7HKa4ib71VUWqEcoc8HSVeFjhWtI5bEjonGXFPrYAOYQasfd 5UaDYWAU4JldUEX85dohWST4dTwFT3ITOGi8h5L+bDF1zMgHyi05LRlfEJS+YN+BCIr0 zV/A== X-Gm-Message-State: AOAM531XU1VrGf/0Zn5HjowSNTCoIjKCBUM8qz9WpwWPdy4OI6i2xQe/ kcmD8KtYSvUPBxEBI/g75pMNAtflhrbe6zeMoh0jnze4O98= X-Google-Smtp-Source: ABdhPJzSOcNMJalDIl1+6VQsiJl2CB2fH2itxJfe7w3nnuXsSum8//84NkiIU6umL9CxpJ/kmiw2Yk1EFOySnUdOpwM= X-Received: by 2002:ac2:4148:: with SMTP id c8mr6882359lfi.307.1619292441713; Sat, 24 Apr 2021 12:27:21 -0700 (PDT) MIME-Version: 1.0 From: Steve French Date: Sat, 24 Apr 2021 14:27:11 -0500 Message-ID: Subject: [PATCH] smb3: add rasize mount parameter to improve performance of readahead To: CIFS Cc: Jeff Layton , David Howells , Matthew Wilcox Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org In some cases readahead of more than the read size can help (to allow parallel i/o of read ahead which can improve performance). Using the buildbot test systems, this resulted in an average improvement of 14% to the Windows server test target for the first 12 tests I tried (no multichannel) changing to 12MB rasize (read ahead size). Similarly increasing the rasize to 12MB to Azure (this time with multichannel, 4 channels) improved performance 37% Note that Ceph had already introduced a mount parameter "rasize" to allow controlling this. Add mount parameter "rasize" to cifs.ko to allow control of read ahead (rasize defaults to 4MB which is typically what it used to default to to the many servers whose rsize was that). Signed-off-by: Steve French Reviewed-by: Shyam Prasad N --- fs/cifs/cifsfs.c | 1 + fs/cifs/fs_context.c | 25 ++++++++++++++++++++++++- fs/cifs/fs_context.h | 2 ++ 3 files changed, 27 insertions(+), 1 deletion(-) diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 39f4889a036b..a1217682da1f 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c @@ -649,6 +649,7 @@ cifs_show_options(struct seq_file *s, struct dentry *root) seq_printf(s, ",rsize=%u", cifs_sb->ctx->rsize); seq_printf(s, ",wsize=%u", cifs_sb->ctx->wsize); seq_printf(s, ",bsize=%u", cifs_sb->ctx->bsize); + seq_printf(s, ",rasize=%u", cifs_sb->ctx->rasize); if (tcon->ses->server->min_offload) seq_printf(s, ",esize=%u", tcon->ses->server->min_offload); seq_printf(s, ",echo_interval=%lu", diff --git a/fs/cifs/fs_context.c b/fs/cifs/fs_context.c index 74758e954035..5ce1f7b854e7 100644 --- a/fs/cifs/fs_context.c +++ b/fs/cifs/fs_context.c @@ -137,6 +137,7 @@ const struct fs_parameter_spec smb3_fs_parameters[] = { fsparam_u32("min_enc_offload", Opt_min_enc_offload), fsparam_u32("esize", Opt_min_enc_offload), fsparam_u32("bsize", Opt_blocksize), + fsparam_u32("rasize", Opt_rasize), fsparam_u32("rsize", Opt_rsize), fsparam_u32("wsize", Opt_wsize), fsparam_u32("actimeo", Opt_actimeo), @@ -941,6 +942,26 @@ static int smb3_fs_context_parse_param(struct fs_context *fc, ctx->bsize = result.uint_32; ctx->got_bsize = true; break; + case Opt_rasize: + /* + * readahead size realistically should never need to be + * less than 1M (CIFS_DEFAULT_IOSIZE) or greater than 32M + * (perhaps an exception should be considered in the + * for the case of a large number of channels + * when multichannel is negotiated) since that would lead + * to plenty of parallel I/O in flight to the server. + * Note that smaller read ahead sizes would + * hurt performance of common tools like cp and scp + * which often trigger sequential i/o with read ahead + */ + if ((result.uint_32 > (8 * SMB3_DEFAULT_IOSIZE)) || + (result.uint_32 < CIFS_DEFAULT_IOSIZE)) { + cifs_errorf(fc, "%s: Invalid rasize %d vs. %d\n", + __func__, result.uint_32, SMB3_DEFAULT_IOSIZE); + goto cifs_parse_mount_err; + } + ctx->rasize = result.uint_32; + break; case Opt_rsize: ctx->rsize = result.uint_32; ctx->got_rsize = true; @@ -1377,7 +1398,9 @@ int smb3_init_fs_context(struct fs_context *fc) ctx->cred_uid = current_uid(); ctx->linux_uid = current_uid(); ctx->linux_gid = current_gid(); - ctx->bsize = 1024 * 1024; /* can improve cp performance significantly */ + /* By default 4MB read ahead size, 1MB block size */ + ctx->bsize = CIFS_DEFAULT_IOSIZE; /* can improve cp performance significantly */ + ctx->rasize = SMB3_DEFAULT_IOSIZE; /* can improve sequential read ahead */ /* * default to SFM style remapping of seven reserved characters diff --git a/fs/cifs/fs_context.h b/fs/cifs/fs_context.h index 56d7a75e2390..2a71c8e411ac 100644 --- a/fs/cifs/fs_context.h +++ b/fs/cifs/fs_context.h @@ -120,6 +120,7 @@ enum cifs_param { Opt_dirmode, Opt_min_enc_offload, Opt_blocksize, + Opt_rasize, Opt_rsize, Opt_wsize, Opt_actimeo, @@ -235,6 +236,7 @@ struct smb3_fs_context { /* reuse existing guid for multichannel */ u8 client_guid[SMB2_CLIENT_GUID_SIZE]; unsigned int bsize; + unsigned int rasize; unsigned int rsize; unsigned int wsize; unsigned int min_offload;