Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>: This is prepare to hiding snd_soc_dapm_context inside soc-dapm.c
Showing the changes to include/uapi (3 of 621 files). Show all
Unified · Split
| @@ -27,14 +27,14 @@ · 26 unmodified lines | ||
| 27 | 27 | * token, rem_id. |
| 28 | 28 | * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error' |
| 29 | 29 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 30 | − * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. | |
| 30 | + * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error]. | |
| 31 | 31 | * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of |
| 32 | 32 | * sk_err) could be set if an error has been detected for this subflow. |
| 33 | 33 | * Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 | |
| 34 | − * daddr6, sport, dport, backup, if_idx [, error]. | |
| 34 | + * daddr6, sport, dport, backup, if-idx [, error]. | |
| 35 | 35 | * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error' |
| 36 | 36 | * should not be set. Attributes: token, family, loc_id, rem_id, saddr4 | |
| 37 | − * saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error]. | |
| 37 | + * saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error]. | |
| 38 | 38 | * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes: |
| 39 | 39 | * family, sport, saddr4 | saddr6. |
| 40 | 40 | * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family, |
| @@ -135,8 +135,28 @@ · 134 unmodified lines | ||
| 135 | 135 | #define UBLKSRV_IO_BUF_TOTAL_SIZE (1ULL << UBLKSRV_IO_BUF_TOTAL_BITS) |
| 136 | 136 | |
| 137 | 137 | /* |
| 138 | − * zero copy requires 4k block size, and can remap ublk driver's io | |
| 139 | − * request into ublksrv's vm space | |
| 138 | + * ublk server can register data buffers for incoming I/O requests with a sparse | |
| 139 | + * io_uring buffer table. The request buffer can then be used as the data buffer | |
| 140 | + * for io_uring operations via the fixed buffer index. | |
| 141 | + * Note that the ublk server can never directly access the request data memory. | |
| 142 | + * | |
| 143 | + * To use this feature, the ublk server must first register a sparse buffer | |
| 144 | + * table on an io_uring instance. | |
| 145 | + * When an incoming ublk request is received, the ublk server submits a | |
| 146 | + * UBLK_U_IO_REGISTER_IO_BUF command to that io_uring instance. The | |
| 147 | + * ublksrv_io_cmd's q_id and tag specify the request whose buffer to register | |
| 148 | + * and addr is the index in the io_uring's buffer table to install the buffer. | |
| 149 | + * SQEs can now be submitted to the io_uring to read/write the request's buffer | |
| 150 | + * by enabling fixed buffers (e.g. using IORING_OP_{READ,WRITE}_FIXED or | |
| 151 | + * IORING_URING_CMD_FIXED) and passing the registered buffer index in buf_index. | |
| 152 | + * Once the last io_uring operation using the request's buffer has completed, | |
| 153 | + * the ublk server submits a UBLK_U_IO_UNREGISTER_IO_BUF command with q_id, tag, | |
| 154 | + * and addr again specifying the request buffer to unregister. | |
| 155 | + * The ublk request is completed when its buffer is unregistered from all | |
| 156 | + * io_uring instances and the ublk server issues UBLK_U_IO_COMMIT_AND_FETCH_REQ. | |
| 157 | + * | |
| 158 | + * Not available for UBLK_F_UNPRIVILEGED_DEV, as a ublk server can leak | |
| 159 | + * uninitialized kernel memory by not reading into the full request buffer. | |
| 140 | 160 | */ |
| 141 | 161 | #define UBLK_F_SUPPORT_ZERO_COPY (1ULL << 0) |
| 142 | 162 | |
| @@ -450,10 +470,10 @@ static inline struct ublk_auto_buf_reg ublk_sqe_addr_to_auto_buf_reg( · 307 unmodified lines | ||
| 450 | 470 | __u64 sqe_addr) |
| 451 | 471 | { |
| 452 | 472 | struct ublk_auto_buf_reg reg = { |
| 453 | − .index = sqe_addr & 0xffff, | |
| 454 | − .flags = (sqe_addr >> 16) & 0xff, | |
| 455 | − .reserved0 = (sqe_addr >> 24) & 0xff, | |
| 456 | − .reserved1 = sqe_addr >> 32, | |
| 473 | + .index = (__u16)sqe_addr, | |
| 474 | + .flags = (__u8)(sqe_addr >> 16), | |
| 475 | + .reserved0 = (__u8)(sqe_addr >> 24), | |
| 476 | + .reserved1 = (__u32)(sqe_addr >> 32), | |
| 457 | 477 | }; |
| 458 | 478 | |
| 459 | 479 | return reg; |
| @@ -17,6 +17,10 @@ · 16 unmodified lines | ||
| 17 | 17 | #ifndef _UAPI_VM_SOCKETS_H |
| 18 | 18 | #define _UAPI_VM_SOCKETS_H |
| 19 | 19 | |
| 20 | +#ifndef __KERNEL__ | |
| 21 | +#include <sys/socket.h> /* for struct sockaddr and sa_family_t */ | |
| 22 | +#endif | |
| 23 | + | |
| 20 | 24 | #include <linux/socket.h> |
| 21 | 25 | #include <linux/types.h> |
| 22 | 26 | |