Commit 24864ae7 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Pavel Emelyanov

parasite: Prepare structures for daemon mode

Parasite daemon mode might be considered as a series
of network messages sent from main crtools module to
parasite daemon which spins on a socket waiting for
command to handle.

Simple command handling session might look as

        crtools                     daemon
        |                           |                           |
        | ---> command message ---> |                           |
        |                           | ---> receive command ---> |
        |                           |           ....            |
        |                           |       handle command      |
        |                           |           ....            |
        |                           | <--- send ack       <---  |
        | <--- receive ack     <--- |                           |
        |                           |                           |
        v                           v                           v
      time

where, in case of multithread application [handle command] stage
includes waking up of children threads via futexes, wait until
handling complete and only then send ack back to ctrools module.

This patch brings in description of command message as

struct ctl_msg {
    unsigned int    id;     /* command recipient */
    unsigned int    cmd;    /* command itself */
    unsigned int    ack;    /* ack on command */
    int             err;    /* error code on reply */
};

For example, in case of dumpee being with pid 2 and acquiring
to handle PARASITE_CMD_DUMP_MISC, the command/ack series will look
as

    cmd-msg
    -------
    .id     = 2,
    .cmd    = PARASITE_CMD_DUMP_MISC,
    .ack    = 0,
    .err    = 0,

    ack-msg
    -------
    .id     = 2,
    .cmd    = PARASITE_CMD_DUMP_MISC,
    .ack    = PARASITE_CMD_DUMP_MISC,
    .err    = 0

in case if error happened in parasite, the @err field set accordingly.

For convenience ctl_msg_cmd()/ctl_msg_ack() macros are provided
for control message generations.

v2: delete futex_t ack from tid_state_s
Fixed-by: 's avatarAndrew Vagin <avagin@openvz.org>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent fe13977b
......@@ -18,8 +18,18 @@
#define __head __used __section(.head.text)
enum {
PARASITE_CMD_IDLE = 0,
PARASITE_CMD_ACK,
PARASITE_CMD_INIT,
PARASITE_CMD_INIT_THREAD,
/*
* These two must be greater than INITs.
*/
PARASITE_CMD_DAEMONIZE,
PARASITE_CMD_DAEMONIZED,
PARASITE_CMD_CFG_LOG,
PARASITE_CMD_FINI,
PARASITE_CMD_FINI_THREAD,
......@@ -40,6 +50,19 @@ enum {
PARASITE_CMD_MAX,
};
struct ctl_msg {
unsigned int id; /* command recipient */
unsigned int cmd; /* command itself */
unsigned int ack; /* ack on command */
int err; /* error code on reply */
};
#define ctl_msg_cmd(_id, _cmd) \
(struct ctl_msg){ .id = _id, .cmd = _cmd, }
#define ctl_msg_ack(_id, _cmd, _err) \
(struct ctl_msg){ .id = _id, .cmd = _cmd, .ack = _cmd, .err = _err, }
struct parasite_init_args {
int id;
......
......@@ -8,6 +8,7 @@
#include "syscall.h"
#include "parasite.h"
#include "lock.h"
#include "vdso.h"
#include "log.h"
......@@ -19,6 +20,10 @@ static int tsock = -1;
static struct tid_state_s {
int id;
futex_t cmd;
int ret;
bool use_sig_blocked;
k_rtsigset_t sig_blocked;
} *tid_state;
......@@ -212,6 +217,8 @@ static int init_thread(struct parasite_init_args *args)
tid_state[next_tid_state].id = next_tid_state;
futex_set(&tid_state[next_tid_state].cmd, PARASITE_CMD_IDLE);
next_tid_state++;
return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment