History

Merge 6.16-rc4 into tty-next

We need the tty/serial fixes in here as well.

Greg Kroah-Hartman committed 1 year ago

Commit 815ac672 parents acc902d d0b3b7b706 files · +8589 −3884Browse files

Showing the changes to include/uapi (7 of 706 files). Show all

Unified · Split

7 files
  1. include/uapi/linux/bits.h +2 −2
  2. include/uapi/linux/ethtool_netlink.h +0 −4
  3. include/uapi/linux/ethtool_netlink_generated.h +2 −2
  4. include/uapi/linux/kvm.h +22 −0
  5. include/uapi/linux/mptcp_pm.h +3 −3
  6. include/uapi/linux/ublk_cmd.h +26 −6
  7. include/uapi/linux/vm_sockets.h +4 −0
include/uapi/linux/bits.h+2−2
@@ -4,9 +4,9 @@ · 3 unmodified lines
44 #ifndef _UAPI_LINUX_BITS_H
55 #define _UAPI_LINUX_BITS_H
66
7−#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (__BITS_PER_LONG - 1 - (h))))
7+#define __GENMASK(h, l) (((~_UL(0)) << (l)) & (~_UL(0) >> (BITS_PER_LONG - 1 - (h))))
88
9−#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (__BITS_PER_LONG_LONG - 1 - (h))))
9+#define __GENMASK_ULL(h, l) (((~_ULL(0)) << (l)) & (~_ULL(0) >> (BITS_PER_LONG_LONG - 1 - (h))))
1010
1111 #define __GENMASK_U128(h, l) \
1212 ((_BIT128((h)) << 1) - (_BIT128(l)))
include/uapi/linux/ethtool_netlink.h+0−4
@@ -208,10 +208,6 @@ enum { · 207 unmodified lines
208208 ETHTOOL_A_STATS_PHY_MAX = (__ETHTOOL_A_STATS_PHY_CNT - 1)
209209 };
210210
211−/* generic netlink info */
212−#define ETHTOOL_GENL_NAME "ethtool"
213−#define ETHTOOL_GENL_VERSION 1
214−
215211 #define ETHTOOL_MCGRP_MONITOR_NAME "monitor"
216212
217213 #endif /* _UAPI_LINUX_ETHTOOL_NETLINK_H_ */
include/uapi/linux/ethtool_netlink_generated.h+2−2
@@ -6,8 +6,8 @@ · 5 unmodified lines
66 #ifndef _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H
77 #define _UAPI_LINUX_ETHTOOL_NETLINK_GENERATED_H
88
9−#define ETHTOOL_FAMILY_NAME "ethtool"
10−#define ETHTOOL_FAMILY_VERSION 1
9+#define ETHTOOL_GENL_NAME "ethtool"
10+#define ETHTOOL_GENL_VERSION 1
1111
1212 enum {
1313 ETHTOOL_UDP_TUNNEL_TYPE_VXLAN,
include/uapi/linux/kvm.h+22−0
@@ -178,6 +178,7 @@ struct kvm_xen_exit { · 177 unmodified lines
178178 #define KVM_EXIT_NOTIFY 37
179179 #define KVM_EXIT_LOONGARCH_IOCSR 38
180180 #define KVM_EXIT_MEMORY_FAULT 39
181+#define KVM_EXIT_TDX 40
181182
182183 /* For KVM_EXIT_INTERNAL_ERROR */
183184 /* Emulate instruction failed. */
@@ -447,6 +448,27 @@ struct kvm_run { · 263 unmodified lines
447448 __u64 gpa;
448449 __u64 size;
449450 } memory_fault;
451+ /* KVM_EXIT_TDX */
452+ struct {
453+ __u64 flags;
454+ __u64 nr;
455+ union {
456+ struct {
457+ __u64 ret;
458+ __u64 data[5];
459+ } unknown;
460+ struct {
461+ __u64 ret;
462+ __u64 gpa;
463+ __u64 size;
464+ } get_quote;
465+ struct {
466+ __u64 ret;
467+ __u64 leaf;
468+ __u64 r11, r12, r13, r14;
469+ } get_tdvmcall_info;
470+ };
471+ } tdx;
450472 /* Fix the size of the union. */
451473 char padding[256];
452474 };
include/uapi/linux/mptcp_pm.h+3−3
@@ -27,14 +27,14 @@ · 26 unmodified lines
2727 * token, rem_id.
2828 * @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
2929 * 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].
3131 * @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
3232 * sk_err) could be set if an error has been detected for this subflow.
3333 * 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].
3535 * @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
3636 * 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].
3838 * @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
3939 * family, sport, saddr4 | saddr6.
4040 * @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,
include/uapi/linux/ublk_cmd.h+26−6
@@ -135,8 +135,28 @@ · 134 unmodified lines
135135 #define UBLKSRV_IO_BUF_TOTAL_SIZE (1ULL << UBLKSRV_IO_BUF_TOTAL_BITS)
136136
137137 /*
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.
140160 */
141161 #define UBLK_F_SUPPORT_ZERO_COPY (1ULL << 0)
142162
@@ -450,10 +470,10 @@ static inline struct ublk_auto_buf_reg ublk_sqe_addr_to_auto_buf_reg( · 307 unmodified lines
450470 __u64 sqe_addr)
451471 {
452472 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),
457477 };
458478
459479 return reg;
include/uapi/linux/vm_sockets.h+4−0
@@ -17,6 +17,10 @@ · 16 unmodified lines
1717 #ifndef _UAPI_VM_SOCKETS_H
1818 #define _UAPI_VM_SOCKETS_H
1919
20+#ifndef __KERNEL__
21+#include <sys/socket.h> /* for struct sockaddr and sa_family_t */
22+#endif
23+
2024 #include <linux/socket.h>
2125 #include <linux/types.h>
2226