Eric Lee / smarc-fsl-linux-kernel

02 Aug, 2011

1 commit

22 Jul, 2011

1 commit

14 Jul, 2011

1 commit

13 Jul, 2011

1 commit

09 Jul, 2011

1 commit

08 Jul, 2011

1 commit

07 Jul, 2011

1 commit

  • d804c6f21   net: doc: fix compile warning of no format arguments in ifenslave.c ... Browse Code »

    Fix following warning in ifenslave.c with gcc version 4.5.2 (Ubuntu/Linaro 4.5.2-8ubuntu4).

    Documentation/networking/ifenslave.c:263:4: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:271:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:277:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:285:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:291:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:292:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:312:4: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:323:3: warning: format not a string literal and no format arguments
    Documentation/networking/ifenslave.c:342:4: warning: format not a string literal and no format arguments

    Signed-off-by: Shan Wei
    Signed-off-by: David S. Miller

    Shan Wei
     

06 Jul, 2011

1 commit

05 Jul, 2011

2 commits

09 Jun, 2011

1 commit

  • 4b9d9be83   inetpeer: remove unused list ... Browse Code »

    Andi Kleen and Tim Chen reported huge contention on inetpeer
    unused_peers.lock, on memcached workload on a 40 core machine, with
    disabled route cache.

    It appears we constantly flip peers refcnt between 0 and 1 values, and
    we must insert/remove peers from unused_peers.list, holding a contended
    spinlock.

    Remove this list completely and perform a garbage collection on-the-fly,
    at lookup time, using the expired nodes we met during the tree
    traversal.

    This removes a lot of code, makes locking more standard, and obsoletes
    two sysctls (inet_peer_gc_mintime and inet_peer_gc_maxtime). This also
    removes two pointers in inet_peer structure.

    There is still a false sharing effect because refcnt is in first cache
    line of object [were the links and keys used by lookups are located], we
    might move it at the end of inet_peer structure to let this first cache
    line mostly read by cpus.

    Signed-off-by: Eric Dumazet
    CC: Andi Kleen
    CC: Tim Chen
    Signed-off-by: David S. Miller

    Eric Dumazet
     

28 May, 2011

1 commit

26 May, 2011

1 commit

20 May, 2011

1 commit

09 May, 2011

1 commit

08 May, 2011

1 commit

30 Apr, 2011

1 commit

  • ad246c992   ipv4, ipv6, bonding: Restore control over number of peer notifications ... Browse Code »

    For backward compatibility, we should retain the module parameters and
    sysfs attributes to control the number of peer notifications
    (gratuitous ARPs and unsolicited NAs) sent after bonding failover.
    Also, it is possible for failover to take place even though the new
    active slave does not have link up, and in that case the peer
    notification should be deferred until it does.

    Change ipv4 and ipv6 so they do not automatically send peer
    notifications on bonding failover.

    Change the bonding driver to send separate NETDEV_NOTIFY_PEERS
    notifications when the link is up, as many times as requested. Since
    it does not directly control which protocols send notifications, make
    num_grat_arp and num_unsol_na aliases for a single parameter. Bump
    the bonding version number and update its documentation.

    Signed-off-by: Ben Hutchings
    Signed-off-by: Jay Vosburgh
    Acked-by: Brian Haley
    Signed-off-by: David S. Miller

    Ben Hutchings
     

14 Apr, 2011

1 commit

08 Apr, 2011

1 commit

05 Apr, 2011

1 commit

31 Mar, 2011

1 commit

16 Mar, 2011

1 commit

15 Mar, 2011

1 commit

  • a23c37f11   bonding: documentation update: mailing lists. ... Browse Code »

    In commit a6c36ee677607b02d8ecc88e8a12785418b88107 ("bonding: change list
    contact to netdev@vger.kernel.org"), the mailing list for bonding
    developpement was changed from bonding-devel to netdev.

    Update the bonding documentation to reflect this change:

    - bonding-devel is used for usage discussions (despite the name).
    - netdev is used for developpement discussions.

    Also remove the reference to the sourceforge bonding page, which is
    deprecated.

    Signed-off-by: Nicolas de Pesloüan
    Signed-off-by: David S. Miller

    Nicolas de Pesloüan
     

10 Mar, 2011

3 commits

  • a015f6f49   Phonet: kill the ST-Ericsson pipe controller Kconfig ... Browse Code »

    This is now a run-time choice so that a single kernel can support both
    old and new generation ISI modems. Support for manually enabling the
    pipe flow is removed as it did not work properly, does not fit well
    with the socket API, and I am not aware of any use at the moment.

    Signed-off-by: Rémi Denis-Courmont
    Signed-off-by: David S. Miller

    Rémi Denis-Courmont
     
  • 297edb600   Phonet: support active connection without pipe controller on modem ... Browse Code »

    This provides support for newer ISI modems with no need for the
    earlier experimental compile-time alternative choice. With this,
    we can now use the same kernel and userspace with both types of
    modems.

    This also avoids confusing two different and incompatible state
    machines, actively connected vs accepted sockets, and adds
    connection response error handling (processing "SYN/RST" of sorts).

    Signed-off-by: Rémi Denis-Courmont
    Signed-off-by: David S. Miller

    Rémi Denis-Courmont
     
  • acaf7df61   Phonet: provide pipe socket option to retrieve the pipe identifier ... Browse Code »

    User-space sometimes needs this information. In particular, the GPRS
    context or the AT commands pipe setups may use the pipe handle as a
    reference.

    This removes the settable pipe handle with CONFIG_PHONET_PIPECTRLR.
    It did not handle error cases correctly. Furthermore, the kernel
    *could* implement a smart scheme for allocating handles (if ever
    needed), but userspace really cannot.

    Signed-off-by: Rémi Denis-Courmont
    Signed-off-by: David S. Miller

    Rémi Denis-Courmont
     

04 Mar, 2011

3 commits

  • 0a0e9ae1b   Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    Conflicts:
    drivers/net/bnx2x/bnx2x.h

    David S. Miller
     
  • b65a0e0c8   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorri… ... Browse Code »

    …s/security-testing-2.6

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
    DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076]

    Linus Torvalds
     
  • 1362fa078   DNS: Fix a NULL pointer deref when trying to read an error key [CVE-2011-1076] ... Browse Code »

    When a DNS resolver key is instantiated with an error indication, attempts to
    read that key will result in an oops because user_read() is expecting there to
    be a payload - and there isn't one [CVE-2011-1076].

    Give the DNS resolver key its own read handler that returns the error cached in
    key->type_data.x[0] as an error rather than crashing.

    Also make the kenter() at the beginning of dns_resolver_instantiate() limit the
    amount of data it prints, since the data is not necessarily NUL-terminated.

    The buggy code was added in:

    commit 4a2d789267e00b5a1175ecd2ddefcc78b83fbf09
    Author: Wang Lei
    Date: Wed Aug 11 09:37:58 2010 +0100
    Subject: DNS: If the DNS server returns an error, allow that to be cached [ver #2]

    This can trivially be reproduced by any user with the following program
    compiled with -lkeyutils:

    #include
    #include
    #include
    static char payload[] = "#dnserror=6";
    int main()
    {
    key_serial_t key;
    key = add_key("dns_resolver", "a", payload, sizeof(payload),
    KEY_SPEC_SESSION_KEYRING);
    if (key == -1)
    err(1, "add_key");
    if (keyctl_read(key, NULL, 0) == -1)
    err(1, "read_key");
    return 0;
    }

    What should happen is that keyctl_read() reports error 6 (ENXIO) to the user:

    dns-break: read_key: No such device or address

    but instead the kernel oopses.

    This cannot be reproduced with the 'keyutils add' or 'keyutils padd' commands
    as both of those cut the data down below the NUL termination that must be
    included in the data. Without this dns_resolver_instantiate() will return
    -EINVAL and the key will not be instantiated such that it can be read.

    The oops looks like:

    BUG: unable to handle kernel NULL pointer dereference at 0000000000000010
    IP: [] user_read+0x4f/0x8f
    PGD 3bdf8067 PUD 385b9067 PMD 0
    Oops: 0000 [#1] SMP
    last sysfs file: /sys/devices/pci0000:00/0000:00:19.0/irq
    CPU 0
    Modules linked in:

    Pid: 2150, comm: dns-break Not tainted 2.6.38-rc7-cachefs+ #468 /DG965RY
    RIP: 0010:[] [] user_read+0x4f/0x8f
    RSP: 0018:ffff88003bf47f08 EFLAGS: 00010246
    RAX: 0000000000000001 RBX: ffff88003b5ea378 RCX: ffffffff81972368
    RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff88003b5ea378
    RBP: ffff88003bf47f28 R08: ffff88003be56620 R09: 0000000000000000
    R10: 0000000000000395 R11: 0000000000000002 R12: 0000000000000000
    R13: 0000000000000000 R14: 0000000000000000 R15: ffffffffffffffa1
    FS: 00007feab5751700(0000) GS:ffff88003e000000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 0000000000000010 CR3: 000000003de40000 CR4: 00000000000006f0
    DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
    DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
    Process dns-break (pid: 2150, threadinfo ffff88003bf46000, task ffff88003be56090)
    Stack:
    ffff88003b5ea378 ffff88003b5ea3a0 0000000000000000 0000000000000000
    ffff88003bf47f68 ffffffff811b708e ffff88003c442bc8 0000000000000000
    00000000004005a0 00007fffba368060 0000000000000000 0000000000000000
    Call Trace:
    [] keyctl_read_key+0xac/0xcf
    [] sys_keyctl+0x75/0xb6
    [] system_call_fastpath+0x16/0x1b
    Code: 75 1f 48 83 7b 28 00 75 18 c6 05 58 2b fb 00 01 be bb 00 00 00 48 c7 c7 76 1c 75 81 e8 13 c2 e9 ff 4c 8b b3 e0 00 00 00 4d 85 ed 0f b7 5e 10 74 2d 4d 85 e4 74 28 e8 98 79 ee ff 49 39 dd 48
    RIP [] user_read+0x4f/0x8f
    RSP
    CR2: 0000000000000010

    Signed-off-by: David Howells
    Acked-by: Jeff Layton
    cc: Wang Lei
    Signed-off-by: James Morris

    David Howells
     

01 Mar, 2011

1 commit

21 Feb, 2011

1 commit

  • 81146ec1b   tcp: document tcp_max_ssthresh (Limited Slow-Start) ... Browse Code »

    Base on Ilpo's patch about documenting tcp_max_ssthresh.
    (see http://marc.info/?l=linux-netdev&m=117950581307310&w=2)

    According to errata of RFC3742, fix the number of segments increased
    during RTT time.

    Just to state the occasion to use this parameter, But
    about how to set parameter value, maybe some others can do it.

    Signed-off-by: Ilpo Järvinen
    Signed-off-by: Shan Wei
    Signed-off-by: David S. Miller

    Ilpo Järvinen
     

20 Feb, 2011

1 commit

11 Feb, 2011

1 commit

  • 520732af9   net: fix ifenslave build flags ... Browse Code »

    -I (include path) should be specified for host builds.
    This one was overlooked somehow. Fixes
    https://bugzilla.kernel.org/show_bug.cgi?id=25902

    Signed-off-by: Randy Dunlap
    Reported-by: Alexey Salmin
    Signed-off-by: David S. Miller

    Randy Dunlap
     

05 Feb, 2011

1 commit

03 Feb, 2011

1 commit

01 Feb, 2011

1 commit

31 Jan, 2011

1 commit

26 Jan, 2011

1 commit

14 Jan, 2011

1 commit

  • 008d23e48   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
    Documentation/trace/events.txt: Remove obsolete sched_signal_send.
    writeback: fix global_dirty_limits comment runtime -> real-time
    ppc: fix comment typo singal -> signal
    drivers: fix comment typo diable -> disable.
    m68k: fix comment typo diable -> disable.
    wireless: comment typo fix diable -> disable.
    media: comment typo fix diable -> disable.
    remove doc for obsolete dynamic-printk kernel-parameter
    remove extraneous 'is' from Documentation/iostats.txt
    Fix spelling milisec -> ms in snd_ps3 module parameter description
    Fix spelling mistakes in comments
    Revert conflicting V4L changes
    i7core_edac: fix typos in comments
    mm/rmap.c: fix comment
    sound, ca0106: Fix assignment to 'channel'.
    hrtimer: fix a typo in comment
    init/Kconfig: fix typo
    anon_inodes: fix wrong function name in comment
    fix comment typos concerning "consistent"
    poll: fix a typo in comment
    ...

    Fix up trivial conflicts in:
    - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
    - fs/ext4/ext4.h

    Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

    Linus Torvalds
     

07 Jan, 2011

1 commit

  • bfbb23466   dccp: make upper bound for seq_window consistent on 32/64 bit ... Browse Code »

    The 'seq_window' sysctl sets the initial value for the DCCP Sequence Window,
    which may range from 32..2^46-1 (RFC 4340, 7.5.2). The patch sets the upper
    bound consistently to 2^32-1 on both 32 and 64 bit systems, which should be
    sufficient - with a RTT of 1sec and 1-byte packets, a seq_window of 2^32-1
    corresponds to a link speed of 34 Gbps.

    Signed-off-by: Gerrit Renker

    Gerrit Renker