Skip to content

Commit 285bad1

Browse files
alecchangodalecchangod
committed
Merge branch 'android-4.19-stable' of https://android.googlesource.com/kernel/common into lineage-21-reb
2 parents 029abca + 115c841 commit 285bad1

File tree

547 files changed

+5881
-6322
lines changed

Some content is hidden

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

547 files changed

+5881
-6322
lines changed

‎Documentation/ABI/testing/sysfs-bus-pci-devices-aer_stats

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ errors may be "seen" / reported by the link partner and not the
99
problematic endpoint itself (which may report all counters as 0 as it never
1010
saw any problems).
1111

12-
Where: /sys/bus/pci/devices/<dev>/aer_dev_correctable
12+
What: /sys/bus/pci/devices/<dev>/aer_dev_correctable
1313
Date: July 2018
1414
Kernel Version: 4.19.0
1515
Contact: linux-pci@vger.kernel.org, rajatja@google.com
@@ -31,7 +31,7 @@ Header Log Overflow 0
3131
TOTAL_ERR_COR 2
3232
-------------------------------------------------------------------------
3333

34-
Where: /sys/bus/pci/devices/<dev>/aer_dev_fatal
34+
What: /sys/bus/pci/devices/<dev>/aer_dev_fatal
3535
Date: July 2018
3636
Kernel Version: 4.19.0
3737
Contact: linux-pci@vger.kernel.org, rajatja@google.com
@@ -62,7 +62,7 @@ TLP Prefix Blocked Error 0
6262
TOTAL_ERR_FATAL 0
6363
-------------------------------------------------------------------------
6464

65-
Where: /sys/bus/pci/devices/<dev>/aer_dev_nonfatal
65+
What: /sys/bus/pci/devices/<dev>/aer_dev_nonfatal
6666
Date: July 2018
6767
Kernel Version: 4.19.0
6868
Contact: linux-pci@vger.kernel.org, rajatja@google.com
@@ -103,19 +103,19 @@ collectors) that are AER capable. These indicate the number of error messages as
103103
device, so these counters include them and are thus cumulative of all the error
104104
messages on the PCI hierarchy originating at that root port.
105105

106-
Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_cor
106+
What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_cor
107107
Date: July 2018
108108
Kernel Version: 4.19.0
109109
Contact: linux-pci@vger.kernel.org, rajatja@google.com
110110
Description: Total number of ERR_COR messages reported to rootport.
111111

112-
Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_fatal
112+
What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_fatal
113113
Date: July 2018
114114
Kernel Version: 4.19.0
115115
Contact: linux-pci@vger.kernel.org, rajatja@google.com
116116
Description: Total number of ERR_FATAL messages reported to rootport.
117117

118-
Where: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_nonfatal
118+
What: /sys/bus/pci/devices/<dev>/aer_stats/aer_rootport_total_err_nonfatal
119119
Date: July 2018
120120
Kernel Version: 4.19.0
121121
Contact: linux-pci@vger.kernel.org, rajatja@google.com

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

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
What: /sys/class/<iface>/queues/rx-<queue>/rps_cpus
1+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_cpus
22
Date: March 2010
33
KernelVersion: 2.6.35
44
Contact: netdev@vger.kernel.org
@@ -8,31 +8,31 @@ Description:
88
network device queue. Possible values depend on the number
99
of available CPU(s) in the system.
1010

11-
What: /sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt
11+
What: /sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt
1212
Date: April 2010
1313
KernelVersion: 2.6.35
1414
Contact: netdev@vger.kernel.org
1515
Description:
1616
Number of Receive Packet Steering flows being currently
1717
processed by this particular network device receive queue.
1818

19-
What: /sys/class/<iface>/queues/tx-<queue>/tx_timeout
19+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_timeout
2020
Date: November 2011
2121
KernelVersion: 3.3
2222
Contact: netdev@vger.kernel.org
2323
Description:
2424
Indicates the number of transmit timeout events seen by this
2525
network interface transmit queue.
2626

27-
What: /sys/class/<iface>/queues/tx-<queue>/tx_maxrate
27+
What: /sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate
2828
Date: March 2015
2929
KernelVersion: 4.1
3030
Contact: netdev@vger.kernel.org
3131
Description:
3232
A Mbps max-rate set for the queue, a value of zero means disabled,
3333
default is disabled.
3434

35-
What: /sys/class/<iface>/queues/tx-<queue>/xps_cpus
35+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_cpus
3636
Date: November 2010
3737
KernelVersion: 2.6.38
3838
Contact: netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description:
4242
network device transmit queue. Possible vaules depend on the
4343
number of available CPU(s) in the system.
4444

45-
What: /sys/class/<iface>/queues/tx-<queue>/xps_rxqs
45+
What: /sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs
4646
Date: June 2018
4747
KernelVersion: 4.18.0
4848
Contact: netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description:
5353
number of available receive queue(s) in the network device.
5454
Default is disabled.
5555

56-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
56+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time
5757
Date: November 2011
5858
KernelVersion: 3.3
5959
Contact: netdev@vger.kernel.org
@@ -62,15 +62,15 @@ Description:
6262
of this particular network device transmit queue.
6363
Default value is 1000.
6464

65-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
65+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight
6666
Date: November 2011
6767
KernelVersion: 3.3
6868
Contact: netdev@vger.kernel.org
6969
Description:
7070
Indicates the number of bytes (objects) in flight on this
7171
network device transmit queue.
7272

73-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit
73+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit
7474
Date: November 2011
7575
KernelVersion: 3.3
7676
Contact: netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description:
7979
on this network device transmit queue. This value is clamped
8080
to be within the bounds defined by limit_max and limit_min.
8181

82-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
82+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max
8383
Date: November 2011
8484
KernelVersion: 3.3
8585
Contact: netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description:
8888
queued on this network device transmit queue. See
8989
include/linux/dynamic_queue_limits.h for the default value.
9090

91-
What: /sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
91+
What: /sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min
9292
Date: November 2011
9393
KernelVersion: 3.3
9494
Contact: netdev@vger.kernel.org

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

+38-22
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
What: /sys/class/<iface>/statistics/collisions
1+
What: /sys/class/net/<iface>/statistics/collisions
22
Date: April 2005
33
KernelVersion: 2.6.12
44
Contact: netdev@vger.kernel.org
55
Description:
66
Indicates the number of collisions seen by this network device.
77
This value might not be relevant with all MAC layers.
88

9-
What: /sys/class/<iface>/statistics/multicast
9+
What: /sys/class/net/<iface>/statistics/multicast
1010
Date: April 2005
1111
KernelVersion: 2.6.12
1212
Contact: netdev@vger.kernel.org
1313
Description:
1414
Indicates the number of multicast packets received by this
1515
network device.
1616

17-
What: /sys/class/<iface>/statistics/rx_bytes
17+
What: /sys/class/net/<iface>/statistics/rx_bytes
1818
Date: April 2005
1919
KernelVersion: 2.6.12
2020
Contact: netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description:
2323
See the network driver for the exact meaning of when this
2424
value is incremented.
2525

26-
What: /sys/class/<iface>/statistics/rx_compressed
26+
What: /sys/class/net/<iface>/statistics/rx_compressed
2727
Date: April 2005
2828
KernelVersion: 2.6.12
2929
Contact: netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description:
3232
network device. This value might only be relevant for interfaces
3333
that support packet compression (e.g: PPP).
3434

35-
What: /sys/class/<iface>/statistics/rx_crc_errors
35+
What: /sys/class/net/<iface>/statistics/rx_crc_errors
3636
Date: April 2005
3737
KernelVersion: 2.6.12
3838
Contact: netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description:
4141
by this network device. Note that the specific meaning might
4242
depend on the MAC layer used by the interface.
4343

44-
What: /sys/class/<iface>/statistics/rx_dropped
44+
What: /sys/class/net/<iface>/statistics/rx_dropped
4545
Date: April 2005
4646
KernelVersion: 2.6.12
4747
Contact: netdev@vger.kernel.org
@@ -51,7 +51,15 @@ Description:
5151
packet processing. See the network driver for the exact
5252
meaning of this value.
5353

54-
What: /sys/class/<iface>/statistics/rx_fifo_errors
54+
What: /sys/class/net/<iface>/statistics/rx_errors
55+
Date: April 2005
56+
KernelVersion: 2.6.12
57+
Contact: netdev@vger.kernel.org
58+
Description:
59+
Indicates the number of receive errors on this network device.
60+
See the network driver for the exact meaning of this value.
61+
62+
What: /sys/class/net/<iface>/statistics/rx_fifo_errors
5563
Date: April 2005
5664
KernelVersion: 2.6.12
5765
Contact: netdev@vger.kernel.org
@@ -60,7 +68,7 @@ Description:
6068
network device. See the network driver for the exact
6169
meaning of this value.
6270

63-
What: /sys/class/<iface>/statistics/rx_frame_errors
71+
What: /sys/class/net/<iface>/statistics/rx_frame_errors
6472
Date: April 2005
6573
KernelVersion: 2.6.12
6674
Contact: netdev@vger.kernel.org
@@ -70,7 +78,7 @@ Description:
7078
on the MAC layer protocol used. See the network driver for
7179
the exact meaning of this value.
7280

73-
What: /sys/class/<iface>/statistics/rx_length_errors
81+
What: /sys/class/net/<iface>/statistics/rx_length_errors
7482
Date: April 2005
7583
KernelVersion: 2.6.12
7684
Contact: netdev@vger.kernel.org
@@ -79,7 +87,7 @@ Description:
7987
error, oversized or undersized. See the network driver for the
8088
exact meaning of this value.
8189

82-
What: /sys/class/<iface>/statistics/rx_missed_errors
90+
What: /sys/class/net/<iface>/statistics/rx_missed_errors
8391
Date: April 2005
8492
KernelVersion: 2.6.12
8593
Contact: netdev@vger.kernel.org
@@ -88,7 +96,15 @@ Description:
8896
due to lack of capacity in the receive side. See the network
8997
driver for the exact meaning of this value.
9098

91-
What: /sys/class/<iface>/statistics/rx_over_errors
99+
What: /sys/class/net/<iface>/statistics/rx_nohandler
100+
Date: February 2016
101+
KernelVersion: 4.6
102+
Contact: netdev@vger.kernel.org
103+
Description:
104+
Indicates the number of received packets that were dropped on
105+
an inactive device by the network core.
106+
107+
What: /sys/class/net/<iface>/statistics/rx_over_errors
92108
Date: April 2005
93109
KernelVersion: 2.6.12
94110
Contact: netdev@vger.kernel.org
@@ -98,15 +114,15 @@ Description:
98114
(e.g: larger than MTU). See the network driver for the exact
99115
meaning of this value.
100116

101-
What: /sys/class/<iface>/statistics/rx_packets
117+
What: /sys/class/net/<iface>/statistics/rx_packets
102118
Date: April 2005
103119
KernelVersion: 2.6.12
104120
Contact: netdev@vger.kernel.org
105121
Description:
106122
Indicates the total number of good packets received by this
107123
network device.
108124

109-
What: /sys/class/<iface>/statistics/tx_aborted_errors
125+
What: /sys/class/net/<iface>/statistics/tx_aborted_errors
110126
Date: April 2005
111127
KernelVersion: 2.6.12
112128
Contact: netdev@vger.kernel.org
@@ -116,7 +132,7 @@ Description:
116132
a medium collision). See the network driver for the exact
117133
meaning of this value.
118134

119-
What: /sys/class/<iface>/statistics/tx_bytes
135+
What: /sys/class/net/<iface>/statistics/tx_bytes
120136
Date: April 2005
121137
KernelVersion: 2.6.12
122138
Contact: netdev@vger.kernel.org
@@ -127,7 +143,7 @@ Description:
127143
transmitted packets or all packets that have been queued for
128144
transmission.
129145

130-
What: /sys/class/<iface>/statistics/tx_carrier_errors
146+
What: /sys/class/net/<iface>/statistics/tx_carrier_errors
131147
Date: April 2005
132148
KernelVersion: 2.6.12
133149
Contact: netdev@vger.kernel.org
@@ -136,7 +152,7 @@ Description:
136152
because of carrier errors (e.g: physical link down). See the
137153
network driver for the exact meaning of this value.
138154

139-
What: /sys/class/<iface>/statistics/tx_compressed
155+
What: /sys/class/net/<iface>/statistics/tx_compressed
140156
Date: April 2005
141157
KernelVersion: 2.6.12
142158
Contact: netdev@vger.kernel.org
@@ -145,7 +161,7 @@ Description:
145161
this might only be relevant for devices that support
146162
compression (e.g: PPP).
147163

148-
What: /sys/class/<iface>/statistics/tx_dropped
164+
What: /sys/class/net/<iface>/statistics/tx_dropped
149165
Date: April 2005
150166
KernelVersion: 2.6.12
151167
Contact: netdev@vger.kernel.org
@@ -154,7 +170,7 @@ Description:
154170
See the driver for the exact reasons as to why the packets were
155171
dropped.
156172

157-
What: /sys/class/<iface>/statistics/tx_errors
173+
What: /sys/class/net/<iface>/statistics/tx_errors
158174
Date: April 2005
159175
KernelVersion: 2.6.12
160176
Contact: netdev@vger.kernel.org
@@ -163,7 +179,7 @@ Description:
163179
a network device. See the driver for the exact reasons as to
164180
why the packets were dropped.
165181

166-
What: /sys/class/<iface>/statistics/tx_fifo_errors
182+
What: /sys/class/net/<iface>/statistics/tx_fifo_errors
167183
Date: April 2005
168184
KernelVersion: 2.6.12
169185
Contact: netdev@vger.kernel.org
@@ -172,7 +188,7 @@ Description:
172188
FIFO error. See the driver for the exact reasons as to why the
173189
packets were dropped.
174190

175-
What: /sys/class/<iface>/statistics/tx_heartbeat_errors
191+
What: /sys/class/net/<iface>/statistics/tx_heartbeat_errors
176192
Date: April 2005
177193
KernelVersion: 2.6.12
178194
Contact: netdev@vger.kernel.org
@@ -181,7 +197,7 @@ Description:
181197
reported as heartbeat errors. See the driver for the exact
182198
reasons as to why the packets were dropped.
183199

184-
What: /sys/class/<iface>/statistics/tx_packets
200+
What: /sys/class/net/<iface>/statistics/tx_packets
185201
Date: April 2005
186202
KernelVersion: 2.6.12
187203
Contact: netdev@vger.kernel.org
@@ -190,7 +206,7 @@ Description:
190206
device. See the driver for whether this reports the number of all
191207
attempted or successful transmissions.
192208

193-
What: /sys/class/<iface>/statistics/tx_window_errors
209+
What: /sys/class/net/<iface>/statistics/tx_window_errors
194210
Date: April 2005
195211
KernelVersion: 2.6.12
196212
Contact: netdev@vger.kernel.org

‎Documentation/admin-guide/hw-vuln/spectre.rst

+11-7
Original file line numberDiff line numberDiff line change
@@ -484,11 +484,14 @@ Spectre variant 2
484484

485485
Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at
486486
boot, by setting the IBRS bit, and they're automatically protected against
487-
Spectre v2 variant attacks, including cross-thread branch target injections
488-
on SMT systems (STIBP). In other words, eIBRS enables STIBP too.
487+
Spectre v2 variant attacks.
489488

490-
Legacy IBRS systems clear the IBRS bit on exit to userspace and
491-
therefore explicitly enable STIBP for that
489+
On Intel's enhanced IBRS systems, this includes cross-thread branch target
490+
injections on SMT systems (STIBP). In other words, Intel eIBRS enables
491+
STIBP, too.
492+
493+
AMD Automatic IBRS does not protect userspace, and Legacy IBRS systems clear
494+
the IBRS bit on exit to userspace, therefore both explicitly enable STIBP.
492495

493496
The retpoline mitigation is turned on by default on vulnerable
494497
CPUs. It can be forced on or off by the administrator
@@ -622,9 +625,10 @@ kernel command line.
622625
retpoline,generic Retpolines
623626
retpoline,lfence LFENCE; indirect branch
624627
retpoline,amd alias for retpoline,lfence
625-
eibrs enhanced IBRS
626-
eibrs,retpoline enhanced IBRS + Retpolines
627-
eibrs,lfence enhanced IBRS + LFENCE
628+
eibrs Enhanced/Auto IBRS
629+
eibrs,retpoline Enhanced/Auto IBRS + Retpolines
630+
eibrs,lfence Enhanced/Auto IBRS + LFENCE
631+
ibrs use IBRS to protect kernel
628632

629633
Not specifying this option is equivalent to
630634
spectre_v2=auto.

0 commit comments

Comments
 (0)