From 0294474b072685816be752b6aa1421a67455748a Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Mon, 17 Oct 2022 14:18:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?newip=E5=BC=80=E5=85=B3=E4=BB=8E/net/newip?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8C=AA=E5=88=B0net=E7=9B=AE=E5=BD=95Kconfi?= =?UTF-8?q?g=E6=96=87=E4=BB=B6=E4=B8=AD=E5=AE=9A=E4=B9=89=EF=BC=8C?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E5=8C=85=E5=90=ABnewip=E6=95=B4?= =?UTF-8?q?=E6=94=B9=E6=88=90nip=EF=BC=8Csh=E8=84=9A=E6=9C=AC=E4=B8=AD?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangyanjun --- apply_newip.sh | 1 - src/linux/include/net/tcp_nip.h | 6 +++--- src/linux/net/newip/Kconfig | 9 +-------- src/linux/net/newip/tcp_nip.c | 10 +++++----- src/linux/net/newip/tcp_nip_input.c | 6 +++--- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/apply_newip.sh b/apply_newip.sh index a415b96..19d33a0 100644 --- a/apply_newip.sh +++ b/apply_newip.sh @@ -2,7 +2,6 @@ # # Copyright (c) 2022 Huawei Device Co., Ltd. # -# you can use it under the terms of the GPL V2 and the BSD2 license. # See the LICENSE file in directory / of this repository for complete details. # diff --git a/src/linux/include/net/tcp_nip.h b/src/linux/include/net/tcp_nip.h index f2927a4..0e962d0 100644 --- a/src/linux/include/net/tcp_nip.h +++ b/src/linux/include/net/tcp_nip.h @@ -161,9 +161,9 @@ static inline bool tcp_nip_write_queue_empty(struct sock *sk) /* connect */ int __tcp_nip_connect(struct sock *sk); -int tcp_newip_conn_request(struct request_sock_ops *rsk_ops, - const struct tcp_request_sock_ops *af_ops, - struct sock *sk, struct sk_buff *skb); +int _tcp_nip_conn_request(struct request_sock_ops *rsk_ops, + const struct tcp_request_sock_ops *af_ops, + struct sock *sk, struct sk_buff *skb); struct sk_buff *tcp_nip_make_synack( const struct sock *sk, struct dst_entry *dst, diff --git a/src/linux/net/newip/Kconfig b/src/linux/net/newip/Kconfig index 5e40c13..93ad569 100644 --- a/src/linux/net/newip/Kconfig +++ b/src/linux/net/newip/Kconfig @@ -6,15 +6,8 @@ # # NewIP as module will cause a CRASH if you try to unload it -menuconfig NEWIP - tristate "The NewIP protocol" - default n - help - Support for NewIP. - - To compile this protocol support as a module, choose M here: the - module will be called NewIP. +# linux-5.10/net/Kconfig define NEWIP if NEWIP config NEWIP_FAST_KEEPALIVE tristate "NewIP fast keepalive" diff --git a/src/linux/net/newip/tcp_nip.c b/src/linux/net/newip/tcp_nip.c index 2bfd116..b08ed21 100644 --- a/src/linux/net/newip/tcp_nip.c +++ b/src/linux/net/newip/tcp_nip.c @@ -512,8 +512,8 @@ void ninet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) */ static int tcp_nip_conn_request(struct sock *sk, struct sk_buff *skb) { - return tcp_newip_conn_request(&tcp_nip_request_sock_ops, - &tcp_request_sock_newip_ops, sk, skb); + return _tcp_nip_conn_request(&tcp_nip_request_sock_ops, + &tcp_request_sock_newip_ops, sk, skb); } /* Function @@ -733,9 +733,9 @@ void tcp_nip_keepalive_enable(struct sock *sk) return; } - pr_crit("%s ok, HZ=%u, time/probes/intvl [%u, %u, %u]", - __func__, HZ, tp->keepalive_time, tp->keepalive_probes, - tp->keepalive_intvl); + DEBUG("%s ok, HZ=%u, time/probes/intvl [%u, %u, %u]", + __func__, HZ, tp->keepalive_time, tp->keepalive_probes, + tp->keepalive_intvl); tp->nip_keepalive_enable = true; #endif } diff --git a/src/linux/net/newip/tcp_nip_input.c b/src/linux/net/newip/tcp_nip_input.c index 2aecc7e..8821e5e 100644 --- a/src/linux/net/newip/tcp_nip_input.c +++ b/src/linux/net/newip/tcp_nip_input.c @@ -766,9 +766,9 @@ void tcp_nip_openreq_init_rwin(struct request_sock *req, * sk: transmission control block. * skb: Transfer control block buffer. */ -int tcp_newip_conn_request(struct request_sock_ops *rsk_ops, - const struct tcp_request_sock_ops *af_ops, - struct sock *sk, struct sk_buff *skb) +int _tcp_nip_conn_request(struct request_sock_ops *rsk_ops, + const struct tcp_request_sock_ops *af_ops, + struct sock *sk, struct sk_buff *skb) { struct tcp_fastopen_cookie foc = { .len = -1 }; -- Gitee From f496c886ff6b31a20c5ab8a8ed2ffae98bf670f7 Mon Sep 17 00:00:00 2001 From: yangyanjun Date: Fri, 21 Oct 2022 11:23:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=9F=BA=E4=BA=8E=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E5=86=85=E6=A0=B8=E4=BE=B5=E5=85=A5=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=86=85=E5=AE=B9=E5=88=B7=E6=96=B0sfc=20newip?= =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BB=A3=E7=A0=81=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?newip=E7=9B=AE=E5=BD=95Kconfig=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E5=86=85=E6=A0=B8=E4=BB=93?= =?UTF-8?q?net=5Fhooks=E7=9B=AE=E5=BD=95=E7=9A=84Kconfig=202=E3=80=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A2=9E=E5=8A=A0#define=20pr=5Ffmt(fmt)=20"?= =?UTF-8?q?NIP:=20"=20fmt=EF=BC=8C=E4=BF=9D=E8=AF=81debug=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E5=89=8D=E5=A2=9E=E5=8A=A0NIP=E6=89=93=E5=8D=B0?= =?UTF-8?q?=EF=BC=8C=E5=BF=AB=E9=80=9F=E8=8E=B7=E5=8F=96NIP=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangyanjun --- src/linux/net/newip/Kconfig | 18 ------------------ src/linux/net/newip/af_ninet.c | 2 +- src/linux/net/newip/hooks/Kconfig | 20 -------------------- src/linux/net/newip/icmp.c | 2 ++ src/linux/net/newip/ninet_connection_sock.c | 2 ++ src/linux/net/newip/ninet_hashtables.c | 2 ++ src/linux/net/newip/nip_addrconf.c | 2 ++ src/linux/net/newip/nip_addrconf_core.c | 2 ++ src/linux/net/newip/nip_fib.c | 2 ++ src/linux/net/newip/nip_fib_rules.c | 2 ++ src/linux/net/newip/nip_hooks_register.c | 2 ++ src/linux/net/newip/nip_input.c | 4 +++- src/linux/net/newip/nip_output.c | 2 ++ src/linux/net/newip/nip_sockglue.c | 2 ++ src/linux/net/newip/nndisc.c | 2 ++ src/linux/net/newip/protocol.c | 2 ++ src/linux/net/newip/route.c | 2 ++ src/linux/net/newip/udp.c | 2 ++ 18 files changed, 32 insertions(+), 40 deletions(-) delete mode 100644 src/linux/net/newip/Kconfig delete mode 100644 src/linux/net/newip/hooks/Kconfig diff --git a/src/linux/net/newip/Kconfig b/src/linux/net/newip/Kconfig deleted file mode 100644 index 93ad569..0000000 --- a/src/linux/net/newip/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Copyright (c) 2022 Huawei Device Co., Ltd. -# -# NewIP configuration -# - -# NewIP as module will cause a CRASH if you try to unload it - -# linux-5.10/net/Kconfig define NEWIP -if NEWIP -config NEWIP_FAST_KEEPALIVE - tristate "NewIP fast keepalive" - default n - help - Support for NewIP fast keepalive. -endif # NEWIP - diff --git a/src/linux/net/newip/af_ninet.c b/src/linux/net/newip/af_ninet.c index 867f4d2..b193f9f 100644 --- a/src/linux/net/newip/af_ninet.c +++ b/src/linux/net/newip/af_ninet.c @@ -7,7 +7,7 @@ * * Based on linux/net/ipv6/af_inet6.c */ -#define pr_fmt(fmt) "NIP AF-NIET: " fmt +#define pr_fmt(fmt) "NIP: " fmt #include #include diff --git a/src/linux/net/newip/hooks/Kconfig b/src/linux/net/newip/hooks/Kconfig deleted file mode 100644 index 83e2e44..0000000 --- a/src/linux/net/newip/hooks/Kconfig +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# Copyright (c) 2022 Huawei Device Co., Ltd. -# -# NewIP Hooks configuration -# - -menu "NewIP Hooks" - -config NEWIP_HOOKS - tristate "NewIP Hooks" - depends on VENDOR_HOOKS && NEWIP - default n - help - Enable NewIP hooks implemented as tracepoints - - Allow NewIP modules to attach to tracepoint "hooks" defined via - DECLARE_TRACE or DECLARE_HOOK - -endmenu diff --git a/src/linux/net/newip/icmp.c b/src/linux/net/newip/icmp.c index c376a0e..0f3a953 100644 --- a/src/linux/net/newip/icmp.c +++ b/src/linux/net/newip/icmp.c @@ -8,6 +8,8 @@ * Based on net/ipv6/icmp.c * Based on net/ipv4/af_inet.c */ +#define pr_fmt(fmt) "NIP-ICMP: " fmt + #include #include #include diff --git a/src/linux/net/newip/ninet_connection_sock.c b/src/linux/net/newip/ninet_connection_sock.c index 7d92e4f..288cef5 100644 --- a/src/linux/net/newip/ninet_connection_sock.c +++ b/src/linux/net/newip/ninet_connection_sock.c @@ -11,6 +11,8 @@ * * Based on net/ipv4/inet_connection_sock.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/ninet_hashtables.c b/src/linux/net/newip/ninet_hashtables.c index b777636..5dfea02 100644 --- a/src/linux/net/newip/ninet_hashtables.c +++ b/src/linux/net/newip/ninet_hashtables.c @@ -15,6 +15,8 @@ * Based on include/net/ipv6.h * Based on net/core/secure_seq.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include diff --git a/src/linux/net/newip/nip_addrconf.c b/src/linux/net/newip/nip_addrconf.c index e1ee256..56dc3cf 100644 --- a/src/linux/net/newip/nip_addrconf.c +++ b/src/linux/net/newip/nip_addrconf.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/addrconf.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/nip_addrconf_core.c b/src/linux/net/newip/nip_addrconf_core.c index 34e9867..e6835b2 100644 --- a/src/linux/net/newip/nip_addrconf_core.c +++ b/src/linux/net/newip/nip_addrconf_core.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/addrconf_core.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/nip_fib.c b/src/linux/net/newip/nip_fib.c index d3ad7e9..2029798 100644 --- a/src/linux/net/newip/nip_fib.c +++ b/src/linux/net/newip/nip_fib.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/ip6_fib.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/nip_fib_rules.c b/src/linux/net/newip/nip_fib_rules.c index 1f3481b..1dc26ed 100644 --- a/src/linux/net/newip/nip_fib_rules.c +++ b/src/linux/net/newip/nip_fib_rules.c @@ -7,6 +7,8 @@ * Based on net/ipv6/fib_rules.c * Based on net/ipv6/fib6_rules.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/nip_hooks_register.c b/src/linux/net/newip/nip_hooks_register.c index 5122286..d8188cb 100644 --- a/src/linux/net/newip/nip_hooks_register.c +++ b/src/linux/net/newip/nip_hooks_register.c @@ -5,6 +5,8 @@ * Definitions for the NewIP Hooks Register module. */ #ifdef CONFIG_NEWIP_HOOKS +#define pr_fmt(fmt) "NIP: " fmt + #include /* ninet_ehashfn */ #include diff --git a/src/linux/net/newip/nip_input.c b/src/linux/net/newip/nip_input.c index 5924887..5ea9443 100644 --- a/src/linux/net/newip/nip_input.c +++ b/src/linux/net/newip/nip_input.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/ip6_input.c */ +#define pr_fmt(fmt) "NIP-INPUT: " fmt + #include #include #include @@ -50,7 +52,7 @@ static int nip_rcv_finish(struct sk_buff *skb) if (net->ipv4.sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk) { const struct ninet_protocol *ipprot; - DEBUG("%s: try to early demux skb.", __func__); + DEBUG("%s: try to early demux skb, nexthdr=0x%x.", __func__, NIPCB(skb)->nexthdr); ipprot = rcu_dereference(ninet_protos[NIPCB(skb)->nexthdr]); if (ipprot) edemux = READ_ONCE(ipprot->early_demux); diff --git a/src/linux/net/newip/nip_output.c b/src/linux/net/newip/nip_output.c index d394937..6c5642a 100644 --- a/src/linux/net/newip/nip_output.c +++ b/src/linux/net/newip/nip_output.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/ip6_output.c */ +#define pr_fmt(fmt) "NIP-OUTPUT: " fmt + #include #include #include diff --git a/src/linux/net/newip/nip_sockglue.c b/src/linux/net/newip/nip_sockglue.c index a94fbef..d33ac0b 100644 --- a/src/linux/net/newip/nip_sockglue.c +++ b/src/linux/net/newip/nip_sockglue.c @@ -10,6 +10,8 @@ * * Based on net/ipv4/ip_sockglue.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/nndisc.c b/src/linux/net/newip/nndisc.c index e365b98..a46e4f2 100644 --- a/src/linux/net/newip/nndisc.c +++ b/src/linux/net/newip/nndisc.c @@ -7,6 +7,8 @@ * * Based on net/ipv6/ndisc.c */ +#define pr_fmt(fmt) "NIP-ND: " fmt + #include #include #include diff --git a/src/linux/net/newip/protocol.c b/src/linux/net/newip/protocol.c index 1f35d9e..8d7f3ea 100644 --- a/src/linux/net/newip/protocol.c +++ b/src/linux/net/newip/protocol.c @@ -10,6 +10,8 @@ * * Based on net/ipv6/protocol.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/route.c b/src/linux/net/newip/route.c index 33af9c1..3c4f407 100644 --- a/src/linux/net/newip/route.c +++ b/src/linux/net/newip/route.c @@ -12,6 +12,8 @@ * Based on net/ipv4/route.c * Based on net/ipv6/route.c */ +#define pr_fmt(fmt) "NIP: " fmt + #include #include #include diff --git a/src/linux/net/newip/udp.c b/src/linux/net/newip/udp.c index c36b6a1..1b4f3fb 100644 --- a/src/linux/net/newip/udp.c +++ b/src/linux/net/newip/udp.c @@ -12,6 +12,8 @@ * Based on net/ipv4/udp.c * Based on net/ipv6/udp.c */ +#define pr_fmt(fmt) "NIP-UDP: " fmt + #include #include #include -- Gitee