diff mbox series

net: l2tp: Fix duplicate included trace.h

Message ID 1648006705-30269-1-git-send-email-baihaowen@meizu.com (mailing list archive)
State Changes Requested
Delegated to: Netdev Maintainers
Headers show
Series net: l2tp: Fix duplicate included trace.h | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit fail Errors and warnings before: 0 this patch: 14
netdev/cc_maintainers warning 4 maintainers not CCed: xiyuyang19@fudan.edu.cn tanxin.ctf@gmail.com tparkin@katalix.com sishuai@purdue.edu
netdev/build_clang fail Errors and warnings before: 0 this patch: 14
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn fail Errors and warnings before: 0 this patch: 14
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 7 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

baihaowen March 23, 2022, 3:38 a.m. UTC 
Clean up the following includecheck warning:

net/l2tp/l2tp_core.c: trace.h is included more than once.

No functional change.

Signed-off-by: Haowen Bai <baihaowen@meizu.com>
---
 net/l2tp/l2tp_core.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Jakub Kicinski March 23, 2022, 5:14 a.m. UTC | #1 
On Wed, 23 Mar 2022 11:38:25 +0800 Haowen Bai wrote:
> Clean up the following includecheck warning:
> 
> net/l2tp/l2tp_core.c: trace.h is included more than once.
> 
> No functional change.

This one doesn't build either.

You must validate your patches to the best of your ability.
If the best of your ability does not include firing up 
a compiler - that will be a problem.
baihaowen March 23, 2022, 6:30 a.m. UTC | #2 
thx for pointing out my mistaken.
kernel test robot March 23, 2022, 12:58 p.m. UTC | #3 
Hi Haowen,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]
[also build test ERROR on net/master horms-ipvs/master linus/master v5.17 next-20220323]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Haowen-Bai/net-l2tp-Fix-duplicate-included-trace-h/20220323-114023
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 4a0cb83ba6e0cd73a50fa4f84736846bf0029f2b
config: openrisc-buildonly-randconfig-r003-20220323 (https://download.01.org/0day-ci/archive/20220323/202203232038.g9DSFJVx-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/d079f4f8992c56c4d970665bad819349d4916c46
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Haowen-Bai/net-l2tp-Fix-duplicate-included-trace-h/20220323-114023
        git checkout d079f4f8992c56c4d970665bad819349d4916c46
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=openrisc SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `trace_session_seqnum_update':
>> l2tp_core.c:(.text+0xa3c): undefined reference to `__tracepoint_session_seqnum_update'
>> or1k-linux-ld: l2tp_core.c:(.text+0xa40): undefined reference to `__tracepoint_session_seqnum_update'
>> or1k-linux-ld: l2tp_core.c:(.text+0xb10): undefined reference to `__traceiter_session_seqnum_update'
   l2tp_core.c:(.text+0xb10): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_session_seqnum_update'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_recv_dequeue':
>> l2tp_core.c:(.text+0x1e58): undefined reference to `__tracepoint_session_pkt_expired'
>> or1k-linux-ld: l2tp_core.c:(.text+0x1e90): undefined reference to `__tracepoint_session_pkt_expired'
>> or1k-linux-ld: l2tp_core.c:(.text+0x1fe0): undefined reference to `__traceiter_session_pkt_expired'
   l2tp_core.c:(.text+0x1fe0): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_session_pkt_expired'
>> or1k-linux-ld: l2tp_core.c:(.text+0x21ac): undefined reference to `__tracepoint_session_seqnum_reset'
   or1k-linux-ld: l2tp_core.c:(.text+0x21b8): undefined reference to `__tracepoint_session_seqnum_reset'
>> or1k-linux-ld: l2tp_core.c:(.text+0x227c): undefined reference to `__traceiter_session_seqnum_reset'
   l2tp_core.c:(.text+0x227c): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_session_seqnum_reset'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_tunnel_delete':
>> (.text+0x2c7c): undefined reference to `__tracepoint_delete_tunnel'
>> or1k-linux-ld: (.text+0x2c80): undefined reference to `__tracepoint_delete_tunnel'
>> or1k-linux-ld: (.text+0x2d4c): undefined reference to `__traceiter_delete_tunnel'
   (.text+0x2d4c): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_delete_tunnel'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_tunnel_dec_refcount':
>> (.text+0x3414): undefined reference to `__tracepoint_free_tunnel'
>> or1k-linux-ld: (.text+0x3418): undefined reference to `__tracepoint_free_tunnel'
>> or1k-linux-ld: (.text+0x34e8): undefined reference to `__traceiter_free_tunnel'
   (.text+0x34e8): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_free_tunnel'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_session_dec_refcount':
>> (.text+0x36c4): undefined reference to `__tracepoint_free_session'
>> or1k-linux-ld: (.text+0x36c8): undefined reference to `__tracepoint_free_session'
>> or1k-linux-ld: (.text+0x3798): undefined reference to `__traceiter_free_session'
   (.text+0x3798): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_free_session'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_tunnel_register':
>> (.text+0x3db8): undefined reference to `__tracepoint_register_tunnel'
>> or1k-linux-ld: (.text+0x3dbc): undefined reference to `__tracepoint_register_tunnel'
>> or1k-linux-ld: (.text+0x3e7c): undefined reference to `__traceiter_register_tunnel'
   (.text+0x3e7c): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_register_tunnel'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_recv_data_seq':
   l2tp_core.c:(.text+0x4074): undefined reference to `__tracepoint_session_pkt_outside_rx_window'
   or1k-linux-ld: l2tp_core.c:(.text+0x4078): undefined reference to `__tracepoint_session_pkt_outside_rx_window'
   or1k-linux-ld: l2tp_core.c:(.text+0x4138): undefined reference to `__traceiter_session_pkt_outside_rx_window'
   l2tp_core.c:(.text+0x4138): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_session_pkt_outside_rx_window'
   or1k-linux-ld: l2tp_core.c:(.text+0x43b0): undefined reference to `__tracepoint_session_pkt_oos'
   or1k-linux-ld: l2tp_core.c:(.text+0x43b4): undefined reference to `__tracepoint_session_pkt_oos'
   or1k-linux-ld: l2tp_core.c:(.text+0x446c): undefined reference to `__traceiter_session_pkt_oos'
   l2tp_core.c:(.text+0x446c): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_session_pkt_oos'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_session_delete':
   (.text+0x45dc): undefined reference to `__tracepoint_delete_session'
   or1k-linux-ld: (.text+0x45e0): undefined reference to `__tracepoint_delete_session'
   or1k-linux-ld: (.text+0x46ac): undefined reference to `__traceiter_delete_session'
   (.text+0x46ac): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `__traceiter_delete_session'
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_session_register':
   (.text+0x525c): undefined reference to `__tracepoint_register_session'
   or1k-linux-ld: (.text+0x5260): undefined reference to `__tracepoint_register_session'
   or1k-linux-ld: (.text+0x5320): undefined reference to `__traceiter_register_session'
   (.text+0x5320): additional relocation overflows omitted from the output
   or1k-linux-ld: net/l2tp/l2tp_core.o: in function `l2tp_recv_common':
   (.text+0x55c4): undefined reference to `__tracepoint_session_seqnum_lns_enable'
   or1k-linux-ld: (.text+0x55d0): undefined reference to `__tracepoint_session_seqnum_lns_enable'
   or1k-linux-ld: (.text+0x5694): undefined reference to `__traceiter_session_seqnum_lns_enable'
   or1k-linux-ld: (.text+0x5818): undefined reference to `__tracepoint_session_seqnum_lns_disable'
   or1k-linux-ld: (.text+0x581c): undefined reference to `__tracepoint_session_seqnum_lns_disable'
   or1k-linux-ld: (.text+0x58e0): undefined reference to `__traceiter_session_seqnum_lns_disable'
kernel test robot March 23, 2022, 1:38 p.m. UTC | #4 
Hi Haowen,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]
[also build test ERROR on net/master horms-ipvs/master linus/master v5.17 next-20220323]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Haowen-Bai/net-l2tp-Fix-duplicate-included-trace-h/20220323-114023
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 4a0cb83ba6e0cd73a50fa4f84736846bf0029f2b
config: riscv-randconfig-r034-20220323 (https://download.01.org/0day-ci/archive/20220323/202203232123.4w2jlskl-lkp@intel.com/config)
compiler: clang version 15.0.0 (https://github.com/llvm/llvm-project 902f4708fe1d03b0de7e5315ef875006a6adc319)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install riscv cross compiling tool for clang build
        # apt-get install binutils-riscv64-linux-gnu
        # https://github.com/0day-ci/linux/commit/d079f4f8992c56c4d970665bad819349d4916c46
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Haowen-Bai/net-l2tp-Fix-duplicate-included-trace-h/20220323-114023
        git checkout d079f4f8992c56c4d970665bad819349d4916c46
        # save the config file to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=riscv SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> ld.lld: error: undefined symbol: __tracepoint_delete_session
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(trace_delete_session) in archive net/built-in.a
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(__jump_table+0x44) in archive net/built-in.a
--
>> ld.lld: error: undefined symbol: __traceiter_delete_session
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(trace_delete_session) in archive net/built-in.a
--
>> ld.lld: error: undefined symbol: __tracepoint_delete_tunnel
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(trace_delete_tunnel) in archive net/built-in.a
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(__jump_table+0x38) in archive net/built-in.a
--
>> ld.lld: error: undefined symbol: __traceiter_delete_tunnel
   >>> referenced by l2tp_core.c
   >>> l2tp/l2tp_core.o:(trace_delete_tunnel) in archive net/built-in.a
diff mbox series

Patch

diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 7499c51..7f31336 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -64,7 +64,6 @@ 
 #include "trace.h"
 
 #define CREATE_TRACE_POINTS
-#include "trace.h"
 
 #define L2TP_DRV_VERSION	"V2.0"