Doug / smarc-fsl-linux-kernel

10 May, 2010

1 commit

  • 3b254c54e   netfilter: nf_conntrack_proto: fix warning with CONFIG_PROVE_RCU ... Browse Code »

    ===================================================
    [ INFO: suspicious rcu_dereference_check() usage. ]
    ---------------------------------------------------
    include/net/netfilter/nf_conntrack_l3proto.h:92 invoked rcu_dereference_check()
    without protection!

    other info that might help us debug this:

    rcu_scheduler_active = 1, debug_locks = 0
    2 locks held by iptables/3197:
    #0: (sk_lock-AF_INET){+.+.+.}, at: []
    ip_setsockopt+0x7c/0xa0
    #1: (&xt[i].mutex){+.+.+.}, at: []
    xt_find_table_lock+0x3e/0x110

    stack backtrace:
    Pid: 3197, comm: iptables Not tainted 2.6.34-rc4 #2
    Call Trace:
    [] lockdep_rcu_dereference+0xb8/0xc0
    [] nf_ct_l3proto_module_put+0x6b/0x70
    [] state_mt_destroy+0x11/0x20
    [] cleanup_match+0x2f/0x50
    [] cleanup_entry+0x33/0x90
    [] ? __do_replace+0x1a3/0x210
    [] __do_replace+0x19c/0x210
    [] do_ipt_set_ctl+0x16a/0x1b0
    [] nf_sockopt+0x60/0xa0
    ...

    The __nf_ct_l3proto_find() call doesn't actually need rcu read side
    protection since the caller holds a reference to the protocol. Use
    rcu_read_lock() anyways to avoid the warning.

    Kernel bugzilla #15781: https://bugzilla.kernel.org/show_bug.cgi?id=15781

    Reported-by: Christian Casteyde
    Signed-off-by: Patrick McHardy

    Patrick McHardy
     

20 Apr, 2010

1 commit

13 Apr, 2010

1 commit

30 Mar, 2010

1 commit

  • 5a0e3ad6a   include cleanup: Update gfp.h and slab.h includes to prepare for breaking implic… ... Browse Code »

    …it slab.h inclusion from percpu.h

    percpu.h is included by sched.h and module.h and thus ends up being
    included when building most .c files. percpu.h includes slab.h which
    in turn includes gfp.h making everything defined by the two files
    universally available and complicating inclusion dependencies.

    percpu.h -> slab.h dependency is about to be removed. Prepare for
    this change by updating users of gfp and slab facilities include those
    headers directly instead of assuming availability. As this conversion
    needs to touch large number of source files, the following script is
    used as the basis of conversion.

    http://userweb.kernel.org/~tj/misc/slabh-sweep.py

    The script does the followings.

    * Scan files for gfp and slab usages and update includes such that
    only the necessary includes are there. ie. if only gfp is used,
    gfp.h, if slab is used, slab.h.

    * When the script inserts a new include, it looks at the include
    blocks and try to put the new include such that its order conforms
    to its surrounding. It's put in the include block which contains
    core kernel includes, in the same order that the rest are ordered -
    alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
    doesn't seem to be any matching order.

    * If the script can't find a place to put a new include (mostly
    because the file doesn't have fitting include block), it prints out
    an error message indicating which .h file needs to be added to the
    file.

    The conversion was done in the following steps.

    1. The initial automatic conversion of all .c files updated slightly
    over 4000 files, deleting around 700 includes and adding ~480 gfp.h
    and ~3000 slab.h inclusions. The script emitted errors for ~400
    files.

    2. Each error was manually checked. Some didn't need the inclusion,
    some needed manual addition while adding it to implementation .h or
    embedding .c file was more appropriate for others. This step added
    inclusions to around 150 files.

    3. The script was run again and the output was compared to the edits
    from #2 to make sure no file was left behind.

    4. Several build tests were done and a couple of problems were fixed.
    e.g. lib/decompress_*.c used malloc/free() wrappers around slab
    APIs requiring slab.h to be added manually.

    5. The script was run on all .h files but without automatically
    editing them as sprinkling gfp.h and slab.h inclusions around .h
    files could easily lead to inclusion dependency hell. Most gfp.h
    inclusion directives were ignored as stuff from gfp.h was usually
    wildly available and often used in preprocessor macros. Each
    slab.h inclusion directive was examined and added manually as
    necessary.

    6. percpu.h was updated not to include slab.h.

    7. Build test were done on the following configurations and failures
    were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
    distributed build env didn't work with gcov compiles) and a few
    more options had to be turned off depending on archs to make things
    build (like ipr on powerpc/64 which failed due to missing writeq).

    * x86 and x86_64 UP and SMP allmodconfig and a custom test config.
    * powerpc and powerpc64 SMP allmodconfig
    * sparc and sparc64 SMP allmodconfig
    * ia64 SMP allmodconfig
    * s390 SMP allmodconfig
    * alpha SMP allmodconfig
    * um on x86_64 SMP allmodconfig

    8. percpu.h modifications were reverted so that it could be applied as
    a separate patch and serve as bisection point.

    Given the fact that I had only a couple of failures from tests on step
    6, I'm fairly confident about the coverage of this conversion patch.
    If there is a breakage, it's likely to be something in one of the arch
    headers which should be easily discoverable easily on most builds of
    the specific arch.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>

    Tejun Heo
     

26 Mar, 2009

1 commit

  • d0dba7255   netfilter: ctnetlink: add callbacks to the per-proto nlattrs ... Browse Code »

    There is added a single callback for the l3 proto helper. The two
    callbacks for the l4 protos are necessary because of the general
    structure of a ctnetlink event, which is in short:

    CTA_TUPLE_ORIG

    CTA_TUPLE_REPLY

    CTA_ID
    ...
    CTA_PROTOINFO

    CTA_TUPLE_MASTER

    Therefore the formular is

    size := sizeof(generic-nlas) + 3 * sizeof(tuple_nlas) + sizeof(protoinfo_nlas)

    Some of the NLAs are optional, e. g. CTA_TUPLE_MASTER, which is only
    set if it's an expected connection. But the number of optional NLAs is
    small enough to prevent netlink_trim() from reallocating if calculated
    properly.

    Signed-off-by: Holger Eitzenberger
    Signed-off-by: Patrick McHardy

    Holger Eitzenberger
     

19 Mar, 2009

1 commit

05 Nov, 2008

1 commit

  • efb9a8c28   netfilter: netns ct: walk netns list under RTNL ... Browse Code »

    netns list (just list) is under RTNL. But helper and proto unregistration
    happen during rmmod when RTNL is not held, and that's how it was tested:
    modprobe/rmmod vs clone(CLONE_NEWNET)/exit.

    BUG: unable to handle kernel paging request at 0000000000100100 ] nf_conntrack_l4proto_unregister+0x96/0xae [nf_conntrack]
    PGD 15e300067 PUD 15e1d8067 PMD 0
    Oops: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC
    last sysfs file: /sys/kernel/uevent_seqnum
    CPU 0
    Modules linked in: nf_conntrack_proto_sctp(-) nf_conntrack_proto_dccp(-) af_packet iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 iptable_filter ip_tables xt_tcpudp ip6table_filter ip6_tables x_tables ipv6 sr_mod cdrom [last unloaded: nf_conntrack_proto_sctp]
    Pid: 16758, comm: rmmod Not tainted 2.6.28-rc2-netns-xfrm #3
    RIP: 0010:[] [] nf_conntrack_l4proto_unregister+0x96/0xae [nf_conntrack]
    RSP: 0018:ffff88015dc1fec8 EFLAGS: 00010212
    RAX: 0000000000000000 RBX: 00000000001000f8 RCX: 0000000000000000
    RDX: ffffffffa009575c RSI: 0000000000000003 RDI: ffffffffa00956b5
    RBP: ffff88015dc1fed8 R08: 0000000000000002 R09: 0000000000000000
    R10: 0000000000000000 R11: ffff88015dc1fe48 R12: ffffffffa0458f60
    R13: 0000000000000880 R14: 00007fff4c361d30 R15: 0000000000000880
    FS: 00007f624435a6f0(0000) GS:ffffffff80521580(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
    CR2: 0000000000100100 CR3: 0000000168969000 CR4: 00000000000006e0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process rmmod (pid: 16758, threadinfo ffff88015dc1e000, task ffff880179864218)
    Stack:
    ffffffffa0459100 0000000000000000 ffff88015dc1fee8 ffffffffa0457934
    ffff88015dc1ff78 ffffffff80253fef 746e6e6f635f666e 6f72705f6b636172
    00707463735f6f74 ffffffff8024cb30 00000000023b8010 0000000000000000
    Call Trace:
    [] nf_conntrack_proto_sctp_fini+0x10/0x1e [nf_conntrack_proto_sctp]
    [] sys_delete_module+0x19f/0x1fe
    [] ? trace_hardirqs_on_caller+0xf0/0x114
    [] ? trace_hardirqs_on_thunk+0x3a/0x3f
    [] system_call_fastpath+0x16/0x1b
    Code: 13 35 e0 e8 c4 6c 1a e0 48 8b 1d 6d c6 46 e0 eb 16 48 89 df 4c 89 e2 48 c7 c6 fc 85 09 a0 e8 61 cd ff ff 48 8b 5b 08 48 83 eb 08 8b 43 08 0f 18 08 48 8d 43 08 48 3d 60 4f 50 80 75 d3 5b 41
    RIP [] nf_conntrack_l4proto_unregister+0x96/0xae [nf_conntrack]
    RSP
    CR2: 0000000000100100
    ---[ end trace bde8ac82debf7192 ]---

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Alexey Dobriyan
     

08 Oct, 2008

2 commits

14 Apr, 2008

1 commit

29 Jan, 2008

1 commit

  • b3fd3ffe3   [NETFILTER]: Use the ctl paths instead of hand-made analogue ... Browse Code »

    The conntracks subsystem has a similar infrastructure
    to maintain ctl_paths, but since we already have it
    on the generic level, I think it's OK to switch to
    using it.

    So, basically, this patch just replaces the ctl_table-s
    with ctl_path-s, nf_register_sysctl_table with
    register_sysctl_paths() and removes no longer needed code.

    After this the net/netfilter/nf_sysctl.c file contains
    the paths only.

    Signed-off-by: Pavel Emelyanov
    Acked-by: Patrick McHardy
    Signed-off-by: David S. Miller

    Pavel Emelyanov
     

26 Apr, 2007

5 commits

13 Feb, 2007

2 commits

03 Dec, 2006

7 commits