mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-29 13:28:27 +00:00
Code Issues Releases Wiki Activity

sk-inet: Add support for checkpoint/restore of ICMP sockets

Browse Source 
Currently there is no option to checkpoint/restore programs that use
ICMP sockets, such as `ping`. This patch adds support for the same.

Fixes #2557

Signed-off-by: समीर सिंह Sameer Singh <lumarzeli30@gmail.com>
This commit is contained in:
समीर सिंह Sameer Singh 2024-12-27 03:47:35 +05:30 committed by Andrei Vagin
parent 80dcaf1e5c
commit 52fd3d6eea
2 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
criu/sk-inet.c
View File

@ -130,6 +130,8 @@ static int can_dump_ipproto(unsigned int ino, int proto, int type)
case IPPROTO_TCP: case IPPROTO_TCP:
case IPPROTO_UDP: case IPPROTO_UDP:
case IPPROTO_UDPLITE: case IPPROTO_UDPLITE:
case IPPROTO_ICMP:
case IPPROTO_ICMPV6:
break; break;
default: default:
pr_err("Unsupported proto %d for socket %x\n", proto, ino); pr_err("Unsupported proto %d for socket %x\n", proto, ino);
@ -922,6 +924,7 @@ static int open_inet_sk(struct file_desc *d, int *new_fd)
} }
if (ie->src_port) { if (ie->src_port) {
if (ie->proto != IPPROTO_ICMP && ie->proto != IPPROTO_ICMPV6)
if (inet_bind(sk, ii)) if (inet_bind(sk, ii))
goto err; goto err;
} }

34
criu/sockets.c
View File

@ -65,7 +65,7 @@ const char *socket_proto_name(unsigned int proto, char *nm, size_t size)
[IPPROTO_IPV6] = __stringify_1(IPPROTO_IPV6), [IPPROTO_RSVP] = __stringify_1(IPPROTO_RSVP), [IPPROTO_IPV6] = __stringify_1(IPPROTO_IPV6), [IPPROTO_RSVP] = __stringify_1(IPPROTO_RSVP),
[IPPROTO_GRE] = __stringify_1(IPPROTO_GRE), [IPPROTO_ESP] = __stringify_1(IPPROTO_ESP), [IPPROTO_GRE] = __stringify_1(IPPROTO_GRE), [IPPROTO_ESP] = __stringify_1(IPPROTO_ESP),
[IPPROTO_AH] = __stringify_1(IPPROTO_AH), [IPPROTO_UDPLITE] = __stringify_1(IPPROTO_UDPLITE), [IPPROTO_AH] = __stringify_1(IPPROTO_AH), [IPPROTO_UDPLITE] = __stringify_1(IPPROTO_UDPLITE),
[IPPROTO_RAW] = __stringify_1(IPPROTO_RAW), [IPPROTO_RAW] = __stringify_1(IPPROTO_RAW), [IPPROTO_ICMPV6] = __stringify_1(IPPROTO_ICMPV6),
}; };
return __socket_const_name(nm, size, protos, ARRAY_SIZE(protos), proto); return __socket_const_name(nm, size, protos, ARRAY_SIZE(protos), proto);
} }
@ -131,10 +131,12 @@ enum socket_cl_bits {
INET_UDP_CL_BIT, INET_UDP_CL_BIT,
INET_UDPLITE_CL_BIT, INET_UDPLITE_CL_BIT,
INET_RAW_CL_BIT, INET_RAW_CL_BIT,
INET_ICMP_CL_BIT,
INET6_TCP_CL_BIT, INET6_TCP_CL_BIT,
INET6_UDP_CL_BIT, INET6_UDP_CL_BIT,
INET6_UDPLITE_CL_BIT, INET6_UDPLITE_CL_BIT,
INET6_RAW_CL_BIT, INET6_RAW_CL_BIT,
INET6_ICMP_CL_BIT,
UNIX_CL_BIT, UNIX_CL_BIT,
PACKET_CL_BIT, PACKET_CL_BIT,
_MAX_CL_BIT, _MAX_CL_BIT,
@ -161,6 +163,8 @@ static inline enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsign
return INET_UDPLITE_CL_BIT; return INET_UDPLITE_CL_BIT;
if (proto == IPPROTO_RAW) if (proto == IPPROTO_RAW)
return INET_RAW_CL_BIT; return INET_RAW_CL_BIT;
if (proto == IPPROTO_ICMP)
return INET_ICMP_CL_BIT;
} }
if (family == AF_INET6) { if (family == AF_INET6) {
if (proto == IPPROTO_TCP) if (proto == IPPROTO_TCP)
@ -171,6 +175,8 @@ static inline enum socket_cl_bits get_collect_bit_nr(unsigned int family, unsign
return INET6_UDPLITE_CL_BIT; return INET6_UDPLITE_CL_BIT;
if (proto == IPPROTO_RAW) if (proto == IPPROTO_RAW)
return INET6_RAW_CL_BIT; return INET6_RAW_CL_BIT;
if (proto == IPPROTO_ICMPV6)
return INET6_ICMP_CL_BIT;
} }
pr_err("Unknown pair family %d proto %d\n", family, proto); pr_err("Unknown pair family %d proto %d\n", family, proto);
@ -282,6 +288,12 @@ void preload_socket_modules(void)
req.r.i.sdiag_protocol = IPPROTO_RAW; req.r.i.sdiag_protocol = IPPROTO_RAW;
probe_diag(nl, &req, -ENOENT); probe_diag(nl, &req, -ENOENT);
req.r.i.sdiag_protocol = IPPROTO_ICMP;
probe_diag(nl, &req, -ENOENT);
req.r.i.sdiag_protocol = IPPROTO_ICMPV6;
probe_diag(nl, &req, -ENOENT);
close(nl); close(nl);
pr_info("Done probing\n"); pr_info("Done probing\n");
} }
@ -773,6 +785,10 @@ static int inet_receive_one(struct nlmsghdr *h, struct ns_id *ns, void *arg)
case IPPROTO_RAW: case IPPROTO_RAW:
type = SOCK_RAW; type = SOCK_RAW;
break; break;
case IPPROTO_ICMP:
case IPPROTO_ICMPV6:
type = SOCK_DGRAM;
break;
default: default:
BUG_ON(1); BUG_ON(1);
return -1; return -1;
@ -797,7 +813,7 @@ static int collect_err(int err, struct ns_id *ns, void *arg)
char family[32], proto[32]; char family[32], proto[32];
char msg[256]; char msg[256];
snprintf(msg, sizeof(msg), "Sockects collect procedure family %s proto %s", snprintf(msg, sizeof(msg), "Sockets collect procedure family %s proto %s",
socket_family_name(gr->family, family, sizeof(family)), socket_family_name(gr->family, family, sizeof(family)),
socket_proto_name(gr->protocol, proto, sizeof(proto))); socket_proto_name(gr->protocol, proto, sizeof(proto)));
@ -905,6 +921,13 @@ int collect_sockets(struct ns_id *ns)
if (tmp) if (tmp)
err = tmp; err = tmp;
/* Collect IPv4 ICMP sockets */
req.r.i.sdiag_family = AF_INET;
req.r.i.sdiag_protocol = IPPROTO_ICMP;
req.r.i.idiag_ext = 0;
req.r.i.idiag_states = -1; /* All */
set_collect_bit(req.r.n.sdiag_family, req.r.n.sdiag_protocol);
/* Collect IPv6 TCP sockets */ /* Collect IPv6 TCP sockets */
req.r.i.sdiag_family = AF_INET6; req.r.i.sdiag_family = AF_INET6;
req.r.i.sdiag_protocol = IPPROTO_TCP; req.r.i.sdiag_protocol = IPPROTO_TCP;
@ -944,6 +967,13 @@ int collect_sockets(struct ns_id *ns)
if (tmp) if (tmp)
err = tmp; err = tmp;
/* Collect IPv6 ICMP sockets */
req.r.i.sdiag_family = AF_INET6;
req.r.i.sdiag_protocol = IPPROTO_ICMPV6;
req.r.i.idiag_ext = 0;
req.r.i.idiag_states = -1; /* All */
set_collect_bit(req.r.n.sdiag_family, req.r.n.sdiag_protocol);
req.r.p.sdiag_family = AF_PACKET; req.r.p.sdiag_family = AF_PACKET;
req.r.p.sdiag_protocol = 0; req.r.p.sdiag_protocol = 0;
req.r.p.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MCLIST | PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG; req.r.p.pdiag_show = PACKET_SHOW_INFO | PACKET_SHOW_MCLIST | PACKET_SHOW_FANOUT | PACKET_SHOW_RING_CFG;