History

Merge tag 'v6.15' into rdma.git for-next

Following patches need the RDMA rc branch since we are past the RC cycle now. Merge conflicts resolved based on Linux-next: - For RXE odp changes keep for-next version and fixup new places that need to call is_odp_mr() https://lore.kernel.org/r/20250422143019.500201bd@canb.auug.org.au https://lore.kernel.org/r/20250514122455.3593b083@canb.auug.org.au - irdma is keeping the while/kfree bugfix from -rc and the pf/cdev_info change from for-next https://lore.kernel.org/r/20250513130630.280ee6c5@canb.auug.org.au

Jason Gunthorpe committed 1 year ago

Commit ef223382 parents 260ce16 0ff41df1920 files · +26599 −12627Browse files

Showing the changes to include/uapi (9 of 1920 files). Show all

Unified · Split

9 files
  1. include/uapi/cxl/features.h +15 −6
  2. include/uapi/drm/ivpu_accel.h +2 −2
  3. include/uapi/linux/bpf.h +3 −0
  4. include/uapi/linux/ethtool_netlink_generated.h +0 −5
  5. include/uapi/linux/io_uring.h +3 −1
  6. include/uapi/linux/landlock.h +57 −30
  7. include/uapi/linux/taskstats.h +29 −18
  8. include/uapi/linux/vhost.h +2 −2
  9. include/uapi/linux/virtio_pci.h +1 −0
include/uapi/cxl/features.h+15−6
@@ -8,10 +8,19 @@ · 7 unmodified lines
8#define _UAPI_CXL_FEATURES_H_8#define _UAPI_CXL_FEATURES_H_
9 9
10#include <linux/types.h>10#include <linux/types.h>
11#ifndef __KERNEL__11
12#include <uuid/uuid.h>12typedef unsigned char __uapi_uuid_t[16];
13#else13
14#ifdef __KERNEL__
14#include <linux/uuid.h>15#include <linux/uuid.h>
16/*
17 * Note, __uapi_uuid_t is 1-byte aligned on modern compilers and 4-byte
18 * aligned on others. Ensure that __uapi_uuid_t in a struct is placed at
19 * a 4-byte aligned offset, or the structure is packed, to ensure
20 * consistent padding.
21 */
22static_assert(sizeof(__uapi_uuid_t) == sizeof(uuid_t));
23#define __uapi_uuid_t uuid_t
15#endif24#endif
16 25
17/*26/*
@@ -60,7 +69,7 @@ struct cxl_mbox_get_sup_feats_in { · 42 unmodified lines
60 * Get Supported Features Supported Feature Entry69 * Get Supported Features Supported Feature Entry
61 */70 */
62struct cxl_feat_entry {71struct cxl_feat_entry {
63 uuid_t uuid;72 __uapi_uuid_t uuid;
64 __le16 id;73 __le16 id;
65 __le16 get_feat_size;74 __le16 get_feat_size;
66 __le16 set_feat_size;75 __le16 set_feat_size;
@@ -110,7 +119,7 @@ struct cxl_mbox_get_sup_feats_out { · 43 unmodified lines
110 * CXL spec r3.2 section 8.2.9.6.2 Table 8-99119 * CXL spec r3.2 section 8.2.9.6.2 Table 8-99
111 */120 */
112struct cxl_mbox_get_feat_in {121struct cxl_mbox_get_feat_in {
113 uuid_t uuid;122 __uapi_uuid_t uuid;
114 __le16 offset;123 __le16 offset;
115 __le16 count;124 __le16 count;
116 __u8 selection;125 __u8 selection;
@@ -143,7 +152,7 @@ enum cxl_get_feat_selection { · 26 unmodified lines
143 */152 */
144struct cxl_mbox_set_feat_in {153struct cxl_mbox_set_feat_in {
145 __struct_group(cxl_mbox_set_feat_hdr, hdr, /* no attrs */,154 __struct_group(cxl_mbox_set_feat_hdr, hdr, /* no attrs */,
146 uuid_t uuid;155 __uapi_uuid_t uuid;
147 __le32 flags;156 __le32 flags;
148 __le16 offset;157 __le16 offset;
149 __u8 version;158 __u8 version;
include/uapi/drm/ivpu_accel.h+2−2
@@ -1,6 +1,6 @@
1/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */1/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
2/*2/*
3 * Copyright (C) 2020-2024 Intel Corporation3 * Copyright (C) 2020-2025 Intel Corporation
4 */4 */
5 5
6#ifndef __UAPI_IVPU_DRM_H__6#ifndef __UAPI_IVPU_DRM_H__
@@ -147,7 +147,7 @@ struct drm_ivpu_param { · 140 unmodified lines
147 * platform type when executing on a simulator or emulator (read-only)147 * platform type when executing on a simulator or emulator (read-only)
148 *148 *
149 * %DRM_IVPU_PARAM_CORE_CLOCK_RATE:149 * %DRM_IVPU_PARAM_CORE_CLOCK_RATE:
150 * Current PLL frequency (read-only)150 * Maximum frequency of the NPU data processing unit clock (read-only)
151 *151 *
152 * %DRM_IVPU_PARAM_NUM_CONTEXTS:152 * %DRM_IVPU_PARAM_NUM_CONTEXTS:
153 * Maximum number of simultaneously existing contexts (read-only)153 * Maximum number of simultaneously existing contexts (read-only)
include/uapi/linux/bpf.h+3−0
@@ -4968,6 +4968,9 @@ union bpf_attr { · 4967 unmodified lines
4968 * the netns switch takes place from ingress to ingress without4968 * the netns switch takes place from ingress to ingress without
4969 * going through the CPU's backlog queue.4969 * going through the CPU's backlog queue.
4970 *4970 *
4971 * *skb*\ **->mark** and *skb*\ **->tstamp** are not cleared during
4972 * the netns switch.
4973 *
4971 * The *flags* argument is reserved and must be 0. The helper is4974 * The *flags* argument is reserved and must be 0. The helper is
4972 * currently only supported for tc BPF program types at the4975 * currently only supported for tc BPF program types at the
4973 * ingress hook and for veth and netkit target device types. The4976 * ingress hook and for veth and netkit target device types. The
include/uapi/linux/ethtool_netlink_generated.h+0−5
@@ -31,11 +31,6 @@ enum ethtool_header_flags { · 30 unmodified lines
31 ETHTOOL_FLAG_STATS = 4,31 ETHTOOL_FLAG_STATS = 4,
32};32};
33 33
34enum {
35 ETHTOOL_PHY_UPSTREAM_TYPE_MAC,
36 ETHTOOL_PHY_UPSTREAM_TYPE_PHY,
37};
38
39enum ethtool_tcp_data_split {34enum ethtool_tcp_data_split {
40 ETHTOOL_TCP_DATA_SPLIT_UNKNOWN,35 ETHTOOL_TCP_DATA_SPLIT_UNKNOWN,
41 ETHTOOL_TCP_DATA_SPLIT_DISABLED,36 ETHTOOL_TCP_DATA_SPLIT_DISABLED,
include/uapi/linux/io_uring.h+3−1
@@ -1010,7 +1010,9 @@ struct io_uring_zcrx_ifq_reg { · 1009 unmodified lines
1010 __u64 region_ptr; /* struct io_uring_region_desc * */1010 __u64 region_ptr; /* struct io_uring_region_desc * */
1011 1011
1012 struct io_uring_zcrx_offsets offsets;1012 struct io_uring_zcrx_offsets offsets;
1013 __u64 __resv[4];1013 __u32 zcrx_id;
1014 __u32 __resv2;
1015 __u64 __resv[3];
1014};1016};
1015 1017
1016#ifdef __cplusplus1018#ifdef __cplusplus
include/uapi/linux/landlock.h+57−30
@@ -53,43 +53,70 @@ struct landlock_ruleset_attr { · 52 unmodified lines
53 __u64 scoped;53 __u64 scoped;
54};54};
55 55
56/*56/**
57 * sys_landlock_create_ruleset() flags:57 * DOC: landlock_create_ruleset_flags
58 *
59 * **Flags**
58 *60 *
59 * - %LANDLOCK_CREATE_RULESET_VERSION: Get the highest supported Landlock ABI61 * %LANDLOCK_CREATE_RULESET_VERSION
60 * version.62 * Get the highest supported Landlock ABI version (starting at 1).
61 * - %LANDLOCK_CREATE_RULESET_ERRATA: Get a bitmask of fixed issues.63 *
64 * %LANDLOCK_CREATE_RULESET_ERRATA
65 * Get a bitmask of fixed issues for the current Landlock ABI version.
62 */66 */
63/* clang-format off */67/* clang-format off */
64#define LANDLOCK_CREATE_RULESET_VERSION (1U << 0)68#define LANDLOCK_CREATE_RULESET_VERSION (1U << 0)
65#define LANDLOCK_CREATE_RULESET_ERRATA (1U << 1)69#define LANDLOCK_CREATE_RULESET_ERRATA (1U << 1)
66/* clang-format on */70/* clang-format on */
67 71
68/*72/**
69 * sys_landlock_restrict_self() flags:73 * DOC: landlock_restrict_self_flags
70 *74 *
71 * - %LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF: Do not create any log related to the75 * **Flags**
72 * enforced restrictions. This should only be set by tools launching unknown76 *
73 * or untrusted programs (e.g. a sandbox tool, container runtime, system77 * By default, denied accesses originating from programs that sandbox themselves
74 * service manager). Because programs sandboxing themselves should fix any78 * are logged via the audit subsystem. Such events typically indicate unexpected
75 * denied access, they should not set this flag to be aware of potential79 * behavior, such as bugs or exploitation attempts. However, to avoid excessive
76 * issues reported by system's logs (i.e. audit).80 * logging, access requests denied by a domain not created by the originating
77 * - %LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON: Explicitly ask to continue81 * program are not logged by default. The rationale is that programs should know
78 * logging denied access requests even after an :manpage:`execve(2)` call.82 * their own behavior, but not necessarily the behavior of other programs. This
79 * This flag should only be set if all the programs than can legitimately be83 * default configuration is suitable for most programs that sandbox themselves.
80 * executed will not try to request a denied access (which could spam audit84 * For specific use cases, the following flags allow programs to modify this
81 * logs).85 * default logging behavior.
82 * - %LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF: Do not create any log related86 *
83 * to the enforced restrictions coming from future nested domains created by87 * The %LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF and
84 * the caller or its descendants. This should only be set according to a88 * %LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON flags apply to the newly created
85 * runtime configuration (i.e. not hardcoded) by programs launching other89 * Landlock domain.
86 * unknown or untrusted programs that may create their own Landlock domains90 *
87 * and spam logs. The main use case is for container runtimes to enable users91 * %LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF
88 * to mute buggy sandboxed programs for a specific container image. Other use92 * Disables logging of denied accesses originating from the thread creating
89 * cases include sandboxer tools and init systems. Unlike93 * the Landlock domain, as well as its children, as long as they continue
90 * %LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF,94 * running the same executable code (i.e., without an intervening
91 * %LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF does not impact the requested95 * :manpage:`execve(2)` call). This is intended for programs that execute
92 * restriction (if any) but only the future nested domains.96 * unknown code without invoking :manpage:`execve(2)`, such as script
97 * interpreters. Programs that only sandbox themselves should not set this
98 * flag, so users can be notified of unauthorized access attempts via system
99 * logs.
100 *
101 * %LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON
102 * Enables logging of denied accesses after an :manpage:`execve(2)` call,
103 * providing visibility into unauthorized access attempts by newly executed
104 * programs within the created Landlock domain. This flag is recommended
105 * only when all potential executables in the domain are expected to comply
106 * with the access restrictions, as excessive audit log entries could make
107 * it more difficult to identify critical events.
108 *
109 * %LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF
110 * Disables logging of denied accesses originating from nested Landlock
111 * domains created by the caller or its descendants. This flag should be set
112 * according to runtime configuration, not hardcoded, to avoid suppressing
113 * important security events. It is useful for container runtimes or
114 * sandboxing tools that may launch programs which themselves create
115 * Landlock domains and could otherwise generate excessive logs. Unlike
116 * ``LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF``, this flag only affects
117 * future nested domains, not the one being created. It can also be used
118 * with a @ruleset_fd value of -1 to mute subdomain logs without creating a
119 * domain.
93 */120 */
94/* clang-format off */121/* clang-format off */
95#define LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF (1U << 0)122#define LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF (1U << 0)
include/uapi/linux/taskstats.h+29−18
@@ -34,7 +34,7 @@ · 33 unmodified lines
34 */34 */
35 35
36 36
37#define TASKSTATS_VERSION 1537#define TASKSTATS_VERSION 16
38#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN38#define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN
39 * in linux/sched.h */39 * in linux/sched.h */
40 40
@@ -72,8 +72,6 @@ struct taskstats { · 31 unmodified lines
72 */72 */
73 __u64 cpu_count __attribute__((aligned(8)));73 __u64 cpu_count __attribute__((aligned(8)));
74 __u64 cpu_delay_total;74 __u64 cpu_delay_total;
75 __u64 cpu_delay_max;
76 __u64 cpu_delay_min;
77 75
78 /* Following four fields atomically updated using task->delays->lock */76 /* Following four fields atomically updated using task->delays->lock */
79 77
@@ -82,14 +80,10 @@ struct taskstats { · 2 unmodified lines
82 */80 */
83 __u64 blkio_count;81 __u64 blkio_count;
84 __u64 blkio_delay_total;82 __u64 blkio_delay_total;
85 __u64 blkio_delay_max;
86 __u64 blkio_delay_min;
87 83
88 /* Delay waiting for page fault I/O (swap in only) */84 /* Delay waiting for page fault I/O (swap in only) */
89 __u64 swapin_count;85 __u64 swapin_count;
90 __u64 swapin_delay_total;86 __u64 swapin_delay_total;
91 __u64 swapin_delay_max;
92 __u64 swapin_delay_min;
93 87
94 /* cpu "wall-clock" running time88 /* cpu "wall-clock" running time
95 * On some architectures, value will adjust for cpu time stolen89 * On some architectures, value will adjust for cpu time stolen
@@ -172,14 +166,11 @@ struct taskstats { · 76 unmodified lines
172 /* Delay waiting for memory reclaim */166 /* Delay waiting for memory reclaim */
173 __u64 freepages_count;167 __u64 freepages_count;
174 __u64 freepages_delay_total;168 __u64 freepages_delay_total;
175 __u64 freepages_delay_max;169
176 __u64 freepages_delay_min;
177 170
178 /* Delay waiting for thrashing page */171 /* Delay waiting for thrashing page */
179 __u64 thrashing_count;172 __u64 thrashing_count;
180 __u64 thrashing_delay_total;173 __u64 thrashing_delay_total;
181 __u64 thrashing_delay_max;
182 __u64 thrashing_delay_min;
183 174
184 /* v10: 64-bit btime to avoid overflow */175 /* v10: 64-bit btime to avoid overflow */
185 __u64 ac_btime64; /* 64-bit begin time */176 __u64 ac_btime64; /* 64-bit begin time */
@@ -187,8 +178,6 @@ struct taskstats { · 1 unmodified line
187 /* v11: Delay waiting for memory compact */178 /* v11: Delay waiting for memory compact */
188 __u64 compact_count;179 __u64 compact_count;
189 __u64 compact_delay_total;180 __u64 compact_delay_total;
190 __u64 compact_delay_max;
191 __u64 compact_delay_min;
192 181
193 /* v12 begin */182 /* v12 begin */
194 __u32 ac_tgid; /* thread group ID */183 __u32 ac_tgid; /* thread group ID */
@@ -210,15 +199,37 @@ struct taskstats { · 15 unmodified lines
210 /* v13: Delay waiting for write-protect copy */199 /* v13: Delay waiting for write-protect copy */
211 __u64 wpcopy_count;200 __u64 wpcopy_count;
212 __u64 wpcopy_delay_total;201 __u64 wpcopy_delay_total;
213 __u64 wpcopy_delay_max;
214 __u64 wpcopy_delay_min;
215 202
216 /* v14: Delay waiting for IRQ/SOFTIRQ */203 /* v14: Delay waiting for IRQ/SOFTIRQ */
217 __u64 irq_count;204 __u64 irq_count;
218 __u64 irq_delay_total;205 __u64 irq_delay_total;
219 __u64 irq_delay_max;206
220 __u64 irq_delay_min;207 /* v15: add Delay max and Delay min */
221 /* v15: add Delay max */208
209 /* v16: move Delay max and Delay min to the end of taskstat */
210 __u64 cpu_delay_max;
211 __u64 cpu_delay_min;
212
213 __u64 blkio_delay_max;
214 __u64 blkio_delay_min;
215
216 __u64 swapin_delay_max;
217 __u64 swapin_delay_min;
218
219 __u64 freepages_delay_max;
220 __u64 freepages_delay_min;
221
222 __u64 thrashing_delay_max;
223 __u64 thrashing_delay_min;
224
225 __u64 compact_delay_max;
226 __u64 compact_delay_min;
227
228 __u64 wpcopy_delay_max;
229 __u64 wpcopy_delay_min;
230
231 __u64 irq_delay_max;
232 __u64 irq_delay_min;
222};233};
223 234
224 235
include/uapi/linux/vhost.h+2−2
@@ -28,10 +28,10 @@ · 27 unmodified lines
28 28
29/* Set current process as the (exclusive) owner of this file descriptor. This29/* Set current process as the (exclusive) owner of this file descriptor. This
30 * must be called before any other vhost command. Further calls to30 * must be called before any other vhost command. Further calls to
31 * VHOST_OWNER_SET fail until VHOST_OWNER_RESET is called. */31 * VHOST_SET_OWNER fail until VHOST_RESET_OWNER is called. */
32#define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)32#define VHOST_SET_OWNER _IO(VHOST_VIRTIO, 0x01)
33/* Give up ownership, and reset the device to default values.33/* Give up ownership, and reset the device to default values.
34 * Allows subsequent call to VHOST_OWNER_SET to succeed. */34 * Allows subsequent call to VHOST_SET_OWNER to succeed. */
35#define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)35#define VHOST_RESET_OWNER _IO(VHOST_VIRTIO, 0x02)
36 36
37/* Set up/modify memory layout */37/* Set up/modify memory layout */
include/uapi/linux/virtio_pci.h+1−0
@@ -246,6 +246,7 @@ struct virtio_pci_cfg_cap { · 245 unmodified lines
246#define VIRTIO_ADMIN_CMD_LIST_USE 0x1246#define VIRTIO_ADMIN_CMD_LIST_USE 0x1
247 247
248/* Admin command group type. */248/* Admin command group type. */
249#define VIRTIO_ADMIN_GROUP_TYPE_SELF 0x0
249#define VIRTIO_ADMIN_GROUP_TYPE_SRIOV 0x1250#define VIRTIO_ADMIN_GROUP_TYPE_SRIOV 0x1
250 251
251/* Transitional device admin command. */252/* Transitional device admin command. */