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

!1931 Backport 5.10.173 LTS patches from upstream.

Merge Pull Request from: @sanglipeng 
 
Issue: https://gitee.com/openeuler/kernel/issues/I7X0QU

Backport 5.10.173 LTS patches from upstream.

Conflicts:

Already merged(37):
e9743b3052e1:  drm/msm/dpu: Add check for pstates
ef7d71d7bd57:  fs: hfsplus: fix UAF issue in hfsplus_put_super
abfed855f058:  x86/speculation: Allow enabling STIBP with legacy IBRS
18c3fa7a7fdb:  net/sched: Retire tcindex classifier
846bfba34175:  ubi: ensure that VID header offset + VID header size <= alloc, size
da26369377f0:  ipv6: Add lwtunnel encap size of all siblings in nexthop calculation
3e734e694181:  vc_screen: modify vcs_size() handling in vcs_read()
c79a924ed6af:  loop: loop_set_status_from_info() check before assignment
84ea44dc3e4e:  tty: fix out-of-bounds access in tty_driver_lookup_tty()
c5fe3fba1b7b:  drm/virtio: Fix error code in virtio_gpu_object_shmem_init()
cb8382c37145:  HID: asus: Remove check for same LED brightness on set
6a63a3334aca:  HID: asus: use spinlock to protect concurrent accesses
9e56938f2072:  x86/microcode: Rip out the OLD_INTERFACE
e6230806681f:  x86/microcode: Default-disable late loading
2416abd6bad2:  net: add sock_init_data_uid()
9a31af61f397:  tun: tun_chr_open(): correctly initialize socket uid
78da5a378bda:  media: rc: Fix use-after-free bugs caused by ene_tx_irqsim()
42f8ba835568:  media: usb: siano: Fix use after free bugs caused by do_submit_urb
1fc9760afd8a:  crypto: hisilicon: Wipe entire pool on error
ab22799f11e3:  jbd2: fix data missing when reusing bh which is ready to be checkpointed
6e02a43acd06:  ring-buffer: Handle race between rb_move_tail and rb_check_pages
ffebd804c7ab:  ubifs: Rectify space budget for ubifs_symlink() if symlink is encrypted
9e07ee28c20d:  ubifs: Rectify space budget for ubifs_xrename()
495ea59a24a3:  ubifs: Fix wrong dirty space budget for dirty inode
38a097dce184:  ubifs: do_rename: Fix wrong space budget when target inode's nlink > 1
38fd7acdc1d2:  ubifs: Reserve one leb for each journal head while doing budget
31d60afe2cc2:  ubi: Fix unreferenced object reported by kmemleak in ubi_resize_volume()
343d273d5fd0:  ubifs: Re-statistic cleaned znode count if commit failed
9d4768523b09:  ubifs: dirty_cow_znode: Fix memleak in error handling path
f09a84548c3:   ubifs: ubifs_writepage: Mark page dirty after writing inode failed
0aa0253f6c99:  ubi: fastmap: Fix missed fm_anchor PEB in wear-leveling after disabling fastmap
9d448dd6bcb6:  ubi: Fix UAF wear-leveling entry in eraseblk_count_seq_show()
8a18856e0744:  ubi: ubi_wl_put_peb: Fix infinite loop when wear-leveling work failed
0a1d0c79eaec:  tcp: Fix listen() regression in 5.10.163
a5bbea50d622:  malidp: Fix NULL vs IS_ERR() checking 
21a2eec4a440:  HID: asus: use spinlock to safely schedule workers
4a9272a864cb:  tap: tap_open(): correctly initialize socket uid

Rejected(10):
2fc7748d4823:  clocksource: Suspend the watchdog temporarily when high read latency detected
c315560e3ef7:  scsi: ses: Fix possible desc_ptr out-of-bounds accesses
8f9542cad6c2:  scsi: ses: Fix slab-out-of-bounds in ses_intf_remove()
35f8d4064e54:  ubi: Fix use-after-free when volume resizing failed
654ae539254d:  PCI: loongson: Prevent LS7A MRRS increases
87cf9bc78c43:  x86/microcode/AMD: Add a @cpu parameter to the reloading functions
89e848bb4aa1:  x86/microcode: Add a parameter to microcode_check() to store CPU capabilities
511e27e5fdd6:  x86/microcode: Check CPU capabilities after late microcode update correctly
8e83e1619fac:  x86/microcode: Adjust late loading result reporting message
01923e3196ee:  PCI: Add ACS quirk for Wangxun NICs

Kabi broken(1):
44a44b57e88f:  x86/microcode/AMD: Fix mixed steppings support

Total patches: 528 - 37 - 10 - 1 =  480 
 
Link:https://gitee.com/openeuler/kernel/pulls/1931

 

Reviewed-by: default avatarzhao xiaoqiang <zhaoxiaoqiang11@jd.com>
Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 21514d72 d9f674f1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Date: Dec 2014
KernelVersion:	4.0
Description:	Default output terminal descriptors

		All attributes read only:
		All attributes read only except bSourceID:

		==============	=============================================
		iTerminal	index of string descriptor
+11 −2
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ Brief summary of control files.
 memory.swappiness		     set/show swappiness parameter of vmscan
				     (See sysctl's vm.swappiness)
 memory.move_charge_at_immigrate     set/show controls of moving charges
                                     This knob is deprecated and shouldn't be
                                     used.
 memory.oom_control		     set/show oom controls.
 memory.numa_stat		     show the number of memory usage per numa
				     node
@@ -741,8 +743,15 @@ NOTE2:
       It is recommended to set the soft limit always below the hard limit,
       otherwise the hard limit will take precedence.

8. Move charges at task migration
=================================
8. Move charges at task migration (DEPRECATED!)
===============================================

THIS IS DEPRECATED!

It's expensive and unreliable! It's better practice to launch workload
tasks directly from inside their target cgroup. Use dedicated workload
cgroups to allow fine-grained policy adjustments without having to
move physical pages between control domains.

Users can move charges associated with a task along with task migration, that
is, uncharge task's pages from the old cgroup and charge them to the new cgroup.
+16 −5
Original line number Diff line number Diff line
@@ -479,8 +479,16 @@ Spectre variant 2
   On Intel Skylake-era systems the mitigation covers most, but not all,
   cases. See :ref:`[3] <spec_ref3>` for more details.

   On CPUs with hardware mitigation for Spectre variant 2 (e.g. Enhanced
   IBRS on x86), retpoline is automatically disabled at run time.
   On CPUs with hardware mitigation for Spectre variant 2 (e.g. IBRS
   or enhanced IBRS on x86), retpoline is automatically disabled at run time.

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

   Legacy IBRS systems clear the IBRS bit on exit to userspace and
   therefore explicitly enable STIBP for that

   The retpoline mitigation is turned on by default on vulnerable
   CPUs. It can be forced on or off by the administrator
@@ -504,9 +512,12 @@ Spectre variant 2
   For Spectre variant 2 mitigation, individual user programs
   can be compiled with return trampolines for indirect branches.
   This protects them from consuming poisoned entries in the branch
   target buffer left by malicious software.  Alternatively, the
   programs can disable their indirect branch speculation via prctl()
   (See :ref:`Documentation/userspace-api/spec_ctrl.rst <set_spec_ctrl>`).
   target buffer left by malicious software.

   On legacy IBRS systems, at return to userspace, implicit STIBP is disabled
   because the kernel clears the IBRS bit. In this case, the userspace programs
   can disable indirect branch speculation via prctl() (See
   :ref:`Documentation/userspace-api/spec_ctrl.rst <set_spec_ctrl>`).
   On x86, this will turn on STIBP to guard against attacks from the
   sibling thread when the user program is running, and use IBPB to
   flush the branch target buffer when switching to/from the program.
+1 −1
Original line number Diff line number Diff line
@@ -312,10 +312,10 @@ define dmesg
			set var $prev_flags = $info->flags
		end

		set var $id = ($id + 1) & $id_mask
		if ($id == $end_id)
			loop_break
		end
		set var $id = ($id + 1) & $id_mask
	end
end
document dmesg
+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ Setup
  this mode. In this case, you should build the kernel with
  CONFIG_RANDOMIZE_BASE disabled if the architecture supports KASLR.

- Build the gdb scripts (required on kernels v5.1 and above)::

    make scripts_gdb

- Enable the gdb stub of QEMU/KVM, either

    - at VM startup time by appending "-s" to the QEMU command line
Loading