History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Jakub Kicinski committed 4 years ago

Commit 7cd28022 parents 0f473bb 6441998342 files · +3131 −1185Browse files

Showing the changes to include/uapi (3 of 342 files). Show all

Unified · Split

3 files
  1. include/uapi/asm-generic/poll.h +1 −1
  2. include/uapi/linux/mptcp.h +10 −8
  3. include/uapi/linux/resource.h +10 −3
include/uapi/asm-generic/poll.h+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #define POLLRDHUP 0x2000
3030 #endif
3131
32−#define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */
32+#define POLLFREE (__force __poll_t)0x4000
3333
3434 #define POLL_BUSY_LOOP (__force __poll_t)0x8000
3535
include/uapi/linux/mptcp.h+10−8
@@ -136,19 +136,21 @@ struct mptcp_info { · 135 unmodified lines
136136 * MPTCP_EVENT_REMOVED: token, rem_id
137137 * An address has been lost by the peer.
138138 *
139− * MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 | saddr6,
140− * daddr4 | daddr6, sport, dport, backup,
141− * if_idx [, error]
139+ * MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id,
140+ * saddr4 | saddr6, daddr4 | daddr6, sport,
141+ * dport, backup, if_idx [, error]
142142 * A new subflow has been established. 'error' should not be set.
143143 *
144− * MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 | saddr6, daddr4 | daddr6,
145− * sport, dport, backup, if_idx [, error]
144+ * MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6,
145+ * daddr4 | daddr6, sport, dport, backup, if_idx
146+ * [, error]
146147 * A subflow has been closed. An error (copy of sk_err) could be set if an
147148 * error has been detected for this subflow.
148149 *
149− * MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 | saddr6, daddr4 | daddr6,
150− * sport, dport, backup, if_idx [, error]
151− * The priority of a subflow has changed. 'error' should not be set.
150+ * MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6,
151+ * daddr4 | daddr6, sport, dport, backup, if_idx
152+ * [, error]
153+ * The priority of a subflow has changed. 'error' should not be set.
152154 */
153155 enum mptcp_event_type {
154156 MPTCP_EVENT_UNSPEC = 0,
include/uapi/linux/resource.h+10−3
@@ -66,10 +66,17 @@ struct rlimit64 { · 65 unmodified lines
6666 #define _STK_LIM (8*1024*1024)
6767
6868 /*
69− * GPG2 wants 64kB of mlocked memory, to make sure pass phrases
70− * and other sensitive information are never written to disk.
69+ * Limit the amount of locked memory by some sane default:
70+ * root can always increase this limit if needed.
71+ *
72+ * The main use-cases are (1) preventing sensitive memory
73+ * from being swapped; (2) real-time operations; (3) via
74+ * IOURING_REGISTER_BUFFERS.
75+ *
76+ * The first two don't need much. The latter will take as
77+ * much as it can get. 8MB is a reasonably sane default.
7178 */
72−#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)
79+#define MLOCK_LIMIT (8*1024*1024)
7380
7481 /*
7582 * Due to binary compatibility, the actual resource numbers