hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: dlm: don't put dlm_local_addrs on heap 

[ Upstream commit c51c9cd8ad ]

This patch removes to allocate the dlm_local_addr[] pointers on the
heap. Instead we directly store the type of "struct sockaddr_storage".
This removes function deinit_local() because it was freeing memory only.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexander Aring 2022-11-17 17:11:52 -05:00 committed by Greg Kroah-Hartman
parent e5dc63f01e
commit b478e414cf
1 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fs/dlm/lowcomms.c
View File

@ -174,7 +174,7 @@ static LIST_HEAD(dlm_node_addrs);
static DEFINE_SPINLOCK(dlm_node_addrs_spin); static DEFINE_SPINLOCK(dlm_node_addrs_spin);
static struct listen_connection listen_con; static struct listen_connection listen_con;
static struct sockaddr_storage *dlm_local_addr[DLM_MAX_ADDR_COUNT]; static struct sockaddr_storage dlm_local_addr[DLM_MAX_ADDR_COUNT];
static int dlm_local_count; static int dlm_local_count;
int dlm_allow_conn; int dlm_allow_conn;
@ -398,7 +398,7 @@ static int nodeid_to_addr(int nodeid, struct sockaddr_storage *sas_out,
if (!sa_out) if (!sa_out)
return 0; return 0;
if (dlm_local_addr[0]->ss_family == AF_INET) { if (dlm_local_addr[0].ss_family == AF_INET) {
struct sockaddr_in *in4 = (struct sockaddr_in *) &sas; struct sockaddr_in *in4 = (struct sockaddr_in *) &sas;
struct sockaddr_in *ret4 = (struct sockaddr_in *) sa_out; struct sockaddr_in *ret4 = (struct sockaddr_in *) sa_out;
ret4->sin_addr.s_addr = in4->sin_addr.s_addr; ret4->sin_addr.s_addr = in4->sin_addr.s_addr;
@ -727,7 +727,7 @@ static void add_sock(struct socket *sock, struct connection *con)
static void make_sockaddr(struct sockaddr_storage *saddr, uint16_t port, static void make_sockaddr(struct sockaddr_storage *saddr, uint16_t port,
int *addr_len) int *addr_len)
{ {
saddr->ss_family = dlm_local_addr[0]->ss_family; saddr->ss_family = dlm_local_addr[0].ss_family;
if (saddr->ss_family == AF_INET) { if (saddr->ss_family == AF_INET) {
struct sockaddr_in *in4_addr = (struct sockaddr_in *)saddr; struct sockaddr_in *in4_addr = (struct sockaddr_in *)saddr;
in4_addr->sin_port = cpu_to_be16(port); in4_addr->sin_port = cpu_to_be16(port);
@ -1167,7 +1167,7 @@ static int sctp_bind_addrs(struct socket *sock, uint16_t port)
int i, addr_len, result = 0; int i, addr_len, result = 0;
for (i = 0; i < dlm_local_count; i++) { for (i = 0; i < dlm_local_count; i++) {
memcpy(&localaddr, dlm_local_addr[i], sizeof(localaddr)); memcpy(&localaddr, &dlm_local_addr[i], sizeof(localaddr));
make_sockaddr(&localaddr, port, &addr_len); make_sockaddr(&localaddr, port, &addr_len);
if (!i) if (!i)
@ -1187,7 +1187,7 @@ static int sctp_bind_addrs(struct socket *sock, uint16_t port)
/* Get local addresses */ /* Get local addresses */
static void init_local(void) static void init_local(void)
{ {
struct sockaddr_storage sas, *addr; struct sockaddr_storage sas;
int i; int i;
dlm_local_count = 0; dlm_local_count = 0;
@ -1195,21 +1195,10 @@ static void init_local(void)
if (dlm_our_addr(&sas, i)) if (dlm_our_addr(&sas, i))
break; break;
addr = kmemdup(&sas, sizeof(*addr), GFP_NOFS); memcpy(&dlm_local_addr[dlm_local_count++], &sas, sizeof(sas));
if (!addr)
break;
dlm_local_addr[dlm_local_count++] = addr;
} }
} }
static void deinit_local(void)
{
int i;
for (i = 0; i < dlm_local_count; i++)
kfree(dlm_local_addr[i]);
}
static struct writequeue_entry *new_writequeue_entry(struct connection *con) static struct writequeue_entry *new_writequeue_entry(struct connection *con)
{ {
struct writequeue_entry *entry; struct writequeue_entry *entry;
@ -1575,7 +1564,7 @@ static void dlm_connect(struct connection *con)
} }
/* Create a socket to communicate with */ /* Create a socket to communicate with */
result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family, result = sock_create_kern(&init_net, dlm_local_addr[0].ss_family,
SOCK_STREAM, dlm_proto_ops->proto, &sock); SOCK_STREAM, dlm_proto_ops->proto, &sock);
if (result < 0) if (result < 0)
goto socket_err; goto socket_err;
@ -1786,7 +1775,6 @@ void dlm_lowcomms_stop(void)
foreach_conn(free_conn); foreach_conn(free_conn);
srcu_read_unlock(&connections_srcu, idx); srcu_read_unlock(&connections_srcu, idx);
work_stop(); work_stop();
deinit_local();
dlm_proto_ops = NULL; dlm_proto_ops = NULL;
} }
@ -1803,7 +1791,7 @@ static int dlm_listen_for_all(void)
if (result < 0) if (result < 0)
return result; return result;
result = sock_create_kern(&init_net, dlm_local_addr[0]->ss_family, result = sock_create_kern(&init_net, dlm_local_addr[0].ss_family,
SOCK_STREAM, dlm_proto_ops->proto, &sock); SOCK_STREAM, dlm_proto_ops->proto, &sock);
if (result < 0) { if (result < 0) {
log_print("Can't create comms socket: %d", result); log_print("Can't create comms socket: %d", result);
@ -1842,7 +1830,7 @@ static int dlm_tcp_bind(struct socket *sock)
/* Bind to our cluster-known address connecting to avoid /* Bind to our cluster-known address connecting to avoid
* routing problems. * routing problems.
*/ */
memcpy(&src_addr, dlm_local_addr[0], sizeof(src_addr)); memcpy(&src_addr, &dlm_local_addr[0], sizeof(src_addr));
make_sockaddr(&src_addr, 0, &addr_len); make_sockaddr(&src_addr, 0, &addr_len);
result = kernel_bind(sock, (struct sockaddr *)&src_addr, result = kernel_bind(sock, (struct sockaddr *)&src_addr,
@ -1899,9 +1887,9 @@ static int dlm_tcp_listen_bind(struct socket *sock)
int addr_len; int addr_len;
/* Bind to our port */ /* Bind to our port */
make_sockaddr(dlm_local_addr[0], dlm_config.ci_tcp_port, &addr_len); make_sockaddr(&dlm_local_addr[0], dlm_config.ci_tcp_port, &addr_len);
return kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0], return kernel_bind(sock, (struct sockaddr *)&dlm_local_addr[0],
addr_len); addr_len);
} }
static const struct dlm_proto_ops dlm_tcp_ops = { static const struct dlm_proto_ops dlm_tcp_ops = {
@ -1992,7 +1980,7 @@ int dlm_lowcomms_start(void)
error = work_start(); error = work_start();
if (error) if (error)
goto fail_local; goto fail;
dlm_allow_conn = 1; dlm_allow_conn = 1;
@ -2022,8 +2010,6 @@ fail_listen:
fail_proto_ops: fail_proto_ops:
dlm_allow_conn = 0; dlm_allow_conn = 0;
work_stop(); work_stop();
fail_local:
deinit_local();
fail: fail:
return error; return error;
} }