6.9: Sync

Signed-off-by: Peter Jung <[email protected]>

6.9/0001-aes-crypto.patch

@@ -1,7 +1,7 @@
-From 75e308545fc25fdf56ca42e345a63de9dd5264d4 Mon Sep 17 00:00:00 2001
+From 0372f7cd0dd5b30cb95113d2e283496d4960f3a4 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
-Date: Wed, 12 Jun 2024 18:19:02 +0200
-Subject: [PATCH 01/11] aes-crypto
+Date: Sun, 16 Jun 2024 15:32:54 +0200
+Subject: [PATCH 01/10] aes-crypto
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -22,7 +22,7 @@ Signed-off-by: Peter Jung <[email protected]>
  delete mode 100644 arch/x86/crypto/aesni-intel_avx-x86_64.S
 
 diff --git a/arch/x86/Kconfig.assembler b/arch/x86/Kconfig.assembler
-index 8ad41da301e53..59aedf32c4eaa 100644
+index 8ad41da301e5..59aedf32c4ea 100644
 --- a/arch/x86/Kconfig.assembler
 +++ b/arch/x86/Kconfig.assembler
 @@ -25,6 +25,16 @@ config AS_GFNI
@@ -43,7 +43,7 @@ index 8ad41da301e53..59aedf32c4eaa 100644
  def_bool $(as-instr,wrussq %rax$(comma)(%rbx))
  help
 diff --git a/arch/x86/crypto/Kconfig b/arch/x86/crypto/Kconfig
-index c9e59589a1cee..24875e6295f2d 100644
+index c9e59589a1ce..24875e6295f2 100644
 --- a/arch/x86/crypto/Kconfig
 +++ b/arch/x86/crypto/Kconfig
 @@ -18,6 +18,7 @@ config CRYPTO_AES_NI_INTEL
@@ -55,7 +55,7 @@ index c9e59589a1cee..24875e6295f2d 100644
  select CRYPTO_SKCIPHER
  select CRYPTO_SIMD
 diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
-index 9aa46093c91b6..53b4a277809e0 100644
+index 9aa46093c91b..53b4a277809e 100644
 --- a/arch/x86/crypto/Makefile
 +++ b/arch/x86/crypto/Makefile
 @@ -48,7 +48,12 @@ chacha-x86_64-$(CONFIG_AS_AVX512) += chacha-avx512vl-x86_64.o
@@ -74,7 +74,7 @@ index 9aa46093c91b6..53b4a277809e0 100644
  sha1-ssse3-y := sha1_avx2_x86_64_asm.o sha1_ssse3_asm.o sha1_ssse3_glue.o
 diff --git a/arch/x86/crypto/aes-gcm-aesni-x86_64.S b/arch/x86/crypto/aes-gcm-aesni-x86_64.S
 new file mode 100644
-index 0000000000000..45940e2883a0f
+index 000000000000..45940e2883a0
 --- /dev/null
 +++ b/arch/x86/crypto/aes-gcm-aesni-x86_64.S
 @@ -0,0 +1,1128 @@
@@ -1208,7 +1208,7 @@ index 0000000000000..45940e2883a0f
 +SYM_FUNC_END(aes_gcm_dec_final_aesni_avx)
 diff --git a/arch/x86/crypto/aes-gcm-avx10-x86_64.S b/arch/x86/crypto/aes-gcm-avx10-x86_64.S
 new file mode 100644
-index 0000000000000..97e0ee515fc5f
+index 000000000000..97e0ee515fc5
 --- /dev/null
 +++ b/arch/x86/crypto/aes-gcm-avx10-x86_64.S
 @@ -0,0 +1,1222 @@
@@ -2436,7 +2436,7 @@ index 0000000000000..97e0ee515fc5f
 +SYM_FUNC_END(aes_gcm_dec_final_vaes_avx10)
 diff --git a/arch/x86/crypto/aes-xts-avx-x86_64.S b/arch/x86/crypto/aes-xts-avx-x86_64.S
 new file mode 100644
-index 0000000000000..48f97b79f7a9c
+index 000000000000..48f97b79f7a9
 --- /dev/null
 +++ b/arch/x86/crypto/aes-xts-avx-x86_64.S
 @@ -0,0 +1,845 @@
@@ -3286,7 +3286,7 @@ index 0000000000000..48f97b79f7a9c
 +SYM_FUNC_END(aes_xts_decrypt_vaes_avx10_512)
 +#endif /* CONFIG_AS_VAES && CONFIG_AS_VPCLMULQDQ */
 diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
-index 411d8c83e88a8..eb153eff9331a 100644
+index 411d8c83e88a..eb153eff9331 100644
 --- a/arch/x86/crypto/aesni-intel_asm.S
 +++ b/arch/x86/crypto/aesni-intel_asm.S
 @@ -10,16 +10,7 @@
@@ -5398,7 +5398,7 @@ index 411d8c83e88a8..eb153eff9331a 100644
 +SYM_FUNC_END(aesni_xts_dec)
 diff --git a/arch/x86/crypto/aesni-intel_avx-x86_64.S b/arch/x86/crypto/aesni-intel_avx-x86_64.S
 deleted file mode 100644
-index 8c9749ed0651b..0000000000000
+index 8c9749ed0651..000000000000
 --- a/arch/x86/crypto/aesni-intel_avx-x86_64.S
 +++ /dev/null
 @@ -1,2804 +0,0 @@
@@ -8207,7 +8207,7 @@ index 8c9749ed0651b..0000000000000
 - RET
 -SYM_FUNC_END(aesni_gcm_finalize_avx_gen4)
 diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
-index b1d90c25975af..cb4bf9895aa2f 100644
+index b1d90c25975a..cb4bf9895aa2 100644
 --- a/arch/x86/crypto/aesni-intel_glue.c
 +++ b/arch/x86/crypto/aesni-intel_glue.c
 @@ -1,7 +1,7 @@
@@ -9987,7 +9987,7 @@ index b1d90c25975af..cb4bf9895aa2f 100644
 
  late_initcall(aesni_init);
 diff --git a/arch/x86/crypto/sha256_ni_asm.S b/arch/x86/crypto/sha256_ni_asm.S
-index 537b6dcd7ed80..d515a55a3bc1d 100644
+index 537b6dcd7ed8..d515a55a3bc1 100644
 --- a/arch/x86/crypto/sha256_ni_asm.S
 +++ b/arch/x86/crypto/sha256_ni_asm.S
 @@ -62,20 +62,41 @@

6.9/0002-amd-pstate.patch

@@ -1,16 +1,16 @@
-From 841eda55513de3b157eb94460e37e7b779980e0c Mon Sep 17 00:00:00 2001
+From f3018861226770c17b47bcda4d4fd4291ad00ae6 Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
-Date: Wed, 12 Jun 2024 18:19:17 +0200
-Subject: [PATCH 02/11] amd-pstate
+Date: Sun, 16 Jun 2024 15:33:06 +0200
+Subject: [PATCH 02/10] amd-pstate
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
- drivers/cpufreq/amd-pstate.c | 267 +++++++++++++++++++++--------------
+ drivers/cpufreq/amd-pstate.c | 265 +++++++++++++++++++++--------------
  include/linux/amd-pstate.h | 20 ++-
- 2 files changed, 178 insertions(+), 109 deletions(-)
+ 2 files changed, 177 insertions(+), 108 deletions(-)
 
 diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
-index 28166df81cf8d..cde3b91b4422a 100644
+index e263db0385ab..cde3b91b4422 100644
 --- a/drivers/cpufreq/amd-pstate.c
 +++ b/drivers/cpufreq/amd-pstate.c
 @@ -68,6 +68,7 @@ static struct cpufreq_driver amd_pstate_epp_driver;
@@ -142,15 +142,6 @@ index 28166df81cf8d..cde3b91b4422a 100644
  static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
  {
  struct amd_cpudata *cpudata = policy->driver_data;
-@@ -705,7 +669,7 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
- if (state)
- policy->cpuinfo.max_freq = cpudata->max_freq;
- else
-- policy->cpuinfo.max_freq = cpudata->nominal_freq;
-+ policy->cpuinfo.max_freq = cpudata->nominal_freq * 1000;
-
- policy->max = policy->cpuinfo.max_freq;
-
 @@ -844,9 +808,93 @@ static void amd_pstate_update_limits(unsigned int cpu)
  mutex_unlock(&amd_pstate_driver_lock);
  }
@@ -388,7 +379,7 @@ index 28166df81cf8d..cde3b91b4422a 100644
  case AMD_PSTATE_UNDEFINED:
  /* Disable on the following configs by default:
 diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
-index d21838835abda..d58fc022ec466 100644
+index d21838835abd..d58fc022ec46 100644
 --- a/include/linux/amd-pstate.h
 +++ b/include/linux/amd-pstate.h
 @@ -49,13 +49,17 @@ struct amd_aperf_mperf {

6.9/0003-bbr3.patch

@@ -1,7 +1,7 @@
-From 891c060e0a6b001fee4430810f6eb5ad1c19aa79 Mon Sep 17 00:00:00 2001
+From 6932461c1677b1976e34dd958a7f32e435f4203d Mon Sep 17 00:00:00 2001
 From: Peter Jung <[email protected]>
-Date: Wed, 12 Jun 2024 18:19:27 +0200
-Subject: [PATCH 03/11] bbr3
+Date: Sun, 16 Jun 2024 15:33:19 +0200
+Subject: [PATCH 03/10] bbr3
 
 Signed-off-by: Peter Jung <[email protected]>
 ---
@@ -24,7 +24,7 @@ Signed-off-by: Peter Jung <[email protected]>
  16 files changed, 1940 insertions(+), 553 deletions(-)
 
 diff --git a/include/linux/tcp.h b/include/linux/tcp.h
-index 55399ee2a57e7..c6193d87a8e68 100644
+index 55399ee2a57e..c6193d87a8e6 100644
 --- a/include/linux/tcp.h
 +++ b/include/linux/tcp.h
 @@ -368,7 +368,9 @@ struct tcp_sock {
@@ -39,7 +39,7 @@ index 55399ee2a57e7..c6193d87a8e68 100644
  recvmsg_inq : 1,/* Indicate # of bytes in queue upon recvmsg */
  fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */
 diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
-index ccf171f7eb60d..400a226d6beab 100644
+index ccf171f7eb60..400a226d6bea 100644
 --- a/include/net/inet_connection_sock.h
 +++ b/include/net/inet_connection_sock.h
 @@ -137,8 +137,8 @@ struct inet_connection_sock {
@@ -54,7 +54,7 @@ index ccf171f7eb60d..400a226d6beab 100644
 
  #define ICSK_TIME_RETRANS 1 /* Retransmit timer */
 diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 2bcf30381d75f..54e1af0789b87 100644
+index 2bcf30381d75..54e1af0789b8 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -381,6 +381,8 @@ static inline void tcp_dec_quickack_mode(struct sock *sk)
@@ -226,7 +226,7 @@ index 2bcf30381d75f..54e1af0789b87 100644
  static inline void tcp_plb_init(const struct sock *sk,
  struct tcp_plb_state *plb)
 diff --git a/include/uapi/linux/inet_diag.h b/include/uapi/linux/inet_diag.h
-index 50655de04c9b6..82f8bd8f0d161 100644
+index 50655de04c9b..82f8bd8f0d16 100644
 --- a/include/uapi/linux/inet_diag.h
 +++ b/include/uapi/linux/inet_diag.h
 @@ -229,6 +229,29 @@ struct tcp_bbr_info {
@@ -260,7 +260,7 @@ index 50655de04c9b6..82f8bd8f0d161 100644
 
  union tcp_cc_info {
 diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
-index 3b687d20c9ed3..a7c30c243b546 100644
+index 3b687d20c9ed..a7c30c243b54 100644
 --- a/include/uapi/linux/rtnetlink.h
 +++ b/include/uapi/linux/rtnetlink.h
 @@ -507,12 +507,14 @@ enum {
@@ -280,7 +280,7 @@ index 3b687d20c9ed3..a7c30c243b546 100644
  struct rta_session {
  __u8 proto;
 diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
-index c07e9f90c0843..5c88336ced60a 100644
+index c07e9f90c084..5c88336ced60 100644
 --- a/include/uapi/linux/tcp.h
 +++ b/include/uapi/linux/tcp.h
 @@ -176,6 +176,7 @@ enum tcp_fastopen_client_fail {
@@ -292,7 +292,7 @@ index c07e9f90c0843..5c88336ced60a 100644
  /*
  * Sender's congestion state indicating normal or abnormal situations
 diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
-index 8e94ed7c56a0e..50dc9970cad28 100644
+index 8e94ed7c56a0..50dc9970cad2 100644
 --- a/net/ipv4/Kconfig
 +++ b/net/ipv4/Kconfig
 @@ -668,15 +668,18 @@ config TCP_CONG_BBR
@@ -324,7 +324,7 @@ index 8e94ed7c56a0e..50dc9970cad28 100644
  choice
  prompt "Default TCP congestion control"
 diff --git a/net/ipv4/bpf_tcp_ca.c b/net/ipv4/bpf_tcp_ca.c
-index 7f518ea5f4ac7..8f9b677c20e11 100644
+index 7f518ea5f4ac..8f9b677c20e1 100644
 --- a/net/ipv4/bpf_tcp_ca.c
 +++ b/net/ipv4/bpf_tcp_ca.c
 @@ -302,11 +302,15 @@ static void bpf_tcp_ca_pkts_acked(struct sock *sk, const struct ack_sample *samp
@@ -355,7 +355,7 @@ index 7f518ea5f4ac7..8f9b677c20e11 100644
  .undo_cwnd = bpf_tcp_ca_undo_cwnd,
  .sndbuf_expand = bpf_tcp_ca_sndbuf_expand,
 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
-index 66d77faca64f6..1ac6ea158eac9 100644
+index 66d77faca64f..1ac6ea158eac 100644
 --- a/net/ipv4/tcp.c
 +++ b/net/ipv4/tcp.c
 @@ -3092,6 +3092,7 @@ int tcp_disconnect(struct sock *sk, int flags)
@@ -376,7 +376,7 @@ index 66d77faca64f6..1ac6ea158eac9 100644
  info->tcpi_options |= TCPI_OPT_SYN_DATA;
  if (tp->tcp_usec_ts)
 diff --git a/net/ipv4/tcp_bbr.c b/net/ipv4/tcp_bbr.c
-index 05dc2d05bc7cb..61ed3e549350c 100644
+index 05dc2d05bc7c..61ed3e549350 100644
 --- a/net/ipv4/tcp_bbr.c
 +++ b/net/ipv4/tcp_bbr.c
 @@ -1,18 +1,19 @@
@@ -3020,7 +3020,7 @@ index 05dc2d05bc7cb..61ed3e549350c 100644
  MODULE_DESCRIPTION("TCP BBR (Bottleneck Bandwidth and RTT)");
 +MODULE_VERSION(__stringify(BBR_VERSION));
 diff --git a/net/ipv4/tcp_cong.c b/net/ipv4/tcp_cong.c
-index 28ffcfbeef14e..7b13915ba2884 100644
+index 28ffcfbeef14..7b13915ba288 100644
 --- a/net/ipv4/tcp_cong.c
 +++ b/net/ipv4/tcp_cong.c
 @@ -237,6 +237,7 @@ void tcp_init_congestion_control(struct sock *sk)
@@ -3032,7 +3032,7 @@ index 28ffcfbeef14e..7b13915ba2884 100644
  icsk->icsk_ca_ops->init(sk);
  if (tcp_ca_needs_ecn(sk))
 diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index a140d9f7a0a36..d23e5f29d3688 100644
+index a140d9f7a0a3..d23e5f29d368 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
 @@ -364,7 +364,7 @@ static void __tcp_ecn_check_ce(struct sock *sk, const struct sk_buff *skb)
@@ -3166,7 +3166,7 @@ index a140d9f7a0a36..d23e5f29d3688 100644
  tcp_in_quickack_mode(sk) ||
  /* Protocol state mandates a one-time immediate ACK */
 diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
-index f0761f060a837..90a9389499e63 100644
+index f0761f060a83..90a9389499e6 100644
 --- a/net/ipv4/tcp_minisocks.c
 +++ b/net/ipv4/tcp_minisocks.c
 @@ -460,6 +460,8 @@ void tcp_ca_openreq_child(struct sock *sk, const struct dst_entry *dst)
@@ -3179,7 +3179,7 @@ index f0761f060a837..90a9389499e63 100644
  const struct tcp_congestion_ops *ca;
 
 diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index 02caeb7bcf634..0e445bc5cc605 100644
+index 02caeb7bcf63..0e445bc5cc60 100644
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
 @@ -332,10 +332,9 @@ static void tcp_ecn_send_syn(struct sock *sk, struct sk_buff *skb)
@@ -3290,7 +3290,7 @@ index 02caeb7bcf634..0e445bc5cc605 100644
  goto rearm_timer;
 
 diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
-index a8f6d9d06f2eb..8737f21346481 100644
+index a8f6d9d06f2e..8737f2134648 100644
 --- a/net/ipv4/tcp_rate.c
 +++ b/net/ipv4/tcp_rate.c
 @@ -34,6 +34,24 @@
@@ -3370,7 +3370,7 @@ index a8f6d9d06f2eb..8737f21346481 100644
  rs->interval_us = max(snd_us, ack_us);
 
 diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index d1ad20ce1c8c7..ef74f33c79055 100644
+index d1ad20ce1c8c..ef74f33c7905 100644
 --- a/net/ipv4/tcp_timer.c
 +++ b/net/ipv4/tcp_timer.c
 @@ -678,6 +678,7 @@ void tcp_write_timer_handler(struct sock *sk)