From: Weston Andros Adamson <dros@primarydata.com>
To: Anna Schumaker <Anna.Schumaker@netapp.com>
Cc: Tom Haynes <thomas.haynes@primarydata.com>,
Trond Myklebust <trond.myklebust@primarydata.com>,
linux-nfs list <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v3 34/49] pnfs: pass ds_commit_idx through the commit path
Date: Tue, 13 Jan 2015 11:10:13 -0500 [thread overview]
Message-ID: <ACAB31F9-E203-4802-8A59-B76674F6AB09@primarydata.com> (raw)
In-Reply-To: <54B53BD0.9000006@Netapp.com>
> On Jan 13, 2015, at 10:37 AM, Anna Schumaker <Anna.Schumaker@netapp.com> wrote:
>
> Hi Dros,
>
> On 01/06/2015 07:28 PM, Tom Haynes wrote:
>> From: Weston Andros Adamson <dros@primarydata.com>
>>
>> Pass ds_commit_idx through the nfs commit path. It's used to select
>> the commit bucket when using pnfs and is ignored when not using pnfs.
>> Several functions had to be changed: nfs_retry_commit,
>> nfs_mark_request_commit, pnfs_mark_request_commit and the pnfs layout
>> driver .mark_request_commit functions.
>
> We're already passing the struct nfs_commit_info everywhere with these functions. Would it make sense to add ds_commit_index as another field in the commit info?
That might work. I kind of remember there being a reason that it wouldn’t work,
but I can’t think of it now.
I should have some time later this week to give it a shot.
-dros
>
>>
>> Signed-off-by: Tom Haynes <loghyr@primarydata.com>
>> ---
>> fs/nfs/direct.c | 5 +++--
>> fs/nfs/filelayout/filelayout.c | 3 ++-
>> fs/nfs/internal.h | 6 ++++--
>> fs/nfs/pnfs.h | 9 +++++----
>> fs/nfs/pnfs_nfsio.c | 4 ++--
>> fs/nfs/write.c | 14 ++++++++------
>> 6 files changed, 24 insertions(+), 17 deletions(-)
>>
>> diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
>> index d7c2d43..1ee41d7 100644
>> --- a/fs/nfs/direct.c
>> +++ b/fs/nfs/direct.c
>> @@ -649,7 +649,7 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data)
>> nfs_list_remove_request(req);
>> if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES) {
>> /* Note the rewrite will go through mds */
>> - nfs_mark_request_commit(req, NULL, &cinfo);
>> + nfs_mark_request_commit(req, NULL, &cinfo, 0);
>> } else
>> nfs_release_request(req);
>> nfs_unlock_and_release_request(req);
>> @@ -748,7 +748,8 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
>> nfs_list_remove_request(req);
>> if (request_commit) {
>> kref_get(&req->wb_kref);
>> - nfs_mark_request_commit(req, hdr->lseg, &cinfo);
>> + nfs_mark_request_commit(req, hdr->lseg, &cinfo,
>> + hdr->ds_commit_idx);
>> }
>> nfs_unlock_and_release_request(req);
>> }
>> diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c
>> index 520cbc5..3c97694 100644
>> --- a/fs/nfs/filelayout/filelayout.c
>> +++ b/fs/nfs/filelayout/filelayout.c
>> @@ -954,7 +954,8 @@ static u32 select_bucket_index(struct nfs4_filelayout_segment *fl, u32 j)
>> static void
>> filelayout_mark_request_commit(struct nfs_page *req,
>> struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo)
>> + struct nfs_commit_info *cinfo,
>> + u32 ds_commit_idx)
>>
>> {
>> struct nfs4_filelayout_segment *fl = FILELAYOUT_LSEG(lseg);
>> diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
>> index e9305e9..05f9a87 100644
>> --- a/fs/nfs/internal.h
>> +++ b/fs/nfs/internal.h
>> @@ -450,13 +450,15 @@ int nfs_scan_commit(struct inode *inode, struct list_head *dst,
>> struct nfs_commit_info *cinfo);
>> void nfs_mark_request_commit(struct nfs_page *req,
>> struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo);
>> + struct nfs_commit_info *cinfo,
>> + u32 ds_commit_idx);
>> int nfs_write_need_commit(struct nfs_pgio_header *);
>> int nfs_generic_commit_list(struct inode *inode, struct list_head *head,
>> int how, struct nfs_commit_info *cinfo);
>> void nfs_retry_commit(struct list_head *page_list,
>> struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo);
>> + struct nfs_commit_info *cinfo,
>> + u32 ds_commit_idx);
>> void nfs_commitdata_release(struct nfs_commit_data *data);
>> void nfs_request_add_commit_list(struct nfs_page *req, struct list_head *dst,
>> struct nfs_commit_info *cinfo);
>> diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
>> index d3cbb6e..ebb4e82 100644
>> --- a/fs/nfs/pnfs.h
>> +++ b/fs/nfs/pnfs.h
>> @@ -137,7 +137,8 @@ struct pnfs_layoutdriver_type {
>> struct pnfs_ds_commit_info *(*get_ds_info) (struct inode *inode);
>> void (*mark_request_commit) (struct nfs_page *req,
>> struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo);
>> + struct nfs_commit_info *cinfo,
>> + u32 ds_commit_idx);
>> void (*clear_request_commit) (struct nfs_page *req,
>> struct nfs_commit_info *cinfo);
>> int (*scan_commit_lists) (struct nfs_commit_info *cinfo,
>> @@ -388,14 +389,14 @@ pnfs_generic_mark_devid_invalid(struct nfs4_deviceid_node *node)
>>
>> static inline bool
>> pnfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo)
>> + struct nfs_commit_info *cinfo, u32 ds_commit_idx)
>> {
>> struct inode *inode = req->wb_context->dentry->d_inode;
>> struct pnfs_layoutdriver_type *ld = NFS_SERVER(inode)->pnfs_curr_ld;
>>
>> if (lseg == NULL || ld->mark_request_commit == NULL)
>> return false;
>> - ld->mark_request_commit(req, lseg, cinfo);
>> + ld->mark_request_commit(req, lseg, cinfo, ds_commit_idx);
>> return true;
>> }
>>
>> @@ -573,7 +574,7 @@ pnfs_get_ds_info(struct inode *inode)
>>
>> static inline bool
>> pnfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo)
>> + struct nfs_commit_info *cinfo, u32 ds_commit_idx)
>> {
>> return false;
>> }
>> diff --git a/fs/nfs/pnfs_nfsio.c b/fs/nfs/pnfs_nfsio.c
>> index c6c3efc..842258e 100644
>> --- a/fs/nfs/pnfs_nfsio.c
>> +++ b/fs/nfs/pnfs_nfsio.c
>> @@ -183,7 +183,7 @@ static void pnfs_generic_retry_commit(struct nfs_commit_info *cinfo, int idx)
>> bucket = &fl_cinfo->buckets[i];
>> if (list_empty(&bucket->committing))
>> continue;
>> - nfs_retry_commit(&bucket->committing, bucket->clseg, cinfo);
>> + nfs_retry_commit(&bucket->committing, bucket->clseg, cinfo, i);
>> spin_lock(cinfo->lock);
>> freeme = bucket->clseg;
>> bucket->clseg = NULL;
>> @@ -242,7 +242,7 @@ pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages,
>> list_add(&data->pages, &list);
>> nreq++;
>> } else {
>> - nfs_retry_commit(mds_pages, NULL, cinfo);
>> + nfs_retry_commit(mds_pages, NULL, cinfo, 0);
>> pnfs_generic_retry_commit(cinfo, 0);
>> cinfo->completion_ops->error_cleanup(NFS_I(inode));
>> return -ENOMEM;
>> diff --git a/fs/nfs/write.c b/fs/nfs/write.c
>> index a6eadac..db802d9 100644
>> --- a/fs/nfs/write.c
>> +++ b/fs/nfs/write.c
>> @@ -847,9 +847,9 @@ EXPORT_SYMBOL_GPL(nfs_init_cinfo);
>> */
>> void
>> nfs_mark_request_commit(struct nfs_page *req, struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo)
>> + struct nfs_commit_info *cinfo, u32 ds_commit_idx)
>> {
>> - if (pnfs_mark_request_commit(req, lseg, cinfo))
>> + if (pnfs_mark_request_commit(req, lseg, cinfo, ds_commit_idx))
>> return;
>> nfs_request_add_commit_list(req, &cinfo->mds->list, cinfo);
>> }
>> @@ -905,7 +905,8 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
>> }
>> if (nfs_write_need_commit(hdr)) {
>> memcpy(&req->wb_verf, &hdr->verf.verifier, sizeof(req->wb_verf));
>> - nfs_mark_request_commit(req, hdr->lseg, &cinfo);
>> + nfs_mark_request_commit(req, hdr->lseg, &cinfo,
>> + 0);
>> goto next;
>> }
>> remove_req:
>> @@ -1561,14 +1562,15 @@ EXPORT_SYMBOL_GPL(nfs_init_commit);
>>
>> void nfs_retry_commit(struct list_head *page_list,
>> struct pnfs_layout_segment *lseg,
>> - struct nfs_commit_info *cinfo)
>> + struct nfs_commit_info *cinfo,
>> + u32 ds_commit_idx)
>> {
>> struct nfs_page *req;
>>
>> while (!list_empty(page_list)) {
>> req = nfs_list_entry(page_list->next);
>> nfs_list_remove_request(req);
>> - nfs_mark_request_commit(req, lseg, cinfo);
>> + nfs_mark_request_commit(req, lseg, cinfo, ds_commit_idx);
>> if (!cinfo->dreq) {
>> dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
>> dec_bdi_stat(page_file_mapping(req->wb_page)->backing_dev_info,
>> @@ -1599,7 +1601,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how,
>> return nfs_initiate_commit(NFS_CLIENT(inode), data, NFS_PROTO(inode),
>> data->mds_ops, how, 0);
>> out_bad:
>> - nfs_retry_commit(head, NULL, cinfo);
>> + nfs_retry_commit(head, NULL, cinfo, 0);
>> cinfo->completion_ops->error_cleanup(NFS_I(inode));
>> return -ENOMEM;
>> }
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2015-01-13 16:10 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 0:28 [PATCH v3 00/49] *** Add Flexfile Layout Module *** Tom Haynes
2015-01-07 0:28 ` [PATCH v3 01/49] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-12 18:59 ` Anna Schumaker
2015-01-12 19:10 ` Tom Haynes
2015-01-12 19:13 ` Christoph Hellwig
2015-01-07 0:28 ` [PATCH v3 02/49] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-07 0:28 ` [PATCH v3 03/49] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-07 14:56 ` Christoph Hellwig
2015-01-07 18:28 ` Tom Haynes
2015-01-13 19:48 ` Tom Haynes
2015-01-07 0:28 ` [PATCH v3 04/49] nfs41: pull decode_ds_addr " Tom Haynes
2015-01-12 16:19 ` Anna Schumaker
2015-01-13 19:43 ` Tom Haynes
2015-01-07 0:28 ` [PATCH v3 05/49] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-07 14:56 ` Christoph Hellwig
2015-01-07 0:28 ` [PATCH v3 06/49] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-07 0:28 ` [PATCH v3 07/49] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-07 0:28 ` [PATCH v3 08/49] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-07 0:28 ` [PATCH v3 09/49] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-07 0:28 ` [PATCH v3 10/49] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-07 0:28 ` [PATCH v3 11/49] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-12 18:41 ` Anna Schumaker
2015-01-12 18:51 ` Tom Haynes
2015-01-07 0:28 ` [PATCH v3 12/49] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-07 0:28 ` [PATCH v3 13/49] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-07 0:28 ` [PATCH v3 14/49] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-07 0:28 ` [PATCH v3 15/49] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-07 0:28 ` [PATCH v3 16/49] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2015-01-07 0:28 ` [PATCH v3 17/49] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-07 0:28 ` [PATCH v3 18/49] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-07 0:28 ` [PATCH v3 19/49] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-07 0:28 ` [PATCH v3 20/49] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-07 0:28 ` [PATCH v3 21/49] nfs41: serialize first layoutget of a file Tom Haynes
2015-01-07 0:28 ` [PATCH v3 22/49] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-07 0:28 ` [PATCH v3 23/49] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-07 0:28 ` [PATCH v3 24/49] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-07 0:28 ` [PATCH v3 25/49] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-07 0:28 ` [PATCH v3 26/49] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-07 0:28 ` [PATCH v3 27/49] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-07 0:28 ` [PATCH v3 28/49] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-07 0:28 ` [PATCH v3 29/49] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-07 0:28 ` [PATCH v3 30/49] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-07 0:28 ` [PATCH v3 31/49] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-07 0:28 ` [PATCH v3 32/49] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-07 0:28 ` [PATCH v3 33/49] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-07 0:28 ` [PATCH v3 34/49] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-13 15:37 ` Anna Schumaker
2015-01-13 16:10 ` Weston Andros Adamson [this message]
2015-01-07 0:28 ` [PATCH v3 35/49] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-07 0:28 ` [PATCH v3 36/49] nfs: mirroring support for direct io Tom Haynes
2015-01-07 0:28 ` [PATCH v3 37/49] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-07 0:28 ` [PATCH v3 38/49] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-07 0:28 ` [PATCH v3 39/49] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-07 0:28 ` [PATCH v3 40/49] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2015-01-07 0:28 ` [PATCH v3 41/49] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-07 0:28 ` [PATCH v3 42/49] nfs41: add range to layoutreturn args Tom Haynes
2015-01-13 19:15 ` Anna Schumaker
2015-01-13 19:42 ` Tom Haynes
2015-01-13 19:51 ` Anna Schumaker
2015-01-13 22:50 ` Tom Haynes
2015-01-14 13:40 ` Anna Schumaker
2015-01-07 0:28 ` [PATCH v3 43/49] nfs41: allow async version layoutreturn Tom Haynes
2015-01-07 0:28 ` [PATCH v3 44/49] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-07 0:28 ` [PATCH v3 45/49] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-07 0:28 ` [PATCH v3 46/49] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-07 0:28 ` [PATCH v3 47/49] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-07 0:28 ` [PATCH v3 48/49] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-07 0:28 ` [PATCH v3 49/49] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-08 14:45 ` [PATCH v3 00/49] *** Add Flexfile Layout Module *** Christoph Hellwig
2015-01-08 15:20 ` Anna Schumaker
2015-01-08 18:13 ` Tom Haynes
2015-01-08 16:02 ` Weston Andros Adamson
2015-01-08 17:07 ` Tom Haynes
2015-01-08 19:36 ` Tom Haynes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ACAB31F9-E203-4802-8A59-B76674F6AB09@primarydata.com \
--to=dros@primarydata.com \
--cc=Anna.Schumaker@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=thomas.haynes@primarydata.com \
--cc=trond.myklebust@primarydata.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox