Unverified Commit a943db2b authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5369 Backport 6.6.9-6.6.22 LTS 

Merge Pull Request from: @anred 
 
Backport 6.6.9-6.6.22 LTS to OLK-6.6.
There are only 8 simple context conflicts：

block: warn once for each partition in bio_check_ro()
crypto: af_alg - Disallow multiple in-flight AIO requests
arm64: Rename ARM64_WORKAROUND_2966298
rtc: Add support for configuring the UIP timeout for RTC reads
bpf: exact states comparison for iterator convergence checks
bpf: verify callbacks as if they are called unknown number of times
memblock: fix crash when reserved memory is not added to memory
mm/vmscan: fix a bug calling wakeup_kswapd() with a wrong zone index

openeuler_defconfig needs to be added because CONFIG is added:
CONFIG_MITIGATION_RFDS： x86/rfds: Mitigate Register File Data Sampling (RFDS)
CONFIG_ARM64_ERRATUM_3117295 ： arm64: errata: Add Cortex-A510 speculative unprivileged load workaround

Build and boot test passed for arm64 & x86.

https://gitee.com/openeuler/kernel/issues/I99TJK 
 
Link:https://gitee.com/openeuler/kernel/pulls/5369

 

Reviewed-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents c62a9941 272af05e

Documentation/ABI/testing/sysfs-class-devfreq

+3 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ Description: 


			echo 0 > /sys/class/devfreq/.../trans_stat



		If the transition table is bigger than PAGE_SIZE, reading

		this will return an -EFBIG error.



What:		/sys/class/devfreq/.../available_frequencies

Date:		October 2012

Contact:	Nishanth Menon <nm@ti.com>

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

+11 −11
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/queues/rx-<queue>/rps_cpus

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_cpus

Date:		March 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -8,7 +8,7 @@ Description: 
		network device queue. Possible values depend on the number

		of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/rx-<queue>/rps_flow_cnt

What:		/sys/class/net/<iface>/queues/rx-<queue>/rps_flow_cnt

Date:		April 2010

KernelVersion:	2.6.35

Contact:	netdev@vger.kernel.org
@@ -16,7 +16,7 @@ Description: 
		Number of Receive Packet Steering flows being currently

		processed by this particular network device receive queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_timeout

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_timeout

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -24,7 +24,7 @@ Description: 
		Indicates the number of transmit timeout events seen by this

		network interface transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/tx_maxrate

What:		/sys/class/net/<iface>/queues/tx-<queue>/tx_maxrate

Date:		March 2015

KernelVersion:	4.1

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		A Mbps max-rate set for the queue, a value of zero means disabled,

		default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_cpus

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_cpus

Date:		November 2010

KernelVersion:	2.6.38

Contact:	netdev@vger.kernel.org
@@ -42,7 +42,7 @@ Description: 
		network device transmit queue. Possible values depend on the

		number of available CPU(s) in the system.



What:		/sys/class/<iface>/queues/tx-<queue>/xps_rxqs

What:		/sys/class/net/<iface>/queues/tx-<queue>/xps_rxqs

Date:		June 2018

KernelVersion:	4.18.0

Contact:	netdev@vger.kernel.org
@@ -53,7 +53,7 @@ Description: 
		number of available receive queue(s) in the network device.

		Default is disabled.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/hold_time

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -62,7 +62,7 @@ Description: 
		of this particular network device transmit queue.

		Default value is 1000.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/inflight

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -70,7 +70,7 @@ Description: 
		Indicates the number of bytes (objects) in flight on this

		network device transmit queue.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -79,7 +79,7 @@ Description: 
		on this network device transmit queue. This value is clamped

		to be within the bounds defined by limit_max and limit_min.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_max

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org
@@ -88,7 +88,7 @@ Description: 
		queued on this network device transmit queue. See

		include/linux/dynamic_queue_limits.h for the default value.



What:		/sys/class/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

What:		/sys/class/net/<iface>/queues/tx-<queue>/byte_queue_limits/limit_min

Date:		November 2011

KernelVersion:	3.3

Contact:	netdev@vger.kernel.org

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

+24 −24
Original line number Diff line number Diff line 
What:		/sys/class/<iface>/statistics/collisions

What:		/sys/class/net/<iface>/statistics/collisions

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -6,7 +6,7 @@ Description: 
		Indicates the number of collisions seen by this network device.

		This value might not be relevant with all MAC layers.



What:		/sys/class/<iface>/statistics/multicast

What:		/sys/class/net/<iface>/statistics/multicast

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -14,7 +14,7 @@ Description: 
		Indicates the number of multicast packets received by this

		network device.



What:		/sys/class/<iface>/statistics/rx_bytes

What:		/sys/class/net/<iface>/statistics/rx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -23,7 +23,7 @@ Description: 
		See the network driver for the exact meaning of when this

		value is incremented.



What:		/sys/class/<iface>/statistics/rx_compressed

What:		/sys/class/net/<iface>/statistics/rx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -32,7 +32,7 @@ Description: 
		network device. This value might only be relevant for interfaces

		that support packet compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/rx_crc_errors

What:		/sys/class/net/<iface>/statistics/rx_crc_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -41,7 +41,7 @@ Description: 
		by this network device. Note that the specific meaning might

		depend on the MAC layer used by the interface.



What:		/sys/class/<iface>/statistics/rx_dropped

What:		/sys/class/net/<iface>/statistics/rx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -51,7 +51,7 @@ Description: 
		packet processing. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_errors

What:		/sys/class/net/<iface>/statistics/rx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -59,7 +59,7 @@ Description: 
		Indicates the number of receive errors on this network device.

		See the network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_fifo_errors

What:		/sys/class/net/<iface>/statistics/rx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -68,7 +68,7 @@ Description: 
		network device. See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_frame_errors

What:		/sys/class/net/<iface>/statistics/rx_frame_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -78,7 +78,7 @@ Description: 
		on the MAC layer protocol used. See the network driver for

		the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_length_errors

What:		/sys/class/net/<iface>/statistics/rx_length_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -87,7 +87,7 @@ Description: 
		error, oversized or undersized. See the network driver for the

		exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_missed_errors

What:		/sys/class/net/<iface>/statistics/rx_missed_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -96,7 +96,7 @@ Description: 
		due to lack of capacity in the receive side. See the network

		driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/rx_nohandler

What:		/sys/class/net/<iface>/statistics/rx_nohandler

Date:		February 2016

KernelVersion:	4.6

Contact:	netdev@vger.kernel.org
@@ -104,7 +104,7 @@ Description: 
		Indicates the number of received packets that were dropped on

		an inactive device by the network core.



What:		/sys/class/<iface>/statistics/rx_over_errors

What:		/sys/class/net/<iface>/statistics/rx_over_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -114,7 +114,7 @@ Description: 
		(e.g: larger than MTU). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/rx_packets

What:		/sys/class/net/<iface>/statistics/rx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -122,7 +122,7 @@ Description: 
		Indicates the total number of good packets received by this

		network device.



What:		/sys/class/<iface>/statistics/tx_aborted_errors

What:		/sys/class/net/<iface>/statistics/tx_aborted_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -132,7 +132,7 @@ Description: 
		a medium collision). See the network driver for the exact

		meaning of this value.



What:		/sys/class/<iface>/statistics/tx_bytes

What:		/sys/class/net/<iface>/statistics/tx_bytes

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -143,7 +143,7 @@ Description: 
		transmitted packets or all packets that have been queued for

		transmission.



What:		/sys/class/<iface>/statistics/tx_carrier_errors

What:		/sys/class/net/<iface>/statistics/tx_carrier_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -152,7 +152,7 @@ Description: 
		because of carrier errors (e.g: physical link down). See the

		network driver for the exact meaning of this value.



What:		/sys/class/<iface>/statistics/tx_compressed

What:		/sys/class/net/<iface>/statistics/tx_compressed

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -161,7 +161,7 @@ Description: 
		this might only be relevant for devices that support

		compression (e.g: PPP).



What:		/sys/class/<iface>/statistics/tx_dropped

What:		/sys/class/net/<iface>/statistics/tx_dropped

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -170,7 +170,7 @@ Description: 
		See the driver for the exact reasons as to why the packets were

		dropped.



What:		/sys/class/<iface>/statistics/tx_errors

What:		/sys/class/net/<iface>/statistics/tx_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -179,7 +179,7 @@ Description: 
		a network device. See the driver for the exact reasons as to

		why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_fifo_errors

What:		/sys/class/net/<iface>/statistics/tx_fifo_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -188,7 +188,7 @@ Description: 
		FIFO error. See the driver for the exact reasons as to why the

		packets were dropped.



What:		/sys/class/<iface>/statistics/tx_heartbeat_errors

What:		/sys/class/net/<iface>/statistics/tx_heartbeat_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -197,7 +197,7 @@ Description: 
		reported as heartbeat errors. See the driver for the exact

		reasons as to why the packets were dropped.



What:		/sys/class/<iface>/statistics/tx_packets

What:		/sys/class/net/<iface>/statistics/tx_packets

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org
@@ -206,7 +206,7 @@ Description: 
		device. See the driver for whether this reports the number of all

		attempted or successful transmissions.



What:		/sys/class/<iface>/statistics/tx_window_errors

What:		/sys/class/net/<iface>/statistics/tx_window_errors

Date:		April 2005

KernelVersion:	2.6.12

Contact:	netdev@vger.kernel.org

Documentation/ABI/testing/sysfs-devices-system-cpu

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ What: /sys/devices/system/cpu/vulnerabilities 
		/sys/devices/system/cpu/vulnerabilities/mds

		/sys/devices/system/cpu/vulnerabilities/meltdown

		/sys/devices/system/cpu/vulnerabilities/mmio_stale_data

		/sys/devices/system/cpu/vulnerabilities/reg_file_data_sampling

		/sys/devices/system/cpu/vulnerabilities/retbleed

		/sys/devices/system/cpu/vulnerabilities/spec_store_bypass

		/sys/devices/system/cpu/vulnerabilities/spectre_v1

Documentation/admin-guide/abi-obsolete.rst

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ marked to be removed at some later point in time. 
The description of the interface will document the reason why it is

obsolete and when it can be expected to be removed.



.. kernel-abi:: $srctree/Documentation/ABI/obsolete

.. kernel-abi:: ABI/obsolete

   :rst: