* Re: [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support.
@ 2020-11-11 9:42 kernel test robot
0 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2020-11-11 9:42 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 5306 bytes --]
CC: kbuild-all(a)lists.01.org
In-Reply-To: <1605076100-21782-4-git-send-email-wenxu@ucloud.cn>
References: <1605076100-21782-4-git-send-email-wenxu@ucloud.cn>
TO: wenxu(a)ucloud.cn
TO: kuba(a)kernel.org
TO: marcelo.leitner(a)gmail.com
TO: vladbu(a)nvidia.com
CC: netdev(a)vger.kernel.org
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 70408949a35f1a31c327c69b6a187635cb0305fa
:::::: branch date: 3 hours ago
:::::: commit date: 3 hours ago
config: x86_64-randconfig-s021-20201111 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.3-106-gd020cf33-dirty
# https://github.com/0day-ci/linux/commit/a551316818f8b3f9164d7a734538decca3762fda
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
git checkout a551316818f8b3f9164d7a734538decca3762fda
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"sparse warnings: (new ones prefixed by >>)"
net/sched/act_api.c:30:5: sparse: sparse: symbol 'tcf_set_xmit_hook' redeclared with different type (incompatible argument 1 (different address spaces)):
>> net/sched/act_api.c:30:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
net/sched/act_api.c: note: in included file (through include/net/pkt_cls.h):
include/net/act_api.h:244:5: sparse: note: previously declared as:
>> include/net/act_api.h:244:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
>> net/sched/act_api.c:64:19: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected int ( [noderef] __rcu *xmit_hook )( ... ) @@ got int ( [noderef] * )( ... ) @@
>> net/sched/act_api.c:64:19: sparse: expected int ( [noderef] __rcu *xmit_hook )( ... )
net/sched/act_api.c:64:19: sparse: got int ( [noderef] * )( ... )
vim +30 net/sched/act_api.c
a551316818f8b3f wenxu 2020-11-11 29
a551316818f8b3f wenxu 2020-11-11 @30 int tcf_set_xmit_hook(int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 31 int (*xmit)(struct sk_buff *skb)))
a551316818f8b3f wenxu 2020-11-11 32 {
a551316818f8b3f wenxu 2020-11-11 33 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 34 if (!tcf_xmit_hook_count) {
a551316818f8b3f wenxu 2020-11-11 35 rcu_assign_pointer(tcf_xmit_hook, xmit_hook);
a551316818f8b3f wenxu 2020-11-11 36 } else if (xmit_hook != tcf_xmit_hook) {
a551316818f8b3f wenxu 2020-11-11 37 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 38 return -EBUSY;
a551316818f8b3f wenxu 2020-11-11 39 }
a551316818f8b3f wenxu 2020-11-11 40
a551316818f8b3f wenxu 2020-11-11 41 tcf_xmit_hook_count++;
a551316818f8b3f wenxu 2020-11-11 42 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 43
a551316818f8b3f wenxu 2020-11-11 44 return 0;
a551316818f8b3f wenxu 2020-11-11 45 }
a551316818f8b3f wenxu 2020-11-11 46 EXPORT_SYMBOL_GPL(tcf_set_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 47
a551316818f8b3f wenxu 2020-11-11 48 void tcf_clear_xmit_hook(void)
a551316818f8b3f wenxu 2020-11-11 49 {
a551316818f8b3f wenxu 2020-11-11 50 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 51 if (--tcf_xmit_hook_count == 0)
a551316818f8b3f wenxu 2020-11-11 52 rcu_assign_pointer(tcf_xmit_hook, NULL);
a551316818f8b3f wenxu 2020-11-11 53 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 54
a551316818f8b3f wenxu 2020-11-11 55 synchronize_rcu();
a551316818f8b3f wenxu 2020-11-11 56 }
a551316818f8b3f wenxu 2020-11-11 57 EXPORT_SYMBOL_GPL(tcf_clear_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 58
a551316818f8b3f wenxu 2020-11-11 59 int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))
a551316818f8b3f wenxu 2020-11-11 60 {
a551316818f8b3f wenxu 2020-11-11 61 int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 62 int (*xmit)(struct sk_buff *skb));
a551316818f8b3f wenxu 2020-11-11 63
a551316818f8b3f wenxu 2020-11-11 @64 xmit_hook = rcu_dereference(tcf_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 65 if (xmit_hook)
a551316818f8b3f wenxu 2020-11-11 66 return xmit_hook(skb, xmit);
a551316818f8b3f wenxu 2020-11-11 67 else
a551316818f8b3f wenxu 2020-11-11 68 return xmit(skb);
a551316818f8b3f wenxu 2020-11-11 69 }
a551316818f8b3f wenxu 2020-11-11 70 EXPORT_SYMBOL_GPL(tcf_dev_queue_xmit);
a551316818f8b3f wenxu 2020-11-11 71
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 39761 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support.
2020-11-11 6:28 ` [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support wenxu
@ 2020-11-12 15:05 ` kernel test robot
0 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2020-11-12 15:05 UTC (permalink / raw)
To: wenxu, kuba, marcelo.leitner, vladbu; +Cc: kbuild-all, netdev
[-- Attachment #1: Type: text/plain, Size: 4921 bytes --]
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 70408949a35f1a31c327c69b6a187635cb0305fa
:::::: branch date: 3 hours ago
:::::: commit date: 3 hours ago
config: x86_64-randconfig-s021-20201111 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.3-106-gd020cf33-dirty
# https://github.com/0day-ci/linux/commit/a551316818f8b3f9164d7a734538decca3762fda
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
git checkout a551316818f8b3f9164d7a734538decca3762fda
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"sparse warnings: (new ones prefixed by >>)"
net/sched/act_api.c:30:5: sparse: sparse: symbol 'tcf_set_xmit_hook' redeclared with different type (incompatible argument 1 (different address spaces)):
>> net/sched/act_api.c:30:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
net/sched/act_api.c: note: in included file (through include/net/pkt_cls.h):
include/net/act_api.h:244:5: sparse: note: previously declared as:
>> include/net/act_api.h:244:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
>> net/sched/act_api.c:64:19: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected int ( [noderef] __rcu *xmit_hook )( ... ) @@ got int ( [noderef] * )( ... ) @@
>> net/sched/act_api.c:64:19: sparse: expected int ( [noderef] __rcu *xmit_hook )( ... )
net/sched/act_api.c:64:19: sparse: got int ( [noderef] * )( ... )
vim +30 net/sched/act_api.c
a551316818f8b3f wenxu 2020-11-11 29
a551316818f8b3f wenxu 2020-11-11 @30 int tcf_set_xmit_hook(int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 31 int (*xmit)(struct sk_buff *skb)))
a551316818f8b3f wenxu 2020-11-11 32 {
a551316818f8b3f wenxu 2020-11-11 33 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 34 if (!tcf_xmit_hook_count) {
a551316818f8b3f wenxu 2020-11-11 35 rcu_assign_pointer(tcf_xmit_hook, xmit_hook);
a551316818f8b3f wenxu 2020-11-11 36 } else if (xmit_hook != tcf_xmit_hook) {
a551316818f8b3f wenxu 2020-11-11 37 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 38 return -EBUSY;
a551316818f8b3f wenxu 2020-11-11 39 }
a551316818f8b3f wenxu 2020-11-11 40
a551316818f8b3f wenxu 2020-11-11 41 tcf_xmit_hook_count++;
a551316818f8b3f wenxu 2020-11-11 42 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 43
a551316818f8b3f wenxu 2020-11-11 44 return 0;
a551316818f8b3f wenxu 2020-11-11 45 }
a551316818f8b3f wenxu 2020-11-11 46 EXPORT_SYMBOL_GPL(tcf_set_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 47
a551316818f8b3f wenxu 2020-11-11 48 void tcf_clear_xmit_hook(void)
a551316818f8b3f wenxu 2020-11-11 49 {
a551316818f8b3f wenxu 2020-11-11 50 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 51 if (--tcf_xmit_hook_count == 0)
a551316818f8b3f wenxu 2020-11-11 52 rcu_assign_pointer(tcf_xmit_hook, NULL);
a551316818f8b3f wenxu 2020-11-11 53 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 54
a551316818f8b3f wenxu 2020-11-11 55 synchronize_rcu();
a551316818f8b3f wenxu 2020-11-11 56 }
a551316818f8b3f wenxu 2020-11-11 57 EXPORT_SYMBOL_GPL(tcf_clear_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 58
a551316818f8b3f wenxu 2020-11-11 59 int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))
a551316818f8b3f wenxu 2020-11-11 60 {
a551316818f8b3f wenxu 2020-11-11 61 int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 62 int (*xmit)(struct sk_buff *skb));
a551316818f8b3f wenxu 2020-11-11 63
a551316818f8b3f wenxu 2020-11-11 @64 xmit_hook = rcu_dereference(tcf_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 65 if (xmit_hook)
a551316818f8b3f wenxu 2020-11-11 66 return xmit_hook(skb, xmit);
a551316818f8b3f wenxu 2020-11-11 67 else
a551316818f8b3f wenxu 2020-11-11 68 return xmit(skb);
a551316818f8b3f wenxu 2020-11-11 69 }
a551316818f8b3f wenxu 2020-11-11 70 EXPORT_SYMBOL_GPL(tcf_dev_queue_xmit);
a551316818f8b3f wenxu 2020-11-11 71
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 39761 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support.
@ 2020-11-12 15:05 ` kernel test robot
0 siblings, 0 replies; 4+ messages in thread
From: kernel test robot @ 2020-11-12 15:05 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 5008 bytes --]
Hi,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on net-next/master]
url: https://github.com/0day-ci/linux/commits/wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
base: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 70408949a35f1a31c327c69b6a187635cb0305fa
:::::: branch date: 3 hours ago
:::::: commit date: 3 hours ago
config: x86_64-randconfig-s021-20201111 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
reproduce:
# apt-get install sparse
# sparse version: v0.6.3-106-gd020cf33-dirty
# https://github.com/0day-ci/linux/commit/a551316818f8b3f9164d7a734538decca3762fda
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review wenxu-ucloud-cn/net-sched-fix-over-mtu-packet-of-defrag-in/20201111-143001
git checkout a551316818f8b3f9164d7a734538decca3762fda
# save the attached .config to linux build tree
make W=1 C=1 CF='-fdiagnostic-prefix -D__CHECK_ENDIAN__' ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
"sparse warnings: (new ones prefixed by >>)"
net/sched/act_api.c:30:5: sparse: sparse: symbol 'tcf_set_xmit_hook' redeclared with different type (incompatible argument 1 (different address spaces)):
>> net/sched/act_api.c:30:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
net/sched/act_api.c: note: in included file (through include/net/pkt_cls.h):
include/net/act_api.h:244:5: sparse: note: previously declared as:
>> include/net/act_api.h:244:5: sparse: int extern [addressable] [signed] [toplevel] tcf_set_xmit_hook( ... )
>> net/sched/act_api.c:64:19: sparse: sparse: incorrect type in assignment (different address spaces) @@ expected int ( [noderef] __rcu *xmit_hook )( ... ) @@ got int ( [noderef] * )( ... ) @@
>> net/sched/act_api.c:64:19: sparse: expected int ( [noderef] __rcu *xmit_hook )( ... )
net/sched/act_api.c:64:19: sparse: got int ( [noderef] * )( ... )
vim +30 net/sched/act_api.c
a551316818f8b3f wenxu 2020-11-11 29
a551316818f8b3f wenxu 2020-11-11 @30 int tcf_set_xmit_hook(int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 31 int (*xmit)(struct sk_buff *skb)))
a551316818f8b3f wenxu 2020-11-11 32 {
a551316818f8b3f wenxu 2020-11-11 33 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 34 if (!tcf_xmit_hook_count) {
a551316818f8b3f wenxu 2020-11-11 35 rcu_assign_pointer(tcf_xmit_hook, xmit_hook);
a551316818f8b3f wenxu 2020-11-11 36 } else if (xmit_hook != tcf_xmit_hook) {
a551316818f8b3f wenxu 2020-11-11 37 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 38 return -EBUSY;
a551316818f8b3f wenxu 2020-11-11 39 }
a551316818f8b3f wenxu 2020-11-11 40
a551316818f8b3f wenxu 2020-11-11 41 tcf_xmit_hook_count++;
a551316818f8b3f wenxu 2020-11-11 42 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 43
a551316818f8b3f wenxu 2020-11-11 44 return 0;
a551316818f8b3f wenxu 2020-11-11 45 }
a551316818f8b3f wenxu 2020-11-11 46 EXPORT_SYMBOL_GPL(tcf_set_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 47
a551316818f8b3f wenxu 2020-11-11 48 void tcf_clear_xmit_hook(void)
a551316818f8b3f wenxu 2020-11-11 49 {
a551316818f8b3f wenxu 2020-11-11 50 spin_lock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 51 if (--tcf_xmit_hook_count == 0)
a551316818f8b3f wenxu 2020-11-11 52 rcu_assign_pointer(tcf_xmit_hook, NULL);
a551316818f8b3f wenxu 2020-11-11 53 spin_unlock(&tcf_xmit_hook_lock);
a551316818f8b3f wenxu 2020-11-11 54
a551316818f8b3f wenxu 2020-11-11 55 synchronize_rcu();
a551316818f8b3f wenxu 2020-11-11 56 }
a551316818f8b3f wenxu 2020-11-11 57 EXPORT_SYMBOL_GPL(tcf_clear_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 58
a551316818f8b3f wenxu 2020-11-11 59 int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))
a551316818f8b3f wenxu 2020-11-11 60 {
a551316818f8b3f wenxu 2020-11-11 61 int (__rcu *xmit_hook)(struct sk_buff *skb,
a551316818f8b3f wenxu 2020-11-11 62 int (*xmit)(struct sk_buff *skb));
a551316818f8b3f wenxu 2020-11-11 63
a551316818f8b3f wenxu 2020-11-11 @64 xmit_hook = rcu_dereference(tcf_xmit_hook);
a551316818f8b3f wenxu 2020-11-11 65 if (xmit_hook)
a551316818f8b3f wenxu 2020-11-11 66 return xmit_hook(skb, xmit);
a551316818f8b3f wenxu 2020-11-11 67 else
a551316818f8b3f wenxu 2020-11-11 68 return xmit(skb);
a551316818f8b3f wenxu 2020-11-11 69 }
a551316818f8b3f wenxu 2020-11-11 70 EXPORT_SYMBOL_GPL(tcf_dev_queue_xmit);
a551316818f8b3f wenxu 2020-11-11 71
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 39761 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support.
2020-11-11 6:28 [PATCH v8 net-next 0/3] net/sched: fix over mtu packet of defrag in wenxu
@ 2020-11-11 6:28 ` wenxu
2020-11-12 15:05 ` kernel test robot
0 siblings, 1 reply; 4+ messages in thread
From: wenxu @ 2020-11-11 6:28 UTC (permalink / raw)
To: kuba, marcelo.leitner, vladbu; +Cc: netdev
From: wenxu <wenxu@ucloud.cn>
Currently kernel tc subsystem can do conntrack in cat_ct. But when several
fragment packets go through the act_ct, function tcf_ct_handle_fragments
will defrag the packets to a big one. But the last action will redirect
mirred to a device which maybe lead the reassembly big packet over the mtu
of target device.
This patch add support for a xmit hook to mirred, that gets executed before
xmiting the packet. Then, when act_ct gets loaded, it configs that hook.
The frag xmit hook maybe reused by other modules.
Signed-off-by: wenxu <wenxu@ucloud.cn>
---
v2: Fix the crash for act_frag module without load
v3: modify the kconfig describe and put tcf_xmit_hook_is_enabled
in the tcf_dev_queue_xmit, and xchg atomic for tcf_xmit_hook
v4: using skb_protocol and fix line length exceeds 80 columns
v5: no change
v6: protect the tcf_xmit_hook with rcu lock
v7: add miss __rcu for tcf_xmit_hook
v8: add miss __rcu for xmit_hook
include/net/act_api.h | 16 +++++
net/sched/Kconfig | 13 ++++
net/sched/Makefile | 1 +
net/sched/act_api.c | 47 ++++++++++++++
net/sched/act_ct.c | 7 +++
net/sched/act_frag.c | 164 +++++++++++++++++++++++++++++++++++++++++++++++++
net/sched/act_mirred.c | 2 +-
7 files changed, 249 insertions(+), 1 deletion(-)
create mode 100644 net/sched/act_frag.c
diff --git a/include/net/act_api.h b/include/net/act_api.h
index 8721492..403a618 100644
--- a/include/net/act_api.h
+++ b/include/net/act_api.h
@@ -239,6 +239,22 @@ int tcf_action_check_ctrlact(int action, struct tcf_proto *tp,
struct netlink_ext_ack *newchain);
struct tcf_chain *tcf_action_set_ctrlact(struct tc_action *a, int action,
struct tcf_chain *newchain);
+
+int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));
+int tcf_set_xmit_hook(int (*xmit_hook)(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb)));
+void tcf_clear_xmit_hook(void);
+
+#if IS_ENABLED(CONFIG_NET_ACT_FRAG)
+int tcf_frag_xmit_hook(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb));
+#else
+static inline int tcf_frag_xmit_hook(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb))
+{
+ return 0;
+}
+#endif
+
#endif /* CONFIG_NET_CLS_ACT */
static inline void tcf_action_stats_update(struct tc_action *a, u64 bytes,
diff --git a/net/sched/Kconfig b/net/sched/Kconfig
index a3b37d8..9a240c7 100644
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -974,9 +974,22 @@ config NET_ACT_TUNNEL_KEY
To compile this code as a module, choose M here: the
module will be called act_tunnel_key.
+config NET_ACT_FRAG
+ tristate "Packet fragmentation"
+ depends on NET_CLS_ACT
+ help
+ Say Y here to allow fragmenting big packets when outputting
+ with the mirred action.
+
+ If unsure, say N.
+
+ To compile this code as a module, choose M here: the
+ module will be called act_frag.
+
config NET_ACT_CT
tristate "connection tracking tc action"
depends on NET_CLS_ACT && NF_CONNTRACK && NF_NAT && NF_FLOW_TABLE
+ depends on NET_ACT_FRAG
help
Say Y here to allow sending the packets to conntrack module.
diff --git a/net/sched/Makefile b/net/sched/Makefile
index 66bbf9a..c146186 100644
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_NET_IFE_SKBMARK) += act_meta_mark.o
obj-$(CONFIG_NET_IFE_SKBPRIO) += act_meta_skbprio.o
obj-$(CONFIG_NET_IFE_SKBTCINDEX) += act_meta_skbtcindex.o
obj-$(CONFIG_NET_ACT_TUNNEL_KEY)+= act_tunnel_key.o
+obj-$(CONFIG_NET_ACT_FRAG) += act_frag.o
obj-$(CONFIG_NET_ACT_CT) += act_ct.o
obj-$(CONFIG_NET_ACT_GATE) += act_gate.o
obj-$(CONFIG_NET_SCH_FIFO) += sch_fifo.o
diff --git a/net/sched/act_api.c b/net/sched/act_api.c
index f66417d..2cfcbe3 100644
--- a/net/sched/act_api.c
+++ b/net/sched/act_api.c
@@ -22,6 +22,53 @@
#include <net/act_api.h>
#include <net/netlink.h>
+static int (__rcu *tcf_xmit_hook)(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb));
+static DEFINE_SPINLOCK(tcf_xmit_hook_lock);
+static u16 tcf_xmit_hook_count;
+
+int tcf_set_xmit_hook(int (__rcu *xmit_hook)(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb)))
+{
+ spin_lock(&tcf_xmit_hook_lock);
+ if (!tcf_xmit_hook_count) {
+ rcu_assign_pointer(tcf_xmit_hook, xmit_hook);
+ } else if (xmit_hook != tcf_xmit_hook) {
+ spin_unlock(&tcf_xmit_hook_lock);
+ return -EBUSY;
+ }
+
+ tcf_xmit_hook_count++;
+ spin_unlock(&tcf_xmit_hook_lock);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(tcf_set_xmit_hook);
+
+void tcf_clear_xmit_hook(void)
+{
+ spin_lock(&tcf_xmit_hook_lock);
+ if (--tcf_xmit_hook_count == 0)
+ rcu_assign_pointer(tcf_xmit_hook, NULL);
+ spin_unlock(&tcf_xmit_hook_lock);
+
+ synchronize_rcu();
+}
+EXPORT_SYMBOL_GPL(tcf_clear_xmit_hook);
+
+int tcf_dev_queue_xmit(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))
+{
+ int (__rcu *xmit_hook)(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb));
+
+ xmit_hook = rcu_dereference(tcf_xmit_hook);
+ if (xmit_hook)
+ return xmit_hook(skb, xmit);
+ else
+ return xmit(skb);
+}
+EXPORT_SYMBOL_GPL(tcf_dev_queue_xmit);
+
static void tcf_action_goto_chain_exec(const struct tc_action *a,
struct tcf_result *res)
{
diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c
index 9c79fb9..dff3c40 100644
--- a/net/sched/act_ct.c
+++ b/net/sched/act_ct.c
@@ -1541,8 +1541,14 @@ static int __init ct_init_module(void)
if (err)
goto err_register;
+ err = tcf_set_xmit_hook(tcf_frag_xmit_hook);
+ if (err)
+ goto err_action;
+
return 0;
+err_action:
+ tcf_unregister_action(&act_ct_ops, &ct_net_ops);
err_register:
tcf_ct_flow_tables_uninit();
err_tbl_init:
@@ -1552,6 +1558,7 @@ static int __init ct_init_module(void)
static void __exit ct_cleanup_module(void)
{
+ tcf_clear_xmit_hook();
tcf_unregister_action(&act_ct_ops, &ct_net_ops);
tcf_ct_flow_tables_uninit();
destroy_workqueue(act_ct_wq);
diff --git a/net/sched/act_frag.c b/net/sched/act_frag.c
new file mode 100644
index 0000000..3a7ab92
--- /dev/null
+++ b/net/sched/act_frag.c
@@ -0,0 +1,164 @@
+// SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
+#include <net/netlink.h>
+#include <net/act_api.h>
+#include <net/dst.h>
+#include <net/ip.h>
+#include <net/ip6_fib.h>
+
+struct tcf_frag_data {
+ unsigned long dst;
+ struct qdisc_skb_cb cb;
+ __be16 inner_protocol;
+ u16 vlan_tci;
+ __be16 vlan_proto;
+ unsigned int l2_len;
+ u8 l2_data[VLAN_ETH_HLEN];
+ int (*xmit)(struct sk_buff *skb);
+};
+
+static DEFINE_PER_CPU(struct tcf_frag_data, tcf_frag_data_storage);
+
+static int tcf_frag_xmit(struct net *net, struct sock *sk, struct sk_buff *skb)
+{
+ struct tcf_frag_data *data = this_cpu_ptr(&tcf_frag_data_storage);
+
+ if (skb_cow_head(skb, data->l2_len) < 0) {
+ kfree_skb(skb);
+ return -ENOMEM;
+ }
+
+ __skb_dst_copy(skb, data->dst);
+ *qdisc_skb_cb(skb) = data->cb;
+ skb->inner_protocol = data->inner_protocol;
+ if (data->vlan_tci & VLAN_CFI_MASK)
+ __vlan_hwaccel_put_tag(skb, data->vlan_proto,
+ data->vlan_tci & ~VLAN_CFI_MASK);
+ else
+ __vlan_hwaccel_clear_tag(skb);
+
+ /* Reconstruct the MAC header. */
+ skb_push(skb, data->l2_len);
+ memcpy(skb->data, &data->l2_data, data->l2_len);
+ skb_postpush_rcsum(skb, skb->data, data->l2_len);
+ skb_reset_mac_header(skb);
+
+ data->xmit(skb);
+
+ return 0;
+}
+
+static void tcf_frag_prepare_frag(struct sk_buff *skb,
+ int (*xmit)(struct sk_buff *skb))
+{
+ unsigned int hlen = skb_network_offset(skb);
+ struct tcf_frag_data *data;
+
+ data = this_cpu_ptr(&tcf_frag_data_storage);
+ data->dst = skb->_skb_refdst;
+ data->cb = *qdisc_skb_cb(skb);
+ data->xmit = xmit;
+ data->inner_protocol = skb->inner_protocol;
+ if (skb_vlan_tag_present(skb))
+ data->vlan_tci = skb_vlan_tag_get(skb) | VLAN_CFI_MASK;
+ else
+ data->vlan_tci = 0;
+ data->vlan_proto = skb->vlan_proto;
+ data->l2_len = hlen;
+ memcpy(&data->l2_data, skb->data, hlen);
+
+ memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+ skb_pull(skb, hlen);
+}
+
+static unsigned int
+tcf_frag_dst_get_mtu(const struct dst_entry *dst)
+{
+ return dst->dev->mtu;
+}
+
+static struct dst_ops tcf_frag_dst_ops = {
+ .family = AF_UNSPEC,
+ .mtu = tcf_frag_dst_get_mtu,
+};
+
+static int tcf_fragment(struct net *net, struct sk_buff *skb,
+ u16 mru, int (*xmit)(struct sk_buff *skb))
+{
+ if (skb_network_offset(skb) > VLAN_ETH_HLEN) {
+ net_warn_ratelimited("L2 header too long to fragment\n");
+ goto err;
+ }
+
+ if (skb_protocol(skb, true) == htons(ETH_P_IP)) {
+ struct dst_entry tcf_frag_dst;
+ unsigned long orig_dst;
+
+ tcf_frag_prepare_frag(skb, xmit);
+ dst_init(&tcf_frag_dst, &tcf_frag_dst_ops, NULL, 1,
+ DST_OBSOLETE_NONE, DST_NOCOUNT);
+ tcf_frag_dst.dev = skb->dev;
+
+ orig_dst = skb->_skb_refdst;
+ skb_dst_set_noref(skb, &tcf_frag_dst);
+ IPCB(skb)->frag_max_size = mru;
+
+ ip_do_fragment(net, skb->sk, skb, tcf_frag_xmit);
+ refdst_drop(orig_dst);
+ } else if (skb_protocol(skb, true) == htons(ETH_P_IPV6)) {
+ unsigned long orig_dst;
+ struct rt6_info tcf_frag_rt;
+
+ tcf_frag_prepare_frag(skb, xmit);
+ memset(&tcf_frag_rt, 0, sizeof(tcf_frag_rt));
+ dst_init(&tcf_frag_rt.dst, &tcf_frag_dst_ops, NULL, 1,
+ DST_OBSOLETE_NONE, DST_NOCOUNT);
+ tcf_frag_rt.dst.dev = skb->dev;
+
+ orig_dst = skb->_skb_refdst;
+ skb_dst_set_noref(skb, &tcf_frag_rt.dst);
+ IP6CB(skb)->frag_max_size = mru;
+
+ ipv6_stub->ipv6_fragment(net, skb->sk, skb, tcf_frag_xmit);
+ refdst_drop(orig_dst);
+ } else {
+ net_warn_ratelimited("Fail frag %s: eth=%x, MRU=%d, MTU=%d\n",
+ netdev_name(skb->dev),
+ ntohs(skb_protocol(skb, true)), mru,
+ skb->dev->mtu);
+ goto err;
+ }
+
+ qdisc_skb_cb(skb)->mru = 0;
+ return 0;
+err:
+ kfree_skb(skb);
+ return -1;
+}
+
+int tcf_frag_xmit_hook(struct sk_buff *skb, int (*xmit)(struct sk_buff *skb))
+{
+ u16 mru = qdisc_skb_cb(skb)->mru;
+ int err;
+
+ if (mru && skb->len > mru + skb->dev->hard_header_len)
+ err = tcf_fragment(dev_net(skb->dev), skb, mru, xmit);
+ else
+ err = xmit(skb);
+
+ return err;
+}
+EXPORT_SYMBOL_GPL(tcf_frag_xmit_hook);
+
+static int __init frag_init_module(void)
+{
+ return 0;
+}
+
+static void __exit frag_cleanup_module(void)
+{
+}
+
+module_init(frag_init_module);
+module_exit(frag_cleanup_module);
+MODULE_AUTHOR("wenxu <wenxu@ucloud.cn>");
+MODULE_LICENSE("GPL v2");
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 17d0095..7153c67 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -210,7 +210,7 @@ static int tcf_mirred_forward(bool want_ingress, struct sk_buff *skb)
int err;
if (!want_ingress)
- err = dev_queue_xmit(skb);
+ err = tcf_dev_queue_xmit(skb, dev_queue_xmit);
else
err = netif_receive_skb(skb);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-12 15:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-11 9:42 [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support kernel test robot
-- strict thread matches above, loose matches on Subject: below --
2020-11-11 6:28 [PATCH v8 net-next 0/3] net/sched: fix over mtu packet of defrag in wenxu
2020-11-11 6:28 ` [PATCH v8 net-next 3/3] net/sched: act_frag: add implict packet fragment support wenxu
2020-11-12 15:05 ` kernel test robot
2020-11-12 15:05 ` kernel test robot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.