1. 02 5月, 2013 20 次提交
    • B
      [SCSI] bnx2fc: Include chip number in the symbolic name · c13d2b6d
      Bhanu Prakash Gollapudi 提交于
      [jejb: move PCI_DEVICE_ID definitions to include/pci_ids.h]
      Signed-off-by: NBhanu Prakash Gollapudi <bprakash@broadcom.com>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      c13d2b6d
    • B
      [SCSI] bnx2fc: Enable cached tasks to improve performance · 353c2ade
      Bhanu Prakash Gollapudi 提交于
      Set perf_config to 3 during firmware initialization to enable both
      cached connections as well as cached tasks.
      Signed-off-by: NBhanu Prakash Gollapudi <bprakash@broadcom.com>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      353c2ade
    • H
      [SCSI] fnic: Incremented driver version · 62271dbd
      Hiral Patel 提交于
      Signed-off-by: NBrian Uchino <buchino@cisco.com>
      Signed-off-by: NHiral Patel <hiralpat@cisco.com>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      62271dbd
    • H
      [SCSI] fnic: Kernel panic due to FIP mode misconfiguration · d7fadce3
      Hiral Patel 提交于
      If switch configured in FIP and adapter configured in non-fip mode, driver
      panics while queueing FIP frame in non-existing fip_frame_queue. Added config
      check before queueing FIP frame in misconfiguration case to avoid kernel panic.
      Signed-off-by: NHiral Patel <hiralpat@cisco.com>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      d7fadce3
    • H
      [SCSI] fnic: FIP VLAN Discovery Feature Support · d3c995f1
      Hiral Patel 提交于
      FIP VLAN discovery discovers the FCoE VLAN that will be used by all other FIP
      protocols as well as by the FCoE encapsulation for Fibre Channel payloads on
      the established virtual link. One of the goals of FC-BB-5 was to be as
      nonintrusive as possible on initiators and targets, and therefore FIP VLAN
      discovery occurs in the native VLAN used by the initiator or target to
      exchange Ethernet traffic. The FIP VLAN discovery protocol is the only FIP
      protocol running on the native VLAN; all other FIP protocols run on the
      discovered FCoE VLANs.
      
      If an administrator has manually configured FCoE VLANs on ENodes and FCFs,
      there is no need to use this protocol. FIP and FCoE will run over the
      configured VLANs.
      
      An ENode without FCoE VLANs configuration would use this automated discovery
      protocol to discover over which VLANs FCoE is running.
      
      The ENode sends a FIP VLAN discovery request to a multicast MAC address called
      All-FCF-MACs, which is a multicast MAC address to which all FCFs listen.
      
      All FCFs that can be reached in the native VLAN of the ENode are expected to
      respond on the same VLAN with a response that lists one or more FCoE VLANs
      that are available for the ENode's VN_Port login. This protocol has the sole
      purpose of allowing the ENode to discover all the available FCoE VLANs.
      
      Now the ENode may enable a subset of these VLANs for FCoE Running the FIP
      protocol in these VLANs on a per VLAN basis. And FCoE data transactions also
      would occur on this VLAN. Hence, Except for FIP VLAN discovery, all other FIP
      and FCoE traffic runs on the selected FCoE VLAN.  Its only the FIP VLAN
      Discovery protocol that is permitted to run on the Default native VLAN of the
      system.
      
      [**** NOTE ****]
      We are working on moving this feature definitions and functionality to libfcoe
      module. We need this patch to be approved, as Suse is looking forward to merge
      this feature in SLES 11 SP3 release.  Once this patch is approved, we will
      submit patch which should move vlan discovery feature to libfoce.
      
      [Fengguang Wu <fengguang.wu@intel.com>: kmalloc cast removal]
      Signed-off-by: NAnantha Prakash T <atungara@cisco.com>
      Signed-off-by: NHiral Patel <hiralpat@cisco.com>
      Signed-off-by: NJames Bottomley <JBottomley@Parallels.com>
      d3c995f1
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 73287a43
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Highlights (1721 non-merge commits, this has to be a record of some
        sort):
      
         1) Add 'random' mode to team driver, from Jiri Pirko and Eric
            Dumazet.
      
         2) Make it so that any driver that supports configuration of multiple
            MAC addresses can provide the forwarding database add and del
            calls by providing a default implementation and hooking that up if
            the driver doesn't have an explicit set of handlers.  From Vlad
            Yasevich.
      
         3) Support GSO segmentation over tunnels and other encapsulating
            devices such as VXLAN, from Pravin B Shelar.
      
         4) Support L2 GRE tunnels in the flow dissector, from Michael Dalton.
      
         5) Implement Tail Loss Probe (TLP) detection in TCP, from Nandita
            Dukkipati.
      
         6) In the PHY layer, allow supporting wake-on-lan in situations where
            the PHY registers have to be written for it to be configured.
      
            Use it to support wake-on-lan in mv643xx_eth.
      
            From Michael Stapelberg.
      
         7) Significantly improve firewire IPV6 support, from YOSHIFUJI
            Hideaki.
      
         8) Allow multiple packets to be sent in a single transmission using
            network coding in batman-adv, from Martin Hundebøll.
      
         9) Add support for T5 cxgb4 chips, from Santosh Rastapur.
      
        10) Generalize the VXLAN forwarding tables so that there is more
            flexibility in configurating various aspects of the endpoints.
            From David Stevens.
      
        11) Support RSS and TSO in hardware over GRE tunnels in bxn2x driver,
            from Dmitry Kravkov.
      
        12) Zero copy support in nfnelink_queue, from Eric Dumazet and Pablo
            Neira Ayuso.
      
        13) Start adding networking selftests.
      
        14) In situations of overload on the same AF_PACKET fanout socket, or
            per-cpu packet receive queue, minimize drop by distributing the
            load to other cpus/fanouts.  From Willem de Bruijn and Eric
            Dumazet.
      
        15) Add support for new payload offset BPF instruction, from Daniel
            Borkmann.
      
        16) Convert several drivers over to mdoule_platform_driver(), from
            Sachin Kamat.
      
        17) Provide a minimal BPF JIT image disassembler userspace tool, from
            Daniel Borkmann.
      
        18) Rewrite F-RTO implementation in TCP to match the final
            specification of it in RFC4138 and RFC5682.  From Yuchung Cheng.
      
        19) Provide netlink socket diag of netlink sockets ("Yo dawg, I hear
            you like netlink, so I implemented netlink dumping of netlink
            sockets.") From Andrey Vagin.
      
        20) Remove ugly passing of rtnetlink attributes into rtnl_doit
            functions, from Thomas Graf.
      
        21) Allow userspace to be able to see if a configuration change occurs
            in the middle of an address or device list dump, from Nicolas
            Dichtel.
      
        22) Support RFC3168 ECN protection for ipv6 fragments, from Hannes
            Frederic Sowa.
      
        23) Increase accuracy of packet length used by packet scheduler, from
            Jason Wang.
      
        24) Beginning set of changes to make ipv4/ipv6 fragment handling more
            scalable and less susceptible to overload and locking contention,
            from Jesper Dangaard Brouer.
      
        25) Get rid of using non-type-safe NLMSG_* macros and use nlmsg_*()
            instead.  From Hong Zhiguo.
      
        26) Optimize route usage in IPVS by avoiding reference counting where
            possible, from Julian Anastasov.
      
        27) Convert IPVS schedulers to RCU, also from Julian Anastasov.
      
        28) Support cpu fanouts in xt_NFQUEUE netfilter target, from Holger
            Eitzenberger.
      
        29) Network namespace support for nf_log, ebt_log, xt_LOG, ipt_ULOG,
            nfnetlink_log, and nfnetlink_queue.  From Gao feng.
      
        30) Implement RFC3168 ECN protection, from Hannes Frederic Sowa.
      
        31) Support several new r8169 chips, from Hayes Wang.
      
        32) Support tokenized interface identifiers in ipv6, from Daniel
            Borkmann.
      
        33) Use usbnet_link_change() helper in USB net driver, from Ming Lei.
      
        34) Add 802.1ad vlan offload support, from Patrick McHardy.
      
        35) Support mmap() based netlink communication, also from Patrick
            McHardy.
      
        36) Support HW timestamping in mlx4 driver, from Amir Vadai.
      
        37) Rationalize AF_PACKET packet timestamping when transmitting, from
            Willem de Bruijn and Daniel Borkmann.
      
        38) Bring parity to what's provided by /proc/net/packet socket dumping
            and the info provided by netlink socket dumping of AF_PACKET
            sockets.  From Nicolas Dichtel.
      
        39) Fix peeking beyond zero sized SKBs in AF_UNIX, from Benjamin
            Poirier"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
        filter: fix va_list build error
        af_unix: fix a fatal race with bit fields
        bnx2x: Prevent memory leak when cnic is absent
        bnx2x: correct reading of speed capabilities
        net: sctp: attribute printl with __printf for gcc fmt checks
        netlink: kconfig: move mmap i/o into netlink kconfig
        netpoll: convert mutex into a semaphore
        netlink: Fix skb ref counting.
        net_sched: act_ipt forward compat with xtables
        mlx4_en: fix a build error on 32bit arches
        Revert "bnx2x: allow nvram test to run when device is down"
        bridge: avoid OOPS if root port not found
        drivers: net: cpsw: fix kernel warn on cpsw irq enable
        sh_eth: use random MAC address if no valid one supplied
        3c509.c: call SET_NETDEV_DEV for all device types (ISA/ISAPnP/EISA)
        tg3: fix to append hardware time stamping flags
        unix/stream: fix peeking with an offset larger than data in queue
        unix/dgram: fix peeking with an offset larger than data in queue
        unix/dgram: peek beyond 0-sized skbs
        openvswitch: Remove unneeded ovs_netdev_get_ifindex()
        ...
      73287a43
    • X
      filter: fix va_list build error · 20074f35
      Xi Wang 提交于
      This patch fixes the following build error.
      
      In file included from include/linux/filter.h:52:0,
                       from arch/arm/net/bpf_jit_32.c:14:
      include/linux/printk.h:54:2: error: unknown type name ‘va_list’
      include/linux/printk.h:105:21: error: unknown type name ‘va_list’
      include/linux/printk.h:108:30: error: unknown type name ‘va_list’
      Signed-off-by: NXi Wang <xi.wang@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      20074f35
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 251df49d
      Linus Torvalds 提交于
      Pull input updates from Dmitry Torokhov:
       "Assorted fixes and cleanups to the existing drivers plus a new driver
        for IMS Passenger Control Unit device they use for ther in-flight
        entertainment system."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (44 commits)
        Input: trackpoint - Optimize trackpoint init to use power-on reset
        Input: apbps2 - convert to devm_ioremap_resource()
        Input: ALPS - use %ph to print buffers
        ARM - shmobile: Armadillo800EVA: Move st1232 reset pin handling
        Input: st1232 - add reset pin handling
        Input: st1232 - convert to devm_* infrastructure
        Input: MT - handle semi-mt devices in core
        Input: adxl34x - use spi_get_drvdata()
        Input: ad7877 - use spi_get_drvdata() and spi_set_drvdata()
        Input: ads7846 - use spi_get_drvdata() and spi_set_drvdata()
        Input: ims-pcu - fix a memory leak on error
        Input: sysrq - supplement reset sequence with timeout functionality
        Input: tegra-kbc - support for defining row/columns based on SoC
        Input: imx_keypad - switch to using managed resources
        Input: arc_ps2 - add support for device tree
        Input: mma8450 - fix signed 12bits to 32bits conversion
        Input: eeti_ts - remove redundant null check
        Input: edt-ft5x06 - remove redundant null check before kfree
        Input: ad714x - add CONFIG_PM_SLEEP to suspend/resume functions
        Input: adxl34x - add CONFIG_PM_SLEEP to suspend/resume functions
        ...
      251df49d
    • E
      af_unix: fix a fatal race with bit fields · 60bc851a
      Eric Dumazet 提交于
      Using bit fields is dangerous on ppc64/sparc64, as the compiler [1]
      uses 64bit instructions to manipulate them.
      If the 64bit word includes any atomic_t or spinlock_t, we can lose
      critical concurrent changes.
      
      This is happening in af_unix, where unix_sk(sk)->gc_candidate/
      gc_maybe_cycle/lock share the same 64bit word.
      
      This leads to fatal deadlock, as one/several cpus spin forever
      on a spinlock that will never be available again.
      
      A safer way would be to use a long to store flags.
      This way we are sure compiler/arch wont do bad things.
      
      As we own unix_gc_lock spinlock when clearing or setting bits,
      we can use the non atomic __set_bit()/__clear_bit().
      
      recursion_level can share the same 64bit location with the spinlock,
      as it is set only with this spinlock held.
      
      [1] bug fixed in gcc-4.8.0 :
      http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52080Reported-by: NAmbrose Feinstein <ambrose@google.com>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      60bc851a
    • D
      Merge branch 'bnx2x' · c3b28ea3
      David S. Miller 提交于
      Yuval Mintz says:
      
      ====================
      This fixes 2 small bugs - one which may cause an unnecessary link flap,
      and the other is a small memory leak when unloading while cnic is not
      loaded.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c3b28ea3
    • Y
      bnx2x: Prevent memory leak when cnic is absent · 05952246
      Yuval Mintz 提交于
      bnx2x driver allocates searcher T2 tables, but it releases that memory
      during unload only released if the cnic is loaded.
      Signed-off-by: NYuval Mintz <yuvalmin@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      05952246
    • Y
      bnx2x: correct reading of speed capabilities · b0261926
      Yaniv Rosner 提交于
      When the bnx2x driver reads the port configuration - mask irrelevant bits.
      
      Without this change, the unintended bits may cause the driver to needlessly
      toggle the link, as a comparison in the link flap avoidance flow will show
      that the old link did not advertise the same capabilities and thus cannot
      be retained.
      Signed-off-by: NYaniv Rosner <yanivr@broadcom.com>
      Signed-off-by: NYuval Mintz <yuvalmin@broadcom.com>
      Signed-off-by: NEilon Greenstein <eilong@broadcom.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b0261926
    • D
      net: sctp: attribute printl with __printf for gcc fmt checks · be3e4581
      Daniel Borkmann 提交于
      Let GCC check for format string errors in sctp's probe printl
      function. This patch fixes the warning when compiled with W=1:
      
      net/sctp/probe.c:73:2: warning: function might be possible candidate
      for 'gnu_printf' format attribute [-Wmissing-format-attribute]
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      be3e4581
    • D
      netlink: kconfig: move mmap i/o into netlink kconfig · ee1bec9b
      Daniel Borkmann 提交于
      Currently, in menuconfig, Netlink's new mmaped IO is the very first
      entry under the ``Networking support'' item and comes even before
      ``Networking options'':
      
        [ ]   Netlink: mmaped IO
        Networking options  --->
        ...
      
      Lets move this into ``Networking options'' under netlink's Kconfig,
      since this might be more appropriate. Introduced by commit ccdfcc39
      (``netlink: mmaped netlink: ring setup'').
      Signed-off-by: NDaniel Borkmann <dborkman@redhat.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ee1bec9b
    • N
      netpoll: convert mutex into a semaphore · bd7c4b60
      Neil Horman 提交于
      Bart Van Assche recently reported a warning to me:
      
      <IRQ>  [<ffffffff8103d79f>] warn_slowpath_common+0x7f/0xc0
      [<ffffffff8103d7fa>] warn_slowpath_null+0x1a/0x20
      [<ffffffff814761dd>] mutex_trylock+0x16d/0x180
      [<ffffffff813968c9>] netpoll_poll_dev+0x49/0xc30
      [<ffffffff8136a2d2>] ? __alloc_skb+0x82/0x2a0
      [<ffffffff81397715>] netpoll_send_skb_on_dev+0x265/0x410
      [<ffffffff81397c5a>] netpoll_send_udp+0x28a/0x3a0
      [<ffffffffa0541843>] ? write_msg+0x53/0x110 [netconsole]
      [<ffffffffa05418bf>] write_msg+0xcf/0x110 [netconsole]
      [<ffffffff8103eba1>] call_console_drivers.constprop.17+0xa1/0x1c0
      [<ffffffff8103fb76>] console_unlock+0x2d6/0x450
      [<ffffffff8104011e>] vprintk_emit+0x1ee/0x510
      [<ffffffff8146f9f6>] printk+0x4d/0x4f
      [<ffffffffa0004f1d>] scsi_print_command+0x7d/0xe0 [scsi_mod]
      
      This resulted from my commit ca99ca14 which introduced a mutex_trylock
      operation in a path that could execute in interrupt context.  When mutex
      debugging is enabled, the above warns the user when we are in fact
      exectuting in interrupt context
      interrupt context.
      
      After some discussion, It seems that a semaphore is the proper mechanism to use
      here.  While mutexes are defined to be unusable in interrupt context, no such
      condition exists for semaphores (save for the fact that the non blocking api
      calls, like up and down_trylock must be used when in irq context).
      Signed-off-by: NNeil Horman <nhorman@tuxdriver.com>
      Reported-by: NBart Van Assche <bvanassche@acm.org>
      CC: Bart Van Assche <bvanassche@acm.org>
      CC: David Miller <davem@davemloft.net>
      CC: netdev@vger.kernel.org
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      bd7c4b60
    • P
      netlink: Fix skb ref counting. · ae6164ad
      Pravin B Shelar 提交于
      Commit f9c22888 (netlink:
      implement memory mapped recvmsg) increamented skb->users
      ref count twice for a dump op which does not look right.
      
      Following patch fixes that.
      
      CC: Patrick McHardy <kaber@trash.net>
      Signed-off-by: NPravin B Shelar <pshelar@nicira.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ae6164ad
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · 8a72f382
      Linus Torvalds 提交于
      Pull tile arch changes from Chris Metcalf:
       "These are some minor new feature work and other changes that didn't
        merit getting pushed up after the 3.9 merge window closed.
      
        There should be a lot more activity in the 3.11 merge window"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        arch/tile: Fix syscall return value passed to tracepoint
        tile: comment assumption about __insn_mtspr for <asm/irqflags.h>
        tile: ns2cycles should use __raw_get_cpu_var
        arch: remove KCORE_ELF again [tile]
        tile: remove two outdated Kconfig entries
        tile: support atomic64_dec_if_positive()
        tile: support TIF_SYSCALL_TRACEPOINT; select HAVE_SYSCALL_TRACEPOINTS
        tile: Add definition of NR_syscalls
        tile: move declaration of sys_call_table to <asm/syscall.h>
        arch/tile: Enable HAVE_ARCH_TRACEHOOK
        arch/tile: Call tracehook_report_syscall_{entry,exit} in syscall trace
      8a72f382
    • S
      init: Do not warn on non-zero initcall return · bf5d770b
      Steven Rostedt 提交于
      Commit f91eb62f ("init: scream bloody murder if interrupts are
      enabled too early") added three new warnings.  The first two seemed
      reasonable, but the third included a warning when an initcall returned
      non-zero.  Although, the third WARN() does include an imbalanced preempt
      disabled, or irqs disable, it shouldn't warn if it only had an initcall
      that just returns non-zero.
      
      In fact, according to Linus, it shouldn't print at all.  As it only
      prints with initcall_debug set, and that already shows enough
      information to fix things.
      
      Link: http://lkml.kernel.org/r/CA+55aFzaBC5SFi7=F2mfm+KWY5qTsBmOqgbbs8E+LUS8JK-sBg@mail.gmail.comSuggested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Reported-by: NKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bf5d770b
    • J
      net_sched: act_ipt forward compat with xtables · 0dcffd09
      Jamal Hadi Salim 提交于
      Deal with changes in newer xtables while maintaining backward
      compatibility. Thanks to Jan Engelhardt for suggestions.
      Signed-off-by: NJamal Hadi Salim <jhs@mojatatu.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0dcffd09
    • L
      Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · a49fe6d5
      Linus Torvalds 提交于
      Pull omap3isp clk support from Mauro Carvalho Chehab:
       "This patch were sent in separate as it depends on a merge from clock
        framework, that you merged in commit 362ed48d"
      
      * 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] omap3isp: Use the common clock framework
      a49fe6d5
  2. 01 5月, 2013 20 次提交