08 May, 2013

18 commits

  • Signed-off-by: Kent Overstreet
    Cc: Zach Brown
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Cc: Theodore Ts'o
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kent Overstreet
     
  • Minor refactoring, to get rid of some duplicated code

    [akpm@linux-foundation.org: fix warning]
    Signed-off-by: Kent Overstreet
    Cc: Zach Brown
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kent Overstreet
     
  • Nothing used the return value, and it probably wasn't possible to use it
    safely for the locked versions (aio_complete(), aio_put_req()). Just
    kill it.

    Signed-off-by: Kent Overstreet
    Acked-by: Zach Brown
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kent Overstreet
     
  • These are handy for measuring the cost of the aio infrastructure with
    operations that do very little and complete immediately.

    Signed-off-by: Zach Brown
    Signed-off-by: Kent Overstreet
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zach Brown
     
  • This removes the retry-based AIO infrastructure now that nothing in tree
    is using it.

    We want to remove retry-based AIO because it is fundemantally unsafe.
    It retries IO submission from a kernel thread that has only assumed the
    mm of the submitting task. All other task_struct references in the IO
    submission path will see the kernel thread, not the submitting task.
    This design flaw means that nothing of any meaningful complexity can use
    retry-based AIO.

    This removes all the code and data associated with the retry machinery.
    The most significant benefit of this is the removal of the locking
    around the unused run list in the submission path.

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Kent Overstreet
    Signed-off-by: Zach Brown
    Cc: Zach Brown
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zach Brown
     
  • This removes the only in-tree user of aio retry. This will let us
    remove the retry code from the aio core.

    Removing retry is relatively easy as the USB gadget wasn't using it to
    retry IOs at all. It always fully submitted the IO in the context of
    the initial io_submit() call. It only used the AIO retry facility to
    get the submitter's mm context for copying the result of a read back to
    user space. This is easy to implement with use_mm() and a work struct,
    much like kvm does with async_pf_execute() for get_user_pages().

    [akpm@linux-foundation.org: coding-style fixes]
    Signed-off-by: Zach Brown
    Signed-off-by: Kent Overstreet
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Cc: Theodore Ts'o
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zach Brown
     
  • Signed-off-by: Zach Brown
    Signed-off-by: Kent Overstreet
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zach Brown
     
  • Bunch of performance improvements and cleanups Zach Brown and I have
    been working on. The code should be pretty solid at this point, though
    it could of course use more review and testing.

    The results in my testing are pretty impressive, particularly when an
    ioctx is being shared between multiple threads. In my crappy synthetic
    benchmark, with 4 threads submitting and one thread reaping completions,
    I saw overhead in the aio code go from ~50% (mostly ioctx lock
    contention) to low single digits. Performance with ioctx per thread
    improved too, but I'd have to rerun those benchmarks.

    The reason I've been focused on performance when the ioctx is shared is
    that for a fair number of real world completions, userspace needs the
    completions aggregated somehow - in practice people just end up
    implementing this aggregation in userspace today, but if it's done right
    we can do it much more efficiently in the kernel.

    Performance wise, the end result of this patch series is that submitting
    a kiocb writes to _no_ shared cachelines - the penalty for sharing an
    ioctx is gone there. There's still going to be some cacheline
    contention when we deliver the completions to the aio ringbuffer (at
    least if you have interrupts being delivered on multiple cores, which
    for high end stuff you do) but I have a couple more patches not in this
    series that implement coalescing for that (by taking advantage of
    interrupt coalescing). With that, there's basically no bottlenecks or
    performance issues to speak of in the aio code.

    This patch:

    use_mm() is used in more places than just aio. There's no need to mention
    callers when describing the function.

    Signed-off-by: Zach Brown
    Signed-off-by: Kent Overstreet
    Cc: Felipe Balbi
    Cc: Greg Kroah-Hartman
    Cc: Mark Fasheh
    Cc: Joel Becker
    Cc: Rusty Russell
    Cc: Jens Axboe
    Cc: Asai Thambi S P
    Cc: Selvan Mani
    Cc: Sam Bradshaw
    Acked-by: Jeff Moyer
    Cc: Al Viro
    Cc: Benjamin LaHaise
    Reviewed-by: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zach Brown
     
  • Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • After finishing a naming transition, remove unused backward
    compatibility wrapper macros

    Signed-off-by: Akinobu Mita
    Cc: "Theodore Ts'o"
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • Use preferable function name which implies using a pseudo-random number
    generator.

    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • Use preferable function name which implies using a pseudo-random number
    generator.

    [akpm@linux-foundation.org: convert team_mode_random.c]
    Signed-off-by: Akinobu Mita
    Acked-by: Thomas Sailer
    Acked-by: Bing Zhao [mwifiex]
    Cc: "David S. Miller"
    Cc: Michael Chan
    Cc: Thomas Sailer
    Cc: Jean-Paul Roubelat
    Cc: Bing Zhao
    Cc: Brett Rudley
    Cc: Arend van Spriel
    Cc: "Franky (Zhenhui) Lin"
    Cc: Hante Meuleman
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Akinobu Mita
     
  • The current kernel returns -EINVAL unless a given mmap length is
    "almost" hugepage aligned. This is because in sys_mmap_pgoff() the
    given length is passed to vm_mmap_pgoff() as it is without being aligned
    with hugepage boundary.

    This is a regression introduced in commit 40716e29243d ("hugetlbfs: fix
    alignment of huge page requests"), where alignment code is pushed into
    hugetlb_file_setup() and the variable len in caller side is not changed.

    To fix this, this patch partially reverts that commit, and adds
    alignment code in caller side. And it also introduces hstate_sizelog()
    in order to get proper hstate to specified hugepage size.

    Addresses https://bugzilla.kernel.org/show_bug.cgi?id=56881

    [akpm@linux-foundation.org: fix warning when CONFIG_HUGETLB_PAGE=n]
    Signed-off-by: Naoya Horiguchi
    Signed-off-by: Johannes Weiner
    Reported-by:
    Cc: Steven Truelove
    Cc: Jianguo Wu
    Cc: Hugh Dickins
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Naoya Horiguchi
     
  • kmap_atomic() requires only one argument now.

    Signed-off-by: Zhao Hongjiang
    Cc: "James E.J. Bottomley"
    Cc: Helge Deller
    Cc: Rolf Eike Beer
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Zhao Hongjiang
     
  • Register layout is the same, so just add the variant to the appropriate
    places.

    Signed-off-by: Lucas Stach
    Signed-off-by: Jan Luebbe
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lucas Stach
     
  • That nameless-function-arguments thing drives me batty. Fix.

    Cc: Dave Hansen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andrew Morton
     
  • This exports the amount of anonymous transparent hugepages for each
    memcg via the new "rss_huge" stat in memory.stat. The units are in
    bytes.

    This is helpful to determine the hugepage utilization for individual
    jobs on the system in comparison to rss and opportunities where
    MADV_HUGEPAGE may be helpful.

    The amount of anonymous transparent hugepages is also included in "rss"
    for backwards compatibility.

    Signed-off-by: David Rientjes
    Acked-by: Michal Hocko
    Acked-by: Johannes Weiner
    Cc: KAMEZAWA Hiroyuki
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     
  • Use common help functions to free reserved pages.

    Signed-off-by: Jiang Liu
    Acked-by: David S. Miller
    Acked-by: Sam Ravnborg
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Jiang Liu
     

07 May, 2013

22 commits

  • Pull slab changes from Pekka Enberg:
    "The bulk of the changes are more slab unification from Christoph.

    There's also few fixes from Aaron, Glauber, and Joonsoo thrown into
    the mix."

    * 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux: (24 commits)
    mm, slab_common: Fix bootstrap creation of kmalloc caches
    slab: Return NULL for oversized allocations
    mm: slab: Verify the nodeid passed to ____cache_alloc_node
    slub: tid must be retrieved from the percpu area of the current processor
    slub: Do not dereference NULL pointer in node_match
    slub: add 'likely' macro to inc_slabs_node()
    slub: correct to calculate num of acquired objects in get_partial_node()
    slub: correctly bootstrap boot caches
    mm/sl[au]b: correct allocation type check in kmalloc_slab()
    slab: Fixup CONFIG_PAGE_ALLOC/DEBUG_SLAB_LEAK sections
    slab: Handle ARCH_DMA_MINALIGN correctly
    slab: Common definition for kmem_cache_node
    slab: Rename list3/l3 to node
    slab: Common Kmalloc cache determination
    stat: Use size_t for sizes instead of unsigned
    slab: Common function to create the kmalloc array
    slab: Common definition for the array of kmalloc caches
    slab: Common constants for kmalloc boundaries
    slab: Rename nodelists to node
    slab: Common name for the per node structures
    ...

    Linus Torvalds
     
  • Pull misc kbuild updates from Michal Marek:
    "Non-critical kbuild changes:

    - make coccicheck improvements, but no new semantic patches this time

    - make rpm improvements

    - make tar-pkg change to include the architecture in the filename.

    This is a deliberate incompatibility, but nobody has complained so
    far and it is useful if you build for different architectures. It
    also matches what the deb-pkg and rpm-pkg targets produce.

    - kbuild documentation fix"

    * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    rpm-pkg: Remove pointless set -e statements
    rpm-pkg: Always regenerate the specfile
    rpm-pkg: Do not write to the parent directory
    rpm-pkg: Do not package the whole source directory
    buildtar: Add ARCH to the archive name
    Coccinelle: Fix patch output when coccicheck is used with M= and C=
    Coccinelle: Add support to the SPFLAGS variable
    Coccinelle: Cleanup the setting of the FLAGS and OPTIONS variables
    Coccinelle: Restore coccicheck verbosity in ONLINE mode (C=1 or C=2)
    scripts/package/Makefile: compare objtree with srctree instead of test KBUILD_OUTPUT
    doc: change example to existing Makefile fragment
    scripts/tags.sh: Add magic for OFFSET and DEFINE

    Linus Torvalds
     
  • Pull kconfig updates from Michal Marek:
    - use pkg-config to detect curses libraries
    - clean up the way curses headers are searched
    - Some randconfig fixes, of which one had to be reverted
    - KCONFIG_SEED for randconfig debugging
    - memuconfig memory leak plugged
    - menuconfig > breadcrumbs > navigation
    - xconfig compilation fix
    - Other minor fixes

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kconfig: fix lists definition for C++
    Revert "kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG"
    kconfig: implement KCONFIG_PROBABILITY for randconfig
    kconfig: allow specifying the seed for randconfig
    kconfig: fix randomising choice entries in presence of KCONFIG_ALLCONFIG
    kconfig: do not override symbols already set
    kconfig: fix randconfig tristate detection
    kconfig/lxdialog: rationalise the include paths where to find {.n}curses{,w}.h
    menuconfig: Add "breadcrumbs" navigation aid
    menuconfig: Fix memory leak introduced by jump keys feature
    merge_config.sh: Avoid creating unnessary source softlinks
    kconfig: optionally use pkg-config to detect ncurses libs
    menuconfig: optionally use pkg-config to detect ncurses libs

    Linus Torvalds
     
  • Pull kbuild changes from Michal Marek:
    "Kbuild commits for v3.10-rc1:

    - Fix make mrproper after mod/file2alias rework
    - Fix ld-option Makefile function
    - Rewrite headers_install to shell to drop Perl dependency.

    There are some more patches I have to look at, so I might send another
    pull request later. Or just queue them for 3.11."

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    Fix cleaning in scripts/mod
    headers_install.pl: convert to headers_install.sh
    kbuild: fix ld-option function

    Linus Torvalds
     
  • Searching for PPC_EFIKA results in a segmentation fault, and it's
    because get_symbol_prop() returns NULL.

    In this case CONFIG_PPC_EFIKA is defined in arch/powerpc/platforms/
    52xx/Kconfig, so it won't be parsed if ARCH!=PPC, but menuconfig knows
    this symbol when it parses sound/soc/fsl/Kconfig:

    config SND_MPC52xx_SOC_EFIKA
    tristate "SoC AC97 Audio support for bbplan Efika and STAC9766"
    depends on PPC_EFIKA

    This bug was introduced by commit bcdedcc1afd6 ("menuconfig: print more
    info for symbol without prompts").

    Reported-and-tested-by: Borislav Petkov
    Signed-off-by: Li Zefan
    Tested-by: Libo Chen
    Reviewed-by: "Yann E. MORIN"
    Signed-off-by: Michal Marek
    Signed-off-by: Linus Torvalds

    Li Zefan
     
  • A scheduling while atomic bug was introduced recently (by commit
    ce43a2168c59: "e1000e: cleanup USLEEP_RANGE checkpatch checks").

    Revert the particular instance of usleep_range() which causes the bug.

    Reported-by: Maarten Lankhorst
    Signed-off-by: Bruce Allan
    Signed-off-by: Jeff Kirsher
    Acked-by: David S. Miller
    Signed-off-by: Linus Torvalds

    Bruce Allan
     
  • Pekka Enberg
     
  • Pull networking fixes from David Miller:
    "Just a small pile of fixes"

    1) Fix race conditions in IP fragmentation LRU list handling, from
    Konstantin Khlebnikov.

    2) vfree() is no longer verboten in interrupts, so deferring is
    pointless, from Al Viro.

    3) Conversion from mutex to semaphore in netpoll left trylock test
    inverted, caught by Dan Carpenter.

    4) 3c59x uses wrong base address when releasing regions, from Sergei
    Shtylyov.

    5) Bounds checking in TIPC from Dan Carpenter.

    6) Fastopen cookies should not be expired as aggressively as other TCP
    metrics. From Eric Dumazet.

    7) Fix retrieval of MAC address in ibmveth, from Ben Herrenschmidt.

    8) Don't use "u16" in virtio user headers, from Stephen Hemminger

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
    tipc: potential divide by zero in tipc_link_recv_fragment()
    tipc: add a bounds check in link_recv_changeover_msg()
    net/usb: new driver for RTL8152
    3c59x: fix freeing nonexistent resource on driver unload
    netpoll: inverted down_trylock() test
    rps_dev_flow_table_release(): no need to delay vfree()
    fib_trie: no need to delay vfree()
    net: frag, fix race conditions in LRU list maintenance
    tcp: do not expire TCP fastopen cookies
    net/eth/ibmveth: Fixup retrieval of MAC address
    virtio: don't expose u16 in userspace api

    Linus Torvalds
     
  • Pull LED subsystem updates from Bryan Wu:
    - move LED trigger drivers into a new directory
    - lp55xx common driver updates
    - other led drivers updates and bug fixing

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds:
    leds: leds-asic3: switch to using SIMPLE_DEV_PM_OPS
    leds: leds-bd2802: add CONFIG_PM_SLEEP to suspend/resume functions
    leds: lp55xx: configure the clock detection
    leds: lp55xx: use common clock framework when external clock is used
    leds: leds-ns2: fix oops at module removal
    leds: leds-pwm: Defer led_pwm_set() if PWM can sleep
    leds: lp55xx: fix the sysfs read operation
    leds: lm355x, lm3642: support camera LED triggers for flash and torch
    leds: add camera LED triggers
    leds: trigger: use inline functions instead of macros
    leds: tca6507: Use of_match_ptr() macro
    leds: wm8350: Complain if we fail to reenable DCDC
    leds: renesas: set gpio_request_one() flags param correctly
    leds: leds-ns2: set devm_gpio_request_one() flags param correctly
    leds: leds-lt3593: set devm_gpio_request_one() flags param correctly
    leds: leds-bd2802: remove erroneous __exit annotation
    leds: atmel-pwm: remove erroneous __exit annotation
    leds: move LED trigger drivers into new subdirectory
    leds: add new LP5562 LED driver

    Linus Torvalds
     
  • Pull GPIO changes from Grant Likely:
    "The usual selection of bug fixes and driver updates for GPIO. Nothing
    really stands out except the addition of the GRGPIO driver and some
    enhacements to ACPI support"

    I'm pulling this despite the earlier mess. Let's hope it compiles these
    days.

    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: (46 commits)
    gpio: grgpio: Add irq support
    gpio: grgpio: Add device driver for GRGPIO cores
    gpiolib-acpi: introduce acpi_get_gpio_by_index() helper
    GPIO: gpio-generic: remove kfree() from bgpio_remove call
    gpio / ACPI: Handle ACPI events in accordance with the spec
    gpio: lpc32xx: Fix off-by-one valid range checking for bank
    gpio: mcp23s08: convert driver to DT
    gpio/omap: force restore if context loss is not detectable
    gpio/omap: optimise interrupt service routine
    gpio/omap: remove extra context restores in *_runtime_resume()
    gpio/omap: free irq domain in probe() failure paths
    gpio: gpio-generic: Add 16 and 32 bit big endian byte order support
    gpio: samsung: Add terminating entry for exynos_pinctrl_ids
    gpio: mvebu: add dbg_show function
    MAX7301 GPIO: Do not force SPI speed when using OF Platform
    gpio: gpio-tps65910.c: fix checkpatch error
    gpio: gpio-timberdale.c: fix checkpatch error
    gpio: gpio-tc3589x.c: fix checkpatch errors
    gpio: gpio-stp-xway.c: fix checkpatch error
    gpio: gpio-sch.c: fix checkpatch error
    ...

    Linus Torvalds
     
  • Pull pwm changes from Thierry Reding:
    "Nothing very exciting this time around. A couple of bug fixes and a
    lot of cleanup across the board. The DaVinci 8xx family of SoCs now
    use the same driver as the AM33xx family.

    Many thanks to Axel Lin and Jingoo Han who have done a great job
    fixing various bugs and inconsistencies."

    * tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (27 commits)
    pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config
    pwm: lpc32xx: Properly set PWM_ENABLE bit in lpc32xx_pwm_[enable|disable]
    pwm: Constify OF match tables
    pwm: pwm-tiehrpwm: Update device-tree binding document
    pwm: pwm-tiecap: Update device-tree binding document
    pwm: puv3: Remove unused enabled filed from struct puv3_pwm_chip
    pwm: pxa: Remove PWM_ID_BASE macro
    pwm: spear: Remove unused *dev from struct spear_pwm_chip
    pwm: mxs: Remove unused *dev from struct mxs_pwm_chip
    pwm: twl: Return proper error if twl6030_pwm_enable() fails
    pwm: pxa: Remove clk_enabled field from struct pxa_pwm_chip
    pwm: imx: Remove enabled field from struct imx_chip
    pwm: twl: Add .owner to struct pwm_ops
    pwm: twl-led: Add .owner to struct pwm_ops
    pwm: atmel-tcb: Add .owner to struct pwm_ops
    pwm: ab8500: Add .owner to struct pwm_ops
    pwm: spear: Fix checking return value of clk_enable() and clk_prepare()
    pwm: tiehrpwm: Staticize non-exported symbols
    pwm: tiecap: Staticize non-exported symbols
    pwm: ab8500: Fix trivial typo in dev_err message
    ...

    Linus Torvalds
     
  • Pull IOMMU updates from Joerg Roedel:
    "The updates are mostly about the x86 IOMMUs this time.

    Exceptions are the groundwork for the PAMU IOMMU from Freescale (for a
    PPC platform) and an extension to the IOMMU group interface.

    On the x86 side this includes a workaround for VT-d to disable
    interrupt remapping on broken chipsets. On the AMD-Vi side the most
    important new feature is a kernel command-line interface to override
    broken information in IVRS ACPI tables and get interrupt remapping
    working this way.

    Besides that there are small fixes all over the place."

    * tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (24 commits)
    iommu/tegra: Fix printk formats for dma_addr_t
    iommu: Add a function to find an iommu group by id
    iommu/vt-d: Remove warning for HPET scope type
    iommu: Move swap_pci_ref function to drivers/iommu/pci.h.
    iommu/vt-d: Disable translation if already enabled
    iommu/amd: fix error return code in early_amd_iommu_init()
    iommu/AMD: Per-thread IOMMU Interrupt Handling
    iommu: Include linux/err.h
    iommu/amd: Workaround for ERBT1312
    iommu/amd: Document ivrs_ioapic and ivrs_hpet parameters
    iommu/amd: Don't report firmware bugs with cmd-line ivrs overrides
    iommu/amd: Add ioapic and hpet ivrs override
    iommu/amd: Add early maps for ioapic and hpet
    iommu/amd: Extend IVRS special device data structure
    iommu/amd: Move add_special_device() to __init
    iommu: Fix compile warnings with forward declarations
    iommu/amd: Properly initialize irq-table lock
    iommu/amd: Use AMD specific data structure for irq remapping
    iommu/amd: Remove map_sg_no_iommu()
    iommu/vt-d: add quirk for broken interrupt remapping on 55XX chipsets
    ...

    Linus Torvalds
     
  • Make sure devicetable-offsets.h is cleaned in the scripts/mod directory

    Signed-off-by: Andreas Schwab
    Tested-by: Geert Uytterhoeven
    Signed-off-by: Michal Marek

    Andreas Schwab
     
  • For SLAB the kmalloc caches must be created in ascending sizes in order
    for the OFF_SLAB sub-slab cache to work properly.

    Create the non power of two caches immediately after the prior power of
    two kmalloc cache. Do not create the non power of two caches before all
    other caches.

    Reported-and-tested-by: Tetsuo Handa
    Signed-off-by: Christoph Lamete
    Link: http://lkml.kernel.org/r/201305040348.CIF81716.OStQOHFJMFLOVF@I-love.SAKURA.ne.jp
    Signed-off-by: Pekka Enberg

    Christoph Lameter
     
  • The worry here is that fragm_sz could be zero since it comes from
    skb->data.

    Signed-off-by: Dan Carpenter
    Signed-off-by: David S. Miller

    Dan Carpenter
     
  • The bearer_id here comes from skb->data and it can be a number from 0 to
    7. The problem is that the ->links[] array has only 2 elements so I
    have added a range check.

    Signed-off-by: Dan Carpenter
    Signed-off-by: David S. Miller

    Dan Carpenter
     
  • Add new driver for supporting Realtek RTL8152 Based USB 2.0 Ethernet Adapters

    Signed-off-by: Hayes Wang
    Cc: Realtek linux nic maintainers
    Signed-off-by: David S. Miller

    hayeswang
     
  • Pull Ceph changes from Alex Elder:
    "This is a big pull.

    Most of it is culmination of Alex's work to implement RBD image
    layering, which is now complete (yay!).

    There is also some work from Yan to fix i_mutex behavior surrounding
    writes in cephfs, a sync write fix, a fix for RBD images that get
    resized while they are mapped, and a few patches from me that resolve
    annoying auth warnings and fix several bugs in the ceph auth code."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (254 commits)
    rbd: fix image request leak on parent read
    libceph: use slab cache for osd client requests
    libceph: allocate ceph message data with a slab allocator
    libceph: allocate ceph messages with a slab allocator
    rbd: allocate image object names with a slab allocator
    rbd: allocate object requests with a slab allocator
    rbd: allocate name separate from obj_request
    rbd: allocate image requests with a slab allocator
    rbd: use binary search for snapshot lookup
    rbd: clear EXISTS flag if mapped snapshot disappears
    rbd: kill off the snapshot list
    rbd: define rbd_snap_size() and rbd_snap_features()
    rbd: use snap_id not index to look up snap info
    rbd: look up snapshot name in names buffer
    rbd: drop obj_request->version
    rbd: drop rbd_obj_method_sync() version parameter
    rbd: more version parameter removal
    rbd: get rid of some version parameters
    rbd: stop tracking header object version
    rbd: snap names are pointer to constant data
    ...

    Linus Torvalds
     
  • Pull CIFS fixes from Steve French:
    "A set of cifs cleanup fixes.

    The only big one of this set optimizes the cifs error logging,
    renaming cFYI and cERROR macros to cifs_dbg, and in the process makes
    it clearer and reduces module size."

    * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
    cifs: small variable name cleanup
    CIFS: fix error return code in cifs_atomic_open()
    cifs: store the real expected sequence number in the mid
    cifs: on send failure, readjust server sequence number downward
    cifs: remove ENOSPC handling in smb_sendv
    [CIFS] cifs: Rename cERROR and cFYI to cifs_dbg
    fs: cifs: use kmemdup instead of kmalloc + memcpy
    cifs: replaced kmalloc + memset with kzalloc
    cifs: ignore the unc= and prefixpath= mount options

    Linus Torvalds
     
  • When checking if an autofs mount point is busy it isn't sufficient to
    only check if it's a mount point.

    For example, if the mount of an offset mountpoint in a tree is denied
    for this host by its export and the dentry becomes a process working
    directory the check incorrectly returns the mount as not in use at
    expire.

    This can happen since the default when mounting within a tree is
    nostrict, which means ingnore mount fails on mounts within the tree and
    continue. The nostrict option is meant to allow mounting in this case.

    Signed-off-by: David Jeffery
    Signed-off-by: Ian Kent
    Cc: stable@vger.kernel.org
    Signed-off-by: Linus Torvalds

    David Jeffery
     
  • Fixed the sparse warning:

    fs/autofs4/root.c:411:5: warning: symbol 'autofs4_d_manage' was not declared. Should it be static?"

    [ Clearly it should be static as the function is declared static at the
    top of root.c. - imk ]

    Signed-off-by: Claudiu Ghioc
    Signed-off-by: Ian Kent
    Signed-off-by: Linus Torvalds

    Claudiu Ghioc
     
  • Pull more s390 updates from Martin Schwidefsky:
    "This is the second batch of s390 patches for the 3.10 merge window.

    Heiko improved the memory detection, this fixes kdump for large memory
    sizes. Some kvm related memory management work, new ipldev/condev
    keywords in cio and bug fixes."

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
    s390/mem_detect: remove artificial kdump memory types
    s390/mm: add pte invalidation notifier for kvm
    s390/zcrypt: ap bus rescan problem when toggle crypto adapters on/off
    s390/memory hotplug,sclp: get rid of per memory increment usecount
    s390/memory hotplug: provide memory_block_size_bytes() function
    s390/mem_detect: limit memory detection loop to "mem=" parameter
    s390/kdump,bootmem: fix bootmem allocator bitmap size
    s390: get rid of odd global real_memory_size
    s390/kvm: Change the virtual memory mapping location for Virtio devices
    s390/zcore: calculate real memory size using own get_mem_size function
    s390/mem_detect: add DAT sanity check
    s390/mem_detect: fix lockdep irq tracing
    s390/mem_detect: move memory detection code to mm folder
    s390/zfcpdump: exploit new cio_ignore keywords
    s390/cio: add condev keyword to cio_ignore
    s390/cio: add ipldev keyword to cio_ignore
    s390/uaccess: add "fallthrough" comments

    Linus Torvalds