KDBUS_MSG_NULL,
/* Filled in by userspace */
- KDBUS_MSG_PAYLOAD, /* .data, inline memory */
KDBUS_MSG_PAYLOAD_VEC, /* .data_vec, reference to memory area */
- KDBUS_MSG_UNIX_FDS, /* .data_fds of file descriptors */
+ KDBUS_MSG_PAYLOAD_MEMFD, /* file descriptor of a special data file */
+ KDBUS_MSG_FDS, /* .data_fds of file descriptors */
KDBUS_MSG_BLOOM, /* for broadcasts, carries bloom filter blob in .data */
KDBUS_MSG_DST_NAME, /* destination's well-known name, in .str */
+ KDBUS_MSG_PRIORITY, /* queue priority for message */
/* Filled in by kernelspace */
- KDBUS_MSG_SRC_NAMES = 0x200,/* NUL separated string list with well-known names of source */
+ KDBUS_MSG_SRC_NAMES = 0x400,/* NUL separated string list with well-known names of source */
KDBUS_MSG_TIMESTAMP, /* .timestamp */
KDBUS_MSG_SRC_CREDS, /* .creds */
KDBUS_MSG_SRC_PID_COMM, /* optional, in .str */
KDBUS_MSG_SRC_AUDIT, /* .audit */
/* Special messages from kernel, consisting of one and only one of these data blocks */
- KDBUS_MSG_NAME_ADD = 0x400,/* .name_change */
+ KDBUS_MSG_NAME_ADD = 0x800,/* .name_change */
KDBUS_MSG_NAME_REMOVE, /* .name_change */
KDBUS_MSG_NAME_CHANGE, /* .name_change */
KDBUS_MSG_ID_ADD, /* .id_change */
KDBUS_MSG_REPLY_DEAD, /* dito */
};
-enum {
- KDBUS_VEC_ALIGNED = 1 << 0,
-};
-
struct kdbus_vec {
__u64 address;
__u64 size;
- __u64 flags;
+};
+
+struct kdbus_memfd {
+ __u64 size;
+ int fd;
};
/**
- * struct kdbus_msg_item - chain of data blocks
+ * struct kdbus_item - chain of data blocks
*
* size: overall data record size
- * type: kdbus_msg_item type of data
+ * type: kdbus_item type of data
*/
-struct kdbus_msg_item {
+struct kdbus_item {
__u64 size;
__u64 type;
union {
__u64 data64[0];
char str[0];
+ /* connection */
+ __u64 id;
+
/* data vector */
struct kdbus_vec vec;
- /* specific fields */
- int fds[0]; /* int array of file descriptors */
+ /* process credentials and properties*/
struct kdbus_creds creds;
struct kdbus_audit audit;
struct kdbus_timestamp timestamp;
+
+ /* specific fields */
+ int fds[0];
struct kdbus_manager_msg_name_change name_change;
struct kdbus_manager_msg_id_change id_change;
};
__u64 cookie_reply; /* cookie we reply to */
__u64 timeout_ns; /* timespan to wait for reply */
};
- struct kdbus_msg_item items[0];
+ struct kdbus_item items[0];
};
enum {
/* Items to append to struct kdbus_cmd_hello */
enum {
KDBUS_HELLO_NULL,
-};
-
-struct kdbus_cmd_hello_item {
- __u64 size;
- __u64 type;
- union {
- __u8 data[0];
- __u64 data64[0];
- char str[0];
- };
+ KDBUS_HELLO_POOL, /* kdbus_vec, userspace supplied buffer to
+ * place received messages */
};
struct kdbus_cmd_hello {
__u64 id; /* id assigned to this connection */
__u64 bloom_size; /* The bloom filter size chosen by the
* bus owner */
- struct kdbus_cmd_hello_item items[0];
+ struct kdbus_item items[0];
};
/* Flags for kdbus_cmd_{bus,ep,ns}_make */
* privileges */
};
-struct kdbus_cmd_make_item {
- __u64 size;
- __u64 type;
- union {
- __u8 data[0];
- __u64 data64[0];
- char str[0];
- };
-};
-
struct kdbus_cmd_bus_make {
__u64 size;
__u64 flags; /* userspace → kernel, kernel → userspace
* structure and returned from
* KDBUS_CMD_HELLO, later */
__u64 bloom_size; /* size of the bloom filter for this bus */
- struct kdbus_cmd_make_item items[0];
+ struct kdbus_item items[0];
};
* same way as for
* KDBUS_CMD_BUS_MAKE. Unused for
* now. */
- struct kdbus_cmd_make_item items[0];
+ struct kdbus_item items[0];
};
struct kdbus_cmd_ns_make {
* same way as for
* KDBUS_CMD_BUS_MAKE. Unused for
* now. */
- struct kdbus_cmd_make_item items[0];
+ struct kdbus_item items[0];
};
enum {
KDBUS_NAME_INFO_ITEM_AUDIT, /* kernel → userspace */
};
-struct kdbus_cmd_name_info_item {
- __u64 size;
- __u64 type;
- __u8 data[0];
-};
-
struct kdbus_cmd_name_info {
__u64 size; /* overall size of info */
__u64 flags;
__u64 id; /* either ID, or 0 and _ITEM_NAME follows */
struct kdbus_creds creds;
- struct kdbus_cmd_name_info_item items[0]; /* list of item records */
+ struct kdbus_item items[0]; /* list of item records */
};
enum {
KDBUS_MATCH_ID_REMOVE, /* Matches an ID against KDBUS_MSG_ID_REMOVE */
};
-struct kdbus_cmd_match_item {
- __u64 size;
- __u64 type;
- union {
- __u64 id;
- __u8 data[0];
- char str[0];
- };
-};
-
struct kdbus_cmd_match {
__u64 size;
__u64 id; /* We allow registration/deregestration of matches for other peers */
__u64 cookie; /* userspace supplied cookie; when removing; kernel deletes everything with same cookie */
__u64 src_id; /* ~0: any. other: exact unique match */
- struct kdbus_cmd_match_item items[0];
+ struct kdbus_item items[0];
};
struct kdbus_cmd_monitor {
/* kdbus ep node commands: require connected state */
KDBUS_CMD_MSG_SEND = _IOWR(KDBUS_IOC_MAGIC, 0x40, struct kdbus_msg),
- KDBUS_CMD_MSG_RECV = _IOWR(KDBUS_IOC_MAGIC, 0x41, struct kdbus_msg),
+ KDBUS_CMD_MSG_RECV = _IOWR(KDBUS_IOC_MAGIC, 0x41, struct kdbus_msg *),
+ KDBUS_CMD_MSG_RELEASE = _IOWR(KDBUS_IOC_MAGIC, 0x42, struct kdbus_msg),
KDBUS_CMD_NAME_ACQUIRE = _IOWR(KDBUS_IOC_MAGIC, 0x50, struct kdbus_cmd_name),
KDBUS_CMD_NAME_RELEASE = _IOWR(KDBUS_IOC_MAGIC, 0x51, struct kdbus_cmd_name),
/* kdbus ep node commands: require ep owner state */
KDBUS_CMD_EP_POLICY_SET = _IOWR(KDBUS_IOC_MAGIC, 0x70, struct kdbus_cmd_policy),
+
+ /* kdbus ep node commands: */
+ KDBUS_CMD_MEMFD_NEW = _IOWR(KDBUS_IOC_MAGIC, 0x80, int *),
+
+ /* kdbus memfd commands: */
+ KDBUS_CMD_MEMFD_SIZE_GET = _IOWR(KDBUS_IOC_MAGIC, 0x81, __u64 *),
+ KDBUS_CMD_MEMFD_SIZE_SET = _IOWR(KDBUS_IOC_MAGIC, 0x82, __u64 *),
+ KDBUS_CMD_MEMFD_SEAL_GET = _IOWR(KDBUS_IOC_MAGIC, 0x83, int *),
+ KDBUS_CMD_MEMFD_SEAL_SET = _IOWR(KDBUS_IOC_MAGIC, 0x84, int),
};
#endif
~ianmdlvl / elogind.git / blobdiff