[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected. No action required from the submitter.
The upstream commit SHA1 provided is correct: d477eb9004845cb2dc92ad5eed79a437738a868a
WARNING: Author mismatch between patch and upstream commit: Backport author: Xiangyu Chenxiangyu.chen@eng.windriver.com Commit author: Eric Dumazetedumazet@google.com
Status in newer kernel trees: 6.13.y | Present (exact SHA1) 6.12.y | Present (exact SHA1) 6.6.y | Present (exact SHA1) 6.1.y | Present (exact SHA1)
Note: The patch differs from the upstream commit: --- 1: d477eb9004845 ! 1: 1bd213f58a064 net: make sock_inuse_add() available @@ Metadata ## Commit message ## net: make sock_inuse_add() available
+ commit d477eb9004845cb2dc92ad5eed79a437738a868a upstream. + MPTCP hard codes it, let us instead provide this helper.
Signed-off-by: Eric Dumazet edumazet@google.com Signed-off-by: David S. Miller davem@davemloft.net + Signed-off-by: Kuniyuki Iwashima kuniyu@amazon.com + [ cherry-pick from amazon-linux amazon-5.15.y/mainline ] + Link: https://github.com/amazonlinux/linux/commit/7154d8eaac16 + Signed-off-by: Xiangyu Chen xiangyu.chen@windriver.com + Signed-off-by: He Zhe zhe.he@windriver.com
## include/net/sock.h ## @@ include/net/sock.h: static inline void sock_prot_inuse_add(const struct net *net, { - __this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val); + this_cpu_add(net->core.prot_inuse->val[prot->inuse_idx], val); } + +static inline void sock_inuse_add(const struct net *net, int val) ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.15.y | Success | Success |