1. 13 Jul, 2013 11 commits
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 560ae371
      Linus Torvalds authored
      Pull perf fixes from Thomas Gleixner:
       - fix for do_div() abuse on x86
       - locking fix in perf core
       - a pile of (build) fixes and cleanups in perf tools
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)
        perf/x86: Fix incorrect use of do_div() in NMI warning
        perf: Fix perf_lock_task_context() vs RCU
        perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario
        perf: Clone child context from parent context pmu
        perf script: Fix broken include in Context.xs
        perf tools: Fix -ldw/-lelf link test when static linking
        perf tools: Revert regression in configuration of Python support
        perf tools: Fix perf version generation
        perf stat: Fix per-socket output bug for uncore events
        perf symbols: Fix vdso list searching
        perf evsel: Fix missing increment in sample parsing
        perf tools: Update symbol_conf.nr_events when processing attribute events
        perf tools: Fix new_term() missing free on error path
        perf tools: Fix parse_events_terms() segfault on error path
        perf evsel: Fix count parameter to read call in event_format__new
        perf tools: fix a typo of a Power7 event name
        perf tools: Fix -x/--exclude-other option for report command
        perf evlist: Enhance perf_evlist__start_workload()
        perf record: Remove -f/--force option
        perf record: Remove -A/--append option
        ...
      560ae371
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4fa109b1
      Linus Torvalds authored
      Pull core locking updates from Thomas Gleixner:
       "Header cleanup as requested by Linus"
      
      (This is the "don't include support for ww_mutex in a header file that
      everybody wants, when almost nobody wants the ww part" change)
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        mutex: Move ww_mutex definitions to ww_mutex.h
      4fa109b1
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 9663398a
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "This is our first set of fixes from arm-soc for 3.11.
         - A handful of build and warning fixes from Arnd
         - A collection of OMAP fixes
         - defconfig updates to make the default configs more useful for real
           use (and testing) out of the box on hardware
      
        And a couple of other small fixes.  Some of these have been recently
        applied but it's normally how we deal with fixes, with less bake time
        in -next needed"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
        arm: multi_v7_defconfig: Tweaks for omap and sunxi
        arm: multi_v7_defconfig: add i.MX options and NFS root
        ARM: omap2: add select of TI_PRIV_EDMA
        ARM: exynos: select PM_GENERIC_DOMAINS only when used
        ARM: ixp4xx: avoid circular header dependency
        ARM: OMAP: omap_common_late_init may be unused
        ARM: sti: move DEBUG_STI_UART into alphabetical order
        ARM: OMAP: build mach-omap code only if needed
        ARM: zynq: use DT_MACHINE_START
        ARM: omap5: omap5 has SCU and TWD
        ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
        ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
        ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
        ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
        ARM: OMAP2+: devices: remove duplicated include from devices.c
        ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
        ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
        ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
        ARM: OMAP2+: Remove obsolete Makefile line
        ARM: OMAP5: Enable Cortex A15 errata 798181
        ...
      9663398a
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · bfd65dd9
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "A few fixes for ARM, mostly just one liners with the exception of the
        missing section specification.  We decided not to rely on .previous to
        fix this but to explicitly state the section we want the code to be
        in."
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
        ARM: 7782/1: Kconfig: Let ARM_ERRATA_364296 not depend on CONFIG_SMP
        ARM: mm: fix boot on SA1110 Assabet
        ARM: 7781/1: mmu: Add debug_ll_io_init() mappings to early mappings
        ARM: 7780/1: add missing linker section markup to head-common.S
      bfd65dd9
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d1447464
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "MIPS updates:
      
         - All the things that didn't make 3.10.
         - Removes the Windriver PPMC platform.  Nobody will miss it.
         - Remove a workaround from kernel/irq/irqdomain.c which was there
           exclusivly for MIPS.  Patch by Grant Likely.
         - More small improvments for the SEAD 3 platform
         - Improvments on the BMIPS / SMP support for the BCM63xx series.
         - Various cleanups of dead leftovers.
         - Platform support for the Cavium Octeon-based EdgeRouter Lite.
      
        Two large KVM patchsets didn't make it for this pull request because
        their respective authors are vacationing"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
        MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
        MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
        MIPS: SEAD3: Disable L2 cache on SEAD-3.
        MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
        MIPS: BCM63xx: Add SMP support to prom.c
        MIPS: define write{b,w,l,q}_relaxed
        MIPS: Expose missing pci_io{map,unmap} declarations
        MIPS: Malta: Update GCMP detection.
        Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
        MIPS: APSP: Remove <asm/kspd.h>
        SSB: Kconfig: Amend SSB_EMBEDDED dependencies
        MIPS: microMIPS: Fix improper definition of ISA exception bit.
        MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
        MIPS: Declare emulate_load_store_microMIPS as a static function.
        MIPS: Fix typos and cleanup comment
        MIPS: Cleanup indentation and whitespace
        MIPS: BMIPS: support booting from physical CPU other than 0
        MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
        MIPS: GIC: Fix gic_set_affinity infinite loop
        MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
        ...
      d1447464
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 833e6834
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       - lots of devm_ conversions and cleanup
       - platform_set_drvdata cleanups
       - s3c2410: dev_err/dev_info + dev_pm_ops
       - watchdog_core: don't try to stop device if not running fix
       - wdrtas: use print_hex_dump
       - xilinx cleanups
       - orion_wdt fixes
       - softdog cleanup
       - hpwdt: check on UEFI bits
       - deletion of mpcore_wdt driver
       - addition of broadcom BCM2835 watchdog timer driver
       - addition of MEN A21 watcdog devices
      
      * git://www.linux-watchdog.org/linux-watchdog: (38 commits)
        watchdog: hpwdt: Add check for UEFI bits
        watchdog: softdog: remove replaceable ping operation
        watchdog: New watchdog driver for MEN A21 watchdogs
        Watchdog: fix clearing of the watchdog interrupt
        Watchdog: allow orion_wdt to be built for Dove
        watchdog: Add Broadcom BCM2835 watchdog timer driver
        watchdog: delete mpcore_wdt driver
        watchdog: xilinx: Setup the origin compatible string
        watchdog: xilinx: Fix driver header
        watchdog: wdrtas: don't use custom version of print_hex_dump
        watchdog: core: don't try to stop device if not running
        watchdog: jz4740: Pass device to clk_get
        watchdog: twl4030: Remove redundant platform_set_drvdata()
        watchdog: mpcore: Remove redundant platform_set_drvdata()
        watchdog: da9055: use platform_{get,set}_drvdata()
        watchdog: da9052: use platform_{get,set}_drvdata()
        watchdog: cpwd: use platform_{get,set}_drvdata()
        watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_ops
        watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()
        watchdog: wm831x: use platform_{get,set}_drvdata()
        ...
      833e6834
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · c5524413
      Linus Torvalds authored
      Pull InfiniBand/RDMA changes from Roland Dreier:
       - AF_IB (native IB addressing) for CMA from Sean Hefty
       - new mlx5 driver for Mellanox Connect-IB adapters (including post
         merge request fixes)
       - SRP fixes from Bart Van Assche (including fix to first merge request)
       - qib HW driver updates
       - resurrection of ocrdma HW driver development
       - uverbs conversion to create fds with O_CLOEXEC set
       - other small changes and fixes
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (66 commits)
        mlx5: Return -EFAULT instead of -EPERM
        IB/qib: Log all SDMA errors unconditionally
        IB/qib: Fix module-level leak
        mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB spec
        IB/srp: Let srp_abort() return FAST_IO_FAIL if TL offline
        IB/uverbs: Use get_unused_fd_flags(O_CLOEXEC) instead of get_unused_fd()
        mlx5_core: Fixes for sparse warnings
        IB/mlx5: Make profile[] static in main.c
        mlx5: Fix parameter type of health_handler_t
        mlx5: Add driver for Mellanox Connect-IB adapters
        IB/core: Add reserved values to enums for low-level driver use
        IB/srp: Bump driver version and release date
        IB/srp: Make HCA completion vector configurable
        IB/srp: Maintain a single connection per I_T nexus
        IB/srp: Fail I/O fast if target offline
        IB/srp: Skip host settle delay
        IB/srp: Avoid skipping srp_reset_host() after a transport error
        IB/srp: Fix remove_one crash due to resource exhaustion
        IB/qib: New transmitter tunning settings for Dell 1.1 backplane
        IB/core: Fix error return code in add_port()
        ...
      c5524413
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 85865511
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "This series contain:
         - new i2c video drivers: ml86v7667 (video decoder),
                                  ths8200 (video encoder)
         - a new video driver for EasyCap cards based on Fushicai USBTV007
         - Improved support for OF and embedded systems, with V4L2 async
           initialization and a better support for clocks
         - API cleanups on the ioctls used by the v4l2 debug tool
         - Lots of cleanups
         - As usual, several driver improvements and new cards additions
         - Revert two changesets that change the minimal symbol rate for
           stv0399, as request by Manu
         - Update MAINTAINERS and other files to point to my new e-mail"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
        MAINTAINERS & ABI: Update to point to my new email
        [media] stb0899: restore minimal rate to 5Mbauds
        [media] exynos4-is: Correct colorspace handling at FIMC-LITE
        [media] exynos4-is: Set valid initial format on FIMC.n subdevs
        [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
        [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
        [media] exynos4-is: Set valid initial format at FIMC-LITE
        [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
        [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
        [media] Documentation: Update driver's directory in video4linux/fimc.txt
        [media] exynos4-is: Change fimc-is firmware file names
        [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
        [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
        [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
        [media] media: i2c: tvp514x: remove manual setting of subdev name
        [media] media: i2c: tvp7002: remove manual setting of subdev name
        [media] mem2mem: set missing v4l2_dev pointer
        [media] wl128x: add missing struct v4l2_device
        [media] tvp514x: Fix init seqeunce
        [media] saa7134: Fix sparse warnings by adding __user annotation
        ...
      85865511
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs · 239dab46
      Linus Torvalds authored
      Pull more xfs updates from Ben Myers:
       "Here are a fix for xfs_fsr, a cleanup in bulkstat, a cleanup in
        xfs_open_by_handle, updated mount options documentation, a cleanup in
        xfs_bmapi_write, a fix for the size of dquot log reservations, a fix
        for sgid inheritance when acls are in use, a fix for cleaning up
        quotainfo structures, and some more of the work which allows group and
        project quotas to be used together.
      
        We had a few more in this last quota category that we might have liked
        to get in, but it looks there are still a few items that need to be
        addressed.
      
         - fix for xfs_fsr returning -EINVAL
         - cleanup in xfs_bulkstat
         - cleanup in xfs_open_by_handle
         - update mount options documentation
         - clean up local format handling in xfs_bmapi_write
         - fix dquot log reservations which were too small
         - fix sgid inheritance for subdirectories when default acls are in use
         - add project quota fields to various structures
         - fix teardown of quotainfo structures when quotas are turned off"
      
      * tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs:
        xfs: Fix the logic check for all quotas being turned off
        xfs: Add pquota fields where gquota is used.
        xfs: fix sgid inheritance for subdirectories inheriting default acls [V3]
        xfs: dquot log reservations are too small
        xfs: remove local fork format handling from xfs_bmapi_write()
        xfs: update mount options documentation
        xfs: use get_unused_fd_flags(0) instead of get_unused_fd()
        xfs: clean up unused codes at xfs_bulkstat()
        xfs: use XFS_BMAP_BMDR_SPACE vs. XFS_BROOT_SIZE_ADJ
      239dab46
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · f1c41088
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Fixes for 4 cifs bugs, including a reconnect problem, a problem
        parsing responses to SMB2 open request, and setting nlink incorrectly
        to some servers which don't report it properly on the wire.  Also
        improves data integrity on reconnect with series from Pavel which adds
        durable handle support for SMB2."
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Fix a deadlock when a file is reopened
        CIFS: Reopen the file if reconnect durable handle failed
        [CIFS] Fix minor endian error in durable handle patch series
        CIFS: Reconnect durable handles for SMB2
        CIFS: Make SMB2_open use cifs_open_parms struct
        CIFS: Introduce cifs_open_parms struct
        CIFS: Request durable open for SMB2 opens
        CIFS: Simplify SMB2 create context handling
        CIFS: Simplify SMB2_open code path
        CIFS: Respect create_options in smb2_open_file
        CIFS: Fix lease context buffer parsing
        [CIFS] use sensible file nlink values if unprovided
        Limit allocation of crypto mechanisms to dialect which requires
      f1c41088
    • Olof Johansson's avatar
      arm: multi_v7_defconfig: Tweaks for omap and sunxi · d4e1c7ef
      Olof Johansson authored
      OMAP recently changed how the platforms are configured, so OMAP2/3/4 SoC
      support is no longer enabled by default. Add them back.
      
      Enable new ethernet driver for sunxi.
      
      The i.MX console options moved due to resorting, no functional change.
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d4e1c7ef
  2. 12 Jul, 2013 10 commits
    • Olof Johansson's avatar
      Merge tag 'ux500-defconfig-for-arm-soc' of... · 1b4fcb85
      Olof Johansson authored
      Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
      
      From Linus Walleij:
      Ux500 defconfig changes:
      - Update base due to different Kconfig changes
      - Select watchdog, MUSB, Ux500 ALSA SoC, various MMC/SD
        features and enable highmem
      
      * tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
        ARM: ux500: Enable HIGHMEM in the u8500 defconfig
        ARM: ux500: Update MMC configs for u8500 defconfig
        ARM: ux500: select SND_SOC_UX500 for ux500
        ARM: ux500: update defconfig base
        ARM: ux500: select WATCHDOG and MUSB for ux500
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      1b4fcb85
    • Vincent Stehlé's avatar
      arm: multi_v7_defconfig: add i.MX options and NFS root · 1157d73d
      Vincent Stehlé authored
      - Add i.MX serial console support. This gives us the boot messages on
        UART on e.g. the i.MX6Q sabre sd platform.
      - Add the necessary config options, to allow booting with NFS root on
        an i.MX6 sabre sd.
      - Add Freescale LPUART serial console support. This gives us the boot
        messages on UART on e.g. the Vybrid VF610 Tower board.
      Signed-off-by: default avatarVincent Stehlé <vincent.stehle@freescale.com>
      Cc: Russell King <linux@arm.linux.org.uk>
      [olof: squashed three commits down to one]
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      1157d73d
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.11/fixes-for-merge-window' of... · f4b96f5e
      Olof Johansson authored
      Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
      
      Omap fixes and minor defconfig updates that would be good to
      get in before -rc1.
      
      * tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
        ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
        ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
        ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
        ARM: OMAP2+: devices: remove duplicated include from devices.c
        ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
        ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
        ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
        ARM: OMAP2+: Remove obsolete Makefile line
        ARM: OMAP5: Enable Cortex A15 errata 798181
        ARM: scu: provide inline dummy functions when SCU is not present
        ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
        ARM: OMAP2+: timer: initialize before using oh_name
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      
      Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
      f4b96f5e
    • Ralf Baechle's avatar
      Merge branch '3.10-fixes' into mips-for-linux-next · 6ac5310e
      Ralf Baechle authored
      This that should have been fixed but weren't, way to much, intrusive
      and late.
      6ac5310e
    • Dave Hansen's avatar
      perf/x86: Fix incorrect use of do_div() in NMI warning · baf64b85
      Dave Hansen authored
      I completely botched understanding the calling conventions of
      do_div().  I assumed that do_div() returned the result instead
      of realizing that it modifies its argument and returns a
      remainder.  The side-effect from this would be bogus numbers
      for the "msecs" value in the warning messages:
      
      	INFO: NMI handler (perf_event_nmi_handler) took too long to run: 0.114 msecs
      
      Note, there was a second fix posted by Stephane Eranian for
      a separate patch which I also botched:
      
      	http://lkml.kernel.org/r/20130704223010.GA30625@quadSigned-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
      Cc: Dave Hansen <dave@sr71.net>
      Link: http://lkml.kernel.org/r/20130708214404.B0B6EA66@viggo.jf.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      baf64b85
    • Maarten Lankhorst's avatar
      mutex: Move ww_mutex definitions to ww_mutex.h · 1b375dc3
      Maarten Lankhorst authored
      Move the definitions for wound/wait mutexes out to a separate
      header, ww_mutex.h. This reduces clutter in mutex.h, and
      increases readability.
      Suggested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Acked-by: default avatarRik van Riel <riel@redhat.com>
      Acked-by: default avatarMaarten Lankhorst <maarten.lankhorst@canonical.com>
      Cc: Dave Airlie <airlied@gmail.com>
      Link: http://lkml.kernel.org/r/51D675DC.3000907@canonical.com
      [ Tidied up the code a bit. ]
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      1b375dc3
    • Peter Zijlstra's avatar
      perf: Fix perf_lock_task_context() vs RCU · 058ebd0e
      Peter Zijlstra authored
      Jiri managed to trigger this warning:
      
       [] ======================================================
       [] [ INFO: possible circular locking dependency detected ]
       [] 3.10.0+ #228 Tainted: G        W
       [] -------------------------------------------------------
       [] p/6613 is trying to acquire lock:
       []  (rcu_node_0){..-...}, at: [<ffffffff810ca797>] rcu_read_unlock_special+0xa7/0x250
       []
       [] but task is already holding lock:
       []  (&ctx->lock){-.-...}, at: [<ffffffff810f2879>] perf_lock_task_context+0xd9/0x2c0
       []
       [] which lock already depends on the new lock.
       []
       [] the existing dependency chain (in reverse order) is:
       []
       [] -> #4 (&ctx->lock){-.-...}:
       [] -> #3 (&rq->lock){-.-.-.}:
       [] -> #2 (&p->pi_lock){-.-.-.}:
       [] -> #1 (&rnp->nocb_gp_wq[1]){......}:
       [] -> #0 (rcu_node_0){..-...}:
      
      Paul was quick to explain that due to preemptible RCU we cannot call
      rcu_read_unlock() while holding scheduler (or nested) locks when part
      of the read side critical section was preemptible.
      
      Therefore solve it by making the entire RCU read side non-preemptible.
      
      Also pull out the retry from under the non-preempt to play nice with RT.
      Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
      Helped-out-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      058ebd0e
    • Jiri Olsa's avatar
      perf: Remove WARN_ON_ONCE() check in __perf_event_enable() for valid scenario · 06f41796
      Jiri Olsa authored
      The '!ctx->is_active' check has a valid scenario, so
      there's no need for the warning.
      
      The reason is that there's a time window between the
      'ctx->is_active' check in the perf_event_enable() function
      and the __perf_event_enable() function having:
      
        - IRQs on
        - ctx->lock unlocked
      
      where the task could be killed and 'ctx' deactivated by
      perf_event_exit_task(), ending up with the warning below.
      
      So remove the WARN_ON_ONCE() check and add comments to
      explain it all.
      
      This addresses the following warning reported by Vince Weaver:
      
      [  324.983534] ------------[ cut here ]------------
      [  324.984420] WARNING: at kernel/events/core.c:1953 __perf_event_enable+0x187/0x190()
      [  324.984420] Modules linked in:
      [  324.984420] CPU: 19 PID: 2715 Comm: nmi_bug_snb Not tainted 3.10.0+ #246
      [  324.984420] Hardware name: Supermicro X8DTN/X8DTN, BIOS 4.6.3 01/08/2010
      [  324.984420]  0000000000000009 ffff88043fce3ec8 ffffffff8160ea0b ffff88043fce3f00
      [  324.984420]  ffffffff81080ff0 ffff8802314fdc00 ffff880231a8f800 ffff88043fcf7860
      [  324.984420]  0000000000000286 ffff880231a8f800 ffff88043fce3f10 ffffffff8108103a
      [  324.984420] Call Trace:
      [  324.984420]  <IRQ>  [<ffffffff8160ea0b>] dump_stack+0x19/0x1b
      [  324.984420]  [<ffffffff81080ff0>] warn_slowpath_common+0x70/0xa0
      [  324.984420]  [<ffffffff8108103a>] warn_slowpath_null+0x1a/0x20
      [  324.984420]  [<ffffffff81134437>] __perf_event_enable+0x187/0x190
      [  324.984420]  [<ffffffff81130030>] remote_function+0x40/0x50
      [  324.984420]  [<ffffffff810e51de>] generic_smp_call_function_single_interrupt+0xbe/0x130
      [  324.984420]  [<ffffffff81066a47>] smp_call_function_single_interrupt+0x27/0x40
      [  324.984420]  [<ffffffff8161fd2f>] call_function_single_interrupt+0x6f/0x80
      [  324.984420]  <EOI>  [<ffffffff816161a1>] ? _raw_spin_unlock_irqrestore+0x41/0x70
      [  324.984420]  [<ffffffff8113799d>] perf_event_exit_task+0x14d/0x210
      [  324.984420]  [<ffffffff810acd04>] ? switch_task_namespaces+0x24/0x60
      [  324.984420]  [<ffffffff81086946>] do_exit+0x2b6/0xa40
      [  324.984420]  [<ffffffff8161615c>] ? _raw_spin_unlock_irq+0x2c/0x30
      [  324.984420]  [<ffffffff81087279>] do_group_exit+0x49/0xc0
      [  324.984420]  [<ffffffff81096854>] get_signal_to_deliver+0x254/0x620
      [  324.984420]  [<ffffffff81043057>] do_signal+0x57/0x5a0
      [  324.984420]  [<ffffffff8161a164>] ? __do_page_fault+0x2a4/0x4e0
      [  324.984420]  [<ffffffff8161665c>] ? retint_restore_args+0xe/0xe
      [  324.984420]  [<ffffffff816166cd>] ? retint_signal+0x11/0x84
      [  324.984420]  [<ffffffff81043605>] do_notify_resume+0x65/0x80
      [  324.984420]  [<ffffffff81616702>] retint_signal+0x46/0x84
      [  324.984420] ---[ end trace 442ec2f04db3771a ]---
      Reported-by: default avatarVince Weaver <vincent.weaver@maine.edu>
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      Suggested-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/1373384651-6109-2-git-send-email-jolsa@redhat.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      06f41796
    • Jiri Olsa's avatar
      perf: Clone child context from parent context pmu · 734df5ab
      Jiri Olsa authored
      Currently when the child context for inherited events is
      created, it's based on the pmu object of the first event
      of the parent context.
      
      This is wrong for the following scenario:
      
        - HW context having HW and SW event
        - HW event got removed (closed)
        - SW event stays in HW context as the only event
          and its pmu is used to clone the child context
      
      The issue starts when the cpu context object is touched
      based on the pmu context object (__get_cpu_context). In
      this case the HW context will work with SW cpu context
      ending up with following WARN below.
      
      Fixing this by using parent context pmu object to clone
      from child context.
      
      Addresses the following warning reported by Vince Weaver:
      
      [ 2716.472065] ------------[ cut here ]------------
      [ 2716.476035] WARNING: at kernel/events/core.c:2122 task_ctx_sched_out+0x3c/0x)
      [ 2716.476035] Modules linked in: nfsd auth_rpcgss oid_registry nfs_acl nfs locn
      [ 2716.476035] CPU: 0 PID: 3164 Comm: perf_fuzzer Not tainted 3.10.0-rc4 #2
      [ 2716.476035] Hardware name: AOpen   DE7000/nMCP7ALPx-DE R1.06 Oct.19.2012, BI2
      [ 2716.476035]  0000000000000000 ffffffff8102e215 0000000000000000 ffff88011fc18
      [ 2716.476035]  ffff8801175557f0 0000000000000000 ffff880119fda88c ffffffff810ad
      [ 2716.476035]  ffff880119fda880 ffffffff810af02a 0000000000000009 ffff880117550
      [ 2716.476035] Call Trace:
      [ 2716.476035]  [<ffffffff8102e215>] ? warn_slowpath_common+0x5b/0x70
      [ 2716.476035]  [<ffffffff810ab2bd>] ? task_ctx_sched_out+0x3c/0x5f
      [ 2716.476035]  [<ffffffff810af02a>] ? perf_event_exit_task+0xbf/0x194
      [ 2716.476035]  [<ffffffff81032a37>] ? do_exit+0x3e7/0x90c
      [ 2716.476035]  [<ffffffff810cd5ab>] ? __do_fault+0x359/0x394
      [ 2716.476035]  [<ffffffff81032fe6>] ? do_group_exit+0x66/0x98
      [ 2716.476035]  [<ffffffff8103dbcd>] ? get_signal_to_deliver+0x479/0x4ad
      [ 2716.476035]  [<ffffffff810ac05c>] ? __perf_event_task_sched_out+0x230/0x2d1
      [ 2716.476035]  [<ffffffff8100205d>] ? do_signal+0x3c/0x432
      [ 2716.476035]  [<ffffffff810abbf9>] ? ctx_sched_in+0x43/0x141
      [ 2716.476035]  [<ffffffff810ac2ca>] ? perf_event_context_sched_in+0x7a/0x90
      [ 2716.476035]  [<ffffffff810ac311>] ? __perf_event_task_sched_in+0x31/0x118
      [ 2716.476035]  [<ffffffff81050dd9>] ? mmdrop+0xd/0x1c
      [ 2716.476035]  [<ffffffff81051a39>] ? finish_task_switch+0x7d/0xa6
      [ 2716.476035]  [<ffffffff81002473>] ? do_notify_resume+0x20/0x5d
      [ 2716.476035]  [<ffffffff813654f5>] ? retint_signal+0x3d/0x78
      [ 2716.476035] ---[ end trace 827178d8a5966c3d ]---
      Reported-by: default avatarVince Weaver <vincent.weaver@maine.edu>
      Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
      Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
      Cc: Frederic Weisbecker <fweisbec@gmail.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Paul Mackerras <paulus@samba.org>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Cc: <stable@kernel.org>
      Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/1373384651-6109-1-git-send-email-jolsa@redhat.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
      734df5ab
    • Ingo Molnar's avatar
      Merge tag 'perf-urgent-for-mingo' of... · c3a1b0cb
      Ingo Molnar authored
      Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
      
      Pull perf/urgent fixes from Arnaldo Carvalho de Melo:
      
       * Fix some freeing bugs on the parsing error paths, from Adrian Hunter.
      
       * Update symbol_conf.nr_events when processing attribute events, fix from Adrian Hunter.
      
       * Fix missing increment in sample parsing when PERF_SAMPLE_STACK_USER
         is present, from Adrian Hunt.
      
       * Fix count parameter to read call in event_format__new, from David Ahern.
      
       * Remove -A/--append option, not working for a long time, from Jiri Olsa.
      
       * Remove -f/--force option, was a no-op for quite some time, from Jiri Olsa.
      
       * Fix -x/--exclude-other option for report command, from Jiri Olsa.
      
       * Cross build fixes, at least one for Android, from Joonsoo Kim.
      
       * Fix memory allocation fail check in mem{set,cpy} 'perf bench' workloads,
         from Kirill A. Shutemov.
      
       * Revert regression in configuration of Python support, from Michael Witten.
      
       * Fix -ldw/-lelf link test when static linking, from Mike Frysinger.
      
       * Fix issues with multiple children processing in perf_evlist__start_workload(),
         from Namhyung Kim.
      
       * Fix broken include in Context.xs ('perf script'), from Ramkumar Ramachandra.
      
       * Fixes for build problems, from Robert Richter.
      
       * Fix a typo of a Power7 event name, from Runzhen Wang.
      
       * Avoid sending SIGTERM to random processes in 'perf stat', fix from Stephane Eranian.
      
       * Fix per-socket output bug for uncore events in 'perf stat', from Stephane Eranian.
      
       * Fix vdso list searching, from Waiman Long.
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      c3a1b0cb
  3. 11 Jul, 2013 19 commits