From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: linux-kernel@vger.kernel.org, santosh.shilimkar@oracle.com
Subject: [net-next][PATCH v2 08/18] RDS: IB: split the mr registration and invalidation path
Date: Tue, 6 Dec 2016 20:01:46 -0800 [thread overview]
Message-ID: <1481083316-11648-9-git-send-email-santosh.shilimkar@oracle.com> (raw)
In-Reply-To: <1481083316-11648-1-git-send-email-santosh.shilimkar@oracle.com>
MR invalidation in RDS is done in background thread and not in
data path like registration. So break the dependency between them
which helps to remove the performance bottleneck.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
---
net/rds/ib.h | 4 +++-
net/rds/ib_cm.c | 9 +++++++--
net/rds/ib_frmr.c | 11 ++++++-----
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/net/rds/ib.h b/net/rds/ib.h
index f4e8121..f14c26d 100644
--- a/net/rds/ib.h
+++ b/net/rds/ib.h
@@ -14,7 +14,8 @@
#define RDS_IB_DEFAULT_RECV_WR 1024
#define RDS_IB_DEFAULT_SEND_WR 256
-#define RDS_IB_DEFAULT_FR_WR 512
+#define RDS_IB_DEFAULT_FR_WR 256
+#define RDS_IB_DEFAULT_FR_INV_WR 256
#define RDS_IB_DEFAULT_RETRY_COUNT 1
@@ -125,6 +126,7 @@ struct rds_ib_connection {
/* To control the number of wrs from fastreg */
atomic_t i_fastreg_wrs;
+ atomic_t i_fastunreg_wrs;
/* interrupt handling */
struct tasklet_struct i_send_tasklet;
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index b9da1e5..3002acf 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -382,7 +382,10 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
* completion queue and send queue. This extra space is used for FRMR
* registration and invalidation work requests
*/
- fr_queue_space = (rds_ibdev->use_fastreg ? RDS_IB_DEFAULT_FR_WR : 0);
+ fr_queue_space = rds_ibdev->use_fastreg ?
+ (RDS_IB_DEFAULT_FR_WR + 1) +
+ (RDS_IB_DEFAULT_FR_INV_WR + 1)
+ : 0;
/* add the conn now so that connection establishment has the dev */
rds_ib_add_conn(rds_ibdev, conn);
@@ -444,6 +447,7 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
attr.send_cq = ic->i_send_cq;
attr.recv_cq = ic->i_recv_cq;
atomic_set(&ic->i_fastreg_wrs, RDS_IB_DEFAULT_FR_WR);
+ atomic_set(&ic->i_fastunreg_wrs, RDS_IB_DEFAULT_FR_INV_WR);
/*
* XXX this can fail if max_*_wr is too large? Are we supposed
@@ -766,7 +770,8 @@ void rds_ib_conn_path_shutdown(struct rds_conn_path *cp)
wait_event(rds_ib_ring_empty_wait,
rds_ib_ring_empty(&ic->i_recv_ring) &&
(atomic_read(&ic->i_signaled_sends) == 0) &&
- (atomic_read(&ic->i_fastreg_wrs) == RDS_IB_DEFAULT_FR_WR));
+ (atomic_read(&ic->i_fastreg_wrs) == RDS_IB_DEFAULT_FR_WR) &&
+ (atomic_read(&ic->i_fastunreg_wrs) == RDS_IB_DEFAULT_FR_INV_WR));
tasklet_kill(&ic->i_send_tasklet);
tasklet_kill(&ic->i_recv_tasklet);
diff --git a/net/rds/ib_frmr.c b/net/rds/ib_frmr.c
index 66b3d62..48332a6 100644
--- a/net/rds/ib_frmr.c
+++ b/net/rds/ib_frmr.c
@@ -241,8 +241,8 @@ static int rds_ib_post_inv(struct rds_ib_mr *ibmr)
if (frmr->fr_state != FRMR_IS_INUSE)
goto out;
- while (atomic_dec_return(&ibmr->ic->i_fastreg_wrs) <= 0) {
- atomic_inc(&ibmr->ic->i_fastreg_wrs);
+ while (atomic_dec_return(&ibmr->ic->i_fastunreg_wrs) <= 0) {
+ atomic_inc(&ibmr->ic->i_fastunreg_wrs);
cpu_relax();
}
@@ -261,7 +261,7 @@ static int rds_ib_post_inv(struct rds_ib_mr *ibmr)
if (unlikely(ret)) {
frmr->fr_state = FRMR_IS_STALE;
frmr->fr_inv = false;
- atomic_inc(&ibmr->ic->i_fastreg_wrs);
+ atomic_inc(&ibmr->ic->i_fastunreg_wrs);
pr_err("RDS/IB: %s returned error(%d)\n", __func__, ret);
goto out;
}
@@ -289,9 +289,10 @@ void rds_ib_mr_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc)
if (frmr->fr_inv) {
frmr->fr_state = FRMR_IS_FREE;
frmr->fr_inv = false;
+ atomic_inc(&ic->i_fastreg_wrs);
+ } else {
+ atomic_inc(&ic->i_fastunreg_wrs);
}
-
- atomic_inc(&ic->i_fastreg_wrs);
}
void rds_ib_unreg_frmr(struct list_head *list, unsigned int *nfreed,
--
1.9.1
next prev parent reply other threads:[~2016-12-07 4:04 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 4:01 [net-next][PATCH v2 00/18] net: RDS updates Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 01/18] RDS: log the address on bind failure Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 02/18] RDS: mark few internal functions static to make sparse build happy Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 03/18] RDS: IB: include faddr in connection log Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 04/18] RDS: IB: make the transport retry count smallest Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 05/18] RDS: RDMA: fix the ib_map_mr_sg_zbva() argument Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 06/18] RDS: RDMA: start rdma listening after init Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 07/18] RDS: RDMA: return appropriate error on rdma map failures Santosh Shilimkar
2016-12-07 4:01 ` Santosh Shilimkar [this message]
2016-12-07 4:01 ` [net-next][PATCH v2 09/18] RDS: RDMA: silence the use_once mr log flood Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 10/18] RDS: IB: track and log active side endpoint in connection Santosh Shilimkar
2016-12-07 15:53 ` David Miller
2016-12-07 16:29 ` Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 11/18] RDS: IB: add few useful cache stasts Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 12/18] RDS: IB: Add vector spreading for cqs Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 13/18] RDS: RDMA: Fix the composite message user notification Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 14/18] RDS: IB: fix panic due to handlers running post teardown Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 15/18] RDS: add stat for socket recv memory usage Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 16/18] RDS: make message size limit compliant with spec Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 17/18] RDS: add receive message trace used by application Santosh Shilimkar
2016-12-07 4:01 ` [net-next][PATCH v2 18/18] RDS: IB: add missing connection cache usage info Santosh Shilimkar
2016-12-07 15:55 ` David Miller
2016-12-07 16:44 ` Santosh Shilimkar
2016-12-07 17:05 ` David Miller
2016-12-07 17:20 ` Santosh Shilimkar
2016-12-07 17:36 ` David Miller
2016-12-07 20:42 ` Santosh Shilimkar
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=1481083316-11648-9-git-send-email-santosh.shilimkar@oracle.com \
--to=santosh.shilimkar@oracle.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).