1. 06 Feb, 2016 4 commits
    • Herbert Xu's avatar
      crypto: algif_skcipher - Do not set MAY_BACKLOG on the async path · dad41997
      Herbert Xu authored
      The async path cannot use MAY_BACKLOG because it is not meant to
      block, which is what MAY_BACKLOG does.  On the other hand, both
      the sync and async paths can make use of MAY_SLEEP.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      dad41997
    • Herbert Xu's avatar
      crypto: algif_skcipher - Do not dereference ctx without socket lock · 6454c2b8
      Herbert Xu authored
      Any access to non-constant bits of the private context must be
      done under the socket lock, in particular, this includes ctx->req.
      
      This patch moves such accesses under the lock, and fetches the
      tfm from the parent socket which is guaranteed to be constant,
      rather than from ctx->req.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      6454c2b8
    • Herbert Xu's avatar
      crypto: algif_skcipher - Do not assume that req is unchanged · ec69bbfb
      Herbert Xu authored
      The async path in algif_skcipher assumes that the crypto completion
      function will be called with the original request.  This is not
      necessarily the case.  In fact there is no need for this anyway
      since we already embed information into the request with struct
      skcipher_async_req.
      
      This patch adds a pointer to that struct and then passes it as
      the data to the callback function.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      Tested-by: default avatarTadeusz Struk <tadeusz.struk@intel.com>
      ec69bbfb
    • Mathias Krause's avatar
      crypto: user - lock crypto_alg_list on alg dump · 63e41ebc
      Mathias Krause authored
      We miss to take the crypto_alg_sem semaphore when traversing the
      crypto_alg_list for CRYPTO_MSG_GETALG dumps. This allows a race with
      crypto_unregister_alg() removing algorithms from the list while we're
      still traversing it, thereby leading to a use-after-free as show below:
      
      [ 3482.071639] general protection fault: 0000 [#1] SMP
      [ 3482.075639] Modules linked in: aes_x86_64 glue_helper lrw ablk_helper cryptd gf128mul ipv6 pcspkr serio_raw virtio_net microcode virtio_pci virtio_ring virtio sr_mod cdrom [last unloaded: aesni_intel]
      [ 3482.075639] CPU: 1 PID: 11065 Comm: crconf Not tainted 4.3.4-grsec+ #126
      [ 3482.075639] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
      [ 3482.075639] task: ffff88001cd41a40 ti: ffff88001cd422c8 task.ti: ffff88001cd422c8
      [ 3482.075639] RIP: 0010:[<ffffffff93722bd3>]  [<ffffffff93722bd3>] strncpy+0x13/0x30
      [ 3482.075639] RSP: 0018:ffff88001f713b60  EFLAGS: 00010202
      [ 3482.075639] RAX: ffff88001f6c4430 RBX: ffff88001f6c43a0 RCX: ffff88001f6c4430
      [ 3482.075639] RDX: 0000000000000040 RSI: fefefefefefeff16 RDI: ffff88001f6c4430
      [ 3482.075639] RBP: ffff88001f713b60 R08: ffff88001f6c4470 R09: ffff88001f6c4480
      [ 3482.075639] R10: 0000000000000002 R11: 0000000000000246 R12: ffff88001ce2aa28
      [ 3482.075639] R13: ffff880000093700 R14: ffff88001f5e4bf8 R15: 0000000000003b20
      [ 3482.075639] FS:  0000033826fa2700(0000) GS:ffff88001e900000(0000) knlGS:0000000000000000
      [ 3482.075639] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      [ 3482.075639] CR2: ffffffffff600400 CR3: 00000000139ec000 CR4: 00000000001606f0
      [ 3482.075639] Stack:
      [ 3482.075639]  ffff88001f713bd8 ffffffff936ccd00 ffff88001e5c4200 ffff880000093700
      [ 3482.075639]  ffff88001f713bd0 ffffffff938ef4bf 0000000000000000 0000000000003b20
      [ 3482.075639]  ffff88001f5e4bf8 ffff88001f5e4848 0000000000000000 0000000000003b20
      [ 3482.075639] Call Trace:
      [ 3482.075639]  [<ffffffff936ccd00>] crypto_report_alg+0xc0/0x3e0
      [ 3482.075639]  [<ffffffff938ef4bf>] ? __alloc_skb+0x16f/0x300
      [ 3482.075639]  [<ffffffff936cd08a>] crypto_dump_report+0x6a/0x90
      [ 3482.075639]  [<ffffffff93935707>] netlink_dump+0x147/0x2e0
      [ 3482.075639]  [<ffffffff93935f99>] __netlink_dump_start+0x159/0x190
      [ 3482.075639]  [<ffffffff936ccb13>] crypto_user_rcv_msg+0xc3/0x130
      [ 3482.075639]  [<ffffffff936cd020>] ? crypto_report_alg+0x3e0/0x3e0
      [ 3482.075639]  [<ffffffff936cc4b0>] ? alg_test_crc32c+0x120/0x120
      [ 3482.075639]  [<ffffffff93933145>] ? __netlink_lookup+0xd5/0x120
      [ 3482.075639]  [<ffffffff936cca50>] ? crypto_add_alg+0x1d0/0x1d0
      [ 3482.075639]  [<ffffffff93938141>] netlink_rcv_skb+0xe1/0x130
      [ 3482.075639]  [<ffffffff936cc4f8>] crypto_netlink_rcv+0x28/0x40
      [ 3482.075639]  [<ffffffff939375a8>] netlink_unicast+0x108/0x180
      [ 3482.075639]  [<ffffffff93937c21>] netlink_sendmsg+0x541/0x770
      [ 3482.075639]  [<ffffffff938e31e1>] sock_sendmsg+0x21/0x40
      [ 3482.075639]  [<ffffffff938e4763>] SyS_sendto+0xf3/0x130
      [ 3482.075639]  [<ffffffff93444203>] ? bad_area_nosemaphore+0x13/0x20
      [ 3482.075639]  [<ffffffff93444470>] ? __do_page_fault+0x80/0x3a0
      [ 3482.075639]  [<ffffffff939d80cb>] entry_SYSCALL_64_fastpath+0x12/0x6e
      [ 3482.075639] Code: 88 4a ff 75 ed 5d 48 0f ba 2c 24 3f c3 66 66 2e 0f 1f 84 00 00 00 00 00 55 48 85 d2 48 89 f8 48 89 f9 4c 8d 04 17 48 89 e5 74 15 <0f> b6 16 80 fa 01 88 11 48 83 de ff 48 83 c1 01 4c 39 c1 75 eb
      [ 3482.075639] RIP  [<ffffffff93722bd3>] strncpy+0x13/0x30
      
      To trigger the race run the following loops simultaneously for a while:
        $ while : ; do modprobe aesni-intel; rmmod aesni-intel; done
        $ while : ; do crconf show all > /dev/null; done
      
      Fix the race by taking the crypto_alg_sem read lock, thereby preventing
      crypto_unregister_alg() from modifying the algorithm list during the
      dump.
      
      This bug has been detected by the PaX memory sanitize feature.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMathias Krause <minipli@googlemail.com>
      Cc: Steffen Klassert <steffen.klassert@secunet.com>
      Cc: PaX Team <pageexec@freemail.hu>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      63e41ebc
  2. 30 Jan, 2016 2 commits
  3. 27 Jan, 2016 1 commit
  4. 26 Jan, 2016 2 commits
  5. 25 Jan, 2016 3 commits
    • Eli Cooper's avatar
      crypto: chacha20-ssse3 - Align stack pointer to 64 bytes · cbe09bd5
      Eli Cooper authored
      This aligns the stack pointer in chacha20_4block_xor_ssse3 to 64 bytes.
      Fixes general protection faults and potential kernel panics.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarEli Cooper <elicooper@gmx.com>
      Acked-by: default avatarMartin Willi <martin@strongswan.org>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      cbe09bd5
    • Peter Jones's avatar
      PKCS#7: Don't require SpcSpOpusInfo in Authenticode pkcs7 signatures · 7ee7014d
      Peter Jones authored
      Dave Young reported:
      > Hi,
      >
      > I saw the warning "Missing required AuthAttr" when testing kexec,
      > known issue?  Idea about how to fix it?
      >
      > The kernel is latest linus tree plus sevral patches from Toshi to
      > cleanup io resource structure.
      >
      > in function pkcs7_sig_note_set_of_authattrs():
      >         if (!test_bit(sinfo_has_content_type, &sinfo->aa_set) ||
      >             !test_bit(sinfo_has_message_digest, &sinfo->aa_set) ||
      >             (ctx->msg->data_type == OID_msIndirectData &&
      >              !test_bit(sinfo_has_ms_opus_info, &sinfo->aa_set))) {
      >                 pr_warn("Missing required AuthAttr\n");
      >                 return -EBADMSG;
      >         }
      >
      > The third condition below is true:
      > (ctx->msg->data_type == OID_msIndirectData &&
      >              !test_bit(sinfo_has_ms_opus_info, &sinfo->aa_set))
      >
      > I signed the kernel with redhat test key like below:
      > pesign -c 'Red Hat Test Certificate' -i arch/x86/boot/bzImage -o /boot/vmlinuz-4.4.0-rc8+ -s --force
      
      And right he is!  The Authenticode specification is a paragon amongst
      technical documents, and has this pearl of wisdom to offer:
      
      ---------------------------------
      Authenticode-Specific SignerInfo UnauthenticatedAttributes Structures
      
        The following Authenticode-specific data structures are present in
        SignerInfo authenticated attributes.
      
        SpcSpOpusInfo
        SpcSpOpusInfo is identified by SPC_SP_OPUS_INFO_OBJID
        (1.3.6.1.4.1.311.2.1.12) and is defined as follows:
        SpcSpOpusInfo ::= SEQUENCE {
          programName  [0] EXPLICIT SpcString OPTIONAL,
          moreInfo     [1] EXPLICIT SpcLink OPTIONAL,
        } --#public--
      
        SpcSpOpusInfo has two fields:
          programName
            This field contains the program description:
            If publisher chooses not to specify a description, the SpcString
            structure contains a zero-length program name.
            If the publisher chooses to specify a
            description, the SpcString structure contains a Unicode string.
          moreInfo
            This field is set to an SPCLink structure that contains a URL for
            a Web site with more information about the signer. The URL is an
            ASCII string.
      ---------------------------------
      
      Which is to say that this is an optional *unauthenticated* field which
      may be present in the Authenticated Attribute list.  This is not how
      pkcs7 is supposed to work, so when David implemented this, he didn't
      appreciate the subtlety the original spec author was working with, and
      missed the part of the sublime prose that says this Authenticated
      Attribute is an Unauthenticated Attribute.  As a result, the code in
      question simply takes as given that the Authenticated Attributes should
      be authenticated.
      
      But this one should not, individually.  Because it says it's not
      authenticated.
      
      It still has to hash right so the TBS digest is correct.  So it is both
      authenticated and unauthenticated, all at once.  Truly, a wonder of
      technical accomplishment.
      
      Additionally, pesign's implementation has always attempted to be
      compatible with the signatures emitted from contemporary versions of
      Microsoft's signtool.exe.  During the initial implementation, Microsoft
      signatures always produced the same values for SpcSpOpusInfo -
      {U"Microsoft Windows", "http://www.microsoft.com"} - without regard to
      who the signer was.
      
      Sometime between Windows 8 and Windows 8.1 they stopped including the
      field in their signatures altogether, and as such pesign stopped
      producing them in commits c0c4da6 and d79cb0c, sometime around June of
      2012.  The theory here is that anything that breaks with
      pesign signatures would also be breaking with signtool.exe sigs as well,
      and that'll be a more noticed problem for firmwares parsing it, so it'll
      get fixed.  The fact that we've done exactly this bug in Linux code is
      first class, grade A irony.
      
      So anyway, we should not be checking this field for presence or any
      particular value: if the field exists, it should be at the right place,
      but aside from that, as long as the hash matches the field is good.
      Signed-off-by: default avatarPeter Jones <pjones@redhat.com>
      Tested-by: default avatarDave Young <dyoung@redhat.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      7ee7014d
    • Horia Geant?'s avatar
      crypto: caam - make write transactions bufferable on PPC platforms · e7a7104e
      Horia Geant? authored
      Previous change (see "Fixes" tag) to the MCFGR register
      clears AWCACHE[0] ("bufferable" AXI3 attribute) (which is "1" at POR).
      
      This makes all writes non-bufferable, causing a ~ 5% performance drop
      for PPC-based platforms.
      
      Rework previous change such that MCFGR[AWCACHE]=4'b0011
      (bufferable + cacheable) for all platforms.
      Note: For ARM-based platforms, AWCACHE[0] is ignored
      by the interconnect IP.
      
      Cc: <stable@vger.kernel.org> # 4.3+
      Fixes: f1096749 ("crypto: caam - fix snooping for write transactions")
      Signed-off-by: default avatarHoria Geant? <horia.geanta@nxp.com>
      Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
      e7a7104e
  6. 24 Jan, 2016 28 commits
    • Linus Torvalds's avatar
      Linux 4.5-rc1 · 92e963f5
      Linus Torvalds authored
      92e963f5
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · e2464688
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for MIPS for 4.5 plus some 4.4 fixes.
      
        The executive summary:
      
         - ATH79 platform improvments, use DT bindings for the ATH79 USB PHY.
         - Avoid useless rebuilds for zboot.
         - jz4780: Add NEMC, BCH and NAND device tree nodes
         - Initial support for the MicroChip's DT platform.  As all the device
           drivers are missing this is still of limited use.
         - Some Loongson3 cleanups.
         - The unavoidable whitespace polishing.
         - Reduce clock skew when synchronizing the CPU cycle counters on CPU
           startup.
         - Add MIPS R6 fixes.
         - Lots of cleanups across arch/mips as fallout from KVM.
         - Lots of minor fixes and changes for IEEE 754-2008 support to the
           FPU emulator / fp-assist software.
         - Minor Ralink, BCM47xx and bcm963xx platform support improvments.
         - Support SMP on BCM63168"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (84 commits)
        MIPS: zboot: Add support for serial debug using the PROM
        MIPS: zboot: Avoid useless rebuilds
        MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB
        MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function
        MIPS: bcm963xx: Update bcm_tag field image_sequence
        MIPS: bcm963xx: Move extended flash address to bcm_tag header file
        MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure
        MIPS: bcm63xx: nvram: Use nvram structure definition from header file
        MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure
        MAINTAINERS: Add KVM for MIPS entry
        MIPS: KVM: Add missing newline to kvm_err()
        MIPS: Move KVM specific opcodes into asm/inst.h
        MIPS: KVM: Use cacheops.h definitions
        MIPS: Break down cacheops.h definitions
        MIPS: Use EXCCODE_ constants with set_except_vector()
        MIPS: Update trap codes
        MIPS: Move Cause.ExcCode trap codes to mipsregs.h
        MIPS: KVM: Make kvm_mips_{init,exit}() static
        MIPS: KVM: Refactor added offsetof()s
        MIPS: KVM: Convert EXPORT_SYMBOL to _GPL
        ...
      e2464688
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v4.5-2' of... · e1c10879
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86
      
      Pull x86 platform driver updates from Darren Hart:
       "Emergency travel prevented me from completing my final testing on this
        until today.  Nothing here that couldn't wait until RC1 fixes, but I
        thought it best to get it out sooner rather than later as it does
        contain a build warning fix.
      
        Summary:
      
        A build warning fix, MAINTAINERS cleanup, and a new DMI quirk:
      
        ideapad-laptop:
         - Add Lenovo Yoga 700 to no_hw_rfkill dmi list
      
        MAINTAINERS:
         - Combine multiple telemetry entries
      
        intel_telemetry_debugfs:
         - Fix unused warnings in telemetry debugfs"
      
      * tag 'platform-drivers-x86-v4.5-2' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
        ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list
        MAINTAINERS: Combine multiple telemetry entries
        intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs
      e1c10879
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 81f05fee
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "The top merge commit was re-generated yesterday because two topic
        branches were dropped from this pull request in the last minute due to
        some unaddressed comments.  All the other material has been in
        linux-next for quite a while.
      
        Specifics:
      
         - Enhance thermal core to handle unexpected device cooling states
           after fresh boot and system resume.  From Zhang Rui and Chen Yu.
      
         - Several fixes and cleanups on Rockchip and RCAR thermal drivers.
           From Caesar Wang and Kuninori Morimoto.
      
         - Add Broxton support for Intel processor thermal reporting device
           driver.  From Amy Wiles"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
        thermal: trip_point_temp_store() calls thermal_zone_device_update()
        thermal: rcar: rcar_thermal_get_temp() return error if strange temp
        thermal: rcar: check irq possibility in rcar_thermal_irq_xxx()
        thermal: rcar: check every rcar_thermal_update_temp() return value
        thermal: rcar: move rcar_thermal_dt_ids to upside
        thermal: rockchip: Support the RK3399 SoCs in thermal driver
        thermal: rockchip: Support the RK3228 SoCs in thermal driver
        dt-bindings: rockchip-thermal: Support the RK3228/RK3399 SoCs compatible
        thermal: rockchip: fix a trivial typo
        Thermal: Enable Broxton SoC thermal reporting device
        thermal: constify pch_dev_ops structure
        Thermal: do thermal zone update after a cooling device registered
        Thermal: handle thermal zone device properly during system sleep
        Thermal: initialize thermal zone device correctly
      81f05fee
    • Linus Torvalds's avatar
      Merge tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs · c52cb431
      Linus Torvalds authored
      Pull 9p updates from Eric Van Hensbergen:
       "Sorry for the last minute pull request, there's was a change that
        didn't get pulled into for-next until two weeks ago and I wanted to
        give it some bake time.
      
        Summary:
      
        Rework and error handling fixes, primarily in the fscatch and fd
        transports"
      
      * tag 'for-linus-4.5-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
        fs/9p: use fscache mutex rather than spinlock
        9p: trans_fd, bail out if recv fcall if missing
        9p: trans_fd, read rework to use p9_parse_header
        net/9p: Add device name details on error
      c52cb431
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 00e3f5cc
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "The two main changes are aio support in CephFS, and a series that
        fixes several issues in the authentication key timeout/renewal code.
      
        On top of that are a variety of cleanups and minor bug fixes"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        libceph: remove outdated comment
        libceph: kill off ceph_x_ticket_handler::validity
        libceph: invalidate AUTH in addition to a service ticket
        libceph: fix authorizer invalidation, take 2
        libceph: clear messenger auth_retry flag if we fault
        libceph: fix ceph_msg_revoke()
        libceph: use list_for_each_entry_safe
        ceph: use i_size_{read,write} to get/set i_size
        ceph: re-send AIO write request when getting -EOLDSNAP error
        ceph: Asynchronous IO support
        ceph: Avoid to propagate the invalid page point
        ceph: fix double page_unlock() in page_mkwrite()
        rbd: delete an unnecessary check before rbd_dev_destroy()
        libceph: use list_next_entry instead of list_entry_next
        ceph: ceph_frag_contains_value can be boolean
        ceph: remove unused functions in ceph_frag.h
      00e3f5cc
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 772950ed
      Linus Torvalds authored
      Pull SMB3 fixes from Steve French:
       "A collection of CIFS/SMB3 fixes.
      
        It includes a couple bug fixes, a few for improved debugging of
        cifs.ko and some improvements to the way cifs does key generation.
      
        I do have some additional bug fixes I expect in the next week or two
        (to address a problem found by xfstest, and some fixes for SMB3.11
        dialect, and a couple patches that just came in yesterday that I am
        reviewing)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs_dbg() outputs an uninitialized buffer in cifs_readdir()
        cifs: fix race between call_async() and reconnect()
        Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.
        cifs: Allow using O_DIRECT with cache=loose
        cifs: Make echo interval tunable
        cifs: Check uniqueid for SMB2+ and return -ESTALE if necessary
        Print IP address of unresponsive server
        cifs: Ratelimit kernel log messages
      772950ed
    • Josh Boyer's avatar
      ideapad-laptop: Add Lenovo Yoga 700 to no_hw_rfkill dmi list · 6b31de3e
      Josh Boyer authored
      Like the Yoga 900 models the Lenovo Yoga 700 does not have a
      hw rfkill switch, and trying to read the hw rfkill switch through the
      ideapad module causes it to always reported blocking breaking wifi.
      
      This commit adds the Lenovo Yoga 700 to the no_hw_rfkill dmi list, fixing
      the wifi breakage.
      
      BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1295272
      Tested-by: <dinyar.rabady+spam@gmail.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarJosh Boyer <jwboyer@fedoraproject.org>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      6b31de3e
    • Souvik Kumar Chakravarty's avatar
      MAINTAINERS: Combine multiple telemetry entries · f1fc3cd8
      Souvik Kumar Chakravarty authored
      This patch combines all the telemetry file entries in MAINTAINERS via
      wildcard.
      Signed-off-by: default avatarSouvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      f1fc3cd8
    • Souvik Kumar Chakravarty's avatar
      intel_telemetry_debugfs: Fix unused warnings in telemetry debugfs · 7885f2f9
      Souvik Kumar Chakravarty authored
      This patch fixes compile time warnings when CONFIG_PM_SLEEP
      is undefined. In this case sleep related counters are unused.
      Signed-off-by: default avatarSouvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
      Signed-off-by: default avatarDarren Hart <dvhart@linux.intel.com>
      7885f2f9
    • Christoph Lameter's avatar
      vmstat: Remove BUG_ON from vmstat_update · 587198ba
      Christoph Lameter authored
      If we detect that there is nothing to do just set the flag and do not
      check if it was already set before.  Races really do not matter.  If the
      flag is set by any code then the shepherd will start dealing with the
      situation and reenable the vmstat workers when necessary again.
      
      Since commit 0eb77e98 ("vmstat: make vmstat_updater deferrable again
      and shut down on idle") quiet_vmstat might update cpu_stat_off and mark
      a particular cpu to be handled by vmstat_shepherd.  This might trigger a
      VM_BUG_ON in vmstat_update because the work item might have been
      sleeping during the idle period and see the cpu_stat_off updated after
      the wake up.  The VM_BUG_ON is therefore misleading and no more
      appropriate.  Moreover it doesn't really suite any protection from real
      bugs because vmstat_shepherd will simply reschedule the vmstat_work
      anytime it sees a particular cpu set or vmstat_update would do the same
      from the worker context directly.  Even when the two would race the
      result wouldn't be incorrect as the counters update is fully idempotent.
      Reported-by: default avatarSasha Levin <sasha.levin@oracle.com>
      Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
      Acked-by: default avatarMichal Hocko <mhocko@suse.com>
      Cc: Johannes Weiner <hannes@cmpxchg.org>
      Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      587198ba
    • Ralf Baechle's avatar
      07d17f09
    • Alban Bedel's avatar
      MIPS: zboot: Add support for serial debug using the PROM · dbb98314
      Alban Bedel authored
      As most platforms implement the PROM serial interface prom_putchar()
      add a simple bridge to allow re-using this code for zboot.
      Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
      Cc: Alex Smith <alex.smith@imgtec.com>
      Cc: Andrew Bresticker <abrestic@chromium.org>
      Cc: Wu Zhangjin <wuzhangjin@gmail.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11811/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      dbb98314
    • Alban Bedel's avatar
      MIPS: zboot: Avoid useless rebuilds · 25f66096
      Alban Bedel authored
      Add dummy.o to the targets list, and fill targets automatically from
      $(vmlinuzobjs) to avoid having to maintain two lists.
      
      When building with XZ compression copy ashldi3.c to the build
      directory to use a different object file for the kernel and zboot.
      Without this the same object file need to be build with different
      flags which cause a rebuild at every run.
      Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
      Cc: linux-mips@linux-mips.org
      Cc: Alex Smith <alex.smith@imgtec.com>
      Cc: Wu Zhangjin <wuzhangjin@gmail.com>
      Cc: Andrew Bresticker <abrestic@chromium.org>
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11810/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      25f66096
    • Florian Fainelli's avatar
      MIPS: BMIPS: Enable ARCH_WANT_OPTIONAL_GPIOLIB · a7b43812
      Florian Fainelli authored
      Allow BMIPS_GENERIC supported platforms to build GPIO controller
      drivers.
      Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
      Reviewed-by: default avatarDragan Stancevic <dragan.stancevic@gmail.com>
      Cc: cernekee@gmail.com
      Cc: jaedon.shin@gmail.com
      Cc: gregory.0xf0@gmail.com
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/12019/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      a7b43812
    • Simon Arlott's avatar
      MIPS: bcm63xx: nvram: Remove unused bcm63xx_nvram_get_psi_size() function · 5bdb102b
      Simon Arlott authored
      Remove bcm63xx_nvram_get_psi_size() as it now has no users.
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11836/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5bdb102b
    • Simon Arlott's avatar
      MIPS: bcm963xx: Update bcm_tag field image_sequence · 696569f7
      Simon Arlott authored
      The "dual_image" and "inactive_flag" fields should be merged into a single
      "image_sequence" field.
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11834/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      696569f7
    • Simon Arlott's avatar
      MIPS: bcm963xx: Move extended flash address to bcm_tag header file · 1f29cb19
      Simon Arlott authored
      The extended flash address needs to be subtracted from bcm_tag flash
      image offsets. Move this value to the bcm_tag header file.
      
      Renamed define name to consistently use bcm963xx for flash layout
      which should be considered a property of the board and not the SoC
      (i.e. bcm63xx could theoretically be used on a board without CFE
      or any flash).
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11833/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      1f29cb19
    • Simon Arlott's avatar
      MIPS: bcm963xx: Move Broadcom BCM963xx image tag data structure · 8fce60b8
      Simon Arlott authored
      Move Broadcom BCM963xx image tag data structure to include/linux/
      so that drivers outside of mach-bcm63xx can use it.
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11832/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8fce60b8
    • Simon Arlott's avatar
      MIPS: bcm63xx: nvram: Use nvram structure definition from header file · 5a8b0b13
      Simon Arlott authored
      Use the common definition of the nvram structure from the header file
      include/linux/bcm963xx_nvram.h instead of maintaining a separate copy.
      
      Read the version 5 size of nvram data from memory and then call the
      new checksum verification function from the header file.
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11831/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5a8b0b13
    • Simon Arlott's avatar
      MIPS: bcm963xx: Add Broadcom BCM963xx board nvram data structure · 3271e610
      Simon Arlott authored
      Broadcom BCM963xx boards have multiple nvram variants across different
      SoCs with additional checksum fields added whenever the size of the
      nvram was extended.
      
      Add this structure as a header file so that multiple drivers can use it.
      Signed-off-by: default avatarSimon Arlott <simon@fire.lp0.eu>
      Cc: David Woodhouse <dwmw2@infradead.org>
      Cc: Brian Norris <computersforpeace@gmail.com>
      Cc: Kevin Cernekee <cernekee@gmail.com>
      Cc: Florian Fainelli <f.fainelli@gmail.com>
      Cc: Jonas Gorski <jogo@openwrt.org>
      Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
      Cc: MIPS Mailing List <linux-mips@linux-mips.org>
      Cc: MTD Maling List <linux-mtd@lists.infradead.org>
      Patchwork: https://patchwork.linux-mips.org/patch/11830/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      3271e610
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · 048ccca8
      Linus Torvalds authored
      Pull rdma updates from Doug Ledford:
       "Initial roundup of 4.5 merge window patches
      
         - Remove usage of ib_query_device and instead store attributes in
           ib_device struct
      
         - Move iopoll out of block and into lib, rename to irqpoll, and use
           in several places in the rdma stack as our new completion queue
           polling library mechanism.  Update the other block drivers that
           already used iopoll to use the new mechanism too.
      
         - Replace the per-entry GID table locks with a single GID table lock
      
         - IPoIB multicast cleanup
      
         - Cleanups to the IB MR facility
      
         - Add support for 64bit extended IB counters
      
         - Fix for netlink oops while parsing RDMA nl messages
      
         - RoCEv2 support for the core IB code
      
         - mlx4 RoCEv2 support
      
         - mlx5 RoCEv2 support
      
         - Cross Channel support for mlx5
      
         - Timestamp support for mlx5
      
         - Atomic support for mlx5
      
         - Raw QP support for mlx5
      
         - MAINTAINERS update for mlx4/mlx5
      
         - Misc ocrdma, qib, nes, usNIC, cxgb3, cxgb4, mlx4, mlx5 updates
      
         - Add support for remote invalidate to the iSER driver (pushed
           through the RDMA tree due to dependencies, acknowledged by nab)
      
         - Update to NFSoRDMA (pushed through the RDMA tree due to
           dependencies, acknowledged by Bruce)"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (169 commits)
        IB/mlx5: Unify CQ create flags check
        IB/mlx5: Expose Raw Packet QP to user space consumers
        {IB, net}/mlx5: Move the modify QP operation table to mlx5_ib
        IB/mlx5: Support setting Ethernet priority for Raw Packet QPs
        IB/mlx5: Add Raw Packet QP query functionality
        IB/mlx5: Add create and destroy functionality for Raw Packet QP
        IB/mlx5: Refactor mlx5_ib_qp to accommodate other QP types
        IB/mlx5: Allocate a Transport Domain for each ucontext
        net/mlx5_core: Warn on unsupported events of QP/RQ/SQ
        net/mlx5_core: Add RQ and SQ event handling
        net/mlx5_core: Export transport objects
        IB/mlx5: Expose CQE version to user-space
        IB/mlx5: Add CQE version 1 support to user QPs and SRQs
        IB/mlx5: Fix data validation in mlx5_ib_alloc_ucontext
        IB/sa: Fix netlink local service GFP crash
        IB/srpt: Remove redundant wc array
        IB/qib: Improve ipoib UD performance
        IB/mlx4: Advertise RoCE v2 support
        IB/mlx4: Create and use another QP1 for RoCEv2
        IB/mlx4: Enable send of RoCE QP1 packets with IP/UDP headers
        ...
      048ccca8
    • James Hogan's avatar
      MAINTAINERS: Add KVM for MIPS entry · bfd3d532
      James Hogan authored
      I've pretty much been maintaining KVM for MIPS for a while now. Lets
      make it more official (and make sure I get Cc'd on relevant patches).
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: linux-mips@linux-mips.org
      Cc: kvm@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11898/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      bfd3d532
    • James Hogan's avatar
      MIPS: KVM: Add missing newline to kvm_err() · f7fdcb60
      James Hogan authored
      Add missing newline to end of kvm_err string when guest PMAP couldn't be
      allocated.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: kvm@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/11896/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f7fdcb60
    • James Hogan's avatar
      MIPS: Move KVM specific opcodes into asm/inst.h · b2c59635
      James Hogan authored
      The header arch/mips/kvm/opcode.h defines a few extra opcodes which
      aren't in arch/mips/include/uapi/asm/inst.h. There's nothing KVM
      specific about them, so lets move them into inst.h where they belong and
      delete the header.
      
      Note that mfmcz_op is renamed to mfmc0_op to match the instruction set
      manual, and wait_op was already added to inst.h in commit b0a3eae2
      ("MIPS: inst.h: define COP0 wait op"), merged in v3.16-rc1.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: linux-mips@linux-mips.org
      Cc: kvm@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11895/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      b2c59635
    • James Hogan's avatar
      MIPS: KVM: Use cacheops.h definitions · f4956f62
      James Hogan authored
      Drop the custom cache operation code definitions used by KVM for
      emulating guest CACHE instructions, and switch to use the existing
      definitions in <asm/cacheops.h>.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: kvm@vger.kernel.org
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/11893/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      f4956f62
    • James Hogan's avatar
      MIPS: Break down cacheops.h definitions · 5fa393c8
      James Hogan authored
      Most of the cache op codes defined in cacheops.h are split into a 2-bit
      cache identifier, and a 3-bit cache op code which does largely the same
      thing semantically regardless of the cache identifier.
      
      To allow the use of these definitions by KVM for decoding cache ops,
      break the definitions down into parts where it makes sense to do so, and
      add masks for the Cache and Op field within the cache op.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: linux-mips@linux-mips.org
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: kvm@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11892/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5fa393c8
    • James Hogan's avatar
      MIPS: Use EXCCODE_ constants with set_except_vector() · 1b505def
      James Hogan authored
      The first argument to set_except_vector is the ExcCode, which we now
      have definitions for. Lets make use of them.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Gleb Natapov <gleb@kernel.org>
      Cc: linux-mips@linux-mips.org
      Cc: kvm@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/11894/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      1b505def