* [PATCH 1/2] libceph: tcp_nodelay support
@ 2015-01-23 11:11 Chaitanya Huilgol
2015-01-23 12:25 ` Ilya Dryomov
0 siblings, 1 reply; 2+ messages in thread
From: Chaitanya Huilgol @ 2015-01-23 11:11 UTC (permalink / raw)
To: ceph-devel
[-- Attachment #1: Type: TEXT/PLAIN, Size: 4683 bytes --]
Chaitanya Huilgol <chaitanya.huilgol@sandisk.com>
TCP_NODELAY socket option set on connection sockets,
disables Nagle’s algorithm and improves latency characteristics.
tcp_nodelay(default)/no_tcp_nodelay option flags provided to
enable/disable setting the socket option.
Signed-off-by: Chaitanya Huilgol <chaitanya.huilgol@sandisk.com>
---
include/linux/ceph/libceph.h | 1 +
include/linux/ceph/messenger.h | 4 +++-
net/ceph/ceph_common.c | 14 +++++++++++++-
net/ceph/messenger.c | 21 ++++++++++++++++++++-
4 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/include/linux/ceph/libceph.h b/include/linux/ceph/libceph.h
index 8b11a79..4919eaa 100644
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
@@ -30,6 +30,7 @@
#define CEPH_OPT_MYIP (1<<2) /* specified my ip */
#define CEPH_OPT_NOCRC (1<<3) /* no data crc on writes */
#define CEPH_OPT_NOMSGAUTH (1<<4) /* not require cephx message signature */
+#define CEPH_OPT_NO_TCP_NODELAY (1<<5) /* no TCP_NODELAY on TCP sockets */
#define CEPH_OPT_DEFAULT (0)
diff --git a/include/linux/ceph/messenger.h b/include/linux/ceph/messenger.h
index d9d396c..e50cade 100644
--- a/include/linux/ceph/messenger.h
+++ b/include/linux/ceph/messenger.h
@@ -57,6 +57,7 @@ struct ceph_messenger {
atomic_t stopping;
bool nocrc;
+ bool no_tcp_nodelay;
/*
* the global_seq counts connections i (attempt to) initiate
@@ -264,7 +265,8 @@ extern void ceph_messenger_init(struct ceph_messenger *msgr,
struct ceph_entity_addr *myaddr,
u64 supported_features,
u64 required_features,
- bool nocrc);
+ bool nocrc,
+ bool no_tcp_nodelay);
extern void ceph_con_init(struct ceph_connection *con, void *private,
const struct ceph_connection_operations *ops,
diff --git a/net/ceph/ceph_common.c b/net/ceph/ceph_common.c
index 5d5ab67..55d5e84 100644
--- a/net/ceph/ceph_common.c
+++ b/net/ceph/ceph_common.c
@@ -239,6 +239,8 @@ enum {
Opt_nocrc,
Opt_cephx_require_signatures,
Opt_nocephx_require_signatures,
+ Opt_tcp_nodelay,
+ Opt_no_tcp_nodelay,
};
static match_table_t opt_tokens = {
@@ -259,6 +261,8 @@ static match_table_t opt_tokens = {
{Opt_nocrc, "nocrc"},
{Opt_cephx_require_signatures, "cephx_require_signatures"},
{Opt_nocephx_require_signatures, "nocephx_require_signatures"},
+ {Opt_tcp_nodelay, "tcp_nodelay"},
+ {Opt_no_tcp_nodelay, "no_tcp_nodelay"},
{-1, NULL}
};
@@ -464,6 +468,13 @@ ceph_parse_options(char *options, const char *dev_name,
opt->flags |= CEPH_OPT_NOMSGAUTH;
break;
+ case Opt_tcp_nodelay:
+ opt->flags &= ~CEPH_OPT_NO_TCP_NODELAY;
+ break;
+ case Opt_no_tcp_nodelay:
+ opt->flags |= CEPH_OPT_NO_TCP_NODELAY;
+ break;
+
default:
BUG_ON(token);
}
@@ -521,7 +532,8 @@ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private,
ceph_messenger_init(&client->msgr, myaddr,
client->supported_features,
client->required_features,
- ceph_test_opt(client, NOCRC));
+ ceph_test_opt(client, NOCRC),
+ ceph_test_opt(client, NO_TCP_NODELAY));
/* subsystems */
err = ceph_monc_init(&client->monc, client);
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
index 33a2f20..6464a17 100644
--- a/net/ceph/messenger.c
+++ b/net/ceph/messenger.c
@@ -469,6 +469,20 @@ static void set_sock_callbacks(struct socket *sock,
/*
* socket helpers
*/
+static void ceph_tcp_set_sock_options(struct ceph_connection *con)
+{
+ int rc;
+
+ if (!con->msgr->no_tcp_nodelay) {
+ /* Not requested to disable TCP_NODELAY, set it by default */
+ int optval = 1;
+ rc = kernel_setsockopt(con->sock, IPPROTO_TCP, TCP_NODELAY,
+ (char *)&optval, sizeof(optval));
+ if (rc != 0) {
+ dout("Error: CEPH_CON_OPT: TCP_NODELAY: %d\n", rc);
+ }
+ }
+}
/*
* initiate connection to a remote socket.
@@ -513,6 +527,9 @@ static int ceph_tcp_connect(struct ceph_connection *con)
sk_set_memalloc(sock->sk);
con->sock = sock;
+ /* process socket options if any */
+ ceph_tcp_set_sock_options(con);
+
return 0;
}
@@ -2922,7 +2939,8 @@ void ceph_messenger_init(struct ceph_messenger *msgr,
struct ceph_entity_addr *myaddr,
u64 supported_features,
u64 required_features,
- bool nocrc)
+ bool nocrc,
+ bool no_tcp_nodelay)
{
msgr->supported_features = supported_features;
msgr->required_features = required_features;
@@ -2937,6 +2955,7 @@ void ceph_messenger_init(struct ceph_messenger *msgr,
get_random_bytes(&msgr->inst.addr.nonce, sizeof(msgr->inst.addr.nonce));
encode_my_addr(msgr);
msgr->nocrc = nocrc;
+ msgr->no_tcp_nodelay = no_tcp_nodelay;
atomic_set(&msgr->stopping, 0);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] libceph: tcp_nodelay support
2015-01-23 11:11 [PATCH 1/2] libceph: tcp_nodelay support Chaitanya Huilgol
@ 2015-01-23 12:25 ` Ilya Dryomov
0 siblings, 0 replies; 2+ messages in thread
From: Ilya Dryomov @ 2015-01-23 12:25 UTC (permalink / raw)
To: Chaitanya Huilgol; +Cc: Ceph Development
On Fri, Jan 23, 2015 at 2:11 PM, Chaitanya Huilgol
<chaitanya.huilgol@gmail.com> wrote:
> Chaitanya Huilgol <chaitanya.huilgol@sandisk.com>
>
> TCP_NODELAY socket option set on connection sockets,
> disables Nagle’s algorithm and improves latency characteristics.
> tcp_nodelay(default)/no_tcp_nodelay option flags provided to
> enable/disable setting the socket option.
>
> Signed-off-by: Chaitanya Huilgol <chaitanya.huilgol@sandisk.com>
My minor nit is the "NO_TCP_NODELAY" and the ensuing things like
if (!con->msgr->no_tcp_nodelay) {
We should probably do no_tcp_nodelay -> nagle internally to avoid this.
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Thanks,
Ilya
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-01-23 12:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-23 11:11 [PATCH 1/2] libceph: tcp_nodelay support Chaitanya Huilgol
2015-01-23 12:25 ` Ilya Dryomov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.