History

Merge branch 'v6.0-rc7'

Merge upstream to get RAPTORLAKE_S

Peter Zijlstra committed 4 years ago

Commit a1ebcd52 parents cce6a2d f76349c1266 files · +11983 −7875Browse files

Showing the changes to include/uapi (4 of 1266 files). Show all

Unified · Split

4 files
  1. include/uapi/linux/bpf.h +1 −1
  2. include/uapi/linux/io_uring.h +14 −22
  3. include/uapi/linux/virtio_net.h +7 −7
  4. include/uapi/linux/xfrm.h +1 −1
include/uapi/linux/bpf.h+1−1
@@ -79,7 +79,7 @@ struct bpf_insn { · 78 unmodified lines
7979 /* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
8080 struct bpf_lpm_trie_key {
8181 __u32 prefixlen; /* up to 32 for AF_INET, 128 for AF_INET6 */
82− __u8 data[]; /* Arbitrary size */
82+ __u8 data[0]; /* Arbitrary size */
8383 };
8484
8585 struct bpf_cgroup_storage_key {
include/uapi/linux/io_uring.h+14−22
@@ -12,6 +12,10 @@ · 11 unmodified lines
1212 #include <linux/types.h>
1313 #include <linux/time_types.h>
1414
15+#ifdef __cplusplus
16+extern "C" {
17+#endif
18+
1519 /*
1620 * IO submission data structure (Submission Queue Entry)
1721 */
@@ -67,8 +71,8 @@ struct io_uring_sqe { · 49 unmodified lines
6771 __s32 splice_fd_in;
6872 __u32 file_index;
6973 struct {
70− __u16 notification_idx;
7174 __u16 addr_len;
75+ __u16 __pad3[1];
7276 };
7377 };
7478 union {
@@ -174,8 +178,7 @@ enum io_uring_op { · 99 unmodified lines
174178 IORING_OP_FALLOCATE,
175179 IORING_OP_OPENAT,
176180 IORING_OP_CLOSE,
177− IORING_OP_RSRC_UPDATE,
178− IORING_OP_FILES_UPDATE = IORING_OP_RSRC_UPDATE,
181+ IORING_OP_FILES_UPDATE,
179182 IORING_OP_STATX,
180183 IORING_OP_READ,
181184 IORING_OP_WRITE,
@@ -202,7 +205,7 @@ enum io_uring_op { · 20 unmodified lines
202205 IORING_OP_GETXATTR,
203206 IORING_OP_SOCKET,
204207 IORING_OP_URING_CMD,
205− IORING_OP_SENDZC_NOTIF,
208+ IORING_OP_SEND_ZC,
206209
207210 /* this goes last, obviously */
208211 IORING_OP_LAST,
@@ -224,7 +227,6 @@ enum io_uring_op { · 15 unmodified lines
224227 #define IORING_TIMEOUT_ETIME_SUCCESS (1U << 5)
225228 #define IORING_TIMEOUT_CLOCK_MASK (IORING_TIMEOUT_BOOTTIME | IORING_TIMEOUT_REALTIME)
226229 #define IORING_TIMEOUT_UPDATE_MASK (IORING_TIMEOUT_UPDATE | IORING_LINK_TIMEOUT_UPDATE)
227−
228230 /*
229231 * sqe->splice_flags
230232 * extends splice(2) flags
@@ -277,29 +279,16 @@ enum io_uring_op { · 46 unmodified lines
277279 *
278280 * IORING_RECVSEND_FIXED_BUF Use registered buffers, the index is stored in
279281 * the buf_index field.
280− *
281− * IORING_RECVSEND_NOTIF_FLUSH Flush a notification after a successful
282− * successful. Only for zerocopy sends.
283282 */
284283 #define IORING_RECVSEND_POLL_FIRST (1U << 0)
285284 #define IORING_RECV_MULTISHOT (1U << 1)
286285 #define IORING_RECVSEND_FIXED_BUF (1U << 2)
287−#define IORING_RECVSEND_NOTIF_FLUSH (1U << 3)
288286
289287 /*
290288 * accept flags stored in sqe->ioprio
291289 */
292290 #define IORING_ACCEPT_MULTISHOT (1U << 0)
293291
294−
295−/*
296− * IORING_OP_RSRC_UPDATE flags
297− */
298−enum {
299− IORING_RSRC_UPDATE_FILES,
300− IORING_RSRC_UPDATE_NOTIF,
301−};
302−
303292 /*
304293 * IORING_OP_MSG_RING command types, stored in sqe->addr
305294 */
@@ -337,10 +326,13 @@ struct io_uring_cqe { · 31 unmodified lines
337326 * IORING_CQE_F_BUFFER If set, the upper 16 bits are the buffer ID
338327 * IORING_CQE_F_MORE If set, parent SQE will generate more CQE entries
339328 * IORING_CQE_F_SOCK_NONEMPTY If set, more data to read after socket recv
329+ * IORING_CQE_F_NOTIF Set for notification CQEs. Can be used to distinct
330+ * them from sends.
340331 */
341332 #define IORING_CQE_F_BUFFER (1U << 0)
342333 #define IORING_CQE_F_MORE (1U << 1)
343334 #define IORING_CQE_F_SOCK_NONEMPTY (1U << 2)
335+#define IORING_CQE_F_NOTIF (1U << 3)
344336
345337 enum {
346338 IORING_CQE_BUFFER_SHIFT = 16,
@@ -481,10 +473,6 @@ enum { · 134 unmodified lines
481473 /* register a range of fixed file slots for automatic slot allocation */
482474 IORING_REGISTER_FILE_ALLOC_RANGE = 25,
483475
484− /* zerocopy notification API */
485− IORING_REGISTER_NOTIFIERS = 26,
486− IORING_UNREGISTER_NOTIFIERS = 27,
487−
488476 /* this goes last */
489477 IORING_REGISTER_LAST
490478 };
@@ -661,4 +649,8 @@ struct io_uring_recvmsg_out { · 170 unmodified lines
661649 __u32 flags;
662650 };
663651
652+#ifdef __cplusplus
653+}
654+#endif
655+
664656 #endif
include/uapi/linux/virtio_net.h+7−7
@@ -56,7 +56,7 @@ · 55 unmodified lines
5656 #define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
5757 * Steering */
5858 #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
59−#define VIRTIO_NET_F_NOTF_COAL 53 /* Guest can handle notifications coalescing */
59+#define VIRTIO_NET_F_NOTF_COAL 53 /* Device supports notifications coalescing */
6060 #define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */
6161 #define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */
6262 #define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */
@@ -364,24 +364,24 @@ struct virtio_net_hash_config { · 301 unmodified lines
364364 */
365365 #define VIRTIO_NET_CTRL_NOTF_COAL 6
366366 /*
367− * Set the tx-usecs/tx-max-packets patameters.
368− * tx-usecs - Maximum number of usecs to delay a TX notification.
369− * tx-max-packets - Maximum number of packets to send before a TX notification.
367+ * Set the tx-usecs/tx-max-packets parameters.
370368 */
371369 struct virtio_net_ctrl_coal_tx {
370+ /* Maximum number of packets to send before a TX notification */
372371 __le32 tx_max_packets;
372+ /* Maximum number of usecs to delay a TX notification */
373373 __le32 tx_usecs;
374374 };
375375
376376 #define VIRTIO_NET_CTRL_NOTF_COAL_TX_SET 0
377377
378378 /*
379− * Set the rx-usecs/rx-max-packets patameters.
380− * rx-usecs - Maximum number of usecs to delay a RX notification.
381− * rx-max-frames - Maximum number of packets to receive before a RX notification.
379+ * Set the rx-usecs/rx-max-packets parameters.
382380 */
383381 struct virtio_net_ctrl_coal_rx {
382+ /* Maximum number of packets to receive before a RX notification */
384383 __le32 rx_max_packets;
384+ /* Maximum number of usecs to delay a RX notification */
385385 __le32 rx_usecs;
386386 };
387387
include/uapi/linux/xfrm.h+1−1
@@ -296,7 +296,7 @@ enum xfrm_attr_type_t { · 295 unmodified lines
296296 XFRMA_ETIMER_THRESH,
297297 XFRMA_SRCADDR, /* xfrm_address_t */
298298 XFRMA_COADDR, /* xfrm_address_t */
299− XFRMA_LASTUSED, /* unsigned long */
299+ XFRMA_LASTUSED, /* __u64 */
300300 XFRMA_POLICY_TYPE, /* struct xfrm_userpolicy_type */
301301 XFRMA_MIGRATE,
302302 XFRMA_ALG_AEAD, /* struct xfrm_algo_aead */