No conflicts.
Showing the changes to include/uapi (3 of 342 files). Show all
Unified · Split
| @@ -29,7 +29,7 @@ · 28 unmodified lines | |||
| 29 | #define POLLRDHUP 0x2000 | 29 | #define POLLRDHUP 0x2000 |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #define POLLFREE (__force __poll_t)0x4000 /* currently only for epoll */ | 32 | #define POLLFREE (__force __poll_t)0x4000 |
| 33 | 33 | ||
| 34 | #define POLL_BUSY_LOOP (__force __poll_t)0x8000 | 34 | #define POLL_BUSY_LOOP (__force __poll_t)0x8000 |
| 35 | 35 | ||
| @@ -136,19 +136,21 @@ struct mptcp_info { · 135 unmodified lines | |||
| 136 | * MPTCP_EVENT_REMOVED: token, rem_id | 136 | * MPTCP_EVENT_REMOVED: token, rem_id |
| 137 | * An address has been lost by the peer. | 137 | * An address has been lost by the peer. |
| 138 | * | 138 | * |
| 139 | * MPTCP_EVENT_SUB_ESTABLISHED: token, family, saddr4 | saddr6, | 139 | * MPTCP_EVENT_SUB_ESTABLISHED: token, family, loc_id, rem_id, |
| 140 | * daddr4 | daddr6, sport, dport, backup, | 140 | * saddr4 | saddr6, daddr4 | daddr6, sport, |
| 141 | * if_idx [, error] | 141 | * dport, backup, if_idx [, error] |
| 142 | * A new subflow has been established. 'error' should not be set. | 142 | * A new subflow has been established. 'error' should not be set. |
| 143 | * | 143 | * |
| 144 | * MPTCP_EVENT_SUB_CLOSED: token, family, saddr4 | saddr6, daddr4 | daddr6, | 144 | * MPTCP_EVENT_SUB_CLOSED: token, family, loc_id, rem_id, saddr4 | saddr6, |
| 145 | * sport, dport, backup, if_idx [, error] | 145 | * daddr4 | daddr6, sport, dport, backup, if_idx |
| 146 | * [, error] | ||
| 146 | * A subflow has been closed. An error (copy of sk_err) could be set if an | 147 | * A subflow has been closed. An error (copy of sk_err) could be set if an |
| 147 | * error has been detected for this subflow. | 148 | * error has been detected for this subflow. |
| 148 | * | 149 | * |
| 149 | * MPTCP_EVENT_SUB_PRIORITY: token, family, saddr4 | saddr6, daddr4 | daddr6, | 150 | * MPTCP_EVENT_SUB_PRIORITY: token, family, loc_id, rem_id, saddr4 | saddr6, |
| 150 | * sport, dport, backup, if_idx [, error] | 151 | * daddr4 | daddr6, sport, dport, backup, if_idx |
| 151 | * The priority of a subflow has changed. 'error' should not be set. | 152 | * [, error] |
| 153 | * The priority of a subflow has changed. 'error' should not be set. | ||
| 152 | */ | 154 | */ |
| 153 | enum mptcp_event_type { | 155 | enum mptcp_event_type { |
| 154 | MPTCP_EVENT_UNSPEC = 0, | 156 | MPTCP_EVENT_UNSPEC = 0, |
| @@ -66,10 +66,17 @@ struct rlimit64 { · 65 unmodified lines | |||
| 66 | #define _STK_LIM (8*1024*1024) | 66 | #define _STK_LIM (8*1024*1024) |
| 67 | 67 | ||
| 68 | /* | 68 | /* |
| 69 | * GPG2 wants 64kB of mlocked memory, to make sure pass phrases | 69 | * Limit the amount of locked memory by some sane default: |
| 70 | * and other sensitive information are never written to disk. | 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. | ||
| 71 | */ | 78 | */ |
| 72 | #define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024) | 79 | #define MLOCK_LIMIT (8*1024*1024) |
| 73 | 80 | ||
| 74 | /* | 81 | /* |
| 75 | * Due to binary compatibility, the actual resource numbers | 82 | * Due to binary compatibility, the actual resource numbers |