Commit 007b350a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dlm-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm 

Pull dlm updates from David Teigland:
 "This is a major dlm networking enhancement that adds message
  retransmission so that the dlm can reliably continue operating when
  network connections fail and nodes reconnect.

  Previously, this would result in lost messages which could only be
  handled as a node failure"

* tag 'dlm-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: (26 commits)
  fs: dlm: invalid buffer access in lookup error
  fs: dlm: fix race in mhandle deletion
  fs: dlm: rename socket and app buffer defines
  fs: dlm: introduce proto values
  fs: dlm: move dlm allow conn
  fs: dlm: use alloc_ordered_workqueue
  fs: dlm: fix memory leak when fenced
  fs: dlm: fix lowcomms_start error case
  fs: dlm: Fix spelling mistake "stucked" -> "stuck"
  fs: dlm: Fix memory leak of object mh
  fs: dlm: don't allow half transmitted messages
  fs: dlm: add midcomms debugfs functionality
  fs: dlm: add reliable connection if reconnect
  fs: dlm: add union in dlm header for lockspace id
  fs: dlm: move out some hash functionality
  fs: dlm: add functionality to re-transmit a message
  fs: dlm: make buffer handling per msg
  fs: dlm: add more midcomms hooks
  fs: dlm: public header in out utility
  fs: dlm: fix connection tcp EOF handling
  ...
parents 8418dabd 957adb68

fs/dlm/config.c

+14 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <net/sock.h>



#include "config.h"

#include "midcomms.h"

#include "lowcomms.h"



/*
@@ -79,6 +80,9 @@ struct dlm_cluster { 
	unsigned int cl_new_rsb_count;

	unsigned int cl_recover_callbacks;

	char cl_cluster_name[DLM_LOCKSPACE_LEN];



	struct dlm_spaces *sps;

	struct dlm_comms *cms;

};



static struct dlm_cluster *config_item_to_cluster(struct config_item *i)
@@ -204,7 +208,7 @@ static int dlm_check_zero(unsigned int x) 


static int dlm_check_buffer_size(unsigned int x)

{

	if (x < DEFAULT_BUFFER_SIZE)

	if (x < DLM_MAX_SOCKET_BUFSIZE)

		return -EINVAL;



	return 0;
@@ -409,6 +413,9 @@ static struct config_group *make_cluster(struct config_group *g, 
	if (!cl || !sps || !cms)

		goto fail;



	cl->sps = sps;

	cl->cms = cms;



	config_group_init_type_name(&cl->group, name, &cluster_type);

	config_group_init_type_name(&sps->ss_group, "spaces", &spaces_type);

	config_group_init_type_name(&cms->cs_group, "comms", &comms_type);
@@ -458,6 +465,9 @@ static void drop_cluster(struct config_group *g, struct config_item *i) 
static void release_cluster(struct config_item *i)

{

	struct dlm_cluster *cl = config_item_to_cluster(i);



	kfree(cl->sps);

	kfree(cl->cms);

	kfree(cl);

}
@@ -532,7 +542,7 @@ static void drop_comm(struct config_group *g, struct config_item *i) 
	struct dlm_comm *cm = config_item_to_comm(i);

	if (local_comm == cm)

		local_comm = NULL;

	dlm_lowcomms_close(cm->nodeid);

	dlm_midcomms_close(cm->nodeid);

	while (cm->addr_count--)

		kfree(cm->addr[cm->addr_count]);

	config_item_put(i);
@@ -942,7 +952,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 
#define DEFAULT_SCAN_SECS          5

#define DEFAULT_LOG_DEBUG          0

#define DEFAULT_LOG_INFO           1

#define DEFAULT_PROTOCOL           0

#define DEFAULT_PROTOCOL           DLM_PROTO_TCP

#define DEFAULT_MARK               0

#define DEFAULT_TIMEWARN_CS      500 /* 5 sec = 500 centiseconds */

#define DEFAULT_WAITWARN_US	   0
@@ -952,7 +962,7 @@ int dlm_our_addr(struct sockaddr_storage *addr, int num) 


struct dlm_config_info dlm_config = {

	.ci_tcp_port = DEFAULT_TCP_PORT,

	.ci_buffer_size = DEFAULT_BUFFER_SIZE,

	.ci_buffer_size = DLM_MAX_SOCKET_BUFSIZE,

	.ci_rsbtbl_size = DEFAULT_RSBTBL_SIZE,

	.ci_recover_timer = DEFAULT_RECOVER_TIMER,

	.ci_toss_secs = DEFAULT_TOSS_SECS,

fs/dlm/config.h

+4 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef __CONFIG_DOT_H__

#define __CONFIG_DOT_H__



#define DEFAULT_BUFFER_SIZE     4096

#define DLM_MAX_SOCKET_BUFSIZE	4096



struct dlm_config_node {

	int nodeid;
@@ -23,6 +23,9 @@ struct dlm_config_node { 


#define DLM_MAX_ADDR_COUNT 3



#define DLM_PROTO_TCP	0

#define DLM_PROTO_SCTP	1



struct dlm_config_info {

	int ci_tcp_port;

	int ci_buffer_size;

fs/dlm/debug_fs.c

+54 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/slab.h>



#include "dlm_internal.h"

#include "midcomms.h"

#include "lock.h"



#define DLM_DEBUG_BUF_LEN 4096
@@ -23,6 +24,7 @@ static char debug_buf[DLM_DEBUG_BUF_LEN]; 
static struct mutex debug_buf_lock;



static struct dentry *dlm_root;

static struct dentry *dlm_comms;



static char *print_lockmode(int mode)

{
@@ -738,6 +740,57 @@ void dlm_delete_debug_file(struct dlm_ls *ls) 
	debugfs_remove(ls->ls_debug_toss_dentry);

}



static int dlm_state_show(struct seq_file *file, void *offset)

{

	seq_printf(file, "%s\n", dlm_midcomms_state(file->private));

	return 0;

}

DEFINE_SHOW_ATTRIBUTE(dlm_state);



static int dlm_flags_show(struct seq_file *file, void *offset)

{

	seq_printf(file, "%lu\n", dlm_midcomms_flags(file->private));

	return 0;

}

DEFINE_SHOW_ATTRIBUTE(dlm_flags);



static int dlm_send_queue_cnt_show(struct seq_file *file, void *offset)

{

	seq_printf(file, "%d\n", dlm_midcomms_send_queue_cnt(file->private));

	return 0;

}

DEFINE_SHOW_ATTRIBUTE(dlm_send_queue_cnt);



static int dlm_version_show(struct seq_file *file, void *offset)

{

	seq_printf(file, "0x%08x\n", dlm_midcomms_version(file->private));

	return 0;

}

DEFINE_SHOW_ATTRIBUTE(dlm_version);



void *dlm_create_debug_comms_file(int nodeid, void *data)

{

	struct dentry *d_node;

	char name[256];



	memset(name, 0, sizeof(name));

	snprintf(name, 256, "%d", nodeid);



	d_node = debugfs_create_dir(name, dlm_comms);

	debugfs_create_file("state", 0444, d_node, data, &dlm_state_fops);

	debugfs_create_file("flags", 0444, d_node, data, &dlm_flags_fops);

	debugfs_create_file("send_queue_count", 0444, d_node, data,

			    &dlm_send_queue_cnt_fops);

	debugfs_create_file("version", 0444, d_node, data, &dlm_version_fops);



	return d_node;

}



void dlm_delete_debug_comms_file(void *ctx)

{

	debugfs_remove(ctx);

}



void dlm_create_debug_file(struct dlm_ls *ls)

{

	char name[DLM_LOCKSPACE_LEN + 8];
@@ -797,6 +850,7 @@ void __init dlm_register_debugfs(void) 
{

	mutex_init(&debug_buf_lock);

	dlm_root = debugfs_create_dir("dlm", NULL);

	dlm_comms = debugfs_create_dir("comms", dlm_root);

}



void dlm_unregister_debugfs(void)

fs/dlm/dlm_internal.h

+39 −3
Original line number Diff line number Diff line
@@ -57,9 +57,12 @@ struct dlm_header; 
struct dlm_message;

struct dlm_rcom;

struct dlm_mhandle;

struct dlm_msg;



#define log_print(fmt, args...) \

	printk(KERN_ERR "dlm: "fmt"\n" , ##args)

#define log_print_ratelimited(fmt, args...) \

	printk_ratelimited(KERN_ERR "dlm: "fmt"\n", ##args)

#define log_error(ls, fmt, args...) \

	printk(KERN_ERR "dlm: %s: " fmt "\n", (ls)->ls_name , ##args)
@@ -368,23 +371,33 @@ static inline int rsb_flag(struct dlm_rsb *r, enum rsb_flags flag) 
/* dlm_header is first element of all structs sent between nodes */



#define DLM_HEADER_MAJOR	0x00030000

#define DLM_HEADER_MINOR	0x00000001

#define DLM_HEADER_MINOR	0x00000002



#define DLM_VERSION_3_1		0x00030001

#define DLM_VERSION_3_2		0x00030002



#define DLM_HEADER_SLOTS	0x00000001



#define DLM_MSG			1

#define DLM_RCOM		2

#define DLM_OPTS		3

#define DLM_ACK			4

#define DLM_FIN			5



struct dlm_header {

	uint32_t		h_version;

	union {

		/* for DLM_MSG and DLM_RCOM */

		uint32_t	h_lockspace;

		/* for DLM_ACK and DLM_OPTS */

		uint32_t	h_seq;

	} u;

	uint32_t		h_nodeid;	/* nodeid of sender */

	uint16_t		h_length;

	uint8_t			h_cmd;		/* DLM_MSG, DLM_RCOM */

	uint8_t			h_pad;

};





#define DLM_MSG_REQUEST		1

#define DLM_MSG_CONVERT		2

#define DLM_MSG_UNLOCK		3
@@ -452,10 +465,29 @@ struct dlm_rcom { 
	char			rc_buf[];

};



struct dlm_opt_header {

	uint16_t	t_type;

	uint16_t	t_length;

	uint32_t	o_pad;

	/* need to be 8 byte aligned */

	char		t_value[];

};



/* encapsulation header */

struct dlm_opts {

	struct dlm_header	o_header;

	uint8_t			o_nextcmd;

	uint8_t			o_pad;

	uint16_t		o_optlen;

	uint32_t		o_pad2;

	char			o_opts[];

};



union dlm_packet {

	struct dlm_header	header;		/* common to other two */

	struct dlm_message	message;

	struct dlm_rcom		rcom;

	struct dlm_opts		opts;

};



#define DLM_RSF_NEED_SLOTS	0x00000001
@@ -722,11 +754,15 @@ void dlm_register_debugfs(void); 
void dlm_unregister_debugfs(void);

void dlm_create_debug_file(struct dlm_ls *ls);

void dlm_delete_debug_file(struct dlm_ls *ls);

void *dlm_create_debug_comms_file(int nodeid, void *data);

void dlm_delete_debug_comms_file(void *ctx);

#else

static inline void dlm_register_debugfs(void) { }

static inline void dlm_unregister_debugfs(void) { }

static inline void dlm_create_debug_file(struct dlm_ls *ls) { }

static inline void dlm_delete_debug_file(struct dlm_ls *ls) { }

static inline void *dlm_create_debug_comms_file(int nodeid, void *data) { return NULL; }

static inline void dlm_delete_debug_comms_file(void *ctx) { }

#endif



#endif				/* __DLM_INTERNAL_DOT_H__ */

fs/dlm/lock.c

+8 −8
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
#include "dlm_internal.h"

#include <linux/dlm_device.h>

#include "memory.h"

#include "lowcomms.h"

#include "midcomms.h"

#include "requestqueue.h"

#include "util.h"

#include "dir.h"
@@ -3534,17 +3534,17 @@ static int _create_message(struct dlm_ls *ls, int mb_len, 
	char *mb;



	/* get_buffer gives us a message handle (mh) that we need to

	   pass into lowcomms_commit and a message buffer (mb) that we

	   pass into midcomms_commit and a message buffer (mb) that we

	   write our data into */



	mh = dlm_lowcomms_get_buffer(to_nodeid, mb_len, GFP_NOFS, &mb);

	mh = dlm_midcomms_get_mhandle(to_nodeid, mb_len, GFP_NOFS, &mb);

	if (!mh)

		return -ENOBUFS;



	ms = (struct dlm_message *) mb;



	ms->m_header.h_version = (DLM_HEADER_MAJOR | DLM_HEADER_MINOR);

	ms->m_header.h_lockspace = ls->ls_global_id;

	ms->m_header.u.h_lockspace = ls->ls_global_id;

	ms->m_header.h_nodeid = dlm_our_nodeid();

	ms->m_header.h_length = mb_len;

	ms->m_header.h_cmd = DLM_MSG;
@@ -3589,7 +3589,7 @@ static int create_message(struct dlm_rsb *r, struct dlm_lkb *lkb, 
static int send_message(struct dlm_mhandle *mh, struct dlm_message *ms)

{

	dlm_message_out(ms);

	dlm_lowcomms_commit_buffer(mh);

	dlm_midcomms_commit_mhandle(mh);

	return 0;

}
@@ -5038,16 +5038,16 @@ void dlm_receive_buffer(union dlm_packet *p, int nodeid) 


	if (hd->h_nodeid != nodeid) {

		log_print("invalid h_nodeid %d from %d lockspace %x",

			  hd->h_nodeid, nodeid, hd->h_lockspace);

			  hd->h_nodeid, nodeid, hd->u.h_lockspace);

		return;

	}



	ls = dlm_find_lockspace_global(hd->h_lockspace);

	ls = dlm_find_lockspace_global(hd->u.h_lockspace);

	if (!ls) {

		if (dlm_config.ci_log_debug) {

			printk_ratelimited(KERN_DEBUG "dlm: invalid lockspace "

				"%u from %d cmd %d type %d\n",

				hd->h_lockspace, nodeid, hd->h_cmd, type);

				hd->u.h_lockspace, nodeid, hd->h_cmd, type);

		}



		if (hd->h_cmd == DLM_RCOM && type == DLM_RCOM_STATUS)