1. 29 1月, 2015 2 次提交
  2. 23 1月, 2015 3 次提交
  3. 22 1月, 2015 9 次提交
  4. 15 1月, 2015 3 次提交
  5. 08 1月, 2015 13 次提交
  6. 07 1月, 2015 1 次提交
    • C
      s390/timex: fix get_tod_clock_ext() inline assembly · e38f9781
      Chen Gang 提交于
      For C language, it treats array parameter as a pointer, so sizeof for an
      array parameter is equal to sizeof for a pointer, which causes compiler
      warning (with allmodconfig by gcc 5):
      
        ./arch/s390/include/asm/timex.h: In function 'get_tod_clock_ext':
        ./arch/s390/include/asm/timex.h:76:32: warning: 'sizeof' on array function parameter 'clk' will return size of 'char *' [-Wsizeof-array-argument]
          typedef struct { char _[sizeof(clk)]; } addrtype;
                                        ^
      Can use macro CLOCK_STORE_SIZE instead of all related hard code numbers,
      which also can avoid this warning. And also add a tab to CLOCK_TICK_RATE
      definition to match coding styles.
      
      [heiko.carstens@de.ibm.com]:
      Chen's patch actually fixes a bug within the get_tod_clock_ext() inline assembly
      where we incorrectly tell the compiler that only 8 bytes of memory get changed
      instead of 16 bytes.
      This would allow gcc to generate incorrect code. Right now this doesn't seem to
      be the case.
      Also slightly changed the patch a bit.
      - renamed CLOCK_STORE_SIZE to STORE_CLOCK_EXT_SIZE
      - changed get_tod_clock_ext() to receive a char pointer parameter
      Signed-off-by: NChen Gang <gang.chen.5i5j@gmail.com>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      e38f9781
  7. 18 12月, 2014 9 次提交
    • H
      98590460
    • C
      s390/kernel: use stnsm 255 instead of stosm 0 · 81fc77fb
      Christian Borntraeger 提交于
      On some models, stnsm 255 might be slightly faster than stosm 0.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      81fc77fb
    • C
      s390/vtime: Get rid of redundant WARN_ON · 032014bc
      Christian Borntraeger 提交于
      in the cpu time accounting function vtime_account_irq_enter
      (vtime_account_system) we use a WARN_ON_ONCE(!irqs_disabled()).
      This is redundant as the function virt_timer_forward is always
      called and has a BUG_ON(!irqs_disabled()).
      
      This saves several nanoseconds in my specific testcase (KVM entry/exit)
      and probably all other callers like (soft)irq entry/exit.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      032014bc
    • H
      s390/zcrypt: kernel oops at insmod of the z90crypt device driver · 099eae11
      Harald Freudenberger 提交于
      Kernel oops caused by invalid parameter at TAPQ instruction:
      On older systems where the QCI instruction is not available
      all possible domains are probed via TAPQ instruction. The
      range for the probe has been extended with the > 16 domain
      support now leading to a possible specification exception
      when this instruction is called for probing higher values
      within the new range. This may happen during insmod and/or
      ap bus reset only on machines without a QCI instruction (z10,
      z196, z114), zEC12 and newer systems are not affected.
      The fix modifies the domain checking function to limit the
      allowed range if no QCI info is available.
      Signed-off-by: NHarald Freudenberger <freude@linux.vnet.ibm.com>
      Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
      099eae11
    • L
      Ceph: remove left-over reject file · 44e8967d
      Linus Torvalds 提交于
      Neither Sage nor I noticed that Zheng Yan had mistakenly committed
      fs/ceph/super.h.rej as part of commit 31c542a1 ("ceph: add inline
      data to pagecache").
      
      Remove it.
      Requested-by: NYan, Zheng <ukernel@gmail.com>
      Cc: Sage Weil <sweil@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      44e8967d
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 57666509
      Linus Torvalds 提交于
      Pull ceph updates from Sage Weil:
       "The big item here is support for inline data for CephFS and for
        message signatures from Zheng.  There are also several bug fixes,
        including interrupted flock request handling, 0-length xattrs, mksnap,
        cached readdir results, and a message version compat field.  Finally
        there are several cleanups from Ilya, Dan, and Markus.
      
        Note that there is another series coming soon that fixes some bugs in
        the RBD 'lingering' requests, but it isn't quite ready yet"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (27 commits)
        ceph: fix setting empty extended attribute
        ceph: fix mksnap crash
        ceph: do_sync is never initialized
        libceph: fixup includes in pagelist.h
        ceph: support inline data feature
        ceph: flush inline version
        ceph: convert inline data to normal data before data write
        ceph: sync read inline data
        ceph: fetch inline data when getting Fcr cap refs
        ceph: use getattr request to fetch inline data
        ceph: add inline data to pagecache
        ceph: parse inline data in MClientReply and MClientCaps
        libceph: specify position of extent operation
        libceph: add CREATE osd operation support
        libceph: add SETXATTR/CMPXATTR osd operations support
        rbd: don't treat CEPH_OSD_OP_DELETE as extent op
        ceph: remove unused stringification macros
        libceph: require cephx message signature by default
        ceph: introduce global empty snap context
        ceph: message versioning fixes
        ...
      57666509
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 87c31b39
      Linus Torvalds 提交于
      Pull user namespace related fixes from Eric Biederman:
       "As these are bug fixes almost all of thes changes are marked for
        backporting to stable.
      
        The first change (implicitly adding MNT_NODEV on remount) addresses a
        regression that was created when security issues with unprivileged
        remount were closed.  I go on to update the remount test to make it
        easy to detect if this issue reoccurs.
      
        Then there are a handful of mount and umount related fixes.
      
        Then half of the changes deal with the a recently discovered design
        bug in the permission checks of gid_map.  Unix since the beginning has
        allowed setting group permissions on files to less than the user and
        other permissions (aka ---rwx---rwx).  As the unix permission checks
        stop as soon as a group matches, and setgroups allows setting groups
        that can not later be dropped, results in a situtation where it is
        possible to legitimately use a group to assign fewer privileges to a
        process.  Which means dropping a group can increase a processes
        privileges.
      
        The fix I have adopted is that gid_map is now no longer writable
        without privilege unless the new file /proc/self/setgroups has been
        set to permanently disable setgroups.
      
        The bulk of user namespace using applications even the applications
        using applications using user namespaces without privilege remain
        unaffected by this change.  Unfortunately this ix breaks a couple user
        space applications, that were relying on the problematic behavior (one
        of which was tools/selftests/mount/unprivileged-remount-test.c).
      
        To hopefully prevent needing a regression fix on top of my security
        fix I rounded folks who work with the container implementations mostly
        like to be affected and encouraged them to test the changes.
      
          > So far nothing broke on my libvirt-lxc test bed. :-)
          > Tested with openSUSE 13.2 and libvirt 1.2.9.
          > Tested-by: Richard Weinberger <richard@nod.at>
      
          > Tested on Fedora20 with libvirt 1.2.11, works fine.
          > Tested-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
      
          > Ok, thanks - yes, unprivileged lxc is working fine with your kernels.
          > Just to be sure I was testing the right thing I also tested using
          > my unprivileged nsexec testcases, and they failed on setgroup/setgid
          > as now expected, and succeeded there without your patches.
          > Tested-by: Serge Hallyn <serge.hallyn@ubuntu.com>
      
          > I tested this with Sandstorm.  It breaks as is and it works if I add
          > the setgroups thing.
          > Tested-by: Andy Lutomirski <luto@amacapital.net> # breaks things as designed :("
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        userns: Unbreak the unprivileged remount tests
        userns; Correct the comment in map_write
        userns: Allow setting gid_maps without privilege when setgroups is disabled
        userns: Add a knob to disable setgroups on a per user namespace basis
        userns: Rename id_map_mutex to userns_state_mutex
        userns: Only allow the creator of the userns unprivileged mappings
        userns: Check euid no fsuid when establishing an unprivileged uid mapping
        userns: Don't allow unprivileged creation of gid mappings
        userns: Don't allow setgroups until a gid mapping has been setablished
        userns: Document what the invariant required for safe unprivileged mappings.
        groups: Consolidate the setgroups permission checks
        mnt: Clear mnt_expire during pivot_root
        mnt: Carefully set CL_UNPRIVILEGED in clone_mnt
        mnt: Move the clear of MNT_LOCKED from copy_tree to it's callers.
        umount: Do not allow unmounting rootfs.
        umount: Disallow unprivileged mount force
        mnt: Update unprivileged remount test
        mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount
      87c31b39
    • L
      mmu_gather: fix over-eager tlb_flush_mmu_free() calling · f045bbb9
      Linus Torvalds 提交于
      Dave Hansen reports that commit fb7332a9 ("mmu_gather: move minimal
      range calculations into generic code") caused a performance problem:
      
        "tlb_finish_mmu() goes up about 9x in the profiles (~0.4%->3.6%) and
         tlb_flush_mmu_free() takes about 3.1% of CPU time with the patch
         applied, but does not show up at all on the commit before"
      
      and the reason is that Will moved the test for whether we need to flush
      from tlb_flush_mmu() into tlb_flush_mmu_tlbonly().  But that meant that
      tlb_flush_mmu_free() basically lost that check.
      
      Move it back into tlb_flush_mmu() where it belongs, so that it covers
      both tlb_flush_mmu_tlbonly() _and_ tlb_flush_mmu_free().
      Reported-and-tested-by: NDave Hansen <dave@sr71.net>
      Acked-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      f045bbb9
    • L
      x86: mm: fix VM_FAULT_RETRY handling · cf3c0a15
      Linus Torvalds 提交于
      My commit 26178ec1 ("x86: mm: consolidate VM_FAULT_RETRY handling")
      had a really stupid typo: the FAULT_FLAG_USER bit is in the 'flags'
      variable, not the 'fault' variable. Duh,
      
      The one silver lining in this is that Dave finding this at least
      confirms that trinity actually triggers this special path easily, in a
      way normal use does not.
      Reported-by: NDave Jones <davej@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cf3c0a15