Commit f66ebf37 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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



Cross-merge networking fixes after downstream PR.

No conflicts and no adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c30a3f54 8c245fe7

Documentation/admin-guide/device-mapper/delay.rst

+32 −9
Original line number Diff line number Diff line
@@ -3,29 +3,52 @@ dm-delay 
========



Device-Mapper's "delay" target delays reads and/or writes

and maps them to different devices.

and/or flushs and optionally maps them to different devices.



Parameters::

Arguments::



    <device> <offset> <delay> [<write_device> <write_offset> <write_delay>

			       [<flush_device> <flush_offset> <flush_delay>]]



With separate write parameters, the first set is only used for reads.

Table line has to either have 3, 6 or 9 arguments:



3: apply offset and delay to read, write and flush operations on device



6: apply offset and delay to device, also apply write_offset and write_delay

   to write and flush operations on optionally different write_device with

   optionally different sector offset



9: same as 6 arguments plus define flush_offset and flush_delay explicitely

   on/with optionally different flush_device/flush_offset.



Offsets are specified in sectors.



Delays are specified in milliseconds.





Example scripts

===============



::



	#!/bin/sh

	# Create device delaying rw operation for 500ms

	echo "0 `blockdev --getsz $1` delay $1 0 500" | dmsetup create delayed

	#

	# Create mapped device named "delayed" delaying read, write and flush operations for 500ms.

	#

	dmsetup create delayed --table  "0 `blockdev --getsz $1` delay $1 0 500"



::

	#!/bin/sh

	#

	# Create mapped device delaying write and flush operations for 400ms and

	# splitting reads to device $1 but writes and flushs to different device $2

	# to different offsets of 2048 and 4096 sectors respectively.

	#

	dmsetup create delayed --table "0 `blockdev --getsz $1` delay $1 2048 0 $2 4096 400"



::

	#!/bin/sh

	# Create device delaying only write operation for 500ms and

	# splitting reads and writes to different devices $1 $2

	echo "0 `blockdev --getsz $1` delay $1 0 0 $2 0 500" | dmsetup create delayed
 
	#

	# Create mapped device delaying reads for 50ms, writes for 100ms and flushs for 333ms

	# onto the same backing device at offset 0 sectors.

	#

	dmsetup create delayed --table "0 `blockdev --getsz $1` delay $1 0 50 $2 0 100 $1 0 333"

Documentation/admin-guide/device-mapper/dm-crypt.rst

+4 −0
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ iv_large_sectors 
   The <iv_offset> must be multiple of <sector_size> (in 512 bytes units)

   if this flag is specified.



integrity_key_size:<bytes>

   Use an integrity key of <bytes> size instead of using an integrity key size

   of the digest size of the used HMAC algorithm.





Module parameters::

   max_read_size

Documentation/admin-guide/device-mapper/vdo.rst

+6 −1
Original line number Diff line number Diff line
@@ -251,6 +251,11 @@ The messages are: 
		by the vdostats userspace program to interpret the output

		buffer.



	config:

		Outputs useful vdo configuration information. Mostly used

		by users who want to recreate a similar VDO volume and

		want to know the creation configuration used.



	dump:

		Dumps many internal structures to the system log. This is

		not always safe to run, so it should only be used to debug

Documentation/admin-guide/kernel-parameters.txt

+17 −0
Original line number Diff line number Diff line
@@ -2677,6 +2677,23 @@ 


			Default is Y (on).



	kvm.enable_virt_at_load=[KVM,ARM64,LOONGARCH,MIPS,RISCV,X86]

			If enabled, KVM will enable virtualization in hardware

			when KVM is loaded, and disable virtualization when KVM

			is unloaded (if KVM is built as a module).



			If disabled, KVM will dynamically enable and disable

			virtualization on-demand when creating and destroying

			VMs, i.e. on the 0=>1 and 1=>0 transitions of the

			number of VMs.



			Enabling virtualization at module lode avoids potential

			latency for creation of the 0=>1 VM, as KVM serializes

			virtualization enabling across all online CPUs.  The

			"cost" of enabling virtualization when KVM is loaded,

			is that doing so may interfere with using out-of-tree

			hypervisors that want to "own" virtualization hardware.



	kvm.enable_vmware_backdoor=[KVM] Support VMware backdoor PV interface.

				   Default is false (don't support).

Documentation/arch/arm/mem_alignment.rst

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ ones. 


Of course this is a bad idea to rely on the alignment trap to perform

unaligned memory access in general.  If those access are predictable, you

are better to use the macros provided by include/asm/unaligned.h.  The

are better to use the macros provided by include/linux/unaligned.h.  The

alignment trap can fixup misaligned access for the exception cases, but at

a high performance cost.  It better be rare.