Refresh patches

Refine compile stand-by works

Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>

Author: nicholas-opensource

.github/workflows/R2S-OpenWrt.yml

@@ -45,8 +45,8 @@ jobs:
         sudo -E apt-get -qq install aria2
         sudo -E wget -P /usr/local/sbin/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/.github/backup/apt-fast
         sudo -E chmod -R 755 /usr/local/sbin/apt-fast
-        sudo -E apt-fast -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-pip python3-ply haveged lrzsz scons
-        sudo -H pip3 install pyelftools pylibfdt
+        sudo -E apt-get -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-dev python3-pip python3-ply python3-pyelftools lrzsz scons
+        pip3 install --user -U pylibfdt
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'

.github/workflows/R4S-OpenWrt.yml

@@ -45,8 +45,8 @@ jobs:
         sudo -E apt-get -qq install aria2
         sudo -E wget -P /usr/local/sbin/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/.github/backup/apt-fast
         sudo -E chmod -R 755 /usr/local/sbin/apt-fast
-        sudo -E apt-fast -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-pip python3-ply haveged lrzsz scons
-        sudo -H pip3 install pyelftools pylibfdt
+        sudo -E apt-get -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-dev python3-pip python3-ply python3-pyelftools lrzsz scons
+        pip3 install --user -U pylibfdt
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'

.github/workflows/X86-OpenWrt.yml

@@ -45,8 +45,8 @@ jobs:
         sudo -E apt-get -qq install aria2
         sudo -E wget -P /usr/local/sbin/ https://github.com/HiGarfield/lede-17.01.4-Mod/raw/master/.github/backup/apt-fast
         sudo -E chmod -R 755 /usr/local/sbin/apt-fast
-        sudo -E apt-fast -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python3 python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-pip python3-ply haveged lrzsz scons
-        sudo -H pip3 install pyelftools pylibfdt
+        sudo -E apt-get -y -qq install dwarves llvm clang lldb lld build-essential rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev patch python2.7 unzip zlib1g-dev lib32gcc-s1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx-ucl libelf-dev autoconf automake libtool autopoint device-tree-compiler g++-multilib antlr3 gperf wget ccache curl swig coreutils vim nano python3 python3-dev python3-pip python3-ply python3-pyelftools lrzsz scons
+        pip3 install --user -U pylibfdt
         sudo -E apt-get -qq autoremove --purge
         sudo -E apt-get -qq clean
         sudo -E git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'

PATCH/BBRv3/kernel/010-bbr3-0001-net-tcp_bbr-broaden-app-limited-rate-sample-detectio.patch

@@ -29,30 +29,23 @@ Change-Id: I37221506f5166877c2b110753d39bb0757985e68
  net/ipv4/tcp_timer.c | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 6849094e5..23ac1f0e3 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3811,6 +3811,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -3811,6 +3811,7 @@ static int tcp_ack(struct sock *sk, cons
 
  	prior_fack = tcp_is_sack(tp) ? tcp_highest_sack_seq(tp) : tp->snd_una;
  	rs.prior_in_flight = tcp_packets_in_flight(tp);
 +	tcp_rate_check_app_limited(sk);
 
  	/* ts_recent update must be made after we are sure that the packet
  	 * is in window.
-diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
-index a8592c187..d00dbeb29 100644
 --- a/net/ipv4/tcp_timer.c
 +++ b/net/ipv4/tcp_timer.c
-@@ -613,6 +613,7 @@ void tcp_write_timer_handler(struct sock *sk)
+@@ -611,6 +611,7 @@ void tcp_write_timer_handler(struct sock
  		goto out;
  	}
 
 +	tcp_rate_check_app_limited(sk);
  	tcp_mstamp_refresh(tcp_sk(sk));
  	event = icsk->icsk_pending;
 
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0002-net-tcp_bbr-v2-shrink-delivered_mstamp-first_tx_msta.patch

@@ -22,11 +22,9 @@ Change-Id: I3b779603797263b52a61ad57c565eb91fe42680c
  net/ipv4/tcp_rate.c | 7 ++++---
  2 files changed, 11 insertions(+), 5 deletions(-)
 
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index d8920f84f..ef15d509a 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
-@@ -800,6 +800,11 @@ static inline u32 tcp_stamp_us_delta(u64 t1, u64 t0)
+@@ -800,6 +800,11 @@ static inline u32 tcp_stamp_us_delta(u64
  	return max_t(s64, t1 - t0, 0);
  }
 
@@ -50,11 +48,9 @@ index d8920f84f..ef15d509a 100644
  		} tx;   /* only used for outgoing skbs */
  		union {
  			struct inet_skb_parm	h4;
-diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
-index 042e27f54..cbb2cbe0f 100644
 --- a/net/ipv4/tcp_rate.c
 +++ b/net/ipv4/tcp_rate.c
-@@ -99,8 +99,9 @@ void tcp_rate_skb_delivered(struct sock *sk, struct sk_buff *skb,
+@@ -99,8 +99,9 @@ void tcp_rate_skb_delivered(struct sock
  		/* Record send time of most recently ACKed packet: */
  		tp->first_tx_mstamp  = tx_tstamp;
  		/* Find the duration of the "send phase" of this window: */
@@ -66,7 +62,7 @@ index 042e27f54..cbb2cbe0f 100644
 
  	}
  	/* Mark off the skb delivered once it's sacked to avoid being
-@@ -149,7 +150,7 @@ void tcp_rate_gen(struct sock *sk, u32 delivered, u32 lost,
+@@ -149,7 +150,7 @@ void tcp_rate_gen(struct sock *sk, u32 d
  	 * longer phase.
  	 */
  	snd_us = rs->interval_us;				/* send phase */
@@ -75,6 +71,3 @@ index 042e27f54..cbb2cbe0f 100644
  				    rs->prior_mstamp); /* ack phase */
  	rs->interval_us = max(snd_us, ack_us);
 
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0003-net-tcp_bbr-v2-snapshot-packets-in-flight-at-transmi.patch

@@ -24,8 +24,6 @@ Change-Id: I7314047d0ff14dd261a04b1969a46dc658c8836a
  net/ipv4/tcp_rate.c   | 20 ++++++++++++++++++++
  3 files changed, 28 insertions(+), 2 deletions(-)
 
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index ef15d509a..808f01070 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -873,8 +873,7 @@ struct tcp_skb_cb {
@@ -57,28 +55,24 @@ index ef15d509a..808f01070 100644
  	s32  delivered;		/* number of packets delivered over interval */
  	long interval_us;	/* time for tp->delivered to incr "delivered" */
  	u32 snd_interval_us;	/* snd interval for delivered packets */
-@@ -1151,6 +1155,7 @@ static inline void tcp_ca_event(struct sock *sk, const enum tcp_ca_event event)
+@@ -1151,6 +1155,7 @@ static inline void tcp_ca_event(struct s
  }
 
  /* From tcp_rate.c */
 +void tcp_set_tx_in_flight(struct sock *sk, struct sk_buff *skb);
  void tcp_rate_skb_sent(struct sock *sk, struct sk_buff *skb);
  void tcp_rate_skb_delivered(struct sock *sk, struct sk_buff *skb,
  			    struct rate_sample *rs);
-diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
-index d46fb6d70..b455d9f24 100644
 --- a/net/ipv4/tcp_output.c
 +++ b/net/ipv4/tcp_output.c
-@@ -2633,6 +2633,7 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
+@@ -2633,6 +2633,7 @@ static bool tcp_write_xmit(struct sock *
  			skb->skb_mstamp_ns = tp->tcp_wstamp_ns = tp->tcp_clock_cache;
  			list_move_tail(&skb->tcp_tsorted_anchor, &tp->tsorted_sent_queue);
  			tcp_init_tso_segs(skb, mss_now);
 +			tcp_set_tx_in_flight(sk, skb);
  			goto repair; /* Skip network transmission */
  		}
 
-diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
-index cbb2cbe0f..50a292d48 100644
 --- a/net/ipv4/tcp_rate.c
 +++ b/net/ipv4/tcp_rate.c
 @@ -34,6 +34,24 @@
@@ -106,22 +100,19 @@ index cbb2cbe0f..50a292d48 100644
  /* Snapshot the current delivery information in the skb, to generate
   * a rate sample later when the skb is (s)acked in tcp_rate_skb_delivered().
   */
-@@ -66,6 +84,7 @@ void tcp_rate_skb_sent(struct sock *sk, struct sk_buff *skb)
+@@ -66,6 +84,7 @@ void tcp_rate_skb_sent(struct sock *sk,
  	TCP_SKB_CB(skb)->tx.delivered_mstamp	= tp->delivered_mstamp;
  	TCP_SKB_CB(skb)->tx.delivered		= tp->delivered;
  	TCP_SKB_CB(skb)->tx.is_app_limited	= tp->app_limited ? 1 : 0;
 +	tcp_set_tx_in_flight(sk, skb);
  }
 
  /* When an skb is sacked or acked, we fill in the rate sample with the (prior)
-@@ -94,6 +113,7 @@ void tcp_rate_skb_delivered(struct sock *sk, struct sk_buff *skb,
+@@ -94,6 +113,7 @@ void tcp_rate_skb_delivered(struct sock
  		rs->prior_mstamp     = scb->tx.delivered_mstamp;
  		rs->is_app_limited   = scb->tx.is_app_limited;
  		rs->is_retrans	     = scb->sacked & TCPCB_RETRANS;
 +		rs->tx_in_flight     = scb->tx.in_flight;
  		rs->last_end_seq     = scb->end_seq;
 
  		/* Record send time of most recently ACKed packet: */
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0004-net-tcp_bbr-v2-count-packets-lost-over-TCP-rate-samp.patch

@@ -16,8 +16,6 @@ Change-Id: I594c2500868d9c530770e7ddd68ffc87c57f4fd5
  net/ipv4/tcp_rate.c | 3 +++
  2 files changed, 7 insertions(+)
 
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index 808f01070..ebf984b01 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -885,6 +885,7 @@ struct tcp_skb_cb {
@@ -41,34 +39,29 @@ index 808f01070..ebf984b01 100644
  	long interval_us;	/* time for tp->delivered to incr "delivered" */
  	u32 snd_interval_us;	/* snd interval for delivered packets */
  	u32 rcv_interval_us;	/* rcv interval for delivered packets */
-diff --git a/net/ipv4/tcp_rate.c b/net/ipv4/tcp_rate.c
-index 50a292d48..f3413e5e2 100644
 --- a/net/ipv4/tcp_rate.c
 +++ b/net/ipv4/tcp_rate.c
-@@ -83,6 +83,7 @@ void tcp_rate_skb_sent(struct sock *sk, struct sk_buff *skb)
+@@ -83,6 +83,7 @@ void tcp_rate_skb_sent(struct sock *sk,
  	TCP_SKB_CB(skb)->tx.first_tx_mstamp	= tp->first_tx_mstamp;
  	TCP_SKB_CB(skb)->tx.delivered_mstamp	= tp->delivered_mstamp;
  	TCP_SKB_CB(skb)->tx.delivered		= tp->delivered;
 +	TCP_SKB_CB(skb)->tx.lost		= tp->lost;
  	TCP_SKB_CB(skb)->tx.is_app_limited	= tp->app_limited ? 1 : 0;
  	tcp_set_tx_in_flight(sk, skb);
  }
-@@ -109,6 +110,7 @@ void tcp_rate_skb_delivered(struct sock *sk, struct sk_buff *skb,
+@@ -109,6 +110,7 @@ void tcp_rate_skb_delivered(struct sock
  	if (!rs->prior_delivered ||
  	    tcp_skb_sent_after(tx_tstamp, tp->first_tx_mstamp,
  			       scb->end_seq, rs->last_end_seq)) {
 +		rs->prior_lost	     = scb->tx.lost;
  		rs->prior_delivered  = scb->tx.delivered;
  		rs->prior_mstamp     = scb->tx.delivered_mstamp;
  		rs->is_app_limited   = scb->tx.is_app_limited;
-@@ -163,6 +165,7 @@ void tcp_rate_gen(struct sock *sk, u32 delivered, u32 lost,
+@@ -163,6 +165,7 @@ void tcp_rate_gen(struct sock *sk, u32 d
  		return;
  	}
  	rs->delivered   = tp->delivered - rs->prior_delivered;
 +	rs->lost        = tp->lost - rs->prior_lost;
 
  	/* Model sending data and receiving ACKs as separate pipeline phases
  	 * for a window. Usually the ACK phase is longer, but with ACK
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0005-net-tcp_bbr-v2-export-FLAG_ECE-in-rate_sample.is_ece.patch

@@ -15,8 +15,6 @@ Change-Id: I3a964e04cee83e11649a54507043d2dfe769a3b3
  net/ipv4/tcp_input.c | 1 +
  2 files changed, 2 insertions(+)
 
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index ebf984b01..a498d3f01 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -1047,6 +1047,7 @@ struct rate_sample {
@@ -27,18 +25,13 @@ index ebf984b01..a498d3f01 100644
  };
 
  struct tcp_congestion_ops {
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 23ac1f0e3..70418310e 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -3910,6 +3910,7 @@ static int tcp_ack(struct sock *sk, const struct sk_buff *skb, int flag)
+@@ -3910,6 +3910,7 @@ static int tcp_ack(struct sock *sk, cons
  	delivered = tcp_newly_delivered(sk, delivered, flag);
  	lost = tp->lost - lost;			/* freshly marked lost */
  	rs.is_ack_delayed = !!(flag & FLAG_ACK_MAYBE_DELAYED);
 +	rs.is_ece = !!(flag & FLAG_ECE);
  	tcp_rate_gen(sk, delivered, lost, is_sack_reneg, sack_state.rate);
  	tcp_cong_control(sk, ack, delivered, flag, sack_state.rate);
  	tcp_xmit_recovery(sk, rexmit);
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0006-net-tcp_bbr-v2-introduce-ca_ops-skb_marked_lost-CC-m.patch

@@ -27,8 +27,6 @@ Change-Id: I54826ab53df636be537e5d3c618a46145d12d51a
  net/ipv4/tcp_input.c | 5 +++++
  2 files changed, 8 insertions(+)
 
-diff --git a/include/net/tcp.h b/include/net/tcp.h
-index a498d3f01..a9f5b0aa4 100644
 --- a/include/net/tcp.h
 +++ b/include/net/tcp.h
 @@ -1074,6 +1074,9 @@ struct tcp_congestion_ops {
@@ -41,11 +39,9 @@ index a498d3f01..a9f5b0aa4 100644
  	/* call when packets are delivered to update cwnd and pacing rate,
  	 * after all the ca_state processing. (optional)
  	 */
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index 70418310e..d608df40e 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1072,7 +1072,12 @@ static void tcp_verify_retransmit_hint(struct tcp_sock *tp, struct sk_buff *skb)
+@@ -1072,7 +1072,12 @@ static void tcp_verify_retransmit_hint(s
   */
  static void tcp_notify_skb_loss_event(struct tcp_sock *tp, const struct sk_buff *skb)
  {
@@ -58,6 +54,3 @@ index 70418310e..d608df40e 100644
  }
 
  void tcp_mark_skb_lost(struct sock *sk, struct sk_buff *skb)
--- 
-2.39.3
-

PATCH/BBRv3/kernel/010-bbr3-0007-net-tcp_bbr-v2-adjust-skb-tx.in_flight-upon-merge-in.patch

@@ -36,11 +36,9 @@ Change-Id: I1b0b75c27519953430c7db51c6f358f104c7af55
  net/ipv4/tcp_input.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
-index d608df40e..6446e88eb 100644
 --- a/net/ipv4/tcp_input.c
 +++ b/net/ipv4/tcp_input.c
-@@ -1458,6 +1458,17 @@ static bool tcp_shifted_skb(struct sock *sk, struct sk_buff *prev,
+@@ -1458,6 +1458,17 @@ static bool tcp_shifted_skb(struct sock
  	WARN_ON_ONCE(tcp_skb_pcount(skb) < pcount);
  	tcp_skb_pcount_add(skb, -pcount);
 
@@ -58,6 +56,3 @@ index d608df40e..6446e88eb 100644
  	/* When we're adding to gso_segs == 1, gso_size will be zero,
  	 * in theory this shouldn't be necessary but as long as DSACK
  	 * code can come after this skb later on it's better to keep
--- 
-2.39.3
-