History

Merge tag 'v5.1-rc1' into spi-5.2

Linux 5.1-rc1

Mark Brown committed 7 years ago

Commit 249acb52 parents 9384d0e 9e98c6711009 files · +495474 −248458Browse files

Showing the changes to include/uapi/linux (64 of 11009 files). Show all

Unified · Split

64 files
  1. include/uapi/linux/android/binder.h +19 −0
  2. include/uapi/linux/auto_fs.h +1 −1
  3. include/uapi/linux/batadv_packet.h +2 −2
  4. include/uapi/linux/batman_adv.h +186 −6
  5. include/uapi/linux/binfmts.h +1 −1
  6. include/uapi/linux/bpf.h +107 −9
  7. include/uapi/linux/btrfs.h +2 −0
  8. include/uapi/linux/devlink.h +47 −0
  9. include/uapi/linux/dm-ioctl.h +2 −2
  10. include/uapi/linux/elf.h +2 −0
  11. include/uapi/linux/errqueue.h +5 −0
  12. include/uapi/linux/ethtool.h +26 −9
  13. include/uapi/linux/fanotify.h +29 −0
  14. include/uapi/linux/fcntl.h +1 −0
  15. include/uapi/linux/fuse.h +6 −1
  16. include/uapi/linux/icmpv6.h +2 −0
  17. include/uapi/linux/if_bonding.h +24 −0
  18. include/uapi/linux/if_link.h +1 −0
  19. include/uapi/linux/igmp.h +1 −0
  20. include/uapi/linux/iio/types.h +7 −0
  21. include/uapi/linux/in.h +5 −4
  22. include/uapi/linux/in6.h +1 −0
  23. include/uapi/linux/io_uring.h +137 −0
  24. include/uapi/linux/kernel-page-flags.h +1 −1
  25. include/uapi/linux/limits.h +2 −2
  26. include/uapi/linux/lirc.h +6 −0
  27. include/uapi/linux/mdio.h +19 −0
  28. include/uapi/linux/mman.h +4 −0
  29. include/uapi/linux/mroute.h +8 −1
  30. include/uapi/linux/mroute6.h +8 −1
  31. include/uapi/linux/ndctl.h +1 −0
  32. include/uapi/linux/netfilter/nf_tables.h +17 −2
  33. include/uapi/linux/nl80211.h +39 −5
  34. include/uapi/linux/nvme_ioctl.h +0 −9
  35. include/uapi/linux/pci_regs.h +2 −0
  36. include/uapi/linux/perf_event.h +52 −3
  37. include/uapi/linux/pkt_cls.h +54 −4
  38. include/uapi/linux/pkt_sched.h +2 −1
  39. include/uapi/linux/pmu.h +2 −0
  40. include/uapi/linux/prctl.h +1 −0
  41. include/uapi/linux/rds.h +11 −0
  42. include/uapi/linux/sctp.h +4 −0
  43. include/uapi/linux/serial_core.h +3 −0
  44. include/uapi/linux/tc_act/tc_bpf.h +0 −2
  45. include/uapi/linux/tc_act/tc_connmark.h +0 −2
  46. include/uapi/linux/tc_act/tc_csum.h +0 −2
  47. include/uapi/linux/tc_act/tc_gact.h +0 −1
  48. include/uapi/linux/tc_act/tc_ife.h +0 −1
  49. include/uapi/linux/tc_act/tc_ipt.h +0 −3
  50. include/uapi/linux/tc_act/tc_mirred.h +0 −1
  51. include/uapi/linux/tc_act/tc_nat.h +0 −2
  52. include/uapi/linux/tc_act/tc_pedit.h +0 −2
  53. include/uapi/linux/tc_act/tc_sample.h +0 −2
  54. include/uapi/linux/tc_act/tc_skbedit.h +0 −2
  55. include/uapi/linux/tc_act/tc_skbmod.h +0 −2
  56. include/uapi/linux/tc_act/tc_tunnel_key.h +0 −2
  57. include/uapi/linux/tc_act/tc_vlan.h +0 −2
  58. include/uapi/linux/time.h +1 −28
  59. include/uapi/linux/time_types.h +36 −0
  60. include/uapi/linux/timex.h +39 −0
  61. include/uapi/linux/tls.h +19 −0
  62. include/uapi/linux/v4l2-controls.h +2 −0
  63. include/uapi/linux/videodev2.h +25 −1
  64. include/uapi/linux/xdp_diag.h +72 −0
include/uapi/linux/android/binder.h+19−0
@@ -41,6 +41,14 @@ enum { · 40 unmodified lines
41enum {41enum {
42 FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,42 FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
43 FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,43 FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
44
45 /**
46 * @FLAT_BINDER_FLAG_TXN_SECURITY_CTX: request security contexts
47 *
48 * Only when set, causes senders to include their security
49 * context
50 */
51 FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,
44};52};
45 53
46#ifdef BINDER_IPC_32BIT54#ifdef BINDER_IPC_32BIT
@@ -218,6 +226,7 @@ struct binder_node_info_for_ref { · 171 unmodified lines
218#define BINDER_VERSION _IOWR('b', 9, struct binder_version)226#define BINDER_VERSION _IOWR('b', 9, struct binder_version)
219#define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)227#define BINDER_GET_NODE_DEBUG_INFO _IOWR('b', 11, struct binder_node_debug_info)
220#define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)228#define BINDER_GET_NODE_INFO_FOR_REF _IOWR('b', 12, struct binder_node_info_for_ref)
229#define BINDER_SET_CONTEXT_MGR_EXT _IOW('b', 13, struct flat_binder_object)
221 230
222/*231/*
223 * NOTE: Two special error codes you should check for when calling232 * NOTE: Two special error codes you should check for when calling
@@ -276,6 +285,11 @@ struct binder_transaction_data { · 52 unmodified lines
276 } data;285 } data;
277};286};
278 287
288struct binder_transaction_data_secctx {
289 struct binder_transaction_data transaction_data;
290 binder_uintptr_t secctx;
291};
292
279struct binder_transaction_data_sg {293struct binder_transaction_data_sg {
280 struct binder_transaction_data transaction_data;294 struct binder_transaction_data transaction_data;
281 binder_size_t buffers_size;295 binder_size_t buffers_size;
@@ -311,6 +325,11 @@ enum binder_driver_return_protocol { · 29 unmodified lines
311 BR_OK = _IO('r', 1),325 BR_OK = _IO('r', 1),
312 /* No parameters! */326 /* No parameters! */
313 327
328 BR_TRANSACTION_SEC_CTX = _IOR('r', 2,
329 struct binder_transaction_data_secctx),
330 /*
331 * binder_transaction_data_secctx: the received command.
332 */
314 BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),333 BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),
315 BR_REPLY = _IOR('r', 3, struct binder_transaction_data),334 BR_REPLY = _IOR('r', 3, struct binder_transaction_data),
316 /*335 /*
include/uapi/linux/auto_fs.h+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#define AUTOFS_MIN_PROTO_VERSION 323#define AUTOFS_MIN_PROTO_VERSION 3
24#define AUTOFS_MAX_PROTO_VERSION 524#define AUTOFS_MAX_PROTO_VERSION 5
25 25
26#define AUTOFS_PROTO_SUBVERSION 426#define AUTOFS_PROTO_SUBVERSION 5
27 27
28/*28/*
29 * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed29 * The wait_queue_token (autofs_wqt_t) is part of a structure which is passed
include/uapi/linux/batadv_packet.h+2−2
@@ -1,5 +1,5 @@
1/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */1/* SPDX-License-Identifier: (GPL-2.0 WITH Linux-syscall-note) */
2/* Copyright (C) 2007-2018 B.A.T.M.A.N. contributors:2/* Copyright (C) 2007-2019 B.A.T.M.A.N. contributors:
3 *3 *
4 * Marek Lindner, Simon Wunderlich4 * Marek Lindner, Simon Wunderlich
5 *5 *
@@ -229,7 +229,7 @@ struct batadv_ogm_packet { · 223 unmodified lines
229 * @packet_type: batman-adv packet type, part of the general header229 * @packet_type: batman-adv packet type, part of the general header
230 * @version: batman-adv protocol version, part of the general header230 * @version: batman-adv protocol version, part of the general header
231 * @ttl: time to live for this packet, part of the general header231 * @ttl: time to live for this packet, part of the general header
232 * @flags: reseved for routing relevant flags - currently always 0232 * @flags: reserved for routing relevant flags - currently always 0
233 * @seqno: sequence number233 * @seqno: sequence number
234 * @orig: originator mac address234 * @orig: originator mac address
235 * @tvlv_len: length of the appended tvlv buffer (in bytes)235 * @tvlv_len: length of the appended tvlv buffer (in bytes)
include/uapi/linux/batman_adv.h+186−6
@@ -1,5 +1,5 @@
1/* SPDX-License-Identifier: MIT */1/* SPDX-License-Identifier: MIT */
2/* Copyright (C) 2016-2018 B.A.T.M.A.N. contributors:2/* Copyright (C) 2016-2019 B.A.T.M.A.N. contributors:
3 *3 *
4 * Matthias Schiffer4 * Matthias Schiffer
5 *5 *
@@ -27,6 +27,7 @@ · 21 unmodified lines
27 27
28#define BATADV_NL_NAME "batadv"28#define BATADV_NL_NAME "batadv"
29 29
30#define BATADV_NL_MCAST_GROUP_CONFIG "config"
30#define BATADV_NL_MCAST_GROUP_TPMETER "tpmeter"31#define BATADV_NL_MCAST_GROUP_TPMETER "tpmeter"
31 32
32/**33/**
@@ -138,6 +139,20 @@ enum batadv_mcast_flags_priv { · 105 unmodified lines
138 BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),139 BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),
139};140};
140 141
142/**
143 * enum batadv_gw_modes - gateway mode of node
144 */
145enum batadv_gw_modes {
146 /** @BATADV_GW_MODE_OFF: gw mode disabled */
147 BATADV_GW_MODE_OFF,
148
149 /** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */
150 BATADV_GW_MODE_CLIENT,
151
152 /** @BATADV_GW_MODE_SERVER: announce itself as gatway server */
153 BATADV_GW_MODE_SERVER,
154};
155
141/**156/**
142 * enum batadv_nl_attrs - batman-adv netlink attributes157 * enum batadv_nl_attrs - batman-adv netlink attributes
143 */158 */
@@ -344,6 +359,138 @@ enum batadv_nl_attrs { · 200 unmodified lines
344 */359 */
345 BATADV_ATTR_MCAST_FLAGS_PRIV,360 BATADV_ATTR_MCAST_FLAGS_PRIV,
346 361
362 /**
363 * @BATADV_ATTR_VLANID: VLAN id on top of soft interface
364 */
365 BATADV_ATTR_VLANID,
366
367 /**
368 * @BATADV_ATTR_AGGREGATED_OGMS_ENABLED: whether the batman protocol
369 * messages of the mesh interface shall be aggregated or not.
370 */
371 BATADV_ATTR_AGGREGATED_OGMS_ENABLED,
372
373 /**
374 * @BATADV_ATTR_AP_ISOLATION_ENABLED: whether the data traffic going
375 * from a wireless client to another wireless client will be silently
376 * dropped.
377 */
378 BATADV_ATTR_AP_ISOLATION_ENABLED,
379
380 /**
381 * @BATADV_ATTR_ISOLATION_MARK: the isolation mark which is used to
382 * classify clients as "isolated" by the Extended Isolation feature.
383 */
384 BATADV_ATTR_ISOLATION_MARK,
385
386 /**
387 * @BATADV_ATTR_ISOLATION_MASK: the isolation (bit)mask which is used to
388 * classify clients as "isolated" by the Extended Isolation feature.
389 */
390 BATADV_ATTR_ISOLATION_MASK,
391
392 /**
393 * @BATADV_ATTR_BONDING_ENABLED: whether the data traffic going through
394 * the mesh will be sent using multiple interfaces at the same time.
395 */
396 BATADV_ATTR_BONDING_ENABLED,
397
398 /**
399 * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
400 * avoidance feature is enabled. This feature detects and avoids loops
401 * between the mesh and devices bridged with the soft interface
402 */
403 BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
404
405 /**
406 * @BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED: whether the distributed
407 * arp table feature is enabled. This feature uses a distributed hash
408 * table to answer ARP requests without flooding the request through
409 * the whole mesh.
410 */
411 BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED,
412
413 /**
414 * @BATADV_ATTR_FRAGMENTATION_ENABLED: whether the data traffic going
415 * through the mesh will be fragmented or silently discarded if the
416 * packet size exceeds the outgoing interface MTU.
417 */
418 BATADV_ATTR_FRAGMENTATION_ENABLED,
419
420 /**
421 * @BATADV_ATTR_GW_BANDWIDTH_DOWN: defines the download bandwidth which
422 * is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
423 * to 'server'.
424 */
425 BATADV_ATTR_GW_BANDWIDTH_DOWN,
426
427 /**
428 * @BATADV_ATTR_GW_BANDWIDTH_UP: defines the upload bandwidth which
429 * is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
430 * to 'server'.
431 */
432 BATADV_ATTR_GW_BANDWIDTH_UP,
433
434 /**
435 * @BATADV_ATTR_GW_MODE: defines the state of the gateway features.
436 * Possible values are specified in enum batadv_gw_modes
437 */
438 BATADV_ATTR_GW_MODE,
439
440 /**
441 * @BATADV_ATTR_GW_SEL_CLASS: defines the selection criteria this node
442 * will use to choose a gateway if gw_mode was set to 'client'.
443 */
444 BATADV_ATTR_GW_SEL_CLASS,
445
446 /**
447 * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied
448 * to an originator message's tq-field on every hop.
449 */
450 BATADV_ATTR_HOP_PENALTY,
451
452 /**
453 * @BATADV_ATTR_LOG_LEVEL: bitmask with to define which debug messages
454 * should be send to the debug log/trace ring buffer
455 */
456 BATADV_ATTR_LOG_LEVEL,
457
458 /**
459 * @BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED: whether multicast
460 * optimizations should be replaced by simple broadcast-like flooding
461 * of multicast packets. If set to non-zero then all nodes in the mesh
462 * are going to use classic flooding for any multicast packet with no
463 * optimizations.
464 */
465 BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED,
466
467 /**
468 * @BATADV_ATTR_NETWORK_CODING_ENABLED: whether Network Coding (using
469 * some magic to send fewer wifi packets but still the same content) is
470 * enabled or not.
471 */
472 BATADV_ATTR_NETWORK_CODING_ENABLED,
473
474 /**
475 * @BATADV_ATTR_ORIG_INTERVAL: defines the interval in milliseconds in
476 * which batman sends its protocol messages.
477 */
478 BATADV_ATTR_ORIG_INTERVAL,
479
480 /**
481 * @BATADV_ATTR_ELP_INTERVAL: defines the interval in milliseconds in
482 * which batman emits probing packets for neighbor sensing (ELP).
483 */
484 BATADV_ATTR_ELP_INTERVAL,
485
486 /**
487 * @BATADV_ATTR_THROUGHPUT_OVERRIDE: defines the throughput value to be
488 * used by B.A.T.M.A.N. V when estimating the link throughput using
489 * this interface. If the value is set to 0 then batman-adv will try to
490 * estimate the throughput by itself.
491 */
492 BATADV_ATTR_THROUGHPUT_OVERRIDE,
493
347 /* add attributes above here, update the policy in netlink.c */494 /* add attributes above here, update the policy in netlink.c */
348 495
349 /**496 /**
@@ -372,10 +519,14 @@ enum batadv_nl_commands { · 22 unmodified lines
372 BATADV_CMD_UNSPEC,519 BATADV_CMD_UNSPEC,
373 520
374 /**521 /**
375 * @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv522 * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
376 * device523 */
524 BATADV_CMD_GET_MESH,
525
526 /**
527 * @BATADV_CMD_GET_MESH_INFO: Alias for @BATADV_CMD_GET_MESH
377 */528 */
378 BATADV_CMD_GET_MESH_INFO,529 BATADV_CMD_GET_MESH_INFO = BATADV_CMD_GET_MESH,
379 530
380 /**531 /**
381 * @BATADV_CMD_TP_METER: Start a tp meter session532 * @BATADV_CMD_TP_METER: Start a tp meter session
@@ -393,9 +544,15 @@ enum batadv_nl_commands { · 11 unmodified lines
393 BATADV_CMD_GET_ROUTING_ALGOS,544 BATADV_CMD_GET_ROUTING_ALGOS,
394 545
395 /**546 /**
396 * @BATADV_CMD_GET_HARDIFS: Query list of hard interfaces547 * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
548 * current softif
397 */549 */
398 BATADV_CMD_GET_HARDIFS,550 BATADV_CMD_GET_HARDIF,
551
552 /**
553 * @BATADV_CMD_GET_HARDIFS: Alias for @BATADV_CMD_GET_HARDIF
554 */
555 BATADV_CMD_GET_HARDIFS = BATADV_CMD_GET_HARDIF,
399 556
400 /**557 /**
401 * @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations558 * @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations
@@ -443,6 +600,29 @@ enum batadv_nl_commands { · 41 unmodified lines
443 */600 */
444 BATADV_CMD_GET_MCAST_FLAGS,601 BATADV_CMD_GET_MCAST_FLAGS,
445 602
603 /**
604 * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
605 */
606 BATADV_CMD_SET_MESH,
607
608 /**
609 * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
610 * current softif
611 */
612 BATADV_CMD_SET_HARDIF,
613
614 /**
615 * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
616 * current softif
617 */
618 BATADV_CMD_GET_VLAN,
619
620 /**
621 * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
622 * current softif
623 */
624 BATADV_CMD_SET_VLAN,
625
446 /* add new commands above here */626 /* add new commands above here */
447 627
448 /**628 /**
include/uapi/linux/binfmts.h+1−1
@@ -16,6 +16,6 @@ struct pt_regs; · 15 unmodified lines
16#define MAX_ARG_STRINGS 0x7FFFFFFF16#define MAX_ARG_STRINGS 0x7FFFFFFF
17 17
18/* sizeof(linux_binprm->buf) */18/* sizeof(linux_binprm->buf) */
19#define BINPRM_BUF_SIZE 12819#define BINPRM_BUF_SIZE 256
20 20
21#endif /* _UAPI_LINUX_BINFMTS_H */21#endif /* _UAPI_LINUX_BINFMTS_H */
include/uapi/linux/bpf.h+107−9
@@ -14,6 +14,7 @@ · 13 unmodified lines
14/* Extended instruction set based on top of classic BPF */14/* Extended instruction set based on top of classic BPF */
15 15
16/* instruction classes */16/* instruction classes */
17#define BPF_JMP32 0x06 /* jmp mode in word width */
17#define BPF_ALU64 0x07 /* alu mode in double word width */18#define BPF_ALU64 0x07 /* alu mode in double word width */
18 19
19/* ld/ldx fields */20/* ld/ldx fields */
@@ -266,6 +267,7 @@ enum bpf_attach_type { · 246 unmodified lines
266#define BPF_ANY 0 /* create new element or update existing */267#define BPF_ANY 0 /* create new element or update existing */
267#define BPF_NOEXIST 1 /* create new element if it didn't exist */268#define BPF_NOEXIST 1 /* create new element if it didn't exist */
268#define BPF_EXIST 2 /* update existing element */269#define BPF_EXIST 2 /* update existing element */
270#define BPF_F_LOCK 4 /* spin_lock-ed map_lookup/map_update */
269 271
270/* flags for BPF_MAP_CREATE command */272/* flags for BPF_MAP_CREATE command */
271#define BPF_F_NO_PREALLOC (1U << 0)273#define BPF_F_NO_PREALLOC (1U << 0)
@@ -2014,6 +2016,19 @@ union bpf_attr { · 1742 unmodified lines
2014 * Only works if *skb* contains an IPv6 packet. Insert a2016 * Only works if *skb* contains an IPv6 packet. Insert a
2015 * Segment Routing Header (**struct ipv6_sr_hdr**) inside2017 * Segment Routing Header (**struct ipv6_sr_hdr**) inside
2016 * the IPv6 header.2018 * the IPv6 header.
2019 * **BPF_LWT_ENCAP_IP**
2020 * IP encapsulation (GRE/GUE/IPIP/etc). The outer header
2021 * must be IPv4 or IPv6, followed by zero or more
2022 * additional headers, up to LWT_BPF_MAX_HEADROOM total
2023 * bytes in all prepended headers. Please note that
2024 * if skb_is_gso(skb) is true, no more than two headers
2025 * can be prepended, and the inner header, if present,
2026 * should be either GRE or UDP/GUE.
2027 *
2028 * BPF_LWT_ENCAP_SEG6*** types can be called by bpf programs of
2029 * type BPF_PROG_TYPE_LWT_IN; BPF_LWT_ENCAP_IP type can be called
2030 * by bpf programs of types BPF_PROG_TYPE_LWT_IN and
2031 * BPF_PROG_TYPE_LWT_XMIT.
2017 *2032 *
2018 * A call to this helper is susceptible to change the underlaying2033 * A call to this helper is susceptible to change the underlaying
2019 * packet buffer. Therefore, at load time, all checks on pointers2034 * packet buffer. Therefore, at load time, all checks on pointers
@@ -2327,6 +2342,30 @@ union bpf_attr { · 307 unmodified lines
2327 * "**y**".2342 * "**y**".
2328 * Return2343 * Return
2329 * 02344 * 0
2345 *
2346 * struct bpf_sock *bpf_sk_fullsock(struct bpf_sock *sk)
2347 * Description
2348 * This helper gets a **struct bpf_sock** pointer such
2349 * that all the fields in bpf_sock can be accessed.
2350 * Return
2351 * A **struct bpf_sock** pointer on success, or NULL in
2352 * case of failure.
2353 *
2354 * struct bpf_tcp_sock *bpf_tcp_sock(struct bpf_sock *sk)
2355 * Description
2356 * This helper gets a **struct bpf_tcp_sock** pointer from a
2357 * **struct bpf_sock** pointer.
2358 *
2359 * Return
2360 * A **struct bpf_tcp_sock** pointer on success, or NULL in
2361 * case of failure.
2362 *
2363 * int bpf_skb_ecn_set_ce(struct sk_buf *skb)
2364 * Description
2365 * Sets ECN of IP header to ce (congestion encountered) if
2366 * current value is ect (ECN capable). Works with IPv6 and IPv4.
2367 * Return
2368 * 1 if set, 0 if not set.
2330 */2369 */
2331#define __BPF_FUNC_MAPPER(FN) \2370#define __BPF_FUNC_MAPPER(FN) \
2332 FN(unspec), \2371 FN(unspec), \
@@ -2421,7 +2460,12 @@ union bpf_attr { · 88 unmodified lines
2421 FN(map_peek_elem), \2460 FN(map_peek_elem), \
2422 FN(msg_push_data), \2461 FN(msg_push_data), \
2423 FN(msg_pop_data), \2462 FN(msg_pop_data), \
2424 FN(rc_pointer_rel),2463 FN(rc_pointer_rel), \
2464 FN(spin_lock), \
2465 FN(spin_unlock), \
2466 FN(sk_fullsock), \
2467 FN(tcp_sock), \
2468 FN(skb_ecn_set_ce),
2425 2469
2426/* integer value in 'imm' field of BPF_CALL instruction selects which helper2470/* integer value in 'imm' field of BPF_CALL instruction selects which helper
2427 * function eBPF program intends to call2471 * function eBPF program intends to call
@@ -2494,7 +2538,8 @@ enum bpf_hdr_start_off { · 66 unmodified lines
2494/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */2538/* Encapsulation type for BPF_FUNC_lwt_push_encap helper. */
2495enum bpf_lwt_encap_mode {2539enum bpf_lwt_encap_mode {
2496 BPF_LWT_ENCAP_SEG6,2540 BPF_LWT_ENCAP_SEG6,
2497 BPF_LWT_ENCAP_SEG6_INLINE2541 BPF_LWT_ENCAP_SEG6_INLINE,
2542 BPF_LWT_ENCAP_IP,
2498};2543};
2499 2544
2500#define __bpf_md_ptr(type, name) \2545#define __bpf_md_ptr(type, name) \
@@ -2540,6 +2585,8 @@ struct __sk_buff { · 39 unmodified lines
2540 __bpf_md_ptr(struct bpf_flow_keys *, flow_keys);2585 __bpf_md_ptr(struct bpf_flow_keys *, flow_keys);
2541 __u64 tstamp;2586 __u64 tstamp;
2542 __u32 wire_len;2587 __u32 wire_len;
2588 __u32 gso_segs;
2589 __bpf_md_ptr(struct bpf_sock *, sk);
2543};2590};
2544 2591
2545struct bpf_tunnel_key {2592struct bpf_tunnel_key {
@@ -2581,7 +2628,15 @@ enum bpf_ret_code { · 35 unmodified lines
2581 BPF_DROP = 2,2628 BPF_DROP = 2,
2582 /* 3-6 reserved */2629 /* 3-6 reserved */
2583 BPF_REDIRECT = 7,2630 BPF_REDIRECT = 7,
2584 /* >127 are reserved for prog type specific return codes */2631 /* >127 are reserved for prog type specific return codes.
2632 *
2633 * BPF_LWT_REROUTE: used by BPF_PROG_TYPE_LWT_IN and
2634 * BPF_PROG_TYPE_LWT_XMIT to indicate that skb had been
2635 * changed and should be routed based on its new L3 header.
2636 * (This is an L3 redirect, as opposed to L2 redirect
2637 * represented by BPF_REDIRECT above).
2638 */
2639 BPF_LWT_REROUTE = 128,
2585};2640};
2586 2641
2587struct bpf_sock {2642struct bpf_sock {
@@ -2591,14 +2646,52 @@ struct bpf_sock { · 3 unmodified lines
2591 __u32 protocol;2646 __u32 protocol;
2592 __u32 mark;2647 __u32 mark;
2593 __u32 priority;2648 __u32 priority;
2594 __u32 src_ip4; /* Allows 1,2,4-byte read.2649 /* IP address also allows 1 and 2 bytes access */
2595 * Stored in network byte order.2650 __u32 src_ip4;
2651 __u32 src_ip6[4];
2652 __u32 src_port; /* host byte order */
2653 __u32 dst_port; /* network byte order */
2654 __u32 dst_ip4;
2655 __u32 dst_ip6[4];
2656 __u32 state;
2657};
2658
2659struct bpf_tcp_sock {
2660 __u32 snd_cwnd; /* Sending congestion window */
2661 __u32 srtt_us; /* smoothed round trip time << 3 in usecs */
2662 __u32 rtt_min;
2663 __u32 snd_ssthresh; /* Slow start size threshold */
2664 __u32 rcv_nxt; /* What we want to receive next */
2665 __u32 snd_nxt; /* Next sequence we send */
2666 __u32 snd_una; /* First byte we want an ack for */
2667 __u32 mss_cache; /* Cached effective mss, not including SACKS */
2668 __u32 ecn_flags; /* ECN status bits. */
2669 __u32 rate_delivered; /* saved rate sample: packets delivered */
2670 __u32 rate_interval_us; /* saved rate sample: time elapsed */
2671 __u32 packets_out; /* Packets which are "in flight" */
2672 __u32 retrans_out; /* Retransmitted packets out */
2673 __u32 total_retrans; /* Total retransmits for entire connection */
2674 __u32 segs_in; /* RFC4898 tcpEStatsPerfSegsIn
2675 * total number of segments in.
2596 */2676 */
2597 __u32 src_ip6[4]; /* Allows 1,2,4-byte read.2677 __u32 data_segs_in; /* RFC4898 tcpEStatsPerfDataSegsIn
2598 * Stored in network byte order.2678 * total number of data segments in.
2599 */2679 */
2600 __u32 src_port; /* Allows 4-byte read.2680 __u32 segs_out; /* RFC4898 tcpEStatsPerfSegsOut
2601 * Stored in host byte order2681 * The total number of segments sent.
2682 */
2683 __u32 data_segs_out; /* RFC4898 tcpEStatsPerfDataSegsOut
2684 * total number of data segments sent.
2685 */
2686 __u32 lost_out; /* Lost packets */
2687 __u32 sacked_out; /* SACK'd packets */
2688 __u64 bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived
2689 * sum(delta(rcv_nxt)), or how many bytes
2690 * were acked.
2691 */
2692 __u64 bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked
2693 * sum(delta(snd_una)), or how many bytes
2694 * were acked.
2602 */2695 */
2603};2696};
2604 2697
@@ -2728,6 +2821,8 @@ struct bpf_prog_info { · 123 unmodified lines
2728 __u32 jited_line_info_rec_size;2821 __u32 jited_line_info_rec_size;
2729 __u32 nr_prog_tags;2822 __u32 nr_prog_tags;
2730 __aligned_u64 prog_tags;2823 __aligned_u64 prog_tags;
2824 __u64 run_time_ns;
2825 __u64 run_cnt;
2731} __attribute__((aligned(8)));2826} __attribute__((aligned(8)));
2732 2827
2733struct bpf_map_info {2828struct bpf_map_info {
@@ -3054,4 +3149,7 @@ struct bpf_line_info { · 320 unmodified lines
3054 __u32 line_col;3149 __u32 line_col;
3055};3150};
3056 3151
3152struct bpf_spin_lock {
3153 __u32 val;
3154};
3057#endif /* _UAPI__LINUX_BPF_H__ */3155#endif /* _UAPI__LINUX_BPF_H__ */
include/uapi/linux/btrfs.h+2−0
@@ -837,6 +837,8 @@ enum btrfs_err_code { · 836 unmodified lines
837 struct btrfs_ioctl_vol_args)837 struct btrfs_ioctl_vol_args)
838#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \838#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
839 struct btrfs_ioctl_vol_args)839 struct btrfs_ioctl_vol_args)
840#define BTRFS_IOC_FORGET_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
841 struct btrfs_ioctl_vol_args)
840/* trans start and trans end are dangerous, and only for842/* trans start and trans end are dangerous, and only for
841 * use by applications that know how to avoid the843 * use by applications that know how to avoid the
842 * resulting deadlocks844 * resulting deadlocks
include/uapi/linux/devlink.h+47−0
@@ -89,6 +89,22 @@ enum devlink_command { · 88 unmodified lines
89 DEVLINK_CMD_REGION_DEL,89 DEVLINK_CMD_REGION_DEL,
90 DEVLINK_CMD_REGION_READ,90 DEVLINK_CMD_REGION_READ,
91 91
92 DEVLINK_CMD_PORT_PARAM_GET, /* can dump */
93 DEVLINK_CMD_PORT_PARAM_SET,
94 DEVLINK_CMD_PORT_PARAM_NEW,
95 DEVLINK_CMD_PORT_PARAM_DEL,
96
97 DEVLINK_CMD_INFO_GET, /* can dump */
98
99 DEVLINK_CMD_HEALTH_REPORTER_GET,
100 DEVLINK_CMD_HEALTH_REPORTER_SET,
101 DEVLINK_CMD_HEALTH_REPORTER_RECOVER,
102 DEVLINK_CMD_HEALTH_REPORTER_DIAGNOSE,
103 DEVLINK_CMD_HEALTH_REPORTER_DUMP_GET,
104 DEVLINK_CMD_HEALTH_REPORTER_DUMP_CLEAR,
105
106 DEVLINK_CMD_FLASH_UPDATE,
107
92 /* add new commands above here */108 /* add new commands above here */
93 __DEVLINK_CMD_MAX,109 __DEVLINK_CMD_MAX,
94 DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1110 DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -285,6 +301,37 @@ enum devlink_attr { · 190 unmodified lines
285 DEVLINK_ATTR_REGION_CHUNK_ADDR, /* u64 */301 DEVLINK_ATTR_REGION_CHUNK_ADDR, /* u64 */
286 DEVLINK_ATTR_REGION_CHUNK_LEN, /* u64 */302 DEVLINK_ATTR_REGION_CHUNK_LEN, /* u64 */
287 303
304 DEVLINK_ATTR_INFO_DRIVER_NAME, /* string */
305 DEVLINK_ATTR_INFO_SERIAL_NUMBER, /* string */
306 DEVLINK_ATTR_INFO_VERSION_FIXED, /* nested */
307 DEVLINK_ATTR_INFO_VERSION_RUNNING, /* nested */
308 DEVLINK_ATTR_INFO_VERSION_STORED, /* nested */
309 DEVLINK_ATTR_INFO_VERSION_NAME, /* string */
310 DEVLINK_ATTR_INFO_VERSION_VALUE, /* string */
311
312 DEVLINK_ATTR_SB_POOL_CELL_SIZE, /* u32 */
313
314 DEVLINK_ATTR_FMSG, /* nested */
315 DEVLINK_ATTR_FMSG_OBJ_NEST_START, /* flag */
316 DEVLINK_ATTR_FMSG_PAIR_NEST_START, /* flag */
317 DEVLINK_ATTR_FMSG_ARR_NEST_START, /* flag */
318 DEVLINK_ATTR_FMSG_NEST_END, /* flag */
319 DEVLINK_ATTR_FMSG_OBJ_NAME, /* string */
320 DEVLINK_ATTR_FMSG_OBJ_VALUE_TYPE, /* u8 */
321 DEVLINK_ATTR_FMSG_OBJ_VALUE_DATA, /* dynamic */
322
323 DEVLINK_ATTR_HEALTH_REPORTER, /* nested */
324 DEVLINK_ATTR_HEALTH_REPORTER_NAME, /* string */
325 DEVLINK_ATTR_HEALTH_REPORTER_STATE, /* u8 */
326 DEVLINK_ATTR_HEALTH_REPORTER_ERR_COUNT, /* u64 */
327 DEVLINK_ATTR_HEALTH_REPORTER_RECOVER_COUNT, /* u64 */
328 DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS, /* u64 */
329 DEVLINK_ATTR_HEALTH_REPORTER_GRACEFUL_PERIOD, /* u64 */
330 DEVLINK_ATTR_HEALTH_REPORTER_AUTO_RECOVER, /* u8 */
331
332 DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME, /* string */
333 DEVLINK_ATTR_FLASH_UPDATE_COMPONENT, /* string */
334
288 /* add new attributes above here, update the policy in devlink.c */335 /* add new attributes above here, update the policy in devlink.c */
289 336
290 __DEVLINK_ATTR_MAX,337 __DEVLINK_ATTR_MAX,
include/uapi/linux/dm-ioctl.h+2−2
@@ -270,9 +270,9 @@ enum { · 269 unmodified lines
270#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)270#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
271 271
272#define DM_VERSION_MAJOR 4272#define DM_VERSION_MAJOR 4
273#define DM_VERSION_MINOR 39273#define DM_VERSION_MINOR 40
274#define DM_VERSION_PATCHLEVEL 0274#define DM_VERSION_PATCHLEVEL 0
275#define DM_VERSION_EXTRA "-ioctl (2018-04-03)"275#define DM_VERSION_EXTRA "-ioctl (2019-01-18)"
276 276
277/* Status bits */277/* Status bits */
278#define DM_READONLY_FLAG (1 << 0) /* In/Out */278#define DM_READONLY_FLAG (1 << 0) /* In/Out */
include/uapi/linux/elf.h+2−0
@@ -421,6 +421,8 @@ typedef struct elf64_shdr { · 420 unmodified lines
421#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */421#define NT_ARM_SYSTEM_CALL 0x404 /* ARM system call number */
422#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */422#define NT_ARM_SVE 0x405 /* ARM Scalable Vector Extension registers */
423#define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication code masks */423#define NT_ARM_PAC_MASK 0x406 /* ARM pointer authentication code masks */
424#define NT_ARM_PACA_KEYS 0x407 /* ARM pointer authentication address keys */
425#define NT_ARM_PACG_KEYS 0x408 /* ARM pointer authentication generic key */
424#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */426#define NT_ARC_V2 0x600 /* ARCv2 accumulator/extra registers */
425#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */427#define NT_VMCOREDD 0x700 /* Vmcore Device Dump Note */
426#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */428#define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */
include/uapi/linux/errqueue.h+5−0
@@ -3,6 +3,7 @@ · 2 unmodified lines
3#define _UAPI_LINUX_ERRQUEUE_H3#define _UAPI_LINUX_ERRQUEUE_H
4 4
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/time_types.h>
6 7
7struct sock_extended_err {8struct sock_extended_err {
8 __u32 ee_errno; 9 __u32 ee_errno;
@@ -41,6 +42,10 @@ struct scm_timestamping { · 32 unmodified lines
41 struct timespec ts[3];42 struct timespec ts[3];
42};43};
43 44
45struct scm_timestamping64 {
46 struct __kernel_timespec ts[3];
47};
48
44/* The type of scm_timestamping, passed in sock_extended_err ee_info.49/* The type of scm_timestamping, passed in sock_extended_err ee_info.
45 * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0]50 * This defines the type of ts[0]. For SCM_TSTAMP_SND only, if ts[0]
46 * is zero, then this is a hardware timestamp and recorded in ts[2].51 * is zero, then this is a hardware timestamp and recorded in ts[2].
include/uapi/linux/ethtool.h+26−9
@@ -1432,6 +1432,13 @@ enum ethtool_link_mode_bit_indices { · 1431 unmodified lines
1432 ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,1432 ETHTOOL_LINK_MODE_56000baseSR4_Full_BIT = 29,
1433 ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,1433 ETHTOOL_LINK_MODE_56000baseLR4_Full_BIT = 30,
1434 ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,1434 ETHTOOL_LINK_MODE_25000baseCR_Full_BIT = 31,
1435
1436 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit
1437 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*
1438 * macro for bits > 31. The only way to use indices > 31 is to
1439 * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.
1440 */
1441
1435 ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,1442 ETHTOOL_LINK_MODE_25000baseKR_Full_BIT = 32,
1436 ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,1443 ETHTOOL_LINK_MODE_25000baseSR_Full_BIT = 33,
1437 ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,1444 ETHTOOL_LINK_MODE_50000baseCR2_Full_BIT = 34,
@@ -1453,15 +1460,24 @@ enum ethtool_link_mode_bit_indices { · 15 unmodified lines
1453 ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,1460 ETHTOOL_LINK_MODE_FEC_NONE_BIT = 49,
1454 ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,1461 ETHTOOL_LINK_MODE_FEC_RS_BIT = 50,
1455 ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,1462 ETHTOOL_LINK_MODE_FEC_BASER_BIT = 51,
1456 1463 ETHTOOL_LINK_MODE_50000baseKR_Full_BIT = 52,
1457 /* Last allowed bit for __ETHTOOL_LINK_MODE_LEGACY_MASK is bit1464 ETHTOOL_LINK_MODE_50000baseSR_Full_BIT = 53,
1458 * 31. Please do NOT define any SUPPORTED_* or ADVERTISED_*1465 ETHTOOL_LINK_MODE_50000baseCR_Full_BIT = 54,
1459 * macro for bits > 31. The only way to use indices > 31 is to1466 ETHTOOL_LINK_MODE_50000baseLR_ER_FR_Full_BIT = 55,
1460 * use the new ETHTOOL_GLINKSETTINGS/ETHTOOL_SLINKSETTINGS API.1467 ETHTOOL_LINK_MODE_50000baseDR_Full_BIT = 56,
1461 */1468 ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT = 57,
1462 1469 ETHTOOL_LINK_MODE_100000baseSR2_Full_BIT = 58,
1463 __ETHTOOL_LINK_MODE_LAST1470 ETHTOOL_LINK_MODE_100000baseCR2_Full_BIT = 59,
1464 = ETHTOOL_LINK_MODE_FEC_BASER_BIT,1471 ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT = 60,
1472 ETHTOOL_LINK_MODE_100000baseDR2_Full_BIT = 61,
1473 ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT = 62,
1474 ETHTOOL_LINK_MODE_200000baseSR4_Full_BIT = 63,
1475 ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT = 64,
1476 ETHTOOL_LINK_MODE_200000baseDR4_Full_BIT = 65,
1477 ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT = 66,
1478
1479 /* must be last entry */
1480 __ETHTOOL_LINK_MODE_MASK_NBITS
1465};1481};
1466 1482
1467#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \1483#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) \
@@ -1569,6 +1585,7 @@ enum ethtool_link_mode_bit_indices { · 101 unmodified lines
1569#define SPEED_50000 500001585#define SPEED_50000 50000
1570#define SPEED_56000 560001586#define SPEED_56000 56000
1571#define SPEED_100000 1000001587#define SPEED_100000 100000
1588#define SPEED_200000 200000
1572 1589
1573#define SPEED_UNKNOWN -11590#define SPEED_UNKNOWN -1
1574 1591
include/uapi/linux/fanotify.h+29−0
@@ -7,9 +7,16 @@ · 6 unmodified lines
7/* the following events that user-space can register for */7/* the following events that user-space can register for */
8#define FAN_ACCESS 0x00000001 /* File was accessed */8#define FAN_ACCESS 0x00000001 /* File was accessed */
9#define FAN_MODIFY 0x00000002 /* File was modified */9#define FAN_MODIFY 0x00000002 /* File was modified */
10#define FAN_ATTRIB 0x00000004 /* Metadata changed */
10#define FAN_CLOSE_WRITE 0x00000008 /* Writtable file closed */11#define FAN_CLOSE_WRITE 0x00000008 /* Writtable file closed */
11#define FAN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */12#define FAN_CLOSE_NOWRITE 0x00000010 /* Unwrittable file closed */
12#define FAN_OPEN 0x00000020 /* File was opened */13#define FAN_OPEN 0x00000020 /* File was opened */
14#define FAN_MOVED_FROM 0x00000040 /* File was moved from X */
15#define FAN_MOVED_TO 0x00000080 /* File was moved to Y */
16#define FAN_CREATE 0x00000100 /* Subfile was created */
17#define FAN_DELETE 0x00000200 /* Subfile was deleted */
18#define FAN_DELETE_SELF 0x00000400 /* Self was deleted */
19#define FAN_MOVE_SELF 0x00000800 /* Self was moved */
13#define FAN_OPEN_EXEC 0x00001000 /* File was opened for exec */20#define FAN_OPEN_EXEC 0x00001000 /* File was opened for exec */
14 21
15#define FAN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */22#define FAN_Q_OVERFLOW 0x00004000 /* Event queued overflowed */
@@ -24,6 +31,7 @@ · 8 unmodified lines
24 31
25/* helper events */32/* helper events */
26#define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */33#define FAN_CLOSE (FAN_CLOSE_WRITE | FAN_CLOSE_NOWRITE) /* close */
34#define FAN_MOVE (FAN_MOVED_FROM | FAN_MOVED_TO) /* moves */
27 35
28/* flags used for fanotify_init() */36/* flags used for fanotify_init() */
29#define FAN_CLOEXEC 0x0000000137#define FAN_CLOEXEC 0x00000001
@@ -44,6 +52,7 @@ · 14 unmodified lines
44 52
45/* Flags to determine fanotify event format */53/* Flags to determine fanotify event format */
46#define FAN_REPORT_TID 0x00000100 /* event->pid is thread id */54#define FAN_REPORT_TID 0x00000100 /* event->pid is thread id */
55#define FAN_REPORT_FID 0x00000200 /* Report unique file id */
47 56
48/* Deprecated - do not use this in programs and do not add new flags here! */57/* Deprecated - do not use this in programs and do not add new flags here! */
49#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | \58#define FAN_ALL_INIT_FLAGS (FAN_CLOEXEC | FAN_NONBLOCK | \
@@ -106,6 +115,26 @@ struct fanotify_event_metadata { · 56 unmodified lines
106 __s32 pid;115 __s32 pid;
107};116};
108 117
118#define FAN_EVENT_INFO_TYPE_FID 1
119
120/* Variable length info record following event metadata */
121struct fanotify_event_info_header {
122 __u8 info_type;
123 __u8 pad;
124 __u16 len;
125};
126
127/* Unique file identifier info record */
128struct fanotify_event_info_fid {
129 struct fanotify_event_info_header hdr;
130 __kernel_fsid_t fsid;
131 /*
132 * Following is an opaque struct file_handle that can be passed as
133 * an argument to open_by_handle_at(2).
134 */
135 unsigned char handle[0];
136};
137
109struct fanotify_response {138struct fanotify_response {
110 __s32 fd;139 __s32 fd;
111 __u32 response;140 __u32 response;
include/uapi/linux/fcntl.h+1−0
@@ -41,6 +41,7 @@ · 40 unmodified lines
41#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */41#define F_SEAL_SHRINK 0x0002 /* prevent file from shrinking */
42#define F_SEAL_GROW 0x0004 /* prevent file from growing */42#define F_SEAL_GROW 0x0004 /* prevent file from growing */
43#define F_SEAL_WRITE 0x0008 /* prevent writes */43#define F_SEAL_WRITE 0x0008 /* prevent writes */
44#define F_SEAL_FUTURE_WRITE 0x0010 /* prevent future writes while mapped */
44/* (1U << 31) is reserved for signed error codes */45/* (1U << 31) is reserved for signed error codes */
45 46
46/*47/*
include/uapi/linux/fuse.h+6−1
@@ -122,6 +122,9 @@ · 121 unmodified lines
122 * - add FOPEN_CACHE_DIR122 * - add FOPEN_CACHE_DIR
123 * - add FUSE_MAX_PAGES, add max_pages to init_out123 * - add FUSE_MAX_PAGES, add max_pages to init_out
124 * - add FUSE_CACHE_SYMLINKS124 * - add FUSE_CACHE_SYMLINKS
125 *
126 * 7.29
127 * - add FUSE_NO_OPENDIR_SUPPORT flag
125 */128 */
126 129
127#ifndef _LINUX_FUSE_H130#ifndef _LINUX_FUSE_H
@@ -157,7 +160,7 @@ · 29 unmodified lines
157#define FUSE_KERNEL_VERSION 7160#define FUSE_KERNEL_VERSION 7
158 161
159/** Minor version number of this interface */162/** Minor version number of this interface */
160#define FUSE_KERNEL_MINOR_VERSION 28163#define FUSE_KERNEL_MINOR_VERSION 29
161 164
162/** The node ID of the root inode */165/** The node ID of the root inode */
163#define FUSE_ROOT_ID 1166#define FUSE_ROOT_ID 1
@@ -259,6 +262,7 @@ struct fuse_file_lock { · 95 unmodified lines
259 * FUSE_ABORT_ERROR: reading the device after abort returns ECONNABORTED262 * FUSE_ABORT_ERROR: reading the device after abort returns ECONNABORTED
260 * FUSE_MAX_PAGES: init_out.max_pages contains the max number of req pages263 * FUSE_MAX_PAGES: init_out.max_pages contains the max number of req pages
261 * FUSE_CACHE_SYMLINKS: cache READLINK responses264 * FUSE_CACHE_SYMLINKS: cache READLINK responses
265 * FUSE_NO_OPENDIR_SUPPORT: kernel supports zero-message opendir
262 */266 */
263#define FUSE_ASYNC_READ (1 << 0)267#define FUSE_ASYNC_READ (1 << 0)
264#define FUSE_POSIX_LOCKS (1 << 1)268#define FUSE_POSIX_LOCKS (1 << 1)
@@ -284,6 +288,7 @@ struct fuse_file_lock { · 19 unmodified lines
284#define FUSE_ABORT_ERROR (1 << 21)288#define FUSE_ABORT_ERROR (1 << 21)
285#define FUSE_MAX_PAGES (1 << 22)289#define FUSE_MAX_PAGES (1 << 22)
286#define FUSE_CACHE_SYMLINKS (1 << 23)290#define FUSE_CACHE_SYMLINKS (1 << 23)
291#define FUSE_NO_OPENDIR_SUPPORT (1 << 24)
287 292
288/**293/**
289 * CUSE INIT request/reply flags294 * CUSE INIT request/reply flags
include/uapi/linux/icmpv6.h+2−0
@@ -108,6 +108,8 @@ struct icmp6hdr { · 107 unmodified lines
108#define ICMPV6_MOBILE_PREFIX_SOL 146108#define ICMPV6_MOBILE_PREFIX_SOL 146
109#define ICMPV6_MOBILE_PREFIX_ADV 147109#define ICMPV6_MOBILE_PREFIX_ADV 147
110 110
111#define ICMPV6_MRDISC_ADV 151
112
111/*113/*
112 * Codes for Destination Unreachable114 * Codes for Destination Unreachable
113 */115 */
include/uapi/linux/if_bonding.h+24−0
@@ -117,6 +117,30 @@ struct ad_info { · 116 unmodified lines
117 __u8 partner_system[ETH_ALEN];117 __u8 partner_system[ETH_ALEN];
118};118};
119 119
120/* Embedded inside LINK_XSTATS_TYPE_BOND */
121enum {
122 BOND_XSTATS_UNSPEC,
123 BOND_XSTATS_3AD,
124 __BOND_XSTATS_MAX
125};
126#define BOND_XSTATS_MAX (__BOND_XSTATS_MAX - 1)
127
128/* Embedded inside BOND_XSTATS_3AD */
129enum {
130 BOND_3AD_STAT_LACPDU_RX,
131 BOND_3AD_STAT_LACPDU_TX,
132 BOND_3AD_STAT_LACPDU_UNKNOWN_RX,
133 BOND_3AD_STAT_LACPDU_ILLEGAL_RX,
134 BOND_3AD_STAT_MARKER_RX,
135 BOND_3AD_STAT_MARKER_TX,
136 BOND_3AD_STAT_MARKER_RESP_RX,
137 BOND_3AD_STAT_MARKER_RESP_TX,
138 BOND_3AD_STAT_MARKER_UNKNOWN_RX,
139 BOND_3AD_STAT_PAD,
140 __BOND_3AD_STAT_MAX
141};
142#define BOND_3AD_STAT_MAX (__BOND_3AD_STAT_MAX - 1)
143
120#endif /* _LINUX_IF_BONDING_H */144#endif /* _LINUX_IF_BONDING_H */
121 145
122/*146/*
include/uapi/linux/if_link.h+1−0
@@ -925,6 +925,7 @@ enum { · 924 unmodified lines
925enum {925enum {
926 LINK_XSTATS_TYPE_UNSPEC,926 LINK_XSTATS_TYPE_UNSPEC,
927 LINK_XSTATS_TYPE_BRIDGE,927 LINK_XSTATS_TYPE_BRIDGE,
928 LINK_XSTATS_TYPE_BOND,
928 __LINK_XSTATS_TYPE_MAX929 __LINK_XSTATS_TYPE_MAX
929};930};
930#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)931#define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
include/uapi/linux/igmp.h+1−0
@@ -93,6 +93,7 @@ struct igmpv3_query { · 92 unmodified lines
93#define IGMP_MTRACE_RESP 0x1e93#define IGMP_MTRACE_RESP 0x1e
94#define IGMP_MTRACE 0x1f94#define IGMP_MTRACE 0x1f
95 95
96#define IGMP_MRDISC_ADV 0x30 /* From RFC4286 */
96 97
97/*98/*
98 * Use the BSD names for these for compatibility99 * Use the BSD names for these for compatibility
include/uapi/linux/iio/types.h+7−0
@@ -46,6 +46,7 @@ enum iio_chan_type { · 45 unmodified lines
46 IIO_GRAVITY,46 IIO_GRAVITY,
47 IIO_POSITIONRELATIVE,47 IIO_POSITIONRELATIVE,
48 IIO_PHASE,48 IIO_PHASE,
49 IIO_MASSCONCENTRATION,
49};50};
50 51
51enum iio_modifier {52enum iio_modifier {
@@ -87,6 +88,12 @@ enum iio_modifier { · 35 unmodified lines
87 IIO_MOD_VOC,88 IIO_MOD_VOC,
88 IIO_MOD_LIGHT_UV,89 IIO_MOD_LIGHT_UV,
89 IIO_MOD_LIGHT_DUV,90 IIO_MOD_LIGHT_DUV,
91 IIO_MOD_PM1,
92 IIO_MOD_PM2P5,
93 IIO_MOD_PM4,
94 IIO_MOD_PM10,
95 IIO_MOD_ETHANOL,
96 IIO_MOD_H2,
90};97};
91 98
92enum iio_event_type {99enum iio_event_type {
include/uapi/linux/in.h+5−4
@@ -292,10 +292,11 @@ struct sockaddr_in { · 291 unmodified lines
292#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)292#define IN_LOOPBACK(a) ((((long int) (a)) & 0xff000000) == 0x7f000000)
293 293
294/* Defines for Multicast INADDR */294/* Defines for Multicast INADDR */
295#define INADDR_UNSPEC_GROUP 0xe0000000U /* 224.0.0.0 */295#define INADDR_UNSPEC_GROUP 0xe0000000U /* 224.0.0.0 */
296#define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */296#define INADDR_ALLHOSTS_GROUP 0xe0000001U /* 224.0.0.1 */
297#define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */297#define INADDR_ALLRTRS_GROUP 0xe0000002U /* 224.0.0.2 */
298#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */298#define INADDR_ALLSNOOPERS_GROUP 0xe000006aU /* 224.0.0.106 */
299#define INADDR_MAX_LOCAL_GROUP 0xe00000ffU /* 224.0.0.255 */
299#endif300#endif
300 301
301/* <asm/byteorder.h> contains the htonl type stuff.. */302/* <asm/byteorder.h> contains the htonl type stuff.. */
include/uapi/linux/in6.h+1−0
@@ -178,6 +178,7 @@ struct in6_flowlabel_req { · 177 unmodified lines
178#define IPV6_JOIN_ANYCAST 27178#define IPV6_JOIN_ANYCAST 27
179#define IPV6_LEAVE_ANYCAST 28179#define IPV6_LEAVE_ANYCAST 28
180#define IPV6_MULTICAST_ALL 29180#define IPV6_MULTICAST_ALL 29
181#define IPV6_ROUTER_ALERT_ISOLATE 30
181 182
182/* IPV6_MTU_DISCOVER values */183/* IPV6_MTU_DISCOVER values */
183#define IPV6_PMTUDISC_DONT 0184#define IPV6_PMTUDISC_DONT 0
include/uapi/linux/io_uring.h+137−0
@@ -0,0 +1,137 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2/*
3 * Header file for the io_uring interface.
4 *
5 * Copyright (C) 2019 Jens Axboe
6 * Copyright (C) 2019 Christoph Hellwig
7 */
8#ifndef LINUX_IO_URING_H
9#define LINUX_IO_URING_H
10
11#include <linux/fs.h>
12#include <linux/types.h>
13
14/*
15 * IO submission data structure (Submission Queue Entry)
16 */
17struct io_uring_sqe {
18 __u8 opcode; /* type of operation for this sqe */
19 __u8 flags; /* IOSQE_ flags */
20 __u16 ioprio; /* ioprio for the request */
21 __s32 fd; /* file descriptor to do IO on */
22 __u64 off; /* offset into file */
23 __u64 addr; /* pointer to buffer or iovecs */
24 __u32 len; /* buffer size or number of iovecs */
25 union {
26 __kernel_rwf_t rw_flags;
27 __u32 fsync_flags;
28 __u16 poll_events;
29 };
30 __u64 user_data; /* data to be passed back at completion time */
31 union {
32 __u16 buf_index; /* index into fixed buffers, if used */
33 __u64 __pad2[3];
34 };
35};
36
37/*
38 * sqe->flags
39 */
40#define IOSQE_FIXED_FILE (1U << 0) /* use fixed fileset */
41
42/*
43 * io_uring_setup() flags
44 */
45#define IORING_SETUP_IOPOLL (1U << 0) /* io_context is polled */
46#define IORING_SETUP_SQPOLL (1U << 1) /* SQ poll thread */
47#define IORING_SETUP_SQ_AFF (1U << 2) /* sq_thread_cpu is valid */
48
49#define IORING_OP_NOP 0
50#define IORING_OP_READV 1
51#define IORING_OP_WRITEV 2
52#define IORING_OP_FSYNC 3
53#define IORING_OP_READ_FIXED 4
54#define IORING_OP_WRITE_FIXED 5
55#define IORING_OP_POLL_ADD 6
56#define IORING_OP_POLL_REMOVE 7
57
58/*
59 * sqe->fsync_flags
60 */
61#define IORING_FSYNC_DATASYNC (1U << 0)
62
63/*
64 * IO completion data structure (Completion Queue Entry)
65 */
66struct io_uring_cqe {
67 __u64 user_data; /* sqe->data submission passed back */
68 __s32 res; /* result code for this event */
69 __u32 flags;
70};
71
72/*
73 * Magic offsets for the application to mmap the data it needs
74 */
75#define IORING_OFF_SQ_RING 0ULL
76#define IORING_OFF_CQ_RING 0x8000000ULL
77#define IORING_OFF_SQES 0x10000000ULL
78
79/*
80 * Filled with the offset for mmap(2)
81 */
82struct io_sqring_offsets {
83 __u32 head;
84 __u32 tail;
85 __u32 ring_mask;
86 __u32 ring_entries;
87 __u32 flags;
88 __u32 dropped;
89 __u32 array;
90 __u32 resv1;
91 __u64 resv2;
92};
93
94/*
95 * sq_ring->flags
96 */
97#define IORING_SQ_NEED_WAKEUP (1U << 0) /* needs io_uring_enter wakeup */
98
99struct io_cqring_offsets {
100 __u32 head;
101 __u32 tail;
102 __u32 ring_mask;
103 __u32 ring_entries;
104 __u32 overflow;
105 __u32 cqes;
106 __u64 resv[2];
107};
108
109/*
110 * io_uring_enter(2) flags
111 */
112#define IORING_ENTER_GETEVENTS (1U << 0)
113#define IORING_ENTER_SQ_WAKEUP (1U << 1)
114
115/*
116 * Passed in for io_uring_setup(2). Copied back with updated info on success
117 */
118struct io_uring_params {
119 __u32 sq_entries;
120 __u32 cq_entries;
121 __u32 flags;
122 __u32 sq_thread_cpu;
123 __u32 sq_thread_idle;
124 __u32 resv[5];
125 struct io_sqring_offsets sq_off;
126 struct io_cqring_offsets cq_off;
127};
128
129/*
130 * io_uring_register(2) opcodes and arguments
131 */
132#define IORING_REGISTER_BUFFERS 0
133#define IORING_UNREGISTER_BUFFERS 1
134#define IORING_REGISTER_FILES 2
135#define IORING_UNREGISTER_FILES 3
136
137#endif
include/uapi/linux/kernel-page-flags.h+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
32 32
33#define KPF_KSM 2133#define KPF_KSM 21
34#define KPF_THP 2234#define KPF_THP 22
35#define KPF_BALLOON 2335#define KPF_OFFLINE 23
36#define KPF_ZERO_PAGE 2436#define KPF_ZERO_PAGE 24
37#define KPF_IDLE 2537#define KPF_IDLE 25
38#define KPF_PGTABLE 2638#define KPF_PGTABLE 26
include/uapi/linux/limits.h+2−2
@@ -1,6 +1,6 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _LINUX_LIMITS_H2#ifndef _UAPI_LINUX_LIMITS_H
3#define _LINUX_LIMITS_H3#define _UAPI_LINUX_LIMITS_H
4 4
5#define NR_OPEN 10245#define NR_OPEN 1024
6 6
include/uapi/linux/lirc.h+6−0
@@ -192,6 +192,9 @@ struct lirc_scancode { · 191 unmodified lines
192 * @RC_PROTO_XMP: XMP protocol192 * @RC_PROTO_XMP: XMP protocol
193 * @RC_PROTO_CEC: CEC protocol193 * @RC_PROTO_CEC: CEC protocol
194 * @RC_PROTO_IMON: iMon Pad protocol194 * @RC_PROTO_IMON: iMon Pad protocol
195 * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
196 * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
197 * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
195 */198 */
196enum rc_proto {199enum rc_proto {
197 RC_PROTO_UNKNOWN = 0,200 RC_PROTO_UNKNOWN = 0,
@@ -218,6 +221,9 @@ enum rc_proto { · 20 unmodified lines
218 RC_PROTO_XMP = 21,221 RC_PROTO_XMP = 21,
219 RC_PROTO_CEC = 22,222 RC_PROTO_CEC = 22,
220 RC_PROTO_IMON = 23,223 RC_PROTO_IMON = 23,
224 RC_PROTO_RCMM12 = 24,
225 RC_PROTO_RCMM24 = 25,
226 RC_PROTO_RCMM32 = 26,
221};227};
222 228
223#endif229#endif
include/uapi/linux/mdio.h+19−0
@@ -45,6 +45,7 @@ · 44 unmodified lines
45#define MDIO_AN_ADVERTISE 16 /* AN advertising (base page) */45#define MDIO_AN_ADVERTISE 16 /* AN advertising (base page) */
46#define MDIO_AN_LPA 19 /* AN LP abilities (base page) */46#define MDIO_AN_LPA 19 /* AN LP abilities (base page) */
47#define MDIO_PCS_EEE_ABLE 20 /* EEE Capability register */47#define MDIO_PCS_EEE_ABLE 20 /* EEE Capability register */
48#define MDIO_PMA_NG_EXTABLE 21 /* 2.5G/5G PMA/PMD extended ability */
48#define MDIO_PCS_EEE_WK_ERR 22 /* EEE wake error counter */49#define MDIO_PCS_EEE_WK_ERR 22 /* EEE wake error counter */
49#define MDIO_PHYXS_LNSTAT 24 /* PHY XGXS lane state */50#define MDIO_PHYXS_LNSTAT 24 /* PHY XGXS lane state */
50#define MDIO_AN_EEE_ADV 60 /* EEE advertisement */51#define MDIO_AN_EEE_ADV 60 /* EEE advertisement */
@@ -92,6 +93,10 @@ · 41 unmodified lines
92#define MDIO_CTRL1_SPEED10G (MDIO_CTRL1_SPEEDSELEXT | 0x00)93#define MDIO_CTRL1_SPEED10G (MDIO_CTRL1_SPEEDSELEXT | 0x00)
93/* 10PASS-TS/2BASE-TL */94/* 10PASS-TS/2BASE-TL */
94#define MDIO_CTRL1_SPEED10P2B (MDIO_CTRL1_SPEEDSELEXT | 0x04)95#define MDIO_CTRL1_SPEED10P2B (MDIO_CTRL1_SPEEDSELEXT | 0x04)
96/* 2.5 Gb/s */
97#define MDIO_CTRL1_SPEED2_5G (MDIO_CTRL1_SPEEDSELEXT | 0x18)
98/* 5 Gb/s */
99#define MDIO_CTRL1_SPEED5G (MDIO_CTRL1_SPEEDSELEXT | 0x1c)
95 100
96/* Status register 1. */101/* Status register 1. */
97#define MDIO_STAT1_LPOWERABLE 0x0002 /* Low-power ability */102#define MDIO_STAT1_LPOWERABLE 0x0002 /* Low-power ability */
@@ -115,6 +120,7 @@ · 17 unmodified lines
115 120
116/* Device present registers. */121/* Device present registers. */
117#define MDIO_DEVS_PRESENT(devad) (1 << (devad))122#define MDIO_DEVS_PRESENT(devad) (1 << (devad))
123#define MDIO_DEVS_C22PRESENT MDIO_DEVS_PRESENT(0)
118#define MDIO_DEVS_PMAPMD MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)124#define MDIO_DEVS_PMAPMD MDIO_DEVS_PRESENT(MDIO_MMD_PMAPMD)
119#define MDIO_DEVS_WIS MDIO_DEVS_PRESENT(MDIO_MMD_WIS)125#define MDIO_DEVS_WIS MDIO_DEVS_PRESENT(MDIO_MMD_WIS)
120#define MDIO_DEVS_PCS MDIO_DEVS_PRESENT(MDIO_MMD_PCS)126#define MDIO_DEVS_PCS MDIO_DEVS_PRESENT(MDIO_MMD_PCS)
@@ -123,6 +129,8 @@ · 2 unmodified lines
123#define MDIO_DEVS_TC MDIO_DEVS_PRESENT(MDIO_MMD_TC)129#define MDIO_DEVS_TC MDIO_DEVS_PRESENT(MDIO_MMD_TC)
124#define MDIO_DEVS_AN MDIO_DEVS_PRESENT(MDIO_MMD_AN)130#define MDIO_DEVS_AN MDIO_DEVS_PRESENT(MDIO_MMD_AN)
125#define MDIO_DEVS_C22EXT MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)131#define MDIO_DEVS_C22EXT MDIO_DEVS_PRESENT(MDIO_MMD_C22EXT)
132#define MDIO_DEVS_VEND1 MDIO_DEVS_PRESENT(MDIO_MMD_VEND1)
133#define MDIO_DEVS_VEND2 MDIO_DEVS_PRESENT(MDIO_MMD_VEND2)
126 134
127/* Control register 2. */135/* Control register 2. */
128#define MDIO_PMA_CTRL2_TYPE 0x000f /* PMA/PMD type selection */136#define MDIO_PMA_CTRL2_TYPE 0x000f /* PMA/PMD type selection */
@@ -142,6 +150,8 @@ · 13 unmodified lines
142#define MDIO_PMA_CTRL2_1000BKX 0x000d /* 1000BASE-KX type */150#define MDIO_PMA_CTRL2_1000BKX 0x000d /* 1000BASE-KX type */
143#define MDIO_PMA_CTRL2_100BTX 0x000e /* 100BASE-TX type */151#define MDIO_PMA_CTRL2_100BTX 0x000e /* 100BASE-TX type */
144#define MDIO_PMA_CTRL2_10BT 0x000f /* 10BASE-T type */152#define MDIO_PMA_CTRL2_10BT 0x000f /* 10BASE-T type */
153#define MDIO_PMA_CTRL2_2_5GBT 0x0030 /* 2.5GBaseT type */
154#define MDIO_PMA_CTRL2_5GBT 0x0031 /* 5GBaseT type */
145#define MDIO_PCS_CTRL2_TYPE 0x0003 /* PCS type selection */155#define MDIO_PCS_CTRL2_TYPE 0x0003 /* PCS type selection */
146#define MDIO_PCS_CTRL2_10GBR 0x0000 /* 10GBASE-R type */156#define MDIO_PCS_CTRL2_10GBR 0x0000 /* 10GBASE-R type */
147#define MDIO_PCS_CTRL2_10GBX 0x0001 /* 10GBASE-X type */157#define MDIO_PCS_CTRL2_10GBX 0x0001 /* 10GBASE-X type */
@@ -195,6 +205,7 @@ · 47 unmodified lines
195#define MDIO_PMA_EXTABLE_1000BKX 0x0040 /* 1000BASE-KX ability */205#define MDIO_PMA_EXTABLE_1000BKX 0x0040 /* 1000BASE-KX ability */
196#define MDIO_PMA_EXTABLE_100BTX 0x0080 /* 100BASE-TX ability */206#define MDIO_PMA_EXTABLE_100BTX 0x0080 /* 100BASE-TX ability */
197#define MDIO_PMA_EXTABLE_10BT 0x0100 /* 10BASE-T ability */207#define MDIO_PMA_EXTABLE_10BT 0x0100 /* 10BASE-T ability */
208#define MDIO_PMA_EXTABLE_NBT 0x4000 /* 2.5/5GBASE-T ability */
198 209
199/* PHY XGXS lane state register. */210/* PHY XGXS lane state register. */
200#define MDIO_PHYXS_LNSTAT_SYNC0 0x0001211#define MDIO_PHYXS_LNSTAT_SYNC0 0x0001
@@ -231,9 +242,13 @@ · 30 unmodified lines
231#define MDIO_PCS_10GBRT_STAT2_BER 0x3f00242#define MDIO_PCS_10GBRT_STAT2_BER 0x3f00
232 243
233/* AN 10GBASE-T control register. */244/* AN 10GBASE-T control register. */
245#define MDIO_AN_10GBT_CTRL_ADV2_5G 0x0080 /* Advertise 2.5GBASE-T */
246#define MDIO_AN_10GBT_CTRL_ADV5G 0x0100 /* Advertise 5GBASE-T */
234#define MDIO_AN_10GBT_CTRL_ADV10G 0x1000 /* Advertise 10GBASE-T */247#define MDIO_AN_10GBT_CTRL_ADV10G 0x1000 /* Advertise 10GBASE-T */
235 248
236/* AN 10GBASE-T status register. */249/* AN 10GBASE-T status register. */
250#define MDIO_AN_10GBT_STAT_LP2_5G 0x0020 /* LP is 2.5GBT capable */
251#define MDIO_AN_10GBT_STAT_LP5G 0x0040 /* LP is 5GBT capable */
237#define MDIO_AN_10GBT_STAT_LPTRR 0x0200 /* LP training reset req. */252#define MDIO_AN_10GBT_STAT_LPTRR 0x0200 /* LP training reset req. */
238#define MDIO_AN_10GBT_STAT_LPLTABLE 0x0400 /* LP loop timing ability */253#define MDIO_AN_10GBT_STAT_LPLTABLE 0x0400 /* LP loop timing ability */
239#define MDIO_AN_10GBT_STAT_LP10G 0x0800 /* LP is 10GBT capable */254#define MDIO_AN_10GBT_STAT_LP10G 0x0800 /* LP is 10GBT capable */
@@ -262,6 +277,10 @@ · 22 unmodified lines
262#define MDIO_EEE_10GKX4 0x0020 /* 10G KX4 EEE cap */277#define MDIO_EEE_10GKX4 0x0020 /* 10G KX4 EEE cap */
263#define MDIO_EEE_10GKR 0x0040 /* 10G KR EEE cap */278#define MDIO_EEE_10GKR 0x0040 /* 10G KR EEE cap */
264 279
280/* 2.5G/5G Extended abilities register. */
281#define MDIO_PMA_NG_EXTABLE_2_5GBT 0x0001 /* 2.5GBASET ability */
282#define MDIO_PMA_NG_EXTABLE_5GBT 0x0002 /* 5GBASET ability */
283
265/* LASI RX_ALARM control/status registers. */284/* LASI RX_ALARM control/status registers. */
266#define MDIO_PMA_LASI_RX_PHYXSLFLT 0x0001 /* PHY XS RX local fault */285#define MDIO_PMA_LASI_RX_PHYXSLFLT 0x0001 /* PHY XS RX local fault */
267#define MDIO_PMA_LASI_RX_PCSLFLT 0x0008 /* PCS RX local fault */286#define MDIO_PMA_LASI_RX_PCSLFLT 0x0008 /* PCS RX local fault */
include/uapi/linux/mman.h+4−0
@@ -12,6 +12,10 @@ · 11 unmodified lines
12#define OVERCOMMIT_ALWAYS 112#define OVERCOMMIT_ALWAYS 1
13#define OVERCOMMIT_NEVER 213#define OVERCOMMIT_NEVER 2
14 14
15#define MAP_SHARED 0x01 /* Share changes */
16#define MAP_PRIVATE 0x02 /* Changes are private */
17#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */
18
15/*19/*
16 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page20 * Huge page size encoding when MAP_HUGETLB is specified, and a huge page
17 * size other than the default is desired. See hugetlb_encode.h.21 * size other than the default is desired. See hugetlb_encode.h.
include/uapi/linux/mroute.h+8−1
@@ -28,12 +28,19 @@ · 27 unmodified lines
28#define MRT_TABLE (MRT_BASE+9) /* Specify mroute table ID */28#define MRT_TABLE (MRT_BASE+9) /* Specify mroute table ID */
29#define MRT_ADD_MFC_PROXY (MRT_BASE+10) /* Add a (*,*|G) mfc entry */29#define MRT_ADD_MFC_PROXY (MRT_BASE+10) /* Add a (*,*|G) mfc entry */
30#define MRT_DEL_MFC_PROXY (MRT_BASE+11) /* Del a (*,*|G) mfc entry */30#define MRT_DEL_MFC_PROXY (MRT_BASE+11) /* Del a (*,*|G) mfc entry */
31#define MRT_MAX (MRT_BASE+11)31#define MRT_FLUSH (MRT_BASE+12) /* Flush all mfc entries and/or vifs */
32#define MRT_MAX (MRT_BASE+12)
32 33
33#define SIOCGETVIFCNT SIOCPROTOPRIVATE /* IP protocol privates */34#define SIOCGETVIFCNT SIOCPROTOPRIVATE /* IP protocol privates */
34#define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)35#define SIOCGETSGCNT (SIOCPROTOPRIVATE+1)
35#define SIOCGETRPF (SIOCPROTOPRIVATE+2)36#define SIOCGETRPF (SIOCPROTOPRIVATE+2)
36 37
38/* MRT_FLUSH optional flags */
39#define MRT_FLUSH_MFC 1 /* Flush multicast entries */
40#define MRT_FLUSH_MFC_STATIC 2 /* Flush static multicast entries */
41#define MRT_FLUSH_VIFS 4 /* Flush multicast vifs */
42#define MRT_FLUSH_VIFS_STATIC 8 /* Flush static multicast vifs */
43
37#define MAXVIFS 3244#define MAXVIFS 32
38typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */45typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */
39typedef unsigned short vifi_t;46typedef unsigned short vifi_t;
include/uapi/linux/mroute6.h+8−1
@@ -31,12 +31,19 @@ · 30 unmodified lines
31#define MRT6_TABLE (MRT6_BASE+9) /* Specify mroute table ID */31#define MRT6_TABLE (MRT6_BASE+9) /* Specify mroute table ID */
32#define MRT6_ADD_MFC_PROXY (MRT6_BASE+10) /* Add a (*,*|G) mfc entry */32#define MRT6_ADD_MFC_PROXY (MRT6_BASE+10) /* Add a (*,*|G) mfc entry */
33#define MRT6_DEL_MFC_PROXY (MRT6_BASE+11) /* Del a (*,*|G) mfc entry */33#define MRT6_DEL_MFC_PROXY (MRT6_BASE+11) /* Del a (*,*|G) mfc entry */
34#define MRT6_MAX (MRT6_BASE+11)34#define MRT6_FLUSH (MRT6_BASE+12) /* Flush all mfc entries and/or vifs */
35#define MRT6_MAX (MRT6_BASE+12)
35 36
36#define SIOCGETMIFCNT_IN6 SIOCPROTOPRIVATE /* IP protocol privates */37#define SIOCGETMIFCNT_IN6 SIOCPROTOPRIVATE /* IP protocol privates */
37#define SIOCGETSGCNT_IN6 (SIOCPROTOPRIVATE+1)38#define SIOCGETSGCNT_IN6 (SIOCPROTOPRIVATE+1)
38#define SIOCGETRPF (SIOCPROTOPRIVATE+2)39#define SIOCGETRPF (SIOCPROTOPRIVATE+2)
39 40
41/* MRT6_FLUSH optional flags */
42#define MRT6_FLUSH_MFC 1 /* Flush multicast entries */
43#define MRT6_FLUSH_MFC_STATIC 2 /* Flush static multicast entries */
44#define MRT6_FLUSH_MIFS 4 /* Flushing multicast vifs */
45#define MRT6_FLUSH_MIFS_STATIC 8 /* Flush static multicast vifs */
46
40#define MAXMIFS 3247#define MAXMIFS 32
41typedef unsigned long mifbitmap_t; /* User mode code depends on this lot */48typedef unsigned long mifbitmap_t; /* User mode code depends on this lot */
42typedef unsigned short mifi_t;49typedef unsigned short mifi_t;
include/uapi/linux/ndctl.h+1−0
@@ -243,6 +243,7 @@ struct nd_cmd_pkg { · 242 unmodified lines
243#define NVDIMM_FAMILY_HPE1 1243#define NVDIMM_FAMILY_HPE1 1
244#define NVDIMM_FAMILY_HPE2 2244#define NVDIMM_FAMILY_HPE2 2
245#define NVDIMM_FAMILY_MSFT 3245#define NVDIMM_FAMILY_MSFT 3
246#define NVDIMM_FAMILY_HYPERV 4
246 247
247#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\248#define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
248 struct nd_cmd_pkg)249 struct nd_cmd_pkg)
include/uapi/linux/netfilter/nf_tables.h+17−2
@@ -219,6 +219,7 @@ enum nft_chain_attributes { · 218 unmodified lines
219 * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)219 * @NFTA_RULE_POSITION: numeric handle of the previous rule (NLA_U64)
220 * @NFTA_RULE_USERDATA: user data (NLA_BINARY, NFT_USERDATA_MAXLEN)220 * @NFTA_RULE_USERDATA: user data (NLA_BINARY, NFT_USERDATA_MAXLEN)
221 * @NFTA_RULE_ID: uniquely identifies a rule in a transaction (NLA_U32)221 * @NFTA_RULE_ID: uniquely identifies a rule in a transaction (NLA_U32)
222 * @NFTA_RULE_POSITION_ID: transaction unique identifier of the previous rule (NLA_U32)
222 */223 */
223enum nft_rule_attributes {224enum nft_rule_attributes {
224 NFTA_RULE_UNSPEC,225 NFTA_RULE_UNSPEC,
@@ -231,6 +232,7 @@ enum nft_rule_attributes { · 6 unmodified lines
231 NFTA_RULE_USERDATA,232 NFTA_RULE_USERDATA,
232 NFTA_RULE_PAD,233 NFTA_RULE_PAD,
233 NFTA_RULE_ID,234 NFTA_RULE_ID,
235 NFTA_RULE_POSITION_ID,
234 __NFTA_RULE_MAX236 __NFTA_RULE_MAX
235};237};
236#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)238#define NFTA_RULE_MAX (__NFTA_RULE_MAX - 1)
@@ -789,6 +791,8 @@ enum nft_exthdr_attributes { · 552 unmodified lines
789 * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)791 * @NFT_META_CGROUP: socket control group (skb->sk->sk_classid)
790 * @NFT_META_PRANDOM: a 32bit pseudo-random number792 * @NFT_META_PRANDOM: a 32bit pseudo-random number
791 * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp)793 * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp)
794 * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind)
795 * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind)
792 */796 */
793enum nft_meta_keys {797enum nft_meta_keys {
794 NFT_META_LEN,798 NFT_META_LEN,
@@ -817,6 +821,8 @@ enum nft_meta_keys { · 22 unmodified lines
817 NFT_META_CGROUP,821 NFT_META_CGROUP,
818 NFT_META_PRANDOM,822 NFT_META_PRANDOM,
819 NFT_META_SECPATH,823 NFT_META_SECPATH,
824 NFT_META_IIFKIND,
825 NFT_META_OIFKIND,
820};826};
821 827
822/**828/**
@@ -871,8 +877,8 @@ enum nft_hash_attributes { · 48 unmodified lines
871 NFTA_HASH_SEED,877 NFTA_HASH_SEED,
872 NFTA_HASH_OFFSET,878 NFTA_HASH_OFFSET,
873 NFTA_HASH_TYPE,879 NFTA_HASH_TYPE,
874 NFTA_HASH_SET_NAME,880 NFTA_HASH_SET_NAME, /* deprecated */
875 NFTA_HASH_SET_ID,881 NFTA_HASH_SET_ID, /* deprecated */
876 __NFTA_HASH_MAX,882 __NFTA_HASH_MAX,
877};883};
878#define NFTA_HASH_MAX (__NFTA_HASH_MAX - 1)884#define NFTA_HASH_MAX (__NFTA_HASH_MAX - 1)
@@ -1721,10 +1727,19 @@ enum nft_tunnel_keys { · 842 unmodified lines
1721};1727};
1722#define NFT_TUNNEL_MAX (__NFT_TUNNEL_MAX - 1)1728#define NFT_TUNNEL_MAX (__NFT_TUNNEL_MAX - 1)
1723 1729
1730enum nft_tunnel_mode {
1731 NFT_TUNNEL_MODE_NONE,
1732 NFT_TUNNEL_MODE_RX,
1733 NFT_TUNNEL_MODE_TX,
1734 __NFT_TUNNEL_MODE_MAX
1735};
1736#define NFT_TUNNEL_MODE_MAX (__NFT_TUNNEL_MODE_MAX - 1)
1737
1724enum nft_tunnel_attributes {1738enum nft_tunnel_attributes {
1725 NFTA_TUNNEL_UNSPEC,1739 NFTA_TUNNEL_UNSPEC,
1726 NFTA_TUNNEL_KEY,1740 NFTA_TUNNEL_KEY,
1727 NFTA_TUNNEL_DREG,1741 NFTA_TUNNEL_DREG,
1742 NFTA_TUNNEL_MODE,
1728 __NFTA_TUNNEL_MAX1743 __NFTA_TUNNEL_MAX
1729};1744};
1730#define NFTA_TUNNEL_MAX (__NFTA_TUNNEL_MAX - 1)1745#define NFTA_TUNNEL_MAX (__NFTA_TUNNEL_MAX - 1)
include/uapi/linux/nl80211.h+39−5
@@ -1565,6 +1565,12 @@ enum nl80211_commands { · 1564 unmodified lines
1565 * (a u32 with flags from &enum nl80211_wpa_versions).1565 * (a u32 with flags from &enum nl80211_wpa_versions).
1566 * @NL80211_ATTR_AKM_SUITES: Used with CONNECT, ASSOCIATE, and NEW_BEACON to1566 * @NL80211_ATTR_AKM_SUITES: Used with CONNECT, ASSOCIATE, and NEW_BEACON to
1567 * indicate which key management algorithm(s) to use (an array of u32).1567 * indicate which key management algorithm(s) to use (an array of u32).
1568 * This attribute is also sent in response to @NL80211_CMD_GET_WIPHY,
1569 * indicating the supported AKM suites, intended for specific drivers which
1570 * implement SME and have constraints on which AKMs are supported and also
1571 * the cases where an AKM support is offloaded to the driver/firmware.
1572 * If there is no such notification from the driver, user space should
1573 * assume the driver supports all the AKM suites.
1568 *1574 *
1569 * @NL80211_ATTR_REQ_IE: (Re)association request information elements as1575 * @NL80211_ATTR_REQ_IE: (Re)association request information elements as
1570 * sent out by the card, for ROAM and successful CONNECT events.1576 * sent out by the card, for ROAM and successful CONNECT events.
@@ -2260,10 +2266,10 @@ enum nl80211_commands { · 689 unmodified lines
2260 * &enum nl80211_external_auth_action value). This is used with the2266 * &enum nl80211_external_auth_action value). This is used with the
2261 * %NL80211_CMD_EXTERNAL_AUTH request event.2267 * %NL80211_CMD_EXTERNAL_AUTH request event.
2262 * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user2268 * @NL80211_ATTR_EXTERNAL_AUTH_SUPPORT: Flag attribute indicating that the user
2263 * space supports external authentication. This attribute shall be used2269 * space supports external authentication. This attribute shall be used
2264 * only with %NL80211_CMD_CONNECT request. The driver may offload2270 * with %NL80211_CMD_CONNECT and %NL80211_CMD_START_AP request. The driver
2265 * authentication processing to user space if this capability is indicated2271 * may offload authentication processing to user space if this capability
2266 * in NL80211_CMD_CONNECT requests from the user space.2272 * is indicated in the respective requests from the user space.
2267 *2273 *
2268 * @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this2274 * @NL80211_ATTR_NSS: Station's New/updated RX_NSS value notified using this
2269 * u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.2275 * u8 attribute. This is used with %NL80211_CMD_STA_OPMODE_CHANGED.
@@ -2299,6 +2305,9 @@ enum nl80211_commands { · 29 unmodified lines
2299 * This is also used for capability advertisement in the wiphy information,2305 * This is also used for capability advertisement in the wiphy information,
2300 * with the appropriate sub-attributes.2306 * with the appropriate sub-attributes.
2301 *2307 *
2308 * @NL80211_ATTR_AIRTIME_WEIGHT: Station's weight when scheduled by the airtime
2309 * scheduler.
2310 *
2302 * @NUM_NL80211_ATTR: total number of nl80211_attrs available2311 * @NUM_NL80211_ATTR: total number of nl80211_attrs available
2303 * @NL80211_ATTR_MAX: highest attribute number currently defined2312 * @NL80211_ATTR_MAX: highest attribute number currently defined
2304 * @__NL80211_ATTR_AFTER_LAST: internal use2313 * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -2748,6 +2757,8 @@ enum nl80211_attrs { · 443 unmodified lines
2748 2757
2749 NL80211_ATTR_PEER_MEASUREMENTS,2758 NL80211_ATTR_PEER_MEASUREMENTS,
2750 2759
2760 NL80211_ATTR_AIRTIME_WEIGHT,
2761
2751 /* add attributes here, update the policy in nl80211.c */2762 /* add attributes here, update the policy in nl80211.c */
2752 2763
2753 __NL80211_ATTR_AFTER_LAST,2764 __NL80211_ATTR_AFTER_LAST,
@@ -3125,6 +3136,9 @@ enum nl80211_sta_bss_param { · 371 unmodified lines
3125 * might not be fully accurate.3136 * might not be fully accurate.
3126 * @NL80211_STA_INFO_CONNECTED_TO_GATE: set to true if STA has a path to a3137 * @NL80211_STA_INFO_CONNECTED_TO_GATE: set to true if STA has a path to a
3127 * mesh gate (u8, 0 or 1)3138 * mesh gate (u8, 0 or 1)
3139 * @NL80211_STA_INFO_TX_DURATION: aggregate PPDU duration for all frames
3140 * sent to the station (u64, usec)
3141 * @NL80211_STA_INFO_AIRTIME_WEIGHT: current airtime weight for station (u16)
3128 * @__NL80211_STA_INFO_AFTER_LAST: internal3142 * @__NL80211_STA_INFO_AFTER_LAST: internal
3129 * @NL80211_STA_INFO_MAX: highest possible station info attribute3143 * @NL80211_STA_INFO_MAX: highest possible station info attribute
3130 */3144 */
@@ -3168,6 +3182,8 @@ enum nl80211_sta_info { · 37 unmodified lines
3168 NL80211_STA_INFO_RX_MPDUS,3182 NL80211_STA_INFO_RX_MPDUS,
3169 NL80211_STA_INFO_FCS_ERROR_COUNT,3183 NL80211_STA_INFO_FCS_ERROR_COUNT,
3170 NL80211_STA_INFO_CONNECTED_TO_GATE,3184 NL80211_STA_INFO_CONNECTED_TO_GATE,
3185 NL80211_STA_INFO_TX_DURATION,
3186 NL80211_STA_INFO_AIRTIME_WEIGHT,
3171 3187
3172 /* keep last */3188 /* keep last */
3173 __NL80211_STA_INFO_AFTER_LAST,3189 __NL80211_STA_INFO_AFTER_LAST,
@@ -3277,8 +3293,10 @@ enum nl80211_mpath_flags { · 103 unmodified lines
3277 * &enum nl80211_mpath_flags;3293 * &enum nl80211_mpath_flags;
3278 * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec3294 * @NL80211_MPATH_INFO_DISCOVERY_TIMEOUT: total path discovery timeout, in msec
3279 * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries3295 * @NL80211_MPATH_INFO_DISCOVERY_RETRIES: mesh path discovery retries
3296 * @NL80211_MPATH_INFO_HOP_COUNT: hop count to destination
3297 * @NL80211_MPATH_INFO_PATH_CHANGE: total number of path changes to destination
3280 * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number3298 * @NL80211_MPATH_INFO_MAX: highest mesh path information attribute number
3281 * currently defind3299 * currently defined
3282 * @__NL80211_MPATH_INFO_AFTER_LAST: internal use3300 * @__NL80211_MPATH_INFO_AFTER_LAST: internal use
3283 */3301 */
3284enum nl80211_mpath_info {3302enum nl80211_mpath_info {
@@ -3290,6 +3308,8 @@ enum nl80211_mpath_info { · 5 unmodified lines
3290 NL80211_MPATH_INFO_FLAGS,3308 NL80211_MPATH_INFO_FLAGS,
3291 NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,3309 NL80211_MPATH_INFO_DISCOVERY_TIMEOUT,
3292 NL80211_MPATH_INFO_DISCOVERY_RETRIES,3310 NL80211_MPATH_INFO_DISCOVERY_RETRIES,
3311 NL80211_MPATH_INFO_HOP_COUNT,
3312 NL80211_MPATH_INFO_PATH_CHANGE,
3293 3313
3294 /* keep last */3314 /* keep last */
3295 __NL80211_MPATH_INFO_AFTER_LAST,3315 __NL80211_MPATH_INFO_AFTER_LAST,
@@ -5316,6 +5336,13 @@ enum nl80211_feature_flags { · 2020 unmodified lines
5316 * if this flag is not set. Ignoring this can leak clear text packets and/or5336 * if this flag is not set. Ignoring this can leak clear text packets and/or
5317 * freeze the connection.5337 * freeze the connection.
5318 *5338 *
5339 * @NL80211_EXT_FEATURE_AIRTIME_FAIRNESS: Driver supports getting airtime
5340 * fairness for transmitted packets and has enabled airtime fairness
5341 * scheduling.
5342 *
5343 * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching
5344 * (set/del PMKSA operations) in AP mode.
5345 *
5319 * @NUM_NL80211_EXT_FEATURES: number of extended features.5346 * @NUM_NL80211_EXT_FEATURES: number of extended features.
5320 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.5347 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
5321 */5348 */
@@ -5355,6 +5382,8 @@ enum nl80211_ext_feature_index { · 33 unmodified lines
5355 NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,5382 NL80211_EXT_FEATURE_SCAN_MIN_PREQ_CONTENT,
5356 NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,5383 NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,
5357 NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,5384 NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,
5385 NL80211_EXT_FEATURE_AIRTIME_FAIRNESS,
5386 NL80211_EXT_FEATURE_AP_PMKSA_CACHING,
5358 5387
5359 /* add new features before the definition below */5388 /* add new features before the definition below */
5360 NUM_NL80211_EXT_FEATURES,5389 NUM_NL80211_EXT_FEATURES,
@@ -5606,9 +5635,14 @@ enum nl80211_crit_proto_id { · 245 unmodified lines
5606 * Used by cfg80211_rx_mgmt()5635 * Used by cfg80211_rx_mgmt()
5607 *5636 *
5608 * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.5637 * @NL80211_RXMGMT_FLAG_ANSWERED: frame was answered by device/driver.
5638 * @NL80211_RXMGMT_FLAG_EXTERNAL_AUTH: Host driver intends to offload
5639 * the authentication. Exclusively defined for host drivers that
5640 * advertises the SME functionality but would like the userspace
5641 * to handle certain authentication algorithms (e.g. SAE).
5609 */5642 */
5610enum nl80211_rxmgmt_flags {5643enum nl80211_rxmgmt_flags {
5611 NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,5644 NL80211_RXMGMT_FLAG_ANSWERED = 1 << 0,
5645 NL80211_RXMGMT_FLAG_EXTERNAL_AUTH = 1 << 1,
5612};5646};
5613 5647
5614/*5648/*
include/uapi/linux/nvme_ioctl.h+0−9
@@ -2,15 +2,6 @@ · 1 unmodified line
2/*2/*
3 * Definitions for the NVM Express ioctl interface3 * Definitions for the NVM Express ioctl interface
4 * Copyright (c) 2011-2014, Intel Corporation.4 * Copyright (c) 2011-2014, Intel Corporation.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License,
8 * version 2, as published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope it will be useful, but WITHOUT
11 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13 * more details.
14 */5 */
15 6
16#ifndef _UAPI_LINUX_NVME_IOCTL_H7#ifndef _UAPI_LINUX_NVME_IOCTL_H
include/uapi/linux/pci_regs.h+2−0
@@ -866,6 +866,7 @@ · 865 unmodified lines
866#define PCI_ATS_CAP 0x04 /* ATS Capability Register */866#define PCI_ATS_CAP 0x04 /* ATS Capability Register */
867#define PCI_ATS_CAP_QDEP(x) ((x) & 0x1f) /* Invalidate Queue Depth */867#define PCI_ATS_CAP_QDEP(x) ((x) & 0x1f) /* Invalidate Queue Depth */
868#define PCI_ATS_MAX_QDEP 32 /* Max Invalidate Queue Depth */868#define PCI_ATS_MAX_QDEP 32 /* Max Invalidate Queue Depth */
869#define PCI_ATS_CAP_PAGE_ALIGNED 0x0020 /* Page Aligned Request */
869#define PCI_ATS_CTRL 0x06 /* ATS Control Register */870#define PCI_ATS_CTRL 0x06 /* ATS Control Register */
870#define PCI_ATS_CTRL_ENABLE 0x8000 /* ATS Enable */871#define PCI_ATS_CTRL_ENABLE 0x8000 /* ATS Enable */
871#define PCI_ATS_CTRL_STU(x) ((x) & 0x1f) /* Smallest Translation Unit */872#define PCI_ATS_CTRL_STU(x) ((x) & 0x1f) /* Smallest Translation Unit */
@@ -880,6 +881,7 @@ · 8 unmodified lines
880#define PCI_PRI_STATUS_RF 0x001 /* Response Failure */881#define PCI_PRI_STATUS_RF 0x001 /* Response Failure */
881#define PCI_PRI_STATUS_UPRGI 0x002 /* Unexpected PRG index */882#define PCI_PRI_STATUS_UPRGI 0x002 /* Unexpected PRG index */
882#define PCI_PRI_STATUS_STOPPED 0x100 /* PRI Stopped */883#define PCI_PRI_STATUS_STOPPED 0x100 /* PRI Stopped */
884#define PCI_PRI_STATUS_PASID 0x8000 /* PRG Response PASID Required */
883#define PCI_PRI_MAX_REQ 0x08 /* PRI max reqs supported */885#define PCI_PRI_MAX_REQ 0x08 /* PRI max reqs supported */
884#define PCI_PRI_ALLOC_REQ 0x0c /* PRI max reqs allowed */886#define PCI_PRI_ALLOC_REQ 0x0c /* PRI max reqs allowed */
885#define PCI_EXT_CAP_PRI_SIZEOF 16887#define PCI_EXT_CAP_PRI_SIZEOF 16
include/uapi/linux/perf_event.h+52−3
@@ -372,7 +372,9 @@ struct perf_event_attr { · 371 unmodified lines
372 context_switch : 1, /* context switch data */372 context_switch : 1, /* context switch data */
373 write_backward : 1, /* Write ring buffer from end to beginning */373 write_backward : 1, /* Write ring buffer from end to beginning */
374 namespaces : 1, /* include namespaces data */374 namespaces : 1, /* include namespaces data */
375 __reserved_1 : 35;375 ksymbol : 1, /* include ksymbol events */
376 bpf_event : 1, /* include bpf events */
377 __reserved_1 : 33;
376 378
377 union {379 union {
378 __u32 wakeup_events; /* wakeup every n events */380 __u32 wakeup_events; /* wakeup every n events */
@@ -445,8 +447,6 @@ struct perf_event_query_bpf { · 66 unmodified lines
445 __u32 ids[0];447 __u32 ids[0];
446};448};
447 449
448#define perf_flags(attr) (*(&(attr)->read_format + 1))
449
450/*450/*
451 * Ioctls that can be done on a perf event fd:451 * Ioctls that can be done on a perf event fd:
452 */452 */
@@ -965,9 +965,58 @@ enum perf_event_type { · 512 unmodified lines
965 */965 */
966 PERF_RECORD_NAMESPACES = 16,966 PERF_RECORD_NAMESPACES = 16,
967 967
968 /*
969 * Record ksymbol register/unregister events:
970 *
971 * struct {
972 * struct perf_event_header header;
973 * u64 addr;
974 * u32 len;
975 * u16 ksym_type;
976 * u16 flags;
977 * char name[];
978 * struct sample_id sample_id;
979 * };
980 */
981 PERF_RECORD_KSYMBOL = 17,
982
983 /*
984 * Record bpf events:
985 * enum perf_bpf_event_type {
986 * PERF_BPF_EVENT_UNKNOWN = 0,
987 * PERF_BPF_EVENT_PROG_LOAD = 1,
988 * PERF_BPF_EVENT_PROG_UNLOAD = 2,
989 * };
990 *
991 * struct {
992 * struct perf_event_header header;
993 * u16 type;
994 * u16 flags;
995 * u32 id;
996 * u8 tag[BPF_TAG_SIZE];
997 * struct sample_id sample_id;
998 * };
999 */
1000 PERF_RECORD_BPF_EVENT = 18,
1001
968 PERF_RECORD_MAX, /* non-ABI */1002 PERF_RECORD_MAX, /* non-ABI */
969};1003};
970 1004
1005enum perf_record_ksymbol_type {
1006 PERF_RECORD_KSYMBOL_TYPE_UNKNOWN = 0,
1007 PERF_RECORD_KSYMBOL_TYPE_BPF = 1,
1008 PERF_RECORD_KSYMBOL_TYPE_MAX /* non-ABI */
1009};
1010
1011#define PERF_RECORD_KSYMBOL_FLAGS_UNREGISTER (1 << 0)
1012
1013enum perf_bpf_event_type {
1014 PERF_BPF_EVENT_UNKNOWN = 0,
1015 PERF_BPF_EVENT_PROG_LOAD = 1,
1016 PERF_BPF_EVENT_PROG_UNLOAD = 2,
1017 PERF_BPF_EVENT_MAX, /* non-ABI */
1018};
1019
971#define PERF_MAX_STACK_DEPTH 1271020#define PERF_MAX_STACK_DEPTH 127
972#define PERF_MAX_CONTEXTS_PER_STACK 81021#define PERF_MAX_CONTEXTS_PER_STACK 8
973 1022
include/uapi/linux/pkt_cls.h+54−4
@@ -63,12 +63,49 @@ enum { · 62 unmodified lines
63#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)63#define TC_ACT_GOTO_CHAIN __TC_ACT_EXT(2)
64#define TC_ACT_EXT_OPCODE_MAX TC_ACT_GOTO_CHAIN64#define TC_ACT_EXT_OPCODE_MAX TC_ACT_GOTO_CHAIN
65 65
66/* These macros are put here for binary compatibility with userspace apps that
67 * make use of them. For kernel code and new userspace apps, use the TCA_ID_*
68 * versions.
69 */
70#define TCA_ACT_GACT 5
71#define TCA_ACT_IPT 6
72#define TCA_ACT_PEDIT 7
73#define TCA_ACT_MIRRED 8
74#define TCA_ACT_NAT 9
75#define TCA_ACT_XT 10
76#define TCA_ACT_SKBEDIT 11
77#define TCA_ACT_VLAN 12
78#define TCA_ACT_BPF 13
79#define TCA_ACT_CONNMARK 14
80#define TCA_ACT_SKBMOD 15
81#define TCA_ACT_CSUM 16
82#define TCA_ACT_TUNNEL_KEY 17
83#define TCA_ACT_SIMP 22
84#define TCA_ACT_IFE 25
85#define TCA_ACT_SAMPLE 26
86
66/* Action type identifiers*/87/* Action type identifiers*/
67enum {88enum tca_id {
68 TCA_ID_UNSPEC=0,89 TCA_ID_UNSPEC = 0,
69 TCA_ID_POLICE=1,90 TCA_ID_POLICE = 1,
91 TCA_ID_GACT = TCA_ACT_GACT,
92 TCA_ID_IPT = TCA_ACT_IPT,
93 TCA_ID_PEDIT = TCA_ACT_PEDIT,
94 TCA_ID_MIRRED = TCA_ACT_MIRRED,
95 TCA_ID_NAT = TCA_ACT_NAT,
96 TCA_ID_XT = TCA_ACT_XT,
97 TCA_ID_SKBEDIT = TCA_ACT_SKBEDIT,
98 TCA_ID_VLAN = TCA_ACT_VLAN,
99 TCA_ID_BPF = TCA_ACT_BPF,
100 TCA_ID_CONNMARK = TCA_ACT_CONNMARK,
101 TCA_ID_SKBMOD = TCA_ACT_SKBMOD,
102 TCA_ID_CSUM = TCA_ACT_CSUM,
103 TCA_ID_TUNNEL_KEY = TCA_ACT_TUNNEL_KEY,
104 TCA_ID_SIMP = TCA_ACT_SIMP,
105 TCA_ID_IFE = TCA_ACT_IFE,
106 TCA_ID_SAMPLE = TCA_ACT_SAMPLE,
70 /* other actions go here */107 /* other actions go here */
71 __TCA_ID_MAX=255108 __TCA_ID_MAX = 255
72};109};
73 110
74#define TCA_ID_MAX __TCA_ID_MAX111#define TCA_ID_MAX __TCA_ID_MAX
@@ -333,12 +370,19 @@ enum { · 258 unmodified lines
333 370
334/* Basic filter */371/* Basic filter */
335 372
373struct tc_basic_pcnt {
374 __u64 rcnt;
375 __u64 rhit;
376};
377
336enum {378enum {
337 TCA_BASIC_UNSPEC,379 TCA_BASIC_UNSPEC,
338 TCA_BASIC_CLASSID,380 TCA_BASIC_CLASSID,
339 TCA_BASIC_EMATCHES,381 TCA_BASIC_EMATCHES,
340 TCA_BASIC_ACT,382 TCA_BASIC_ACT,
341 TCA_BASIC_POLICE,383 TCA_BASIC_POLICE,
384 TCA_BASIC_PCNT,
385 TCA_BASIC_PAD,
342 __TCA_BASIC_MAX386 __TCA_BASIC_MAX
343};387};
344 388
@@ -527,11 +571,17 @@ enum { · 182 unmodified lines
527 571
528/* Match-all classifier */572/* Match-all classifier */
529 573
574struct tc_matchall_pcnt {
575 __u64 rhit;
576};
577
530enum {578enum {
531 TCA_MATCHALL_UNSPEC,579 TCA_MATCHALL_UNSPEC,
532 TCA_MATCHALL_CLASSID,580 TCA_MATCHALL_CLASSID,
533 TCA_MATCHALL_ACT,581 TCA_MATCHALL_ACT,
534 TCA_MATCHALL_FLAGS,582 TCA_MATCHALL_FLAGS,
583 TCA_MATCHALL_PCNT,
584 TCA_MATCHALL_PAD,
535 __TCA_MATCHALL_MAX,585 __TCA_MATCHALL_MAX,
536};586};
537 587
include/uapi/linux/pkt_sched.h+2−1
@@ -954,7 +954,7 @@ enum { · 953 unmodified lines
954#define TCA_PIE_MAX (__TCA_PIE_MAX - 1)954#define TCA_PIE_MAX (__TCA_PIE_MAX - 1)
955 955
956struct tc_pie_xstats {956struct tc_pie_xstats {
957 __u32 prob; /* current probability */957 __u64 prob; /* current probability */
958 __u32 delay; /* current delay in ms */958 __u32 delay; /* current delay in ms */
959 __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */959 __u32 avg_dq_rate; /* current average dq_rate in bits/pie_time */
960 __u32 packets_in; /* total number of packets enqueued */960 __u32 packets_in; /* total number of packets enqueued */
@@ -1021,6 +1021,7 @@ enum { · 60 unmodified lines
1021 TCA_CAKE_INGRESS,1021 TCA_CAKE_INGRESS,
1022 TCA_CAKE_ACK_FILTER,1022 TCA_CAKE_ACK_FILTER,
1023 TCA_CAKE_SPLIT_GSO,1023 TCA_CAKE_SPLIT_GSO,
1024 TCA_CAKE_FWMARK,
1024 __TCA_CAKE_MAX1025 __TCA_CAKE_MAX
1025};1026};
1026#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1)1027#define TCA_CAKE_MAX (__TCA_CAKE_MAX - 1)
include/uapi/linux/pmu.h+2−0
@@ -19,7 +19,9 @@ · 18 unmodified lines
19#define PMU_POWER_CTRL 0x11 /* control power of some devices */19#define PMU_POWER_CTRL 0x11 /* control power of some devices */
20#define PMU_ADB_CMD 0x20 /* send ADB packet */20#define PMU_ADB_CMD 0x20 /* send ADB packet */
21#define PMU_ADB_POLL_OFF 0x21 /* disable ADB auto-poll */21#define PMU_ADB_POLL_OFF 0x21 /* disable ADB auto-poll */
22#define PMU_WRITE_XPRAM 0x32 /* write eXtended Parameter RAM */
22#define PMU_WRITE_NVRAM 0x33 /* write non-volatile RAM */23#define PMU_WRITE_NVRAM 0x33 /* write non-volatile RAM */
24#define PMU_READ_XPRAM 0x3a /* read eXtended Parameter RAM */
23#define PMU_READ_NVRAM 0x3b /* read non-volatile RAM */25#define PMU_READ_NVRAM 0x3b /* read non-volatile RAM */
24#define PMU_SET_RTC 0x30 /* set real-time clock */26#define PMU_SET_RTC 0x30 /* set real-time clock */
25#define PMU_READ_RTC 0x38 /* read real-time clock */27#define PMU_READ_RTC 0x38 /* read real-time clock */
include/uapi/linux/prctl.h+1−0
@@ -219,6 +219,7 @@ struct prctl_mm_map { · 218 unmodified lines
219# define PR_SPEC_ENABLE (1UL << 1)219# define PR_SPEC_ENABLE (1UL << 1)
220# define PR_SPEC_DISABLE (1UL << 2)220# define PR_SPEC_DISABLE (1UL << 2)
221# define PR_SPEC_FORCE_DISABLE (1UL << 3)221# define PR_SPEC_FORCE_DISABLE (1UL << 3)
222# define PR_SPEC_DISABLE_NOEXEC (1UL << 4)
222 223
223/* Reset arm64 pointer authentication keys */224/* Reset arm64 pointer authentication keys */
224#define PR_PAC_RESET_KEYS 54225#define PR_PAC_RESET_KEYS 54
include/uapi/linux/rds.h+11−0
@@ -69,6 +69,12 @@ · 68 unmodified lines
69#define RDS_TRANS_COUNT 369#define RDS_TRANS_COUNT 3
70#define RDS_TRANS_NONE (~0)70#define RDS_TRANS_NONE (~0)
71 71
72/* IOCTLS commands for SOL_RDS */
73#define SIOCRDSSETTOS (SIOCPROTOPRIVATE)
74#define SIOCRDSGETTOS (SIOCPROTOPRIVATE + 1)
75
76typedef __u8 rds_tos_t;
77
72/*78/*
73 * Control message types for SOL_RDS.79 * Control message types for SOL_RDS.
74 *80 *
@@ -149,6 +155,7 @@ struct rds_info_connection { · 74 unmodified lines
149 __be32 faddr;155 __be32 faddr;
150 __u8 transport[TRANSNAMSIZ]; /* null term ascii */156 __u8 transport[TRANSNAMSIZ]; /* null term ascii */
151 __u8 flags;157 __u8 flags;
158 __u8 tos;
152} __attribute__((packed));159} __attribute__((packed));
153 160
154struct rds6_info_connection {161struct rds6_info_connection {
@@ -171,6 +178,7 @@ struct rds_info_message { · 16 unmodified lines
171 __be16 lport;178 __be16 lport;
172 __be16 fport;179 __be16 fport;
173 __u8 flags;180 __u8 flags;
181 __u8 tos;
174} __attribute__((packed));182} __attribute__((packed));
175 183
176struct rds6_info_message {184struct rds6_info_message {
@@ -214,6 +222,7 @@ struct rds_info_tcp_socket { · 37 unmodified lines
214 __u32 last_sent_nxt;222 __u32 last_sent_nxt;
215 __u32 last_expected_una;223 __u32 last_expected_una;
216 __u32 last_seen_una;224 __u32 last_seen_una;
225 __u8 tos;
217} __attribute__((packed));226} __attribute__((packed));
218 227
219struct rds6_info_tcp_socket {228struct rds6_info_tcp_socket {
@@ -240,6 +249,7 @@ struct rds_info_rdma_connection { · 20 unmodified lines
240 __u32 max_send_sge;249 __u32 max_send_sge;
241 __u32 rdma_mr_max;250 __u32 rdma_mr_max;
242 __u32 rdma_mr_size;251 __u32 rdma_mr_size;
252 __u8 tos;
243};253};
244 254
245struct rds6_info_rdma_connection {255struct rds6_info_rdma_connection {
@@ -253,6 +263,7 @@ struct rds6_info_rdma_connection { · 7 unmodified lines
253 __u32 max_send_sge;263 __u32 max_send_sge;
254 __u32 rdma_mr_max;264 __u32 rdma_mr_max;
255 __u32 rdma_mr_size;265 __u32 rdma_mr_size;
266 __u8 tos;
256};267};
257 268
258/* RDS message Receive Path Latency points */269/* RDS message Receive Path Latency points */
include/uapi/linux/sctp.h+4−0
@@ -59,6 +59,10 @@ · 58 unmodified lines
59 59
60typedef __s32 sctp_assoc_t;60typedef __s32 sctp_assoc_t;
61 61
62#define SCTP_FUTURE_ASSOC 0
63#define SCTP_CURRENT_ASSOC 1
64#define SCTP_ALL_ASSOC 2
65
62/* The following symbols come from the Sockets API Extensions for66/* The following symbols come from the Sockets API Extensions for
63 * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.67 * SCTP <draft-ietf-tsvwg-sctpsocket-07.txt>.
64 */68 */
include/uapi/linux/serial_core.h+3−0
@@ -79,6 +79,9 @@ · 78 unmodified lines
79/* Nuvoton UART */79/* Nuvoton UART */
80#define PORT_NPCM 4080#define PORT_NPCM 40
81 81
82/* NVIDIA Tegra Combined UART */
83#define PORT_TEGRA_TCU 41
84
82/* Intel EG20 */85/* Intel EG20 */
83#define PORT_PCH_8LINE 4486#define PORT_PCH_8LINE 44
84#define PORT_PCH_2LINE 4587#define PORT_PCH_2LINE 45
include/uapi/linux/tc_act/tc_bpf.h+0−2
@@ -13,8 +13,6 @@ · 12 unmodified lines
13 13
14#include <linux/pkt_cls.h>14#include <linux/pkt_cls.h>
15 15
16#define TCA_ACT_BPF 13
17
18struct tc_act_bpf {16struct tc_act_bpf {
19 tc_gen;17 tc_gen;
20};18};
include/uapi/linux/tc_act/tc_connmark.h+0−2
@@ -5,8 +5,6 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7 7
8#define TCA_ACT_CONNMARK 14
9
10struct tc_connmark {8struct tc_connmark {
11 tc_gen;9 tc_gen;
12 __u16 zone;10 __u16 zone;
include/uapi/linux/tc_act/tc_csum.h+0−2
@@ -5,8 +5,6 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7 7
8#define TCA_ACT_CSUM 16
9
10enum {8enum {
11 TCA_CSUM_UNSPEC,9 TCA_CSUM_UNSPEC,
12 TCA_CSUM_PARMS,10 TCA_CSUM_PARMS,
include/uapi/linux/tc_act/tc_gact.h+0−1
@@ -5,7 +5,6 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7 7
8#define TCA_ACT_GACT 5
9struct tc_gact {8struct tc_gact {
10 tc_gen;9 tc_gen;
11 10
include/uapi/linux/tc_act/tc_ife.h+0−1
@@ -6,7 +6,6 @@ · 5 unmodified lines
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7#include <linux/ife.h>7#include <linux/ife.h>
8 8
9#define TCA_ACT_IFE 25
10/* Flag bits for now just encoding/decoding; mutually exclusive */9/* Flag bits for now just encoding/decoding; mutually exclusive */
11#define IFE_ENCODE 110#define IFE_ENCODE 1
12#define IFE_DECODE 011#define IFE_DECODE 0
include/uapi/linux/tc_act/tc_ipt.h+0−3
@@ -4,9 +4,6 @@ · 3 unmodified lines
4 4
5#include <linux/pkt_cls.h>5#include <linux/pkt_cls.h>
6 6
7#define TCA_ACT_IPT 6
8#define TCA_ACT_XT 10
9
10enum {7enum {
11 TCA_IPT_UNSPEC,8 TCA_IPT_UNSPEC,
12 TCA_IPT_TABLE,9 TCA_IPT_TABLE,
include/uapi/linux/tc_act/tc_mirred.h+0−1
@@ -5,7 +5,6 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7 7
8#define TCA_ACT_MIRRED 8
9#define TCA_EGRESS_REDIR 1 /* packet redirect to EGRESS*/8#define TCA_EGRESS_REDIR 1 /* packet redirect to EGRESS*/
10#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */9#define TCA_EGRESS_MIRROR 2 /* mirror packet to EGRESS */
11#define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/10#define TCA_INGRESS_REDIR 3 /* packet redirect to INGRESS*/
include/uapi/linux/tc_act/tc_nat.h+0−2
@@ -5,8 +5,6 @@ · 4 unmodified lines
5#include <linux/pkt_cls.h>5#include <linux/pkt_cls.h>
6#include <linux/types.h>6#include <linux/types.h>
7 7
8#define TCA_ACT_NAT 9
9
10enum {8enum {
11 TCA_NAT_UNSPEC,9 TCA_NAT_UNSPEC,
12 TCA_NAT_PARMS,10 TCA_NAT_PARMS,
include/uapi/linux/tc_act/tc_pedit.h+0−2
@@ -5,8 +5,6 @@ · 4 unmodified lines
5#include <linux/types.h>5#include <linux/types.h>
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7 7
8#define TCA_ACT_PEDIT 7
9
10enum {8enum {
11 TCA_PEDIT_UNSPEC,9 TCA_PEDIT_UNSPEC,
12 TCA_PEDIT_TM,10 TCA_PEDIT_TM,
include/uapi/linux/tc_act/tc_sample.h+0−2
@@ -6,8 +6,6 @@ · 5 unmodified lines
6#include <linux/pkt_cls.h>6#include <linux/pkt_cls.h>
7#include <linux/if_ether.h>7#include <linux/if_ether.h>
8 8
9#define TCA_ACT_SAMPLE 26
10
11struct tc_sample {9struct tc_sample {
12 tc_gen;10 tc_gen;
13};11};
include/uapi/linux/tc_act/tc_skbedit.h+0−2
@@ -23,8 +23,6 @@ · 22 unmodified lines
23 23
24#include <linux/pkt_cls.h>24#include <linux/pkt_cls.h>
25 25
26#define TCA_ACT_SKBEDIT 11
27
28#define SKBEDIT_F_PRIORITY 0x126#define SKBEDIT_F_PRIORITY 0x1
29#define SKBEDIT_F_QUEUE_MAPPING 0x227#define SKBEDIT_F_QUEUE_MAPPING 0x2
30#define SKBEDIT_F_MARK 0x428#define SKBEDIT_F_MARK 0x4
include/uapi/linux/tc_act/tc_skbmod.h+0−2
@@ -13,8 +13,6 @@ · 12 unmodified lines
13 13
14#include <linux/pkt_cls.h>14#include <linux/pkt_cls.h>
15 15
16#define TCA_ACT_SKBMOD 15
17
18#define SKBMOD_F_DMAC 0x116#define SKBMOD_F_DMAC 0x1
19#define SKBMOD_F_SMAC 0x217#define SKBMOD_F_SMAC 0x2
20#define SKBMOD_F_ETYPE 0x418#define SKBMOD_F_ETYPE 0x4
include/uapi/linux/tc_act/tc_tunnel_key.h+0−2
@@ -14,8 +14,6 @@ · 13 unmodified lines
14 14
15#include <linux/pkt_cls.h>15#include <linux/pkt_cls.h>
16 16
17#define TCA_ACT_TUNNEL_KEY 17
18
19#define TCA_TUNNEL_KEY_ACT_SET 117#define TCA_TUNNEL_KEY_ACT_SET 1
20#define TCA_TUNNEL_KEY_ACT_RELEASE 218#define TCA_TUNNEL_KEY_ACT_RELEASE 2
21 19
include/uapi/linux/tc_act/tc_vlan.h+0−2
@@ -13,8 +13,6 @@ · 12 unmodified lines
13 13
14#include <linux/pkt_cls.h>14#include <linux/pkt_cls.h>
15 15
16#define TCA_ACT_VLAN 12
17
18#define TCA_VLAN_ACT_POP 116#define TCA_VLAN_ACT_POP 1
19#define TCA_VLAN_ACT_PUSH 217#define TCA_VLAN_ACT_PUSH 2
20#define TCA_VLAN_ACT_MODIFY 318#define TCA_VLAN_ACT_MODIFY 3
include/uapi/linux/time.h+1−28
@@ -3,7 +3,7 @@ · 2 unmodified lines
3#define _UAPI_LINUX_TIME_H3#define _UAPI_LINUX_TIME_H
4 4
5#include <linux/types.h>5#include <linux/types.h>
6 6#include <linux/time_types.h>
7 7
8#ifndef _STRUCT_TIMESPEC8#ifndef _STRUCT_TIMESPEC
9#define _STRUCT_TIMESPEC9#define _STRUCT_TIMESPEC
@@ -23,7 +23,6 @@ struct timezone { · 13 unmodified lines
23 int tz_dsttime; /* type of dst correction */23 int tz_dsttime; /* type of dst correction */
24};24};
25 25
26
27/*26/*
28 * Names of the interval timers, and structure27 * Names of the interval timers, and structure
29 * defining a timer setting:28 * defining a timer setting:
@@ -42,32 +41,6 @@ struct itimerval { · 12 unmodified lines
42 struct timeval it_value; /* current value */41 struct timeval it_value; /* current value */
43};42};
44 43
45#ifndef __kernel_timespec
46struct __kernel_timespec {
47 __kernel_time64_t tv_sec; /* seconds */
48 long long tv_nsec; /* nanoseconds */
49};
50#endif
51
52#ifndef __kernel_itimerspec
53struct __kernel_itimerspec {
54 struct __kernel_timespec it_interval; /* timer period */
55 struct __kernel_timespec it_value; /* timer expiration */
56};
57#endif
58
59/*
60 * legacy timeval structure, only embedded in structures that
61 * traditionally used 'timeval' to pass time intervals (not absolute
62 * times). Do not add new users. If user space fails to compile
63 * here, this is probably because it is not y2038 safe and needs to
64 * be changed to use another interface.
65 */
66struct __kernel_old_timeval {
67 __kernel_long_t tv_sec;
68 __kernel_long_t tv_usec;
69};
70
71/*44/*
72 * The IDs of the various system clocks (for POSIX.1b interval timers):45 * The IDs of the various system clocks (for POSIX.1b interval timers):
73 */46 */
include/uapi/linux/time_types.h+36−0
@@ -0,0 +1,36 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_TIME_TYPES_H
3#define _UAPI_LINUX_TIME_TYPES_H
4
5#include <linux/types.h>
6
7struct __kernel_timespec {
8 __kernel_time64_t tv_sec; /* seconds */
9 long long tv_nsec; /* nanoseconds */
10};
11
12struct __kernel_itimerspec {
13 struct __kernel_timespec it_interval; /* timer period */
14 struct __kernel_timespec it_value; /* timer expiration */
15};
16
17/*
18 * legacy timeval structure, only embedded in structures that
19 * traditionally used 'timeval' to pass time intervals (not absolute
20 * times). Do not add new users. If user space fails to compile
21 * here, this is probably because it is not y2038 safe and needs to
22 * be changed to use another interface.
23 */
24#ifndef __kernel_old_timeval
25struct __kernel_old_timeval {
26 __kernel_long_t tv_sec;
27 __kernel_long_t tv_usec;
28};
29#endif
30
31struct __kernel_sock_timeval {
32 __s64 tv_sec;
33 __s64 tv_usec;
34};
35
36#endif /* _UAPI_LINUX_TIME_TYPES_H */
include/uapi/linux/timex.h+39−0
@@ -92,6 +92,45 @@ struct timex { · 91 unmodified lines
92 int :32; int :32; int :32;92 int :32; int :32; int :32;
93};93};
94 94
95struct __kernel_timex_timeval {
96 __kernel_time64_t tv_sec;
97 long long tv_usec;
98};
99
100struct __kernel_timex {
101 unsigned int modes; /* mode selector */
102 int :32; /* pad */
103 long long offset; /* time offset (usec) */
104 long long freq; /* frequency offset (scaled ppm) */
105 long long maxerror;/* maximum error (usec) */
106 long long esterror;/* estimated error (usec) */
107 int status; /* clock command/status */
108 int :32; /* pad */
109 long long constant;/* pll time constant */
110 long long precision;/* clock precision (usec) (read only) */
111 long long tolerance;/* clock frequency tolerance (ppm)
112 * (read only)
113 */
114 struct __kernel_timex_timeval time; /* (read only, except for ADJ_SETOFFSET) */
115 long long tick; /* (modified) usecs between clock ticks */
116
117 long long ppsfreq;/* pps frequency (scaled ppm) (ro) */
118 long long jitter; /* pps jitter (us) (ro) */
119 int shift; /* interval duration (s) (shift) (ro) */
120 int :32; /* pad */
121 long long stabil; /* pps stability (scaled ppm) (ro) */
122 long long jitcnt; /* jitter limit exceeded (ro) */
123 long long calcnt; /* calibration intervals (ro) */
124 long long errcnt; /* calibration errors (ro) */
125 long long stbcnt; /* stability limit exceeded (ro) */
126
127 int tai; /* TAI offset (ro) */
128
129 int :32; int :32; int :32; int :32;
130 int :32; int :32; int :32; int :32;
131 int :32; int :32; int :32;
132};
133
95/*134/*
96 * Mode codes (timex.mode)135 * Mode codes (timex.mode)
97 */136 */
include/uapi/linux/tls.h+19−0
@@ -51,6 +51,10 @@ · 50 unmodified lines
51#define TLS_1_2_VERSION_MINOR 0x351#define TLS_1_2_VERSION_MINOR 0x3
52#define TLS_1_2_VERSION TLS_VERSION_NUMBER(TLS_1_2)52#define TLS_1_2_VERSION TLS_VERSION_NUMBER(TLS_1_2)
53 53
54#define TLS_1_3_VERSION_MAJOR 0x3
55#define TLS_1_3_VERSION_MINOR 0x4
56#define TLS_1_3_VERSION TLS_VERSION_NUMBER(TLS_1_3)
57
54/* Supported ciphers */58/* Supported ciphers */
55#define TLS_CIPHER_AES_GCM_128 5159#define TLS_CIPHER_AES_GCM_128 51
56#define TLS_CIPHER_AES_GCM_128_IV_SIZE 860#define TLS_CIPHER_AES_GCM_128_IV_SIZE 8
@@ -59,6 +63,13 @@ · 2 unmodified lines
59#define TLS_CIPHER_AES_GCM_128_TAG_SIZE 1663#define TLS_CIPHER_AES_GCM_128_TAG_SIZE 16
60#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE 864#define TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE 8
61 65
66#define TLS_CIPHER_AES_GCM_256 52
67#define TLS_CIPHER_AES_GCM_256_IV_SIZE 8
68#define TLS_CIPHER_AES_GCM_256_KEY_SIZE 32
69#define TLS_CIPHER_AES_GCM_256_SALT_SIZE 4
70#define TLS_CIPHER_AES_GCM_256_TAG_SIZE 16
71#define TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE 8
72
62#define TLS_SET_RECORD_TYPE 173#define TLS_SET_RECORD_TYPE 1
63#define TLS_GET_RECORD_TYPE 274#define TLS_GET_RECORD_TYPE 2
64 75
@@ -75,4 +86,12 @@ struct tls12_crypto_info_aes_gcm_128 { · 10 unmodified lines
75 unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];86 unsigned char rec_seq[TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE];
76};87};
77 88
89struct tls12_crypto_info_aes_gcm_256 {
90 struct tls_crypto_info info;
91 unsigned char iv[TLS_CIPHER_AES_GCM_256_IV_SIZE];
92 unsigned char key[TLS_CIPHER_AES_GCM_256_KEY_SIZE];
93 unsigned char salt[TLS_CIPHER_AES_GCM_256_SALT_SIZE];
94 unsigned char rec_seq[TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE];
95};
96
78#endif /* _UAPI_LINUX_TLS_H */97#endif /* _UAPI_LINUX_TLS_H */
include/uapi/linux/v4l2-controls.h+2−0
@@ -533,6 +533,8 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type { · 532 unmodified lines
533};533};
534#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER (V4L2_CID_MPEG_BASE+381)534#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER (V4L2_CID_MPEG_BASE+381)
535#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP (V4L2_CID_MPEG_BASE+382)535#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP (V4L2_CID_MPEG_BASE+382)
536#define V4L2_CID_MPEG_VIDEO_H264_CONSTRAINED_INTRA_PREDICTION (V4L2_CID_MPEG_BASE+383)
537#define V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET (V4L2_CID_MPEG_BASE+384)
536#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)538#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP (V4L2_CID_MPEG_BASE+400)
537#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)539#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP (V4L2_CID_MPEG_BASE+401)
538#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)540#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP (V4L2_CID_MPEG_BASE+402)
include/uapi/linux/videodev2.h+25−1
@@ -130,6 +130,13 @@ enum v4l2_field { · 129 unmodified lines
130 ((field) == V4L2_FIELD_BOTTOM ||\130 ((field) == V4L2_FIELD_BOTTOM ||\
131 (field) == V4L2_FIELD_TOP ||\131 (field) == V4L2_FIELD_TOP ||\
132 (field) == V4L2_FIELD_ALTERNATE)132 (field) == V4L2_FIELD_ALTERNATE)
133#define V4L2_FIELD_IS_INTERLACED(field) \
134 ((field) == V4L2_FIELD_INTERLACED ||\
135 (field) == V4L2_FIELD_INTERLACED_TB ||\
136 (field) == V4L2_FIELD_INTERLACED_BT)
137#define V4L2_FIELD_IS_SEQUENTIAL(field) \
138 ((field) == V4L2_FIELD_SEQ_TB ||\
139 (field) == V4L2_FIELD_SEQ_BT)
133 140
134enum v4l2_buf_type {141enum v4l2_buf_type {
135 V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,142 V4L2_BUF_TYPE_VIDEO_CAPTURE = 1,
@@ -161,7 +168,8 @@ enum v4l2_buf_type { · 25 unmodified lines
161 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \168 || (type) == V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY \
162 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \169 || (type) == V4L2_BUF_TYPE_VBI_OUTPUT \
163 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \170 || (type) == V4L2_BUF_TYPE_SLICED_VBI_OUTPUT \
164 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT)171 || (type) == V4L2_BUF_TYPE_SDR_OUTPUT \
172 || (type) == V4L2_BUF_TYPE_META_OUTPUT)
165 173
166enum v4l2_tuner_type {174enum v4l2_tuner_type {
167 V4L2_TUNER_RADIO = 1,175 V4L2_TUNER_RADIO = 1,
@@ -554,6 +562,10 @@ struct v4l2_pix_format { · 386 unmodified lines
554#define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */562#define V4L2_PIX_FMT_YUV555 v4l2_fourcc('Y', 'U', 'V', 'O') /* 16 YUV-5-5-5 */
555#define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */563#define V4L2_PIX_FMT_YUV565 v4l2_fourcc('Y', 'U', 'V', 'P') /* 16 YUV-5-6-5 */
556#define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */564#define V4L2_PIX_FMT_YUV32 v4l2_fourcc('Y', 'U', 'V', '4') /* 32 YUV-8-8-8-8 */
565#define V4L2_PIX_FMT_AYUV32 v4l2_fourcc('A', 'Y', 'U', 'V') /* 32 AYUV-8-8-8-8 */
566#define V4L2_PIX_FMT_XYUV32 v4l2_fourcc('X', 'Y', 'U', 'V') /* 32 XYUV-8-8-8-8 */
567#define V4L2_PIX_FMT_VUYA32 v4l2_fourcc('V', 'U', 'Y', 'A') /* 32 VUYA-8-8-8-8 */
568#define V4L2_PIX_FMT_VUYX32 v4l2_fourcc('V', 'U', 'Y', 'X') /* 32 VUYX-8-8-8-8 */
557#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */569#define V4L2_PIX_FMT_HI240 v4l2_fourcc('H', 'I', '2', '4') /* 8 8-bit color */
558#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */570#define V4L2_PIX_FMT_HM12 v4l2_fourcc('H', 'M', '1', '2') /* 8 YUV 4:2:0 16x16 macroblocks */
559#define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */571#define V4L2_PIX_FMT_M420 v4l2_fourcc('M', '4', '2', '0') /* 12 YUV 4:2:0 2 lines y, 1 line uv interleaved */
@@ -973,6 +985,18 @@ struct v4l2_buffer { · 413 unmodified lines
973 };985 };
974};986};
975 987
988/**
989 * v4l2_timeval_to_ns - Convert timeval to nanoseconds
990 * @ts: pointer to the timeval variable to be converted
991 *
992 * Returns the scalar nanosecond representation of the timeval
993 * parameter.
994 */
995static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
996{
997 return (__u64)tv->tv_sec * 1000000000ULL + tv->tv_usec * 1000;
998}
999
976/* Flags for 'flags' field */1000/* Flags for 'flags' field */
977/* Buffer is mapped (flag) */1001/* Buffer is mapped (flag) */
978#define V4L2_BUF_FLAG_MAPPED 0x000000011002#define V4L2_BUF_FLAG_MAPPED 0x00000001
include/uapi/linux/xdp_diag.h+72−0
@@ -0,0 +1,72 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2/*
3 * xdp_diag: interface for query/monitor XDP sockets
4 * Copyright(c) 2019 Intel Corporation.
5 */
6
7#ifndef _LINUX_XDP_DIAG_H
8#define _LINUX_XDP_DIAG_H
9
10#include <linux/types.h>
11
12struct xdp_diag_req {
13 __u8 sdiag_family;
14 __u8 sdiag_protocol;
15 __u16 pad;
16 __u32 xdiag_ino;
17 __u32 xdiag_show;
18 __u32 xdiag_cookie[2];
19};
20
21struct xdp_diag_msg {
22 __u8 xdiag_family;
23 __u8 xdiag_type;
24 __u16 pad;
25 __u32 xdiag_ino;
26 __u32 xdiag_cookie[2];
27};
28
29#define XDP_SHOW_INFO (1 << 0) /* Basic information */
30#define XDP_SHOW_RING_CFG (1 << 1)
31#define XDP_SHOW_UMEM (1 << 2)
32#define XDP_SHOW_MEMINFO (1 << 3)
33
34enum {
35 XDP_DIAG_NONE,
36 XDP_DIAG_INFO,
37 XDP_DIAG_UID,
38 XDP_DIAG_RX_RING,
39 XDP_DIAG_TX_RING,
40 XDP_DIAG_UMEM,
41 XDP_DIAG_UMEM_FILL_RING,
42 XDP_DIAG_UMEM_COMPLETION_RING,
43 XDP_DIAG_MEMINFO,
44 __XDP_DIAG_MAX,
45};
46
47#define XDP_DIAG_MAX (__XDP_DIAG_MAX - 1)
48
49struct xdp_diag_info {
50 __u32 ifindex;
51 __u32 queue_id;
52};
53
54struct xdp_diag_ring {
55 __u32 entries; /*num descs */
56};
57
58#define XDP_DU_F_ZEROCOPY (1 << 0)
59
60struct xdp_diag_umem {
61 __u64 size;
62 __u32 id;
63 __u32 num_pages;
64 __u32 chunk_size;
65 __u32 headroom;
66 __u32 ifindex;
67 __u32 queue_id;
68 __u32 flags;
69 __u32 refs;
70};
71
72#endif /* _LINUX_XDP_DIAG_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t