From: Tom Haynes <thomas.haynes@primarydata.com>
To: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: Linux NFS Mailing list <linux-nfs@vger.kernel.org>
Subject: [PATCH v4 40/50] nfs: add nfs_pgio_current_mirror helper
Date: Wed, 14 Jan 2015 08:44:46 -0800 [thread overview]
Message-ID: <1421253896-73106-41-git-send-email-loghyr@primarydata.com> (raw)
In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com>
From: Peng Tao <tao.peng@primarydata.com>
Let it return current nfs_pgio_mirror in use depending on pg_mirror_count.
For read, we always use pg_mirrors[0], so this effectively gives us freedom
to use pg_mirror_idx to track the actual mirror to read from through out the
IO stack.
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Tom Haynes <loghyr@primarydata.com>
---
fs/nfs/internal.h | 2 ++
fs/nfs/objlayout/objio_osd.c | 2 +-
fs/nfs/pagelist.c | 25 +++++++++++++++++--------
fs/nfs/pnfs.c | 9 ++++-----
4 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 5be06bc..ffe4b7a 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -255,6 +255,8 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr,
struct rpc_cred *cred, const struct nfs_rpc_ops *rpc_ops,
const struct rpc_call_ops *call_ops, int how, int flags);
void nfs_free_request(struct nfs_page *req);
+struct nfs_pgio_mirror *
+nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc);
static inline void nfs_iocounter_init(struct nfs_io_counter *c)
{
diff --git a/fs/nfs/objlayout/objio_osd.c b/fs/nfs/objlayout/objio_osd.c
index 9a5f2ee..24e1d74 100644
--- a/fs/nfs/objlayout/objio_osd.c
+++ b/fs/nfs/objlayout/objio_osd.c
@@ -537,7 +537,7 @@ int objio_write_pagelist(struct nfs_pgio_header *hdr, int how)
static size_t objio_pg_test(struct nfs_pageio_descriptor *pgio,
struct nfs_page *prev, struct nfs_page *req)
{
- struct nfs_pgio_mirror *mirror = &pgio->pg_mirrors[pgio->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(pgio);
unsigned int size;
size = pnfs_generic_pg_test(pgio, prev, req);
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index f9d8c46..960c99f 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -42,11 +42,20 @@ static bool nfs_pgarray_set(struct nfs_page_array *p, unsigned int pagecount)
return p->pagevec != NULL;
}
+struct nfs_pgio_mirror *
+nfs_pgio_current_mirror(struct nfs_pageio_descriptor *desc)
+{
+ return nfs_pgio_has_mirroring(desc) ?
+ &desc->pg_mirrors[desc->pg_mirror_idx] :
+ &desc->pg_mirrors[0];
+}
+EXPORT_SYMBOL_GPL(nfs_pgio_current_mirror);
+
void nfs_pgheader_init(struct nfs_pageio_descriptor *desc,
struct nfs_pgio_header *hdr,
void (*release)(struct nfs_pgio_header *hdr))
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
hdr->req = nfs_list_entry(mirror->pg_list.next);
@@ -485,7 +494,7 @@ nfs_wait_on_request(struct nfs_page *req)
size_t nfs_generic_pg_test(struct nfs_pageio_descriptor *desc,
struct nfs_page *prev, struct nfs_page *req)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
if (mirror->pg_count > mirror->pg_bsize) {
@@ -782,7 +791,7 @@ static void nfs_pgio_result(struct rpc_task *task, void *calldata)
int nfs_generic_pgio(struct nfs_pageio_descriptor *desc,
struct nfs_pgio_header *hdr)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
struct nfs_page *req;
struct page **pages,
@@ -831,7 +840,7 @@ static int nfs_generic_pg_pgios(struct nfs_pageio_descriptor *desc)
struct nfs_pgio_header *hdr;
int ret;
- mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ mirror = nfs_pgio_current_mirror(desc);
hdr = nfs_pgio_header_alloc(desc->pg_rw_ops);
if (!hdr) {
@@ -961,7 +970,7 @@ static bool nfs_can_coalesce_requests(struct nfs_page *prev,
static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
struct nfs_page *req)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
struct nfs_page *prev = NULL;
@@ -985,7 +994,7 @@ static int nfs_pageio_do_add_request(struct nfs_pageio_descriptor *desc,
*/
static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
if (!list_empty(&mirror->pg_list)) {
@@ -1015,7 +1024,7 @@ static void nfs_pageio_doio(struct nfs_pageio_descriptor *desc)
static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc,
struct nfs_page *req)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
struct nfs_page *subreq;
unsigned int bytes_left = 0;
@@ -1078,7 +1087,7 @@ err_ptr:
static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
LIST_HEAD(head);
do {
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index e123cfc..b822b17 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -1731,7 +1731,7 @@ static void
pnfs_write_through_mds(struct nfs_pageio_descriptor *desc,
struct nfs_pgio_header *hdr)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
list_splice_tail_init(&hdr->pages, &mirror->pg_list);
@@ -1785,7 +1785,7 @@ EXPORT_SYMBOL_GPL(pnfs_writehdr_free);
int
pnfs_generic_pg_writepages(struct nfs_pageio_descriptor *desc)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
struct nfs_pgio_header *hdr;
int ret;
@@ -1846,8 +1846,7 @@ static void
pnfs_read_through_mds(struct nfs_pageio_descriptor *desc,
struct nfs_pgio_header *hdr)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
-
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
if (!test_and_set_bit(NFS_IOHDR_REDO, &hdr->flags)) {
list_splice_tail_init(&hdr->pages, &mirror->pg_list);
@@ -1903,7 +1902,7 @@ EXPORT_SYMBOL_GPL(pnfs_readhdr_free);
int
pnfs_generic_pg_readpages(struct nfs_pageio_descriptor *desc)
{
- struct nfs_pgio_mirror *mirror = &desc->pg_mirrors[desc->pg_mirror_idx];
+ struct nfs_pgio_mirror *mirror = nfs_pgio_current_mirror(desc);
struct nfs_pgio_header *hdr;
int ret;
--
1.9.3
next prev parent reply other threads:[~2015-01-14 16:46 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 16:44 [PATCH v4 00/50] Add Flexfile Layout Module Tom Haynes
2015-01-14 16:44 ` [PATCH v4 01/50] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2015-01-14 16:44 ` [PATCH v4 02/50] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2015-01-14 16:44 ` [PATCH v4 03/50] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 04/50] nfs41: pull decode_ds_addr " Tom Haynes
2015-01-14 16:44 ` [PATCH v4 05/50] nfs41: pull nfs4_ds_connect " Tom Haynes
2015-01-14 16:44 ` [PATCH v4 06/50] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2015-01-14 16:44 ` [PATCH v4 07/50] nfs41: move file layout macros to generic pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 08/50] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2015-01-14 16:44 ` [PATCH v4 09/50] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2015-01-14 16:44 ` [PATCH v4 10/50] nfs41: create NFSv3 DS connection if specified Tom Haynes
2015-01-14 16:44 ` [PATCH v4 11/50] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2015-01-14 16:44 ` [PATCH v4 12/50] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2015-01-14 16:44 ` [PATCH v4 13/50] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2015-01-14 16:44 ` [PATCH v4 14/50] nfs4: export nfs4_sequence_done Tom Haynes
2015-01-14 16:44 ` [PATCH v4 15/50] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2015-01-14 16:44 ` [PATCH v4 16/50] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2015-01-14 16:44 ` [PATCH v4 17/50] sunrpc: add rpc_count_iostats_idx Tom Haynes
2015-01-14 16:44 ` [PATCH v4 18/50] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2015-01-14 16:44 ` [PATCH v4 19/50] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2015-01-14 16:44 ` [PATCH v4 20/50] nfs41: close a small race window when adding new layout to global list Tom Haynes
2015-01-14 16:44 ` [PATCH v4 21/50] nfs41: serialize first layoutget of a file Tom Haynes
2015-01-14 16:44 ` [PATCH v4 22/50] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2015-01-14 16:44 ` [PATCH v4 23/50] nfs41: pass iomode through layoutreturn args Tom Haynes
2015-01-14 16:44 ` [PATCH v4 24/50] nfs41: make a helper function to send layoutreturn Tom Haynes
2015-01-14 16:44 ` [PATCH v4 25/50] nfs41: add a helper to mark layout for return Tom Haynes
2015-01-14 16:44 ` [PATCH v4 26/50] nfs41: don't use a layout if it is marked for returning Tom Haynes
2015-01-14 16:44 ` [PATCH v4 27/50] nfs41: send layoutreturn in last put_lseg Tom Haynes
2015-01-14 16:44 ` [PATCH v4 28/50] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2015-01-14 16:44 ` [PATCH v4 29/50] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2015-01-14 16:44 ` [PATCH v4 30/50] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2015-01-14 16:44 ` [PATCH v4 31/50] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2015-01-14 16:44 ` [PATCH v4 32/50] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2015-01-14 16:44 ` [PATCH v4 33/50] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2015-01-14 16:44 ` [PATCH v4 34/50] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2015-01-14 16:44 ` [PATCH v4 35/50] nfs: add mirroring support to pgio layer Tom Haynes
2015-01-14 16:44 ` [PATCH v4 36/50] nfs: mirroring support for direct io Tom Haynes
2015-01-14 16:44 ` [PATCH v4 37/50] pnfs: fail comparison when bucket verifier not set Tom Haynes
2015-01-14 16:44 ` [PATCH v4 38/50] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2015-01-14 16:44 ` [PATCH v4 39/50] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2015-01-14 16:44 ` Tom Haynes [this message]
2015-01-14 16:44 ` [PATCH v4 41/50] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2015-01-14 16:44 ` [PATCH v4 42/50] nfs41: add range to layoutreturn args Tom Haynes
2015-01-14 16:44 ` [PATCH v4 43/50] nfs41: allow async version layoutreturn Tom Haynes
2015-01-14 16:44 ` [PATCH v4 44/50] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2015-01-14 16:44 ` [PATCH v4 45/50] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2015-01-14 16:44 ` [PATCH v4 46/50] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2015-01-14 16:44 ` [PATCH v4 47/50] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2015-01-14 16:44 ` [PATCH v4 48/50] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2015-01-14 16:44 ` [PATCH v4 49/50] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2015-01-14 16:44 ` [PATCH v4 50/50] pnfs: Update documentation on the Layout Drivers 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=1421253896-73106-41-git-send-email-loghyr@primarydata.com \
--to=thomas.haynes@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--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