dlm for 3.11
This set includes a number of SCTP related fixes in the dlm, and a few other minor fixes and changes. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJR0eE4AAoJEDgbc8f8gGmqmE4QAKgEdiuaLzb1Y76ng7GU9UMz 6+RVgjDr+fix5pHrs/KgTMNyfP8QKUYgoaspTTgH1YzyjL0Fvx7SjVt8MIs4694j OT1sPQhwWcCaeRxK9ss4qQxexN25N69iv/A6W1o+RPbL7VqXkvHfyCTePUEMlX4y 55AXcSMlCUoYXKq3CMEkTG/25rK6L3fMopzLDKMyH+bbeOtQwHmTL9pHKj3VRwv2 iV3A5U0pOdbGeWilTzhsLz+iF0oZsfjsNADrrAwuYaAbK5fcXQDDkO5hGkDwa/dd nDR4qs4TBIGUu8J8wgK4dz8Zhcm6mEo5A5/ORgbKvRo3dClLlhX/78xaYtMp/RGG 8v+u2HVwiMd/Ma029m3SxgtjI6cH6XFtZ1ncnL8A72h2Ey1bPEbxmMOQFkSU48Ve ZZyjxLYhtaDxl0xzfqLhh8tWAk8JnOAKu2T5bgO2ShLFvTU6yMmyKwovPdFgZctf qV81wQbuXeqF4xi/uwNLh7UBIPnzXS3OYNhfgzTuawMSwSP2ix+rouqozv6c5804 Ay7/cv+cVJItR0f7GKny0U/tEc5BXkngbhIAG3vWQfOjmU5WMuDMvAxzA9i4CH6h P1pgnoh0VoxoaX1meu0H7XnREAdBo1my9iaJE3Tzk4sjV341JjF9BAuYraMB6krK zHiQjNdDDBy/F8P0YCYt =/kqw -----END PGP SIGNATURE----- Merge tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm Pull dlm updates from David Teigland: "This set includes a number of SCTP related fixes in the dlm, and a few other minor fixes and changes." * tag 'dlm-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: Avoid LVB truncation dlm: log an error for unmanaged lockspaces dlm: config: using strlcpy instead of strncpy dlm: remove duplicated include from lowcomms.c dlm: disable nagle for SCTP dlm: retry failed SCTP sends dlm: try other IPs when sctp init assoc fails dlm: clear correct bit during sctp init failure handling dlm: set sctp assoc id during setup dlm: clear correct init bit during sctp setup
This commit is contained in:
Linus Torvalds
Коммит
6072a93b98
|
|
@ -138,8 +138,9 @@ static ssize_t cluster_cluster_name_read(struct dlm_cluster *cl, char *buf)
|
|||
static ssize_t cluster_cluster_name_write(struct dlm_cluster *cl,
|
||||
const char *buf, size_t len)
|
||||
{
|
||||
strncpy(dlm_config.ci_cluster_name, buf, DLM_LOCKSPACE_LEN);
|
||||
strncpy(cl->cl_cluster_name, buf, DLM_LOCKSPACE_LEN);
|
||||
strlcpy(dlm_config.ci_cluster_name, buf,
|
||||
sizeof(dlm_config.ci_cluster_name));
|
||||
strlcpy(cl->cl_cluster_name, buf, sizeof(cl->cl_cluster_name));
|
||||
return len;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2038,8 +2038,8 @@ static void set_lvb_lock_pc(struct dlm_rsb *r, struct dlm_lkb *lkb,
|
|||
b = dlm_lvb_operations[lkb->lkb_grmode + 1][lkb->lkb_rqmode + 1];
|
||||
if (b == 1) {
|
||||
int len = receive_extralen(ms);
|
||||
if (len > DLM_RESNAME_MAXLEN)
|
||||
len = DLM_RESNAME_MAXLEN;
|
||||
if (len > r->res_ls->ls_lvblen)
|
||||
len = r->res_ls->ls_lvblen;
|
||||
memcpy(lkb->lkb_lvbptr, ms->m_extra, len);
|
||||
lkb->lkb_lvbseq = ms->m_lvbseq;
|
||||
}
|
||||
|
|
@ -3893,8 +3893,8 @@ static int receive_lvb(struct dlm_ls *ls, struct dlm_lkb *lkb,
|
|||
if (!lkb->lkb_lvbptr)
|
||||
return -ENOMEM;
|
||||
len = receive_extralen(ms);
|
||||
if (len > DLM_RESNAME_MAXLEN)
|
||||
len = DLM_RESNAME_MAXLEN;
|
||||
if (len > ls->ls_lvblen)
|
||||
len = ls->ls_lvblen;
|
||||
memcpy(lkb->lkb_lvbptr, ms->m_extra, len);
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -883,17 +883,24 @@ int dlm_release_lockspace(void *lockspace, int force)
|
|||
void dlm_stop_lockspaces(void)
|
||||
{
|
||||
struct dlm_ls *ls;
|
||||
int count;
|
||||
|
||||
restart:
|
||||
count = 0;
|
||||
spin_lock(&lslist_lock);
|
||||
list_for_each_entry(ls, &lslist, ls_list) {
|
||||
if (!test_bit(LSFL_RUNNING, &ls->ls_flags))
|
||||
if (!test_bit(LSFL_RUNNING, &ls->ls_flags)) {
|
||||
count++;
|
||||
continue;
|
||||
}
|
||||
spin_unlock(&lslist_lock);
|
||||
log_error(ls, "no userland control daemon, stopping lockspace");
|
||||
dlm_ls_stop(ls);
|
||||
goto restart;
|
||||
}
|
||||
spin_unlock(&lslist_lock);
|
||||
|
||||
if (count)
|
||||
log_print("dlm user daemon left %d lockspaces", count);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@
|
|||
#include <linux/mutex.h>
|
||||
#include <linux/sctp.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/sctp.h>
|
||||
#include <net/sctp/sctp.h>
|
||||
#include <net/ipv6.h>
|
||||
|
||||
|
|
@ -126,6 +125,7 @@ struct connection {
|
|||
struct connection *othercon;
|
||||
struct work_struct rwork; /* Receive workqueue */
|
||||
struct work_struct swork; /* Send workqueue */
|
||||
bool try_new_addr;
|
||||
};
|
||||
#define sock2con(x) ((struct connection *)(x)->sk_user_data)
|
||||
|
||||
|
|
@ -144,6 +144,7 @@ struct dlm_node_addr {
|
|||
struct list_head list;
|
||||
int nodeid;
|
||||
int addr_count;
|
||||
int curr_addr_index;
|
||||
struct sockaddr_storage *addr[DLM_MAX_ADDR_COUNT];
|
||||
};
|
||||
|
||||
|
|
@ -310,7 +311,7 @@ static int addr_compare(struct sockaddr_storage *x, struct sockaddr_storage *y)
|
|||
}
|
||||
|
||||
static int nodeid_to_addr(int nodeid, struct sockaddr_storage *sas_out,
|
||||
struct sockaddr *sa_out)
|
||||
struct sockaddr *sa_out, bool try_new_addr)
|
||||
{
|
||||
struct sockaddr_storage sas;
|
||||
struct dlm_node_addr *na;
|
||||
|
|
@ -320,8 +321,16 @@ static int nodeid_to_addr(int nodeid, struct sockaddr_storage *sas_out,
|
|||
|
||||
spin_lock(&dlm_node_addrs_spin);
|
||||
na = find_node_addr(nodeid);
|
||||
if (na && na->addr_count)
|
||||
memcpy(&sas, na->addr[0], sizeof(struct sockaddr_storage));
|
||||
if (na && na->addr_count) {
|
||||
if (try_new_addr) {
|
||||
na->curr_addr_index++;
|
||||
if (na->curr_addr_index == na->addr_count)
|
||||
na->curr_addr_index = 0;
|
||||
}
|
||||
|
||||
memcpy(&sas, na->addr[na->curr_addr_index ],
|
||||
sizeof(struct sockaddr_storage));
|
||||
}
|
||||
spin_unlock(&dlm_node_addrs_spin);
|
||||
|
||||
if (!na)
|
||||
|
|
@ -353,19 +362,22 @@ static int addr_to_nodeid(struct sockaddr_storage *addr, int *nodeid)
|
|||
{
|
||||
struct dlm_node_addr *na;
|
||||
int rv = -EEXIST;
|
||||
int addr_i;
|
||||
|
||||
spin_lock(&dlm_node_addrs_spin);
|
||||
list_for_each_entry(na, &dlm_node_addrs, list) {
|
||||
if (!na->addr_count)
|
||||
continue;
|
||||
|
||||
if (!addr_compare(na->addr[0], addr))
|
||||
continue;
|
||||
|
||||
for (addr_i = 0; addr_i < na->addr_count; addr_i++) {
|
||||
if (addr_compare(na->addr[addr_i], addr)) {
|
||||
*nodeid = na->nodeid;
|
||||
rv = 0;
|
||||
break;
|
||||
goto unlock;
|
||||
}
|
||||
}
|
||||
}
|
||||
unlock:
|
||||
spin_unlock(&dlm_node_addrs_spin);
|
||||
return rv;
|
||||
}
|
||||
|
|
@ -561,8 +573,23 @@ static void sctp_send_shutdown(sctp_assoc_t associd)
|
|||
|
||||
static void sctp_init_failed_foreach(struct connection *con)
|
||||
{
|
||||
|
||||
/*
|
||||
* Don't try to recover base con and handle race where the
|
||||
* other node's assoc init creates a assoc and we get that
|
||||
* notification, then we get a notification that our attempt
|
||||
* failed due. This happens when we are still trying the primary
|
||||
* address, but the other node has already tried secondary addrs
|
||||
* and found one that worked.
|
||||
*/
|
||||
if (!con->nodeid || con->sctp_assoc)
|
||||
return;
|
||||
|
||||
log_print("Retrying SCTP association init for node %d\n", con->nodeid);
|
||||
|
||||
con->try_new_addr = true;
|
||||
con->sctp_assoc = 0;
|
||||
if (test_and_clear_bit(CF_CONNECT_PENDING, &con->flags)) {
|
||||
if (test_and_clear_bit(CF_INIT_PENDING, &con->flags)) {
|
||||
if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
|
||||
queue_work(send_workqueue, &con->swork);
|
||||
}
|
||||
|
|
@ -579,15 +606,56 @@ static void sctp_init_failed(void)
|
|||
mutex_unlock(&connections_lock);
|
||||
}
|
||||
|
||||
static void retry_failed_sctp_send(struct connection *recv_con,
|
||||
struct sctp_send_failed *sn_send_failed,
|
||||
char *buf)
|
||||
{
|
||||
int len = sn_send_failed->ssf_length - sizeof(struct sctp_send_failed);
|
||||
struct dlm_mhandle *mh;
|
||||
struct connection *con;
|
||||
char *retry_buf;
|
||||
int nodeid = sn_send_failed->ssf_info.sinfo_ppid;
|
||||
|
||||
log_print("Retry sending %d bytes to node id %d", len, nodeid);
|
||||
|
||||
con = nodeid2con(nodeid, 0);
|
||||
if (!con) {
|
||||
log_print("Could not look up con for nodeid %d\n",
|
||||
nodeid);
|
||||
return;
|
||||
}
|
||||
|
||||
mh = dlm_lowcomms_get_buffer(nodeid, len, GFP_NOFS, &retry_buf);
|
||||
if (!mh) {
|
||||
log_print("Could not allocate buf for retry.");
|
||||
return;
|
||||
}
|
||||
memcpy(retry_buf, buf + sizeof(struct sctp_send_failed), len);
|
||||
dlm_lowcomms_commit_buffer(mh);
|
||||
|
||||
/*
|
||||
* If we got a assoc changed event before the send failed event then
|
||||
* we only need to retry the send.
|
||||
*/
|
||||
if (con->sctp_assoc) {
|
||||
if (!test_and_set_bit(CF_WRITE_PENDING, &con->flags))
|
||||
queue_work(send_workqueue, &con->swork);
|
||||
} else
|
||||
sctp_init_failed_foreach(con);
|
||||
}
|
||||
|
||||
/* Something happened to an association */
|
||||
static void process_sctp_notification(struct connection *con,
|
||||
struct msghdr *msg, char *buf)
|
||||
{
|
||||
union sctp_notification *sn = (union sctp_notification *)buf;
|
||||
|
||||
if (sn->sn_header.sn_type == SCTP_ASSOC_CHANGE) {
|
||||
switch (sn->sn_header.sn_type) {
|
||||
case SCTP_SEND_FAILED:
|
||||
retry_failed_sctp_send(con, &sn->sn_send_failed, buf);
|
||||
break;
|
||||
case SCTP_ASSOC_CHANGE:
|
||||
switch (sn->sn_assoc_change.sac_state) {
|
||||
|
||||
case SCTP_COMM_UP:
|
||||
case SCTP_RESTART:
|
||||
{
|
||||
|
|
@ -662,9 +730,11 @@ static void process_sctp_notification(struct connection *con,
|
|||
log_print("connecting to %d sctp association %d",
|
||||
nodeid, (int)sn->sn_assoc_change.sac_assoc_id);
|
||||
|
||||
new_con->sctp_assoc = sn->sn_assoc_change.sac_assoc_id;
|
||||
new_con->try_new_addr = false;
|
||||
/* Send any pending writes */
|
||||
clear_bit(CF_CONNECT_PENDING, &new_con->flags);
|
||||
clear_bit(CF_INIT_PENDING, &con->flags);
|
||||
clear_bit(CF_INIT_PENDING, &new_con->flags);
|
||||
if (!test_and_set_bit(CF_WRITE_PENDING, &new_con->flags)) {
|
||||
queue_work(send_workqueue, &new_con->swork);
|
||||
}
|
||||
|
|
@ -683,14 +753,10 @@ static void process_sctp_notification(struct connection *con,
|
|||
}
|
||||
break;
|
||||
|
||||
/* We don't know which INIT failed, so clear the PENDING flags
|
||||
* on them all. if assoc_id is zero then it will then try
|
||||
* again */
|
||||
|
||||
case SCTP_CANT_STR_ASSOC:
|
||||
{
|
||||
/* Will retry init when we get the send failed notification */
|
||||
log_print("Can't start SCTP association - retrying");
|
||||
sctp_init_failed();
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -699,6 +765,8 @@ static void process_sctp_notification(struct connection *con,
|
|||
(int)sn->sn_assoc_change.sac_assoc_id,
|
||||
sn->sn_assoc_change.sac_state);
|
||||
}
|
||||
default:
|
||||
; /* fall through */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -958,6 +1026,24 @@ static void free_entry(struct writequeue_entry *e)
|
|||
kfree(e);
|
||||
}
|
||||
|
||||
/*
|
||||
* writequeue_entry_complete - try to delete and free write queue entry
|
||||
* @e: write queue entry to try to delete
|
||||
* @completed: bytes completed
|
||||
*
|
||||
* writequeue_lock must be held.
|
||||
*/
|
||||
static void writequeue_entry_complete(struct writequeue_entry *e, int completed)
|
||||
{
|
||||
e->offset += completed;
|
||||
e->len -= completed;
|
||||
|
||||
if (e->len == 0 && e->users == 0) {
|
||||
list_del(&e->list);
|
||||
free_entry(e);
|
||||
}
|
||||
}
|
||||
|
||||
/* Initiate an SCTP association.
|
||||
This is a special case of send_to_sock() in that we don't yet have a
|
||||
peeled-off socket for this association, so we use the listening socket
|
||||
|
|
@ -977,15 +1063,14 @@ static void sctp_init_assoc(struct connection *con)
|
|||
int addrlen;
|
||||
struct kvec iov[1];
|
||||
|
||||
mutex_lock(&con->sock_mutex);
|
||||
if (test_and_set_bit(CF_INIT_PENDING, &con->flags))
|
||||
return;
|
||||
goto unlock;
|
||||
|
||||
if (con->retries++ > MAX_CONNECT_RETRIES)
|
||||
return;
|
||||
|
||||
if (nodeid_to_addr(con->nodeid, NULL, (struct sockaddr *)&rem_addr)) {
|
||||
if (nodeid_to_addr(con->nodeid, NULL, (struct sockaddr *)&rem_addr,
|
||||
con->try_new_addr)) {
|
||||
log_print("no address for nodeid %d", con->nodeid);
|
||||
return;
|
||||
goto unlock;
|
||||
}
|
||||
base_con = nodeid2con(0, 0);
|
||||
BUG_ON(base_con == NULL);
|
||||
|
|
@ -1003,17 +1088,25 @@ static void sctp_init_assoc(struct connection *con)
|
|||
if (list_empty(&con->writequeue)) {
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
log_print("writequeue empty for nodeid %d", con->nodeid);
|
||||
return;
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
e = list_first_entry(&con->writequeue, struct writequeue_entry, list);
|
||||
len = e->len;
|
||||
offset = e->offset;
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
|
||||
/* Send the first block off the write queue */
|
||||
iov[0].iov_base = page_address(e->page)+offset;
|
||||
iov[0].iov_len = len;
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
|
||||
if (rem_addr.ss_family == AF_INET) {
|
||||
struct sockaddr_in *sin = (struct sockaddr_in *)&rem_addr;
|
||||
log_print("Trying to connect to %pI4", &sin->sin_addr.s_addr);
|
||||
} else {
|
||||
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&rem_addr;
|
||||
log_print("Trying to connect to %pI6", &sin6->sin6_addr);
|
||||
}
|
||||
|
||||
cmsg = CMSG_FIRSTHDR(&outmessage);
|
||||
cmsg->cmsg_level = IPPROTO_SCTP;
|
||||
|
|
@ -1021,8 +1114,9 @@ static void sctp_init_assoc(struct connection *con)
|
|||
cmsg->cmsg_len = CMSG_LEN(sizeof(struct sctp_sndrcvinfo));
|
||||
sinfo = CMSG_DATA(cmsg);
|
||||
memset(sinfo, 0x00, sizeof(struct sctp_sndrcvinfo));
|
||||
sinfo->sinfo_ppid = cpu_to_le32(dlm_our_nodeid());
|
||||
sinfo->sinfo_ppid = cpu_to_le32(con->nodeid);
|
||||
outmessage.msg_controllen = cmsg->cmsg_len;
|
||||
sinfo->sinfo_flags |= SCTP_ADDR_OVER;
|
||||
|
||||
ret = kernel_sendmsg(base_con->sock, &outmessage, iov, 1, len);
|
||||
if (ret < 0) {
|
||||
|
|
@ -1035,15 +1129,12 @@ static void sctp_init_assoc(struct connection *con)
|
|||
}
|
||||
else {
|
||||
spin_lock(&con->writequeue_lock);
|
||||
e->offset += ret;
|
||||
e->len -= ret;
|
||||
|
||||
if (e->len == 0 && e->users == 0) {
|
||||
list_del(&e->list);
|
||||
free_entry(e);
|
||||
}
|
||||
writequeue_entry_complete(e, ret);
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
}
|
||||
|
||||
unlock:
|
||||
mutex_unlock(&con->sock_mutex);
|
||||
}
|
||||
|
||||
/* Connect a new socket to its peer */
|
||||
|
|
@ -1075,7 +1166,7 @@ static void tcp_connect_to_sock(struct connection *con)
|
|||
goto out_err;
|
||||
|
||||
memset(&saddr, 0, sizeof(saddr));
|
||||
result = nodeid_to_addr(con->nodeid, &saddr, NULL);
|
||||
result = nodeid_to_addr(con->nodeid, &saddr, NULL, false);
|
||||
if (result < 0) {
|
||||
log_print("no address for nodeid %d", con->nodeid);
|
||||
goto out_err;
|
||||
|
|
@ -1254,6 +1345,7 @@ static int sctp_listen_for_all(void)
|
|||
int result = -EINVAL, num = 1, i, addr_len;
|
||||
struct connection *con = nodeid2con(0, GFP_NOFS);
|
||||
int bufsize = NEEDED_RMEM;
|
||||
int one = 1;
|
||||
|
||||
if (!con)
|
||||
return -ENOMEM;
|
||||
|
|
@ -1288,6 +1380,11 @@ static int sctp_listen_for_all(void)
|
|||
goto create_delsock;
|
||||
}
|
||||
|
||||
result = kernel_setsockopt(sock, SOL_SCTP, SCTP_NODELAY, (char *)&one,
|
||||
sizeof(one));
|
||||
if (result < 0)
|
||||
log_print("Could not set SCTP NODELAY error %d\n", result);
|
||||
|
||||
/* Init con struct */
|
||||
sock->sk->sk_user_data = con;
|
||||
con->sock = sock;
|
||||
|
|
@ -1493,13 +1590,7 @@ static void send_to_sock(struct connection *con)
|
|||
}
|
||||
|
||||
spin_lock(&con->writequeue_lock);
|
||||
e->offset += ret;
|
||||
e->len -= ret;
|
||||
|
||||
if (e->len == 0 && e->users == 0) {
|
||||
list_del(&e->list);
|
||||
free_entry(e);
|
||||
}
|
||||
writequeue_entry_complete(e, ret);
|
||||
}
|
||||
spin_unlock(&con->writequeue_lock);
|
||||
out:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче