From patchwork Sun May 29 20:59:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9139961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id AF7BC60757 for ; Sun, 29 May 2016 20:59:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 898932796F for ; Sun, 29 May 2016 20:59:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A681281F9; Sun, 29 May 2016 20:59:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB5992796F for ; Sun, 29 May 2016 20:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753005AbcE2U7f (ORCPT ); Sun, 29 May 2016 16:59:35 -0400 Received: from mail-yw0-f193.google.com ([209.85.161.193]:34656 "EHLO mail-yw0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752862AbcE2U7e (ORCPT ); Sun, 29 May 2016 16:59:34 -0400 Received: by mail-yw0-f193.google.com with SMTP id j74so12773589ywg.1 for ; Sun, 29 May 2016 13:59:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=qzV6PYYO96gic33FzTPsPfVr/GKfY8ZWJcx9d2vCtPY=; b=di7Nj0Xq3d4Vfo8rEckukfPnOap+jYEmewX0gIycSbmujfuN/SZX19uFvogS4DjvbT cKt6K524tq/KbZjZn988EUSUKg++ML3TCdprgQ1VSUm42FUcijbjNHgZuUcqRPo9mSVL GssvHoeRjNfJvIF09ENRVIyQM/lif3HrLCT3fAv5rOYtz2RX0SEvNbWRLMEWNraDcWM4 PX7m+LKO9ML8VZ6M+ZfgRTU64WIa2Mfi3hqaBcH74s/C8EsztDNUT9kcGC5MGpiwGWPH Oc1Et047SEcyhoFxq+SGtD88/d++TiE5NaPNTYVbLHVP/1nS7Ng9VkKFd4JoHMmbSqqk gB7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qzV6PYYO96gic33FzTPsPfVr/GKfY8ZWJcx9d2vCtPY=; b=Xj3vN4KWcIzimkRWf+o5fm4vAVg0hCfkhtbgWRhkrOTjVxuIR5bR0hyHmvpA3BMTSD BN3jZTq/csmzwsf4y4p7IVL1Zz3Q3flDLlmqEf7y9p9i6o/FHkHMwZcixwTyETsVeNR0 SVYXyFept9Hdh3gBWXLhLstVoBQ1RkvjHlWIEfw70WDuSpXap6PyE/PKB4FXqHbDlbQ3 tzCGUwvN1qwWjbbpYfN9gKWeyzQGw8om/oLclhLIf+ORrqmNY4eBIvr3DZBmolzOAt3b lwRoTepoVR/mpJfKwKaalKwLlhcF8VBe6HPMndz0HzpLQVvnz6O+IOhLGNehTdsJvUYV lvRw== X-Gm-Message-State: ALyK8tK4XTk/ZAaxGEXXfPv0mGemy6J1g1cQvt7d0QvYVH2y1/C09rhhWFJ+AX81JER3TA== X-Received: by 10.37.111.11 with SMTP id k11mr14846485ybc.59.1464555573471; Sun, 29 May 2016 13:59:33 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id l200sm11741959ywe.40.2016.05.29.13.59.32 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 29 May 2016 13:59:32 -0700 (PDT) From: Jeff Layton To: linux-nfs@vger.kernel.org Cc: Tom Haynes Subject: [RFC PATCH] nfsd: allow nfsd to advertise multiple layout types Date: Sun, 29 May 2016 16:59:27 -0400 Message-Id: <1464555567-16055-1-git-send-email-jlayton@poochiereds.net> X-Mailer: git-send-email 2.5.5 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If the underlying filesystem supports multiple layout types, then there is little reason not to advertise that fact to clients and let them choose what type to use. Turn the ex_layout_type field into a bitfield. For each supported layout type, we set a bit in that field. When the client requests a layout, ensure that the bit for that layout type is set. When the client requests attributes, send back a list of supported types. Signed-off-by: Jeff Layton Reviewed-by: Weston Andros Adamson --- fs/nfsd/export.c | 4 ++-- fs/nfsd/export.h | 2 +- fs/nfsd/nfs4layouts.c | 6 +++--- fs/nfsd/nfs4proc.c | 4 ++-- fs/nfsd/nfs4xdr.c | 30 ++++++++++++++---------------- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index b4d84b579f20..f97ba49d5e66 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -706,7 +706,7 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem) new->ex_fslocs.locations = NULL; new->ex_fslocs.locations_count = 0; new->ex_fslocs.migrated = 0; - new->ex_layout_type = 0; + new->ex_layout_types = 0; new->ex_uuid = NULL; new->cd = item->cd; } @@ -731,7 +731,7 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem) item->ex_fslocs.locations_count = 0; new->ex_fslocs.migrated = item->ex_fslocs.migrated; item->ex_fslocs.migrated = 0; - new->ex_layout_type = item->ex_layout_type; + new->ex_layout_types = item->ex_layout_types; new->ex_nflavors = item->ex_nflavors; for (i = 0; i < MAX_SECINFO_LIST; i++) { new->ex_flavors[i] = item->ex_flavors[i]; diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h index 2e315072bf3f..730f15eeb7ed 100644 --- a/fs/nfsd/export.h +++ b/fs/nfsd/export.h @@ -57,7 +57,7 @@ struct svc_export { struct nfsd4_fs_locations ex_fslocs; uint32_t ex_nflavors; struct exp_flavor_info ex_flavors[MAX_SECINFO_LIST]; - enum pnfs_layouttype ex_layout_type; + u32 ex_layout_types; struct nfsd4_deviceid_map *ex_devid_map; struct cache_detail *cd; }; diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 6d98d16b3354..2be9602b0221 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c @@ -139,21 +139,21 @@ void nfsd4_setup_layout_type(struct svc_export *exp) * otherwise advertise the block layout. */ #ifdef CONFIG_NFSD_FLEXFILELAYOUT - exp->ex_layout_type = LAYOUT_FLEX_FILES; + exp->ex_layout_types |= 1 << LAYOUT_FLEX_FILES; #endif #ifdef CONFIG_NFSD_BLOCKLAYOUT /* overwrite flex file layout selection if needed */ if (sb->s_export_op->get_uuid && sb->s_export_op->map_blocks && sb->s_export_op->commit_blocks) - exp->ex_layout_type = LAYOUT_BLOCK_VOLUME; + exp->ex_layout_types |= 1 << LAYOUT_BLOCK_VOLUME; #endif #ifdef CONFIG_NFSD_SCSILAYOUT /* overwrite block layout selection if needed */ if (sb->s_export_op->map_blocks && sb->s_export_op->commit_blocks && sb->s_bdev && sb->s_bdev->bd_disk->fops->pr_ops) - exp->ex_layout_type = LAYOUT_SCSI; + exp->ex_layout_types |= 1 << LAYOUT_SCSI; #endif } diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 2ee2dc170327..719c620753e2 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1219,12 +1219,12 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, static const struct nfsd4_layout_ops * nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type) { - if (!exp->ex_layout_type) { + if (!exp->ex_layout_types) { dprintk("%s: export does not support pNFS\n", __func__); return NULL; } - if (exp->ex_layout_type != layout_type) { + if (!(exp->ex_layout_types & (1 << layout_type))) { dprintk("%s: layout type %d not supported\n", __func__, layout_type); return NULL; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 9df898ba648f..4d3ae75ad4c8 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -2164,22 +2164,20 @@ nfsd4_encode_aclname(struct xdr_stream *xdr, struct svc_rqst *rqstp, } static inline __be32 -nfsd4_encode_layout_type(struct xdr_stream *xdr, enum pnfs_layouttype layout_type) +nfsd4_encode_layout_types(struct xdr_stream *xdr, u32 layout_types) { - __be32 *p; + __be32 *p; + unsigned long i = hweight_long(layout_types); - if (layout_type) { - p = xdr_reserve_space(xdr, 8); - if (!p) - return nfserr_resource; - *p++ = cpu_to_be32(1); - *p++ = cpu_to_be32(layout_type); - } else { - p = xdr_reserve_space(xdr, 4); - if (!p) - return nfserr_resource; - *p++ = cpu_to_be32(0); - } + p = xdr_reserve_space(xdr, 4 + 4 * i); + if (!p) + return nfserr_resource; + + *p++ = cpu_to_be32(i); + + for (i = LAYOUT_NFSV4_1_FILES; i < LAYOUT_TYPE_MAX; ++i) + if (layout_types & (1 << i)) + *p++ = cpu_to_be32(i); return 0; } @@ -2754,13 +2752,13 @@ out_acl: } #ifdef CONFIG_NFSD_PNFS if (bmval1 & FATTR4_WORD1_FS_LAYOUT_TYPES) { - status = nfsd4_encode_layout_type(xdr, exp->ex_layout_type); + status = nfsd4_encode_layout_types(xdr, exp->ex_layout_types); if (status) goto out; } if (bmval2 & FATTR4_WORD2_LAYOUT_TYPES) { - status = nfsd4_encode_layout_type(xdr, exp->ex_layout_type); + status = nfsd4_encode_layout_types(xdr, exp->ex_layout_types); if (status) goto out; }