Skip to content

Commit afdb094

Browse files
KAGA-KOKOKAGA-KOKO
committed
Merge tag 'v3.16-rc5' into timers/core
Reason: Bring in upstream modifications, so the pending changes which depend on them can be queued.
2 parents be11e6d + 1795cd9 commit afdb094

File tree

4,678 files changed

+183534
-89686
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,678 files changed

+183534
-89686
lines changed

‎.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
*.lst
2323
*.symtypes
2424
*.order
25-
modules.builtin
2625
*.elf
2726
*.bin
2827
*.gz
@@ -33,6 +32,8 @@ modules.builtin
3332
*.lzo
3433
*.patch
3534
*.gcno
35+
modules.builtin
36+
Module.symvers
3637

3738
#
3839
# Top-level generic files
@@ -44,7 +45,6 @@ modules.builtin
4445
/vmlinuz
4546
/System.map
4647
/Module.markers
47-
/Module.symvers
4848

4949
#
5050
# Debian directory (make deb-pkg)

‎CREDITS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
Linus
1010
----------
1111

12+
M: Matt Mackal
13+
E: [email protected]
14+
D: SLOB slab allocator
15+
1216
N: Matti Aarnio
1317
E: [email protected]
1418
D: Alpha systems hacking, IPv6 and other network related stuff

‎Documentation/ABI/stable/sysfs-devices-system-cpu

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/devices/system/cpu/dscr_default
2+
Date: 13-May-2014
3+
KernelVersion: v3.15.0
4+
Contact:
5+
Description: Writes are equivalent to writing to
6+
/sys/devices/system/cpu/cpuN/dscr on all CPUs.
7+
Reads return the last written value or 0.
8+
This value is not a global default: it is a way to set
9+
all per-CPU defaults at the same time.
10+
Values: 64 bit unsigned integer (bit field)
11+
12+
What: /sys/devices/system/cpu/cpu[0-9]+/dscr
13+
Date: 13-May-2014
14+
KernelVersion: v3.15.0
15+
Contact:
16+
Description: Default value for the Data Stream Control Register (DSCR) on
17+
a CPU.
18+
This default value is used when the kernel is executing and
19+
for any process that has not set the DSCR itself.
20+
If a process ever sets the DSCR (via direct access to the
21+
SPR) that value will be persisted for that process and used
22+
on any CPU where it executes (overriding the value described
23+
here).
24+
If set by a process it will be inherited by child processes.
25+
Values: 64 bit unsigned integer (bit field)

‎Documentation/ABI/testing/ima_policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Description:
2323
[fowner]]
2424
lsm: [[subj_user=] [subj_role=] [subj_type=]
2525
[obj_user=] [obj_role=] [obj_type=]]
26-
option: [[appraise_type=]]
26+
option: [[appraise_type=]] [permit_directio]
2727

2828
base: func:= [BPRM_CHECK][MMAP_CHECK][FILE_CHECK][MODULE_CHECK]
2929
mask:= [MAY_READ] [MAY_WRITE] [MAY_APPEND] [MAY_EXEC]

‎Documentation/ABI/testing/sysfs-class-net

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,14 @@ Description:
169169
"unknown", "notpresent", "down", "lowerlayerdown", "testing",
170170
"dormant", "up".
171171

172+
What: /sys/class/net/<iface>/phys_port_id
173+
Date: July 2013
174+
KernelVersion: 3.12
175+
Contact: [email protected]
176+
Description:
177+
Indicates the interface unique physical port identifier within
178+
the NIC, as a string.
179+
172180
What: /sys/class/net/<iface>/speed
173181
Date: October 2009
174182
KernelVersion: 2.6.33

‎Documentation/ABI/testing/sysfs-class-net-cdc_ncm

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
What: /sys/class/net/<iface>/cdc_ncm/min_tx_pkt
2+
Date: May 2014
3+
KernelVersion: 3.16
4+
Contact: Bjørn Mork <[email protected]>
5+
Description:
6+
The driver will pad NCM Transfer Blocks (NTBs) longer
7+
than this to tx_max, allowing the device to receive
8+
tx_max sized frames with no terminating short
9+
packet. NTBs shorter than this limit are transmitted
10+
as-is, without any padding, and are terminated with a
11+
short USB packet.
12+
13+
Padding to tx_max allows the driver to transmit NTBs
14+
back-to-back without any interleaving short USB
15+
packets. This reduces the number of short packet
16+
interrupts in the device, and represents a tradeoff
17+
between USB bus bandwidth and device DMA optimization.
18+
19+
Set to 0 to pad all frames. Set greater than tx_max to
20+
disable all padding.
21+
22+
What: /sys/class/net/<iface>/cdc_ncm/rx_max
23+
Date: May 2014
24+
KernelVersion: 3.16
25+
Contact: Bjørn Mork <[email protected]>
26+
Description:
27+
The maximum NTB size for RX. Cannot exceed the
28+
maximum value supported by the device. Must allow at
29+
least one max sized datagram plus headers.
30+
31+
The actual limits are device dependent. See
32+
dwNtbInMaxSize.
33+
34+
Note: Some devices will silently ignore changes to
35+
this value, resulting in oversized NTBs and
36+
corresponding framing errors.
37+
38+
What: /sys/class/net/<iface>/cdc_ncm/tx_max
39+
Date: May 2014
40+
KernelVersion: 3.16
41+
Contact: Bjørn Mork <[email protected]>
42+
Description:
43+
The maximum NTB size for TX. Cannot exceed the
44+
maximum value supported by the device. Must allow at
45+
least one max sized datagram plus headers.
46+
47+
The actual limits are device dependent. See
48+
dwNtbOutMaxSize.
49+
50+
What: /sys/class/net/<iface>/cdc_ncm/tx_timer_usecs
51+
Date: May 2014
52+
KernelVersion: 3.16
53+
Contact: Bjørn Mork <[email protected]>
54+
Description:
55+
Datagram aggregation timeout in µs. The driver will
56+
wait up to 3 times this timeout for more datagrams to
57+
aggregate before transmitting an NTB frame.
58+
59+
Valid range: 5 to 4000000
60+
61+
Set to 0 to disable aggregation.
62+
63+
The following read-only attributes all represent fields of the
64+
structure defined in section 6.2.1 "GetNtbParameters" of "Universal
65+
Serial Bus Communications Class Subclass Specifications for Network
66+
Control Model Devices" (CDC NCM), Revision 1.0 (Errata 1), November
67+
24, 2010 from USB Implementers Forum, Inc. The descriptions are
68+
quoted from table 6-3 of CDC NCM: "NTB Parameter Structure".
69+
70+
What: /sys/class/net/<iface>/cdc_ncm/bmNtbFormatsSupported
71+
Date: May 2014
72+
KernelVersion: 3.16
73+
Contact: Bjørn Mork <[email protected]>
74+
Description:
75+
Bit 0: 16-bit NTB supported (set to 1)
76+
Bit 1: 32-bit NTB supported
77+
Bits 2 – 15: reserved (reset to zero; must be ignored by host)
78+
79+
What: /sys/class/net/<iface>/cdc_ncm/dwNtbInMaxSize
80+
Date: May 2014
81+
KernelVersion: 3.16
82+
Contact: Bjørn Mork <[email protected]>
83+
Description:
84+
IN NTB Maximum Size in bytes
85+
86+
What: /sys/class/net/<iface>/cdc_ncm/wNdpInDivisor
87+
Date: May 2014
88+
KernelVersion: 3.16
89+
Contact: Bjørn Mork <[email protected]>
90+
Description:
91+
Divisor used for IN NTB Datagram payload alignment
92+
93+
What: /sys/class/net/<iface>/cdc_ncm/wNdpInPayloadRemainder
94+
Date: May 2014
95+
KernelVersion: 3.16
96+
Contact: Bjørn Mork <[email protected]>
97+
Description:
98+
Remainder used to align input datagram payload within
99+
the NTB: (Payload Offset) mod (wNdpInDivisor) =
100+
wNdpInPayloadRemainder
101+
102+
What: /sys/class/net/<iface>/cdc_ncm/wNdpInAlignment
103+
Date: May 2014
104+
KernelVersion: 3.16
105+
Contact: Bjørn Mork <[email protected]>
106+
Description:
107+
NDP alignment modulus for NTBs on the IN pipe. Shall
108+
be a power of 2, and shall be at least 4.
109+
110+
What: /sys/class/net/<iface>/cdc_ncm/dwNtbOutMaxSize
111+
Date: May 2014
112+
KernelVersion: 3.16
113+
Contact: Bjørn Mork <[email protected]>
114+
Description:
115+
OUT NTB Maximum Size
116+
117+
What: /sys/class/net/<iface>/cdc_ncm/wNdpOutDivisor
118+
Date: May 2014
119+
KernelVersion: 3.16
120+
Contact: Bjørn Mork <[email protected]>
121+
Description:
122+
OUT NTB Datagram alignment modulus
123+
124+
What: /sys/class/net/<iface>/cdc_ncm/wNdpOutPayloadRemainder
125+
Date: May 2014
126+
KernelVersion: 3.16
127+
Contact: Bjørn Mork <[email protected]>
128+
Description:
129+
Remainder used to align output datagram payload
130+
offsets within the NTB: Padding, shall be transmitted
131+
as zero by function, and ignored by host. (Payload
132+
Offset) mod (wNdpOutDivisor) = wNdpOutPayloadRemainder
133+
134+
What: /sys/class/net/<iface>/cdc_ncm/wNdpOutAlignment
135+
Date: May 2014
136+
KernelVersion: 3.16
137+
Contact: Bjørn Mork <[email protected]>
138+
Description:
139+
NDP alignment modulus for use in NTBs on the OUT
140+
pipe. Shall be a power of 2, and shall be at least 4.
141+
142+
What: /sys/class/net/<iface>/cdc_ncm/wNtbOutMaxDatagrams
143+
Date: May 2014
144+
KernelVersion: 3.16
145+
Contact: Bjørn Mork <[email protected]>
146+
Description:
147+
Maximum number of datagrams that the host may pack
148+
into a single OUT NTB. Zero means that the device
149+
imposes no limit.

‎Documentation/ABI/testing/sysfs-class-net-queues

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
What: /sys/class/<iface>/queues/rx-<queue>/rps_cpus
2+
Date: March 2010
3+
KernelVersion: 2.6.35
4+
Contact: [email protected]
5+
Description:
6+
Mask of the CPU(s) currently enabled to participate into the
7+
Receive Packet Steering packet processing flow for this
8+
network device queue. Possible values depend on the number
9+
of available CPU(s) in the system.
10+
11+
What: /sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt
12+
Date: April 2010
13+
KernelVersion: 2.6.35
14+
Contact: [email protected]
15+
Description:
16+
Number of Receive Packet Steering flows being currently
17+
processed by this particular network device receive queue.
18+
19+
What: /sys/class/<iface>/queues/tx-<queue>/tx_timeout
20+
Date: November 2011
21+
KernelVersion: 3.3
22+
Contact: [email protected]
23+
Description:
24+
Indicates the number of transmit timeout events seen by this
25+
network interface transmit queue.
26+
27+
What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
28+
Date: November 2010
29+
KernelVersion: 2.6.38
30+
Contact: [email protected]
31+
Description:
32+
Mask of the CPU(s) currently enabled to participate into the
33+
Transmit Packet Steering packet processing flow for this
34+
network device transmit queue. Possible vaules depend on the
35+
number of available CPU(s) in the system.
36+
37+
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
38+
Date: November 2011
39+
KernelVersion: 3.3
40+
Contact: [email protected]
41+
Description:
42+
Indicates the hold time in milliseconds to measure the slack
43+
of this particular network device transmit queue.
44+
Default value is 1000.
45+
46+
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
47+
Date: November 2011
48+
KernelVersion: 3.3
49+
Contact: [email protected]
50+
Description:
51+
Indicates the number of bytes (objects) in flight on this
52+
network device transmit queue.
53+
54+
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit
55+
Date: November 2011
56+
KernelVersion: 3.3
57+
Contact: [email protected]
58+
Description:
59+
Indicates the current limit of bytes allowed to be queued
60+
on this network device transmit queue. This value is clamped
61+
to be within the bounds defined by limit_max and limit_min.
62+
63+
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
64+
Date: November 2011
65+
KernelVersion: 3.3
66+
Contact: [email protected]
67+
Description:
68+
Indicates the absolute maximum limit of bytes allowed to be
69+
queued on this network device transmit queue. See
70+
include/linux/dynamic_queue_limits.h for the default value.
71+
72+
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
73+
Date: November 2011
74+
KernelVersion: 3.3
75+
Contact: [email protected]
76+
Description:
77+
Indicates the absolute minimum limit of bytes allowed to be
78+
queued on this network device transmit queue. Default value is
79+
0.

0 commit comments

Comments
 (0)