17 Apr, 2014

10 commits

  • These serial drivers were removed in kernel v3.1, so we can drop their
    documentation files and references to their magic numbers and
    parameters.

    There are still references to these old drivers in
    Documentation/devices.txt but I'm afraid they can't be removed.

    Signed-off-by: Jean Delvare
    Cc: Greg Kroah-Hartman
    Cc: Jiri Slaby
    Cc: Rob Landley
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • The lack of pm_runtime_resume handling for the device state leads into
    device wake-up interrupts not working after a while for runtime PM.

    Also, serial-omap is confused about the use of device_may_wakeup.
    The checks for device_may_wakeup should only be done for suspend and
    resume, not for pm_runtime_suspend and pm_runtime_resume. The wake-up
    events for PM runtime should always be enabled.

    The lack of pm_runtime_resume handling leads into device wake-up
    interrupts not working after a while for runtime PM.

    Rather than try to patch over the issue of adding complex tests to
    the pm_runtime_resume, let's fix the issues properly:

    1. Make serial_omap_enable_wakeup deal with all internal PM state
    handling so we don't need to test for up->wakeups_enabled elsewhere.

    Later on once omap3 boots in device tree only mode we can also
    remove the up->wakeups_enabled flag and rely on the wake-up
    interrupt enable/disable state alone.

    2. Do the device_may_wakeup checks in suspend and resume only,
    for runtime PM the wake-up events need to be always enabled.

    3. Finally just call serial_omap_enable_wakeup and make sure we
    call it also in pm_runtime_resume.

    4. Note that we also have to use disable_irq_nosync as serial_omap_irq
    calls pm_runtime_get_sync.

    Fixes: 2a0b965cfb6e (serial: omap: Add support for optional wake-up)
    Cc: stable@vger.kernel.org # v3.13+
    Signed-off-by: Tony Lindgren
    Acked-by: Felipe Balbi
    Signed-off-by: Greg Kroah-Hartman

    Tony Lindgren
     
  • When a serial port is closed, uart_close() takes care of shutting down the
    hardware, and powering it down.

    When a serial port is unbound while in use, uart_close() bypasses all of
    this, as this is supposed to be done through uart_hangup() (invoked via
    tty_vhangup() in uart_remove_one_port()).

    However, uart_hangup() does not set the hardware's power state, leaving it
    powered up. This may also lead to unbounded nesting counts in clock and
    power management, depending on their internal implementation.

    Make sure to power down the port in uart_hangup(), except when the port is
    used as a serial console.

    For serial consoles, this operation must be postponed until after the port
    becomes completely unused. This case is not fixed yet, as it depends on a
    (future) fix for the tty->count vs. port->count imbalance on failed
    uart_open().

    After this, the module clock used by the sh-sci driver is disabled on
    unbind while the serial port is in use.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Greg Kroah-Hartman

    Geert Uytterhoeven
     
  • The amba-pl011.c driver sets DMA burst size equal to FIFO trigger level.
    If now exactly DMA burst size bytes are received, the DMAC will retrieve
    them all and no Rx timeout interrupt will be generated. To fix that set
    the burst size to half the FIFO trigger level.

    Signed-off-by: Guennadi Liakhovetski
    Signed-off-by: Greg Kroah-Hartman

    Guennadi Liakhovetski
     
  • As far as I know the Timberdale chip was only used as a companion for
    Intel Atom E600 series processors. As such, its drivers are only
    useful on X86_32.

    Signed-off-by: Jean Delvare
    Cc: Greg Kroah-Hartman
    Cc: Jiri Slaby
    Signed-off-by: Greg Kroah-Hartman

    Jean Delvare
     
  • This driver, like several others, uses the upper bits of the character
    to track both real and dummy state. Unfortunately it neglects to mask
    these bits properly when passing the character data around. This means
    neither break detection nor sysrq character handling work correctly.

    This patch adds the requires masking and has been tested to confirm
    that it correctly handles magic sysrq sequences on ST's B2020 board.

    Signed-off-by: Daniel Thompson
    Signed-off-by: Greg Kroah-Hartman

    Daniel Thompson
     
  • This reverts commit 63e3ad3252695a2b8c01b6f6c225e4537af08b85,
    since this not works as expected and produce runtime error:

    BUG: sleeping function called from invalid context at drivers/tty/serial/clps711x.c:379
    in_atomic(): 0, irqs_disabled(): 128, pid: 287, name: mount

    Signed-off-by: Alexander Shiyan
    Signed-off-by: Greg Kroah-Hartman

    Alexander Shiyan
     
  • If the serial_core ring buffer empties just as the tty layer receives
    an XOFF, then start_tx will never be called when the tty layer
    receives an XON as the serial_core ring buffer is empty. This will
    possibly leave a few bytes trapped in the fifo for drivers that
    disable the transmitter when flow controlled.

    Signed-off-by: Seth Bollinger
    Signed-off-by: Greg Kroah-Hartman

    Seth Bollinger
     
  • Wolfram Sang pointed out that "efm32,$device" is non-standard. So use the
    common scheme and prefix device with "efm32-". The old compatible string
    is left in place until arch/arm/boot/dts/efm32* is fixed.

    Reported-by: Wolfram Sang
    Signed-off-by: Uwe Kleine-König
    Acked-by: Wolfram Sang
    Signed-off-by: Greg Kroah-Hartman

    Uwe Kleine-König
     
  • Signed-off-by: Sanjay Singh Rawat
    Signed-off-by: Greg Kroah-Hartman

    Sanjay Singh Rawat
     

14 Apr, 2014

4 commits

  • Linus Torvalds
     
  • Some versions of gcc even warn about it:

    mm/shmem.c: In function ‘shmem_file_aio_read’:
    mm/shmem.c:1414: warning: ‘error’ may be used uninitialized in this function

    If the loop is aborted during the first iteration by one of the two
    first break statements, error will be uninitialized.

    Introduced by commit 6e58e79db8a1 ("introduce copy_page_to_iter, kill
    loop over iovec in generic_file_aio_read()").

    Signed-off-by: Geert Uytterhoeven
    Acked-by: Al Viro
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • On 32 bit, size_t is "unsigned int", not "unsigned long", causing the
    following warning when comparing with PAGE_SIZE, which is always "unsigned
    long":

    fs/cifs/file.c: In function ‘cifs_readdata_to_iov’:
    fs/cifs/file.c:2757: warning: comparison of distinct pointer types lacks a cast

    Introduced by commit 7f25bba819a3 ("cifs_iovec_read: keep iov_iter
    between the calls of cifs_readdata_to_iov()"), which changed the
    signedness of "remaining" and the code from min_t() to min().

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     
  • Pull slab changes from Pekka Enberg:
    "The biggest change is byte-sized freelist indices which reduces slab
    freelist memory usage:

    https://lkml.org/lkml/2013/12/2/64"

    * 'slab/next' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
    mm: slab/slub: use page->list consistently instead of page->lru
    mm/slab.c: cleanup outdated comments and unify variables naming
    slab: fix wrongly used macro
    slub: fix high order page allocation problem with __GFP_NOFAIL
    slab: Make allocations with GFP_ZERO slightly more efficient
    slab: make more slab management structure off the slab
    slab: introduce byte sized index for the freelist of a slab
    slab: restrict the number of objects in a slab
    slab: introduce helper functions to get/set free object
    slab: factor out calculate nr objects in cache_estimate

    Linus Torvalds
     

13 Apr, 2014

20 commits

  • Pull misc kbuild changes from Michal Marek:
    "Here is the non-critical part of kbuild:
    - One bogus coccinelle check removed, one check fixed not to suggest
    the obsolete PTR_RET macro
    - scripts/tags.sh does not index the generated *.mod.c files
    - new objdiff tool to list differences between two versions of an
    object file
    - A fix for scripts/bootgraph.pl"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    scripts/coccinelle: Use PTR_ERR_OR_ZERO
    scripts/bootgraph.pl: Add graphic header
    scripts: objdiff: detect object code changes between two commits
    Coccicheck: Remove memcpy to struct assignment test
    scripts/tags.sh: Ignore *.mod.c

    Linus Torvalds
     
  • This patch fixes I/O errors with the sym53c8xx_2 driver when the disk
    returns QUEUE FULL status.

    When the controller encounters an error (including QUEUE FULL or BUSY
    status), it aborts all not yet submitted requests in the function
    sym_dequeue_from_squeue.

    This function aborts them with DID_SOFT_ERROR.

    If the disk has full tag queue, the request that caused the overflow is
    aborted with QUEUE FULL status (and the scsi midlayer properly retries
    it until it is accepted by the disk), but the sym53c8xx_2 driver aborts
    the following requests with DID_SOFT_ERROR --- for them, the midlayer
    does just a few retries and then signals the error up to sd.

    The result is that disk returning QUEUE FULL causes request failures.

    The error was reproduced on 53c895 with COMPAQ BD03685A24 disk
    (rebranded ST336607LC) with command queue 48 or 64 tags. The disk has
    64 tags, but under some access patterns it return QUEUE FULL when there
    are less than 64 pending tags. The SCSI specification allows returning
    QUEUE FULL anytime and it is up to the host to retry.

    Signed-off-by: Mikulas Patocka
    Cc: Matthew Wilcox
    Cc: James Bottomley
    Signed-off-by: Linus Torvalds

    Mikulas Patocka
     
  • Commit 8f619b5429d9 ("powerpc/ppc64: Do not turn AIL (reloc-on
    interrupts) too early") added code to set the AIL bit in the LPCR
    without checking whether the kernel is running in hypervisor mode. The
    result is that when the kernel is running as a guest (i.e., under
    PowerKVM or PowerVM), the processor takes a privileged instruction
    interrupt at that point, causing a panic. The visible result is that
    the kernel hangs after printing "returning from prom_init".

    This fixes it by checking for hypervisor mode being available before
    setting LPCR. If we are not in hypervisor mode, we enable relocation-on
    interrupts later in pSeries_setup_arch using the H_SET_MODE hcall.

    Signed-off-by: Paul Mackerras
    Acked-by: Benjamin Herrenschmidt
    Signed-off-by: Linus Torvalds

    Paul Mackerras
     
  • Commits 11d4616bd07f ("futex: revert back to the explicit waiter
    counting code") and 69cd9eba3886 ("futex: avoid race between requeue and
    wake") changed some of the finer details of how we think about futexes.
    One was a late fix and the other a consequence of overlooking the whole
    requeuing logic.

    The first change caused our documentation to be incorrect, and the
    second made us aware that we need to explicitly add more details to it.

    Signed-off-by: Davidlohr Bueso
    Signed-off-by: Linus Torvalds

    Davidlohr Bueso
     
  • Pull yet more networking updates from David Miller:

    1) Various fixes to the new Redpine Signals wireless driver, from
    Fariya Fatima.

    2) L2TP PPP connect code takes PMTU from the wrong socket, fix from
    Dmitry Petukhov.

    3) UFO and TSO packets differ in whether they include the protocol
    header in gso_size, account for that in skb_gso_transport_seglen().
    From Florian Westphal.

    4) If VLAN untagging fails, we double free the SKB in the bridging
    output path. From Toshiaki Makita.

    5) Several call sites of sk->sk_data_ready() were referencing an SKB
    just added to the socket receive queue in order to calculate the
    second argument via skb->len. This is dangerous because the moment
    the skb is added to the receive queue it can be consumed in another
    context and freed up.

    It turns out also that none of the sk->sk_data_ready()
    implementations even care about this second argument.

    So just kill it off and thus fix all these use-after-free bugs as a
    side effect.

    6) Fix inverted test in tcp_v6_send_response(), from Lorenzo Colitti.

    7) pktgen needs to do locking properly for LLTX devices, from Daniel
    Borkmann.

    8) xen-netfront driver initializes TX array entries in RX loop :-) From
    Vincenzo Maffione.

    9) After refactoring, some tunnel drivers allow a tunnel to be
    configured on top itself. Fix from Nicolas Dichtel.

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (46 commits)
    vti: don't allow to add the same tunnel twice
    gre: don't allow to add the same tunnel twice
    drivers: net: xen-netfront: fix array initialization bug
    pktgen: be friendly to LLTX devices
    r8152: check RTL8152_UNPLUG
    net: sun4i-emac: add promiscuous support
    net/apne: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
    net: ipv6: Fix oif in TCP SYN+ACK route lookup.
    drivers: net: cpsw: enable interrupts after napi enable and clearing previous interrupts
    drivers: net: cpsw: discard all packets received when interface is down
    net: Fix use after free by removing length arg from sk_data_ready callbacks.
    Drivers: net: hyperv: Address UDP checksum issues
    Drivers: net: hyperv: Negotiate suitable ndis version for offload support
    Drivers: net: hyperv: Allocate memory for all possible per-pecket information
    bridge: Fix double free and memory leak around br_allowed_ingress
    bonding: Remove debug_fs files when module init fails
    i40evf: program RSS LUT correctly
    i40evf: remove open-coded skb_cow_head
    ixgb: remove open-coded skb_cow_head
    igbvf: remove open-coded skb_cow_head
    ...

    Linus Torvalds
     
  • …realmz6/blackfin-linux

    Pull blackfin updates from Steven Miao:
    "Code cleanup, some previously ignored patches, and bug fixes"

    * tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
    blackfin: cleanup board files
    bf609: clock: drop unused clock bit set/clear functions
    Blackfin: bf537: rename "CONFIG_ADT75"
    Blackfin: bf537: rename "CONFIG_AD7314"
    Blackfin: bf537: rename ad2s120x ->ad2s1200
    blackfin: bf537: fix typo "CONFIG_SND_SOC_ADV80X_MODULE"
    blackfin: dma: current count mmr is read only
    bfin_crc: Move architecture independant crc header file out of the blackfin folder.
    bf54x: drop unuesd HOST status,control,timeout registers bit define macros
    blackfin: portmux: cleanup head file
    Blackfin: remove "config IP_CHECKSUM_L1"
    blackfin: Remove GENERIC_GPIO config option again
    blackfin:Use generic /proc/interrupts implementation
    blackfin: bf60x: fix typo "CONFIG_PM_BFIN_WAKE_PA15_POL"

    Linus Torvalds
     
  • …l/git/ohad/remoteproc

    Pull remoteproc cleanups from Ohad Ben-Cohen:
    "Several remoteproc cleanup patches coming from Jingoo Han, Julia
    Lawall and Uwe Kleine-König"

    * tag 'remoteproc-3.15-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
    remoteproc/ste_modem: staticize local symbols
    remoteproc/davinci: simplify use of devm_ioremap_resource
    remoteproc/davinci: drop needless devm_clk_put

    Linus Torvalds
     
  • Pull llvm patches from Behan Webster:
    "These are some initial updates to support compiling the kernel with
    clang.

    These patches have been through the proper reviews to the best of my
    ability, and have been soaking in linux-next for a few weeks. These
    patches by themselves still do not completely allow clang to be used
    with the kernel code, but lay the foundation for other patches which
    are still under review.

    Several other of the LLVMLinux patches have been already added via
    maintainer trees"

    * tag 'llvmlinux-for-v3.15' of git://git.linuxfoundation.org/llvmlinux/kernel:
    x86: LLVMLinux: Fix "incomplete type const struct x86cpu_device_id"
    x86 kbuild: LLVMLinux: More cc-options added for clang
    x86, acpi: LLVMLinux: Remove nested functions from Thinkpad ACPI
    LLVMLinux: Add support for clang to compiler.h and new compiler-clang.h
    LLVMLinux: Remove warning about returning an uninitialized variable
    kbuild: LLVMLinux: Fix LINUX_COMPILER definition script for compilation with clang
    Documentation: LLVMLinux: Update Documentation/dontdiff
    kbuild: LLVMLinux: Adapt warnings for compilation with clang
    kbuild: LLVMLinux: Add Kbuild support for building kernel with Clang

    Linus Torvalds
     
  • Pull SCSI target updates from Nicholas Bellinger:
    "Here are the target pending updates for v3.15-rc1. Apologies in
    advance for waiting until the second to last day of the merge window
    to send these out.

    The highlights this round include:

    - iser-target support for T10 PI (DIF) offloads (Sagi + Or)
    - Fix Task Aborted Status (TAS) handling in target-core (Alex Leung)
    - Pass in transport supported PI at session initialization (Sagi + MKP + nab)
    - Add WRITE_INSERT + READ_STRIP T10 PI support in target-core (nab + Sagi)
    - Fix iscsi-target ERL=2 ASYNC_EVENT connection pointer bug (nab)
    - Fix tcm_fc use-after-free of ft_tpg (Andy Grover)
    - Use correct ib_sg_dma primitives in ib_isert (Mike Marciniszyn)

    Also, note the virtio-scsi + vhost-scsi changes to expose T10 PI
    metadata into KVM guest have been left-out for now, as there where a
    few comments from MST + Paolo that where not able to be addressed in
    time for v3.15. Please expect this feature for v3.16-rc1"

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (43 commits)
    ib_srpt: Use correct ib_sg_dma primitives
    target/tcm_fc: Rename ft_tport_create to ft_tport_get
    target/tcm_fc: Rename ft_{add,del}_lport to {add,del}_wwn
    target/tcm_fc: Rename structs and list members for clarity
    target/tcm_fc: Limit to 1 TPG per wwn
    target/tcm_fc: Don't export ft_lport_list
    target/tcm_fc: Fix use-after-free of ft_tpg
    target: Add check to prevent Abort Task from aborting itself
    target: Enable READ_STRIP emulation in target_complete_ok_work
    target/sbc: Add sbc_dif_read_strip software emulation
    target: Enable WRITE_INSERT emulation in target_execute_cmd
    target/sbc: Add sbc_dif_generate software emulation
    target/sbc: Only expose PI read_cap16 bits when supported by fabric
    target/spc: Only expose PI mode page bits when supported by fabric
    target/spc: Only expose PI inquiry bits when supported by fabric
    target: Pass in transport supported PI at session initialization
    target/iblock: Fix double bioset_integrity_free bug
    Target/sbc: Initialize COMPARE_AND_WRITE write_sg scatterlist
    target/rd: T10-Dif: RAM disk is allocating more space than required.
    iscsi-target: Fix ERL=2 ASYNC_EVENT connection pointer bug
    ...

    Linus Torvalds
     
  • Pull media fixes from Mauro Carvalho Chehab:
    "A series of bug fix patches for v3.15-rc1. Most are just driver
    fixes. There are some changes at remote controller core level, fixing
    some definitions on a new API added for Kernel v3.15.

    It also adds the missing include at include/uapi/linux/v4l2-common.h,
    to allow its compilation on userspace, as pointed by you"

    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (24 commits)
    [media] gpsca: remove the risk of a division by zero
    [media] stk1160: warrant a NUL terminated string
    [media] v4l: ti-vpe: retain v4l2_buffer flags for captured buffers
    [media] v4l: ti-vpe: Set correct field parameter for output and capture buffers
    [media] v4l: ti-vpe: zero out reserved fields in try_fmt
    [media] v4l: ti-vpe: Fix initial configuration queue data
    [media] v4l: ti-vpe: Use correct bus_info name for the device in querycap
    [media] v4l: ti-vpe: report correct capabilities in querycap
    [media] v4l: ti-vpe: Allow usage of smaller images
    [media] v4l: ti-vpe: Use video_device_release_empty
    [media] v4l: ti-vpe: Make sure in job_ready that we have the needed number of dst_bufs
    [media] lgdt3305: include sleep functionality in lgdt3304_ops
    [media] drx-j: use customise option correctly
    [media] m88rs2000: fix sparse static warnings
    [media] r820t: fix size and init values
    [media] rc-core: remove generic scancode filter
    [media] rc-core: split dev->s_filter
    [media] rc-core: do not change 32bit NEC scancode format for now
    [media] rtl28xxu: remove duplicate ID 0458:707f Genius TVGo DVB-T03
    [media] xc2028: add missing break to switch
    ...

    Linus Torvalds
     
  • Pull PCIe non-transparent bridge fixes and features from Jon Mason:
    "NTB driver bug fixes to address issues in list traversal, skb leak in
    ntb_netdev, a typo, and a leak of msix entries in the error path.
    Clean ups of the event handling logic, as well as a overall style
    cleanup. Finally, the driver was converted to use the new
    pci_enable_msix_range logic (and the refactoring to go along with it)"

    * tag 'ntb-3.15' of git://github.com/jonmason/ntb:
    ntb: Use pci_enable_msix_range() instead of pci_enable_msix()
    ntb: Split ntb_setup_msix() into separate BWD/SNB routines
    ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs
    NTB: Code Style Clean-up
    NTB: client event cleanup
    ntb: Fix leakage of ntb_device::msix_entries[] array
    NTB: Fix typo in setting one translation register
    ntb_netdev: Fix skb free issue in open
    ntb_netdev: Fix list_for_each_entry exit issue

    Linus Torvalds
     
  • The vfs merge caused a latent bug to show up:

    In file included from fs/ceph/super.h:4:0,
    from fs/ceph/ioctl.c:3:
    include/linux/ceph/ceph_debug.h:4:0: warning: "pr_fmt" redefined [enabled by default]
    #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
    ^
    In file included from include/linux/kernel.h:13:0,
    from include/linux/uio.h:12,
    from include/linux/socket.h:7,
    from include/uapi/linux/in.h:22,
    from include/linux/in.h:23,
    from fs/ceph/ioctl.c:1:
    include/linux/printk.h:214:0: note: this is the location of the previous definition
    #define pr_fmt(fmt) fmt
    ^

    where the reason is that is included much too late
    for the "pr_fmt()" define.

    The include of needs to be the first include in the
    file, but fs/ceph/ioctl.c had for some reason missed that, and it wasn't
    noticeable until some unrelated header file changes brought in an
    indirect earlier include of .

    Signed-off-by: Linus Torvalds

    Linus Torvalds
     
  • Pull vfs updates from Al Viro:
    "The first vfs pile, with deep apologies for being very late in this
    window.

    Assorted cleanups and fixes, plus a large preparatory part of iov_iter
    work. There's a lot more of that, but it'll probably go into the next
    merge window - it *does* shape up nicely, removes a lot of
    boilerplate, gets rid of locking inconsistencie between aio_write and
    splice_write and I hope to get Kent's direct-io rewrite merged into
    the same queue, but some of the stuff after this point is having
    (mostly trivial) conflicts with the things already merged into
    mainline and with some I want more testing.

    This one passes LTP and xfstests without regressions, in addition to
    usual beating. BTW, readahead02 in ltp syscalls testsuite has started
    giving failures since "mm/readahead.c: fix readahead failure for
    memoryless NUMA nodes and limit readahead pages" - might be a false
    positive, might be a real regression..."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (63 commits)
    missing bits of "splice: fix racy pipe->buffers uses"
    cifs: fix the race in cifs_writev()
    ceph_sync_{,direct_}write: fix an oops on ceph_osdc_new_request() failure
    kill generic_file_buffered_write()
    ocfs2_file_aio_write(): switch to generic_perform_write()
    ceph_aio_write(): switch to generic_perform_write()
    xfs_file_buffered_aio_write(): switch to generic_perform_write()
    export generic_perform_write(), start getting rid of generic_file_buffer_write()
    generic_file_direct_write(): get rid of ppos argument
    btrfs_file_aio_write(): get rid of ppos
    kill the 5th argument of generic_file_buffered_write()
    kill the 4th argument of __generic_file_aio_write()
    lustre: don't open-code kernel_recvmsg()
    ocfs2: don't open-code kernel_recvmsg()
    drbd: don't open-code kernel_recvmsg()
    constify blk_rq_map_user_iov() and friends
    lustre: switch to kernel_sendmsg()
    ocfs2: don't open-code kernel_sendmsg()
    take iov_iter stuff to mm/iov_iter.c
    process_vm_access: tidy up a bit
    ...

    Linus Torvalds
     
  • Nicolas Dichtel says:

    ====================
    tunnels: don't allow to add the same tunnel twice

    This series fixes the check of an existing tunnel with the same
    parameters when a new tunnel is added. I've checked all users of
    ip_tunnel_newlink(): gre, gretap, ipip and vti. The bug exists only
    for gre and vti.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Before the patch, it was possible to add two times the same tunnel:
    ip l a vti1 type vti remote 10.16.0.121 local 10.16.0.249 key 41
    ip l a vti2 type vti remote 10.16.0.121 local 10.16.0.249 key 41

    It was possible, because ip_tunnel_newlink() calls ip_tunnel_find() with the
    argument dev->type, which was set only later (when calling ndo_init handler
    in register_netdevice()). Let's set this type in the setup handler, which is
    called before newlink handler.

    Introduced by commit b9959fd3b0fa ("vti: switch to new ip tunnel code").

    CC: Cong Wang
    CC: Steffen Klassert
    Signed-off-by: Nicolas Dichtel
    Signed-off-by: David S. Miller

    Nicolas Dichtel
     
  • Before the patch, it was possible to add two times the same tunnel:
    ip l a gre1 type gre remote 10.16.0.121 local 10.16.0.249
    ip l a gre2 type gre remote 10.16.0.121 local 10.16.0.249

    It was possible, because ip_tunnel_newlink() calls ip_tunnel_find() with the
    argument dev->type, which was set only later (when calling ndo_init handler
    in register_netdevice()). Let's set this type in the setup handler, which is
    called before newlink handler.

    Introduced by commit c54419321455 ("GRE: Refactor GRE tunneling code.").

    CC: Pravin B Shelar
    Signed-off-by: Nicolas Dichtel
    Signed-off-by: David S. Miller

    Nicolas Dichtel
     
  • This patch fixes the initialization of an array used in the TX
    datapath that was mistakenly initialized together with the
    RX datapath arrays. An out of range array access could happen
    when RX and TX rings had different sizes.

    Signed-off-by: Vincenzo Maffione
    Signed-off-by: David S. Miller

    Vincenzo Maffione
     
  • Jeff Kirsher says:

    ====================
    Intel Wired LAN Driver Updates

    This series contains updates to e1000, e1000e, igb, igbvf, ixgb, ixgbe,
    ixgbevf and i40evf.

    Mark fixes an issue with ixgbe and ixgbevf by adding a bit to indicate
    when workqueues have been initialized. This permits the register read
    error handling from attempting to use them prior to that, which also
    generates warnings. Checking for a detected removal after initializing
    the work queues allows the probe function to return an error without
    getting the workqueue involved. Further, if the error_detected
    callback is entered before the workqueues are initialized, exit without
    recovery since the device initialization was so truncated.

    Francois Romieu provides several patches to all the drivers to remove
    the open coded skb_cow_head.

    Jakub Kicinski provides a fix for igb where last_rx_timestamp should be
    updated only when Rx time stamp is read.

    Mitch provides a fix for i40evf where a recent change broke the RSS LUT
    programming causing it to be programmed with all 0's.
    ====================

    Signed-off-by: David S. Miller

    David S. Miller
     
  • Pull more tracing updates from Steven Rostedt:
    "This includes the final patch to clean up and fix the issue with the
    design of tracepoints and how a user could register a tracepoint and
    have that tracepoint not be activated but no error was shown.

    The design was for an out of tree module but broke in tree users. The
    clean up was to remove the saving of the hash table of tracepoint
    names such that they can be enabled before they exist (enabling a
    module tracepoint before that module is loaded). This added more
    complexity than needed. The clean up was to remove that code and just
    enable tracepoints that exist or fail if they do not.

    This removed a lot of code as well as the complexity that it brought.
    As a side effect, instead of registering a tracepoint by its name, the
    tracepoint needs to be registered with the tracepoint descriptor.
    This removes having to duplicate the tracepoint names that are
    enabled.

    The second patch was added that simplified the way modules were
    searched for.

    This cleanup required changes that were in the 3.15 queue as well as
    some changes that were added late in the 3.14-rc cycle. This final
    change waited till the two were merged in upstream and then the change
    was added and full tests were run. Unfortunately, the test found some
    errors, but after it was already submitted to the for-next branch and
    not to be rebased. Sparse errors were detected by Fengguang Wu's bot
    tests, and my internal tests discovered that the anonymous union
    initialization triggered a bug in older gcc compilers. Luckily, there
    was a bugzilla for the gcc bug which gave a work around to the
    problem. The third and fourth patch handled the sparse error and the
    gcc bug respectively.

    A final patch was tagged along to fix a missing documentation for the
    README file"

    * tag 'trace-3.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
    tracing: Add missing function triggers dump and cpudump to README
    tracing: Fix anonymous unions in struct ftrace_event_call
    tracepoint: Fix sparse warnings in tracepoint.c
    tracepoint: Simplify tracepoint module search
    tracepoint: Use struct pointer instead of name hash for reg/unreg tracepoints

    Linus Torvalds
     
  • Pull audit updates from Eric Paris.

    * git://git.infradead.org/users/eparis/audit: (28 commits)
    AUDIT: make audit_is_compat depend on CONFIG_AUDIT_COMPAT_GENERIC
    audit: renumber AUDIT_FEATURE_CHANGE into the 1300 range
    audit: do not cast audit_rule_data pointers pointlesly
    AUDIT: Allow login in non-init namespaces
    audit: define audit_is_compat in kernel internal header
    kernel: Use RCU_INIT_POINTER(x, NULL) in audit.c
    sched: declare pid_alive as inline
    audit: use uapi/linux/audit.h for AUDIT_ARCH declarations
    syscall_get_arch: remove useless function arguments
    audit: remove stray newline from audit_log_execve_info() audit_panic() call
    audit: remove stray newlines from audit_log_lost messages
    audit: include subject in login records
    audit: remove superfluous new- prefix in AUDIT_LOGIN messages
    audit: allow user processes to log from another PID namespace
    audit: anchor all pid references in the initial pid namespace
    audit: convert PPIDs to the inital PID namespace.
    pid: get pid_t ppid of task in init_pid_ns
    audit: rename the misleading audit_get_context() to audit_take_context()
    audit: Add generic compat syscall support
    audit: Add CONFIG_HAVE_ARCH_AUDITSYSCALL
    ...

    Linus Torvalds
     

12 Apr, 2014

6 commits

  • that commit has fixed only the parts of that mess in fs/splice.c itself;
    there had been more in several other ->splice_read() instances...

    Signed-off-by: Al Viro

    Al Viro
     
  • O_APPEND handling there hadn't been completely fixed by Pavel's
    patch; it checks the right value, but it's racy - we can't really
    do that until i_mutex has been taken.

    Fix by switching to __generic_file_aio_write() (open-coding
    generic_file_aio_write(), actually) and pulling mutex_lock() above
    inode_size_read().

    Cc: stable@vger.kernel.org
    Signed-off-by: Al Viro

    Al Viro
     
  • ceph_osdc_put_request(ERR_PTR(-error)) oopses. What we want there
    is break, not goto out.

    Signed-off-by: Al Viro

    Al Viro
     
  • Similarly to commit 43279500deca ("packet: respect devices with
    LLTX flag in direct xmit"), we can basically apply the very same
    to pktgen. This will help testing against LLTX devices such as
    dummy driver (or others), which only have a single netdevice txq
    and would otherwise require locking their txq from pktgen side
    while e.g. in dummy case, we would not need any locking. Fix this
    by making use of HARD_TX_{UN,}LOCK API, so that NETIF_F_LLTX will
    be respected.

    Signed-off-by: Daniel Borkmann
    Signed-off-by: Jesper Dangaard Brouer
    Cc: Eric Dumazet
    Signed-off-by: David S. Miller

    Daniel Borkmann
     
  • When the device is unplugged, the driver would try to disable the
    device. Add checking the flag of RTL8152_UNPLUG to skip setting
    the device when it is unplugged. This could shorten the time of
    unloading the driver.

    Signed-off-by: Hayes Wang
    Signed-off-by: David S. Miller

    hayeswang
     
  • The sun4i-emac driver is rather primitive, and doesn't support
    promiscuous mode. This makes usage such as bridging impossible,
    which is a shame on virtualization capable HW such as the
    Allwinner A20.

    The fix is fairly simple: move the RX setup code to the ndo_set_rx_mode
    vector, and add the required HW configuration when IFF_PROMISC is passed
    by the core code.

    This has been tested on a generic A20 box running a few virtual
    machines hanging off a bridge with the EMAC chip as the link to the
    outside world.

    Cc: Stefan Roese
    Cc: Maxime Ripard
    Signed-off-by: Marc Zyngier
    Acked-by: Stefan Roese
    Signed-off-by: David S. Miller

    Marc Zyngier