Merge branch '13.0' into 13.0-ksu

Documentation/ABI/testing/sysfs-fs-f2fs

@@ -96,6 +96,12 @@ Description: Controls the issue rate of discard commands that consist of small
  checkpoint is triggered, and issued during the checkpoint.
  By default, it is disabled with 0.
 
+What: /sys/fs/f2fs/<disk>/max_ordered_discard
+Date: October 2022
+Contact: "Yangtao Li" <[email protected]>
+Description: Controls the maximum ordered discard, the unit size is one block(4KB).
+ Set it to 16 by default.
+
 What: /sys/fs/f2fs/<disk>/max_discard_request
 Date: December 2021
 Contact: "Konstantin Vyshetsky" <[email protected]>
@@ -173,12 +179,6 @@ Description: Controls the memory footprint used by free nids and cached
  nat entries. By default, 1 is set, which indicates
  10 MB / 1 GB RAM.
 
-What: /sys/fs/f2fs/<disk>/batched_trim_sections
-Date: February 2015
-Contact: "Jaegeuk Kim" <[email protected]>
-Description: Controls the trimming rate in batch mode.
- <deprecated>
-
 What: /sys/fs/f2fs/<disk>/cp_interval
 Date: October 2015
 Contact: "Jaegeuk Kim" <[email protected]>
@@ -453,6 +453,30 @@ Description: Show status of f2fs superblock in real time.
  0x4000 SBI_IS_FREEZING freefs is in process
  ====== ===================== =================================
 
+What: /sys/fs/f2fs/<disk>/stat/cp_status
+Date: September 2022
+Contact: "Chao Yu" <[email protected]>
+Description: Show status of f2fs checkpoint in real time.
+
+ =============================== ==============================
+ cp flag value
+ CP_UMOUNT_FLAG 0x00000001
+ CP_ORPHAN_PRESENT_FLAG 0x00000002
+ CP_COMPACT_SUM_FLAG 0x00000004
+ CP_ERROR_FLAG 0x00000008
+ CP_FSCK_FLAG 0x00000010
+ CP_FASTBOOT_FLAG 0x00000020
+ CP_CRC_RECOVERY_FLAG 0x00000040
+ CP_NAT_BITS_FLAG 0x00000080
+ CP_TRIMMED_FLAG 0x00000100
+ CP_NOCRC_RECOVERY_FLAG 0x00000200
+ CP_LARGE_NAT_BITMAP_FLAG 0x00000400
+ CP_QUOTA_NEED_FSCK_FLAG 0x00000800
+ CP_DISABLED_FLAG 0x00001000
+ CP_DISABLED_QUICK_FLAG 0x00002000
+ CP_RESIZEFS_FLAG 0x00004000
+ =============================== ==============================
+
 What: /sys/fs/f2fs/<disk>/ckpt_thread_ioprio
 Date: January 2021
 Contact: "Daeho Jeong" <[email protected]>
@@ -549,10 +573,10 @@ Description: With "mode=fragment:block" mount options, we can scatter block allo
  in the length of 1..<max_fragment_hole> by turns. This value can be set
  between 1..512 and the default value is 4.
 
-What: /sys/fs/f2fs/<disk>/gc_urgent_high_remaining
-Date: December 2021
-Contact: "Daeho Jeong" <daehojeong@google.com>
-Description: You can set the trial count limit for GC urgent high mode with this value.
+What: /sys/fs/f2fs/<disk>/gc_remaining_trials
+Date: October 2022
+Contact: "Yangtao Li" <frank.li@vivo.com>
+Description: You can set the trial count limit for GC urgent and idle mode with this value.
  If GC thread gets to the limit, the mode will turn back to GC normal mode.
  By default, the value is zero, which means there is no limit like before.
 
@@ -585,3 +609,101 @@ Date: July 2022
 Contact: "Daeho Jeong" <[email protected]>
 Description: Show the accumulated total revoked atomic write block count after boot.
  If you write "0" here, you can initialize to "0".
+
+What: /sys/fs/f2fs/<disk>/gc_mode
+Date: October 2022
+Contact: "Yangtao Li" <[email protected]>
+Description: Show the current gc_mode as a string.
+ This is a read-only entry.
+
+What: /sys/fs/f2fs/<disk>/discard_urgent_util
+Date: November 2022
+Contact: "Yangtao Li" <[email protected]>
+Description: When space utilization exceeds this, do background DISCARD aggressively.
+ Does DISCARD forcibly in a period of given min_discard_issue_time when the number
+ of discards is not 0 and set discard granularity to 1.
+ Default: 80
+
+What: /sys/fs/f2fs/<disk>/hot_data_age_threshold
+Date: November 2022
+Contact: "Ping Xiong" <[email protected]>
+Description: When DATA SEPARATION is on, it controls the age threshold to indicate
+ the data blocks as hot. By default it was initialized as 262144 blocks
+ (equals to 1GB).
+
+What: /sys/fs/f2fs/<disk>/warm_data_age_threshold
+Date: November 2022
+Contact: "Ping Xiong" <[email protected]>
+Description: When DATA SEPARATION is on, it controls the age threshold to indicate
+ the data blocks as warm. By default it was initialized as 2621440 blocks
+ (equals to 10GB).
+
+What: /sys/fs/f2fs/<disk>/fault_rate
+Date: May 2016
+Contact: "Sheng Yong" <[email protected]>
+Contact: "Chao Yu" <[email protected]>
+Description: Enable fault injection in all supported types with
+ specified injection rate.
+
+What: /sys/fs/f2fs/<disk>/fault_type
+Date: May 2016
+Contact: "Sheng Yong" <[email protected]>
+Contact: "Chao Yu" <[email protected]>
+Description: Support configuring fault injection type, should be
+ enabled with fault_injection option, fault type value
+ is shown below, it supports single or combined type.
+
+ =================== ===========
+ Type_Name Type_Value
+ =================== ===========
+ FAULT_KMALLOC 0x000000001
+ FAULT_KVMALLOC 0x000000002
+ FAULT_PAGE_ALLOC 0x000000004
+ FAULT_PAGE_GET 0x000000008
+ FAULT_ALLOC_BIO 0x000000010 (obsolete)
+ FAULT_ALLOC_NID 0x000000020
+ FAULT_ORPHAN 0x000000040
+ FAULT_BLOCK 0x000000080
+ FAULT_DIR_DEPTH 0x000000100
+ FAULT_EVICT_INODE 0x000000200
+ FAULT_TRUNCATE 0x000000400
+ FAULT_READ_IO 0x000000800
+ FAULT_CHECKPOINT 0x000001000
+ FAULT_DISCARD 0x000002000
+ FAULT_WRITE_IO 0x000004000
+ FAULT_SLAB_ALLOC 0x000008000
+ FAULT_DQUOT_INIT 0x000010000
+ FAULT_LOCK_OP 0x000020000
+ FAULT_BLKADDR 0x000040000
+ =================== ===========
+
+What: /sys/fs/f2fs/<disk>/discard_io_aware_gran
+Date: January 2023
+Contact: "Yangtao Li" <[email protected]>
+Description: Controls background discard granularity of inner discard thread
+ when is not in idle. Inner thread will not issue discards with size that
+ is smaller than granularity. The unit size is one block(4KB), now only
+ support configuring in range of [0, 512].
+ Default: 512
+
+What: /sys/fs/f2fs/<disk>/last_age_weight
+Date: January 2023
+Contact: "Ping Xiong" <[email protected]>
+Description: When DATA SEPARATION is on, it controls the weight of last data block age.
+
+What: /sys/fs/f2fs/<disk>/compress_watermark
+Date: February 2023
+Contact: "Yangtao Li" <[email protected]>
+Description: When compress cache is on, it controls free memory watermark
+ in order to limit caching compress page. If free memory is lower
+ than watermark, then deny caching compress page. The value should be in
+ range of (0, 100], by default it was initialized as 20(%).
+
+What: /sys/fs/f2fs/<disk>/compress_percent
+Date: February 2023
+Contact: "Yangtao Li" <[email protected]>
+Description: When compress cache is on, it controls cached page
+ percent(compress pages / free_ram) in order to limit caching compress page.
+ If cached page percent exceed threshold, then deny caching compress page.
+ The value should be in range of (0, 100], by default it was initialized
+ as 20(%).

Documentation/filesystems/f2fs.rst

@@ -154,6 +154,8 @@ nobarrier This option can be used if underlying storage guarantees
  If this option is set, no cache_flush commands are issued
  but f2fs still guarantees the write ordering of all the
  data writes.
+barrier If this option is set, cache_flush commands are allowed to be
+ issued.
 fastboot This option is used when a system wants to reduce mount
  time as much as possible, even though normal performance
  can be sacrificed.
@@ -199,6 +201,7 @@ fault_type=%d Support configuring fault injection type, should be
  FAULT_SLAB_ALLOC 0x000008000
  FAULT_DQUOT_INIT 0x000010000
  FAULT_LOCK_OP 0x000020000
+ FAULT_BLKADDR 0x000040000
  =================== ===========
 mode=%s Control block allocation mode which supports "adaptive"
  and "lfs". In "lfs" mode, there should be no random
@@ -257,7 +260,7 @@ checkpoint=%s[:%u[%]] Set to "disable" to turn off checkpointing. Set to "enabl
  disabled, any unmounting or unexpected shutdowns will cause
  the filesystem contents to appear as they did when the
  filesystem was mounted with that option.
- While mounting with checkpoint=disabled, the filesystem must
+ While mounting with checkpoint=disable, the filesystem must
  run garbage collection to ensure that all available space can
  be used. If this takes too much time, the mount may return
  EAGAIN. You may optionally add a value to indicate how much
@@ -341,6 +344,10 @@ memory=%s Control memory mode. This supports "normal" and "low" modes.
  Because of the nature of low memory devices, in this mode, f2fs
  will try to save memory sometimes by sacrificing performance.
  "normal" mode is the default mode and same as before.
+age_extent_cache Enable an age extent cache based on rb-tree. It records
+ data block update frequency of the extent per inode, in
+ order to provide better temperature hints for data block
+ allocation.
 ======================== ============================================================
 
 Debugfs Entries

Documentation/sound/hd-audio/models.rst

@@ -429,7 +429,7 @@ ref
 no-jd
  BIOS setup but without jack-detection
 intel
- Intel DG45* mobos
+ Intel D*45* mobos
 dell-m6-amic
  Dell desktops/laptops with analog mics
 dell-m6-dmic

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 4
 PATCHLEVEL = 14
-SUBLEVEL = 312
+SUBLEVEL = 314
 EXTRAVERSION =
 NAME = Petit Gorille
 

arch/arm/boot/dts/rk3288.dtsi

@@ -910,7 +910,7 @@
  status = "disabled";
  };
 
- spdif: sound@ff88b0000 {
+ spdif: sound@ff8b0000 {
  compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif";
  reg = <0x0 0xff8b0000 0x0 0x10000>;
  #sound-dai-cells = <0>;

arch/arm64/kvm/guest.c

@@ -57,9 +57,8 @@ static u64 core_reg_offset_from_id(u64 id)
  return id & ~(KVM_REG_ARCH_MASK | KVM_REG_SIZE_MASK | KVM_REG_ARM_CORE);
 }
 
-static int validate_core_offset(const struct kvm_one_reg *reg)
+static int core_reg_size_from_offset(u64 off)
 {
- u64 off = core_reg_offset_from_id(reg->id);
  int size;
 
  switch (off) {
@@ -89,11 +88,24 @@ static int validate_core_offset(const struct kvm_one_reg *reg)
  return -EINVAL;
  }
 
- if (KVM_REG_SIZE(reg->id) == size &&
- IS_ALIGNED(off, size / sizeof(__u32)))
- return 0;
+ if (!IS_ALIGNED(off, size / sizeof(__u32)))
+ return -EINVAL;
 
- return -EINVAL;
+ return size;
+}
+
+static int validate_core_offset(const struct kvm_one_reg *reg)
+{
+ u64 off = core_reg_offset_from_id(reg->id);
+ int size = core_reg_size_from_offset(off);
+
+ if (size < 0)
+ return -EINVAL;
+
+ if (KVM_REG_SIZE(reg->id) != size)
+ return -EINVAL;
+
+ return 0;
 }
 
 static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
@@ -193,9 +205,51 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
  return -EINVAL;
 }
 
+static int kvm_arm_copy_core_reg_indices(u64 __user *uindices)
+{
+ unsigned int i;
+ int n = 0;
+
+ for (i = 0; i < sizeof(struct kvm_regs) / sizeof(__u32); i++) {
+ u64 reg = KVM_REG_ARM64 | KVM_REG_ARM_CORE | i;
+ int size = core_reg_size_from_offset(i);
+
+ if (size < 0)
+ continue;
+
+ switch (size) {
+ case sizeof(__u32):
+ reg |= KVM_REG_SIZE_U32;
+ break;
+
+ case sizeof(__u64):
+ reg |= KVM_REG_SIZE_U64;
+ break;
+
+ case sizeof(__uint128_t):
+ reg |= KVM_REG_SIZE_U128;
+ break;
+
+ default:
+ WARN_ON(1);
+ continue;
+ }
+
+ if (uindices) {
+ if (put_user(reg, uindices))
+ return -EFAULT;
+ uindices++;
+ }
+
+ n++;
+ }
+
+ return n;
+}
+
 static unsigned long num_core_regs(void)
 {
- return sizeof(struct kvm_regs) / sizeof(__u32);
+ return kvm_arm_copy_core_reg_indices(NULL);
 }
 
 /**
@@ -269,23 +323,20 @@ unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu)
  */
 int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *uindices)
 {
- unsigned int i;
- const u64 core_reg = KVM_REG_ARM64 | KVM_REG_SIZE_U64 | KVM_REG_ARM_CORE;
  int ret;
 
- for (i = 0; i < sizeof(struct kvm_regs) / sizeof(__u32); i++) {
- if (put_user(core_reg | i, uindices))
- return -EFAULT;
- uindices++;
- }
+ ret = kvm_arm_copy_core_reg_indices(uindices);
+ if (ret < 0)
+ return ret;
+ uindices += ret;
 
  ret = kvm_arm_copy_fw_reg_indices(vcpu, uindices);
- if (ret)
+ if (ret < 0)
  return ret;
  uindices += kvm_arm_get_fw_num_regs(vcpu);
 
  ret = copy_timer_indices(vcpu, uindices);
- if (ret)
+ if (ret < 0)
  return ret;
  uindices += NUM_TIMER_REGS;
 

arch/s390/kernel/ptrace.c

@@ -500,9 +500,7 @@ long arch_ptrace(struct task_struct *child, long request,
  }
  return 0;
  case PTRACE_GET_LAST_BREAK:
- put_user(child->thread.last_break,
- (unsigned long __user *) data);
- return 0;
+ return put_user(child->thread.last_break, (unsigned long __user *)data);
  case PTRACE_ENABLE_TE:
  if (!MACHINE_HAS_TE)
  return -EIO;
@@ -854,9 +852,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
  }
  return 0;
  case PTRACE_GET_LAST_BREAK:
- put_user(child->thread.last_break,
- (unsigned int __user *) data);
- return 0;
+ return put_user(child->thread.last_break, (unsigned int __user *)data);
  }
  return compat_ptrace_request(child, request, addr, data);
 }

arch/x86/kernel/sysfb_efi.c

@@ -273,6 +273,14 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = {
  "IdeaPad Duet 3 10IGL5"),
  },
  },
+ {
+ /* Lenovo Yoga Book X91F / X91L */
+ .matches = {
+ DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"),
+ /* Non exact match to match F + L versions */
+ DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"),
+ },
+ },
  {},
 };