mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 23:05:39 +00:00
Code Issues Releases Wiki Activity

rst: Fix rst_tcp_sock memory management

Browse Source 
In current scheme we grow an array with realloc()-s then
memcpy() the result into rst_mem. I propose to get rid
or realloc-s (we already have objects for the data we
need to keep) and memcpy-s (and put objects directly
into rst_mem at the end).

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-06-25 15:36:44 +03:00
parent 7166e3c984
commit 73e303c8e2
4 changed files with 39 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cr-restore.c
View File

@@ -2647,9 +2647,6 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
struct vma_area *vma;
unsigned long tgt_vmas;
void *tcp_socks_mem;
unsigned long tcp_socks;
void *timerfd_mem;
unsigned long timerfd_mem_cpos;
@@ -2717,17 +2714,12 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
}
/*
* Copy tcp sockets fds to rst memory -- restorer will
* turn repair off before going sigreturn
* Get all the tcp sockets fds into rst memory -- restorer
* will turn repair off before going sigreturn
*/
tcp_socks = rst_mem_cpos(RM_PRIVATE);
tcp_socks_mem = rst_mem_alloc(rst_tcp_socks_len(), RM_PRIVATE);
if (!tcp_socks_mem)
if (rst_tcp_socks_prep())
goto err_nv;
memcpy(tcp_socks_mem, rst_tcp_socks, rst_tcp_socks_len());
/*
* Copy timerfd params for restorer args, we need to proceed
* timer setting at the very late.
@@ -2886,7 +2878,7 @@ static int sigreturn_restore(pid_t pid, CoreEntry *core)
remap_array(posix_timers, posix_timers_nr, posix_timers_cpos);
remap_array(timerfd, rst_timerfd_nr, timerfd_mem_cpos);
remap_array(siginfo, siginfo_nr, siginfo_cpos);
remap_array(tcp_socks, rst_tcp_socks_nr, tcp_socks);
remap_array(tcp_socks, rst_tcp_socks_nr, rst_tcp_socks_cpos);
remap_array(rings, mm->n_aios, aio_rings);
remap_array(rlims, rlims_nr, rlims_cpos);
remap_array(helpers, n_helpers, helpers_pos);

29
include/sk-inet.h
View File

@@ -40,25 +40,18 @@ struct inet_sk_info {
InetSkEntry *ie;
struct file_desc d;
struct inet_port *port;
/*
* This is an fd by which the socket is opened.
* It will be carried down to restorer code to
* repair-off the socket at the very end.
*/
int sk_fd;
struct list_head rlist;
};
extern int inet_bind(int sk, struct inet_sk_info *);
extern int inet_connect(int sk, struct inet_sk_info *);
struct rst_tcp_sock {
int sk;
bool reuseaddr;
};
extern struct rst_tcp_sock *rst_tcp_socks;
extern int rst_tcp_socks_nr;
static inline unsigned long rst_tcp_socks_len(void)
{
return rst_tcp_socks_nr * sizeof(struct rst_tcp_sock);
}
static inline void tcp_repair_off(int fd)
{
int aux = 0, ret;
@@ -78,7 +71,15 @@ extern int restore_one_tcp(int sk, struct inet_sk_info *si);
#define SK_EST_PARAM "tcp-established"
extern int check_tcp(void);
extern int rst_tcp_socks_add(int fd, bool reuseaddr);
extern mutex_t *inet_get_reuseaddr_lock(struct inet_sk_info *ii);
int rst_tcp_socks_prep(void);
extern unsigned long rst_tcp_socks_cpos;
extern unsigned int rst_tcp_socks_nr;
struct rst_tcp_sock {
int sk;
bool reuseaddr;
};
#endif /* __CR_SK_INET_H__ */

6
sk-inet.c
View File

@@ -450,9 +450,9 @@ static int post_open_inet_sk(struct file_desc *d, int sk)
* after unlocking connections.
*/
if (tcp_connection(ii->ie)) {
if (rst_tcp_socks_add(sk, ii->ie->opts->reuseaddr))
return -1;
pr_debug("Schedule %d socket for repair off\n", sk);
BUG_ON(ii->sk_fd != -1);
ii->sk_fd = sk;
return 0;
}

33
sk-tcp.c
View File

@@ -21,6 +21,7 @@
#include "config.h"
#include "cr-show.h"
#include "kerndat.h"
#include "rst-malloc.h"
#include "protobuf.h"
#include "protobuf/tcp-stream.pb-c.h"
@@ -653,26 +654,25 @@ err:
return -1;
}
/*
* rst_tcp_socks contains sockets in repair mode,
* which will be off in restorer before resuming.
*/
struct rst_tcp_sock *rst_tcp_socks = NULL;
int rst_tcp_socks_nr = 0;
unsigned long rst_tcp_socks_cpos;
unsigned int rst_tcp_socks_nr = 0;
int rst_tcp_socks_add(int fd, bool reuseaddr)
int rst_tcp_socks_prep(void)
{
struct rst_tcp_sock *cur;
struct inet_sk_info *ii;
rst_tcp_socks_nr++;
rst_tcp_socks = xrealloc(rst_tcp_socks, rst_tcp_socks_len());
if (!rst_tcp_socks)
return -1;
rst_tcp_socks_cpos = rst_mem_cpos(RM_PRIVATE);
list_for_each_entry(ii, &rst_tcp_repair_sockets, rlist) {
struct rst_tcp_sock *rs;
pr_debug("Schedule %d socket for repair off\n", fd);
cur = &rst_tcp_socks[rst_tcp_socks_nr - 1];
cur->sk = fd;
cur->reuseaddr = reuseaddr;
rs = rst_mem_alloc(sizeof(*rs), RM_PRIVATE);
if (!rs)
return -1;
rs->sk = ii->sk_fd;
rs->reuseaddr = ii->ie->opts->reuseaddr;
rst_tcp_socks_nr++;
}
return 0;
}
@@ -693,6 +693,7 @@ int restore_one_tcp(int fd, struct inet_sk_info *ii)
void tcp_locked_conn_add(struct inet_sk_info *ii)
{
list_add_tail(&ii->rlist, &rst_tcp_repair_sockets);
ii->sk_fd = -1;
}
void rst_unlock_tcp_connections(void)