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

!1771 Backport 5.10.164 - 5.10.165 LTS patches from upstream. 

Merge Pull Request from: @sanglipeng 
 
issue: https://gitee.com/openeuler/kernel/issues/I7T7G4

Backport 5.10.164 - 5.10.165  LTS patches from upstream.

Conflicts:

Context confilict(2):  
83e3a5be7475:  xhci: Add update_hub_device override for PCI xHCI hosts
03ba86bb3811:  x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN

Already merged(5):
550efeff989b:  netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits
6c9e2c11c33c:  ipv6: raw: Deduct extension header length in rawv6_push_pending_frames
9f8e45720e0e:  prlimit: do_prlimit needs to have a speculation check
f6c201b4382d:  net/ulp: use consistent error code when blocking ULP
856e4b5e53f2:  USB: gadgetfs: Fix race between mounting and unmounting

Rejected(1):
a3a1114aa615:  xfrm: fix rcu lock in xfrm_notify_userpolicy()

Total patches: 162 - 5 - 1 = 156 
 
Link:https://gitee.com/openeuler/kernel/pulls/1771

 

Reviewed-by: default avatarzhao xiaoqiang <zhaoxiaoqiang11@jd.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 1813d41c 3e8f09d3

Documentation/admin-guide/kernel-parameters.txt

+42 −9
Original line number Diff line number Diff line
@@ -2221,24 +2221,57 @@ 


	ivrs_ioapic	[HW,X86-64]

			Provide an override to the IOAPIC-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map IOAPIC-ID decimal 10 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map IOAPIC-ID decimal 10 to

			PCI segment 0x1 and PCI device 00:14.0,

			write the parameter as:

				ivrs_ioapic=10@0001:00:14.0



			Deprecated formats:

			* To map IOAPIC-ID decimal 10 to PCI device 00:14.0

			  write the parameter as:

				ivrs_ioapic[10]=00:14.0

			* To map IOAPIC-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_hpet	[HW,X86-64]

			Provide an override to the HPET-ID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map HPET-ID decimal 0 to

			PCI device 00:14.0 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map HPET-ID decimal 10 to

			PCI segment 0x1 and PCI device 00:14.0,

			write the parameter as:

				ivrs_hpet=10@0001:00:14.0



			Deprecated formats:

			* To map HPET-ID decimal 0 to PCI device 00:14.0

			  write the parameter as:

				ivrs_hpet[0]=00:14.0

			* To map HPET-ID decimal 10 to PCI segment 0x1 and

			  PCI device 00:14.0 write the parameter as:

				ivrs_ioapic[10]=0001:00:14.0



	ivrs_acpihid	[HW,X86-64]

			Provide an override to the ACPI-HID:UID<->DEVICE-ID

			mapping provided in the IVRS ACPI table. For

			example, to map UART-HID:UID AMD0020:0 to

			PCI device 00:14.5 write the parameter as:

			mapping provided in the IVRS ACPI table.

			By default, PCI segment is 0, and can be omitted.



			For example, to map UART-HID:UID AMD0020:0 to

			PCI segment 0x1 and PCI device ID 00:14.5,

			write the parameter as:

				ivrs_acpihid=AMD0020:0@0001:00:14.5



			Deprecated formats:

			* To map UART-HID:UID AMD0020:0 to PCI segment is 0,

			  PCI device ID 00:14.5, write the parameter as:

				ivrs_acpihid[00:14.5]=AMD0020:0

			* To map UART-HID:UID AMD0020:0 to PCI segment 0x1 and

			  PCI device ID 00:14.5, write the parameter as:

				ivrs_acpihid[0001:00:14.5]=AMD0020:0



	js=		[HW,JOY] Analog joystick

			See Documentation/input/joydev/joystick.rst.

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb2-phy.yaml

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb2-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb2-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic G12A USB2 PHY
@@ -13,8 +13,8 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb2-phy

      - amlogic,meson-a1-usb2-phy

      - amlogic,g12a-usb2-phy

      - amlogic,a1-usb2-phy



  reg:

    maxItems: 1
@@ -68,7 +68,7 @@ additionalProperties: false 
examples:

  - |

    phy@36000 {

          compatible = "amlogic,meson-g12a-usb2-phy";

          compatible = "amlogic,g12a-usb2-phy";

          reg = <0x36000 0x2000>;

          clocks = <&xtal>;

          clock-names = "xtal";

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml→Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#"

$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: Amlogic G12A USB3 + PCIE Combo PHY
@@ -13,7 +13,7 @@ maintainers: 
properties:

  compatible:

    enum:

      - amlogic,meson-g12a-usb3-pcie-phy

      - amlogic,g12a-usb3-pcie-phy



  reg:

    maxItems: 1
@@ -49,7 +49,7 @@ additionalProperties: false 
examples:

  - |

    phy@46000 {

          compatible = "amlogic,meson-g12a-usb3-pcie-phy";

          compatible = "amlogic,g12a-usb3-pcie-phy";

          reg = <0x46000 0x2000>;

          clocks = <&ref_clk>;

          clock-names = "ref_clk";

Documentation/sphinx/load_config.py

+4 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


import os

import sys

from sphinx.util.pycompat import execfile_

from sphinx.util.osutil import fs_encoding



# ------------------------------------------------------------------------------

def loadConfig(namespace):
@@ -48,7 +48,9 @@ def loadConfig(namespace): 
            sys.stdout.write("load additional sphinx-config: %s\n" % config_file)

            config = namespace.copy()

            config['__file__'] = config_file

            execfile_(config_file, config)

            with open(config_file, 'rb') as f:

                code = compile(f.read(), fs_encoding, 'exec')

                exec(code, config)

            del config['__file__']

            namespace.update(config)

        else:

Documentation/virt/kvm/api.rst

+60 −0
Original line number Diff line number Diff line
@@ -6756,3 +6756,63 @@ When enabled, KVM will disable paravirtual features provided to the 
guest according to the bits in the KVM_CPUID_FEATURES CPUID leaf

(0x40000001). Otherwise, a guest may use the paravirtual features

regardless of what has actually been exposed through the CPUID leaf.



9. Known KVM API problems

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



In some cases, KVM's API has some inconsistencies or common pitfalls

that userspace need to be aware of.  This section details some of

these issues.



Most of them are architecture specific, so the section is split by

architecture.



9.1. x86

--------



``KVM_GET_SUPPORTED_CPUID`` issues

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



In general, ``KVM_GET_SUPPORTED_CPUID`` is designed so that it is possible

to take its result and pass it directly to ``KVM_SET_CPUID2``.  This section

documents some cases in which that requires some care.



Local APIC features

~~~~~~~~~~~~~~~~~~~



CPU[EAX=1]:ECX[21] (X2APIC) is reported by ``KVM_GET_SUPPORTED_CPUID``,

but it can only be enabled if ``KVM_CREATE_IRQCHIP`` or

``KVM_ENABLE_CAP(KVM_CAP_IRQCHIP_SPLIT)`` are used to enable in-kernel emulation of

the local APIC.



The same is true for the ``KVM_FEATURE_PV_UNHALT`` paravirtualized feature.



CPU[EAX=1]:ECX[24] (TSC_DEADLINE) is not reported by ``KVM_GET_SUPPORTED_CPUID``.

It can be enabled if ``KVM_CAP_TSC_DEADLINE_TIMER`` is present and the kernel

has enabled in-kernel emulation of the local APIC.



CPU topology

~~~~~~~~~~~~



Several CPUID values include topology information for the host CPU:

0x0b and 0x1f for Intel systems, 0x8000001e for AMD systems.  Different

versions of KVM return different values for this information and userspace

should not rely on it.  Currently they return all zeroes.



If userspace wishes to set up a guest topology, it should be careful that

the values of these three leaves differ for each CPU.  In particular,

the APIC ID is found in EDX for all subleaves of 0x0b and 0x1f, and in EAX

for 0x8000001e; the latter also encodes the core id and node id in bits

7:0 of EBX and ECX respectively.



Obsolete ioctls and capabilities

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



KVM_CAP_DISABLE_QUIRKS does not let userspace know which quirks are actually

available.  Use ``KVM_CHECK_EXTENSION(KVM_CAP_DISABLE_QUIRKS2)`` instead if

available.



Ordering of KVM_GET_*/KVM_SET_* ioctls

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^



TBD