1. 04 7月, 2020 13 次提交
    • L
      Merge tag '5.8-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · b8e516b3
      Linus Torvalds 提交于
      Pull cifs fixes from Steve French:
       "Eight cifs/smb3 fixes, most when specifying the multiuser mount flag.
      
        Five of the fixes are for stable"
      
      * tag '5.8-rc3-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: prevent truncation from long to int in wait_for_free_credits
        cifs: Fix the target file was deleted when rename failed.
        SMB3: Honor 'posix' flag for multiuser mounts
        SMB3: Honor 'handletimeout' flag for multiuser mounts
        SMB3: Honor lease disabling for multiuser mounts
        SMB3: Honor persistent/resilient handle flags for multiuser mounts
        SMB3: Honor 'seal' flag for multiuser mounts
        cifs: Display local UID details for SMB sessions in DebugData
      b8e516b3
    • L
      Merge tag 'hwmon-for-v5.8-rc4' of... · 6f216714
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon fixes from Guenter Roeck:
      
       - Fix typo in Kconfig SENSORS_IR35221 option
      
       - Fix potential memory leak in acpi_power_meter_add()
      
       - Make sure the OVERT mask is set correctly in max6697 driver
      
       - In PMBus core, fix page vs. register when accessing fans
      
       - Mark is_visible functions static in bt1-pvt driver
      
       - Define Temp- and Volt-to-N poly as maybe-unused in bt1-pvt driver
      
      * tag 'hwmon-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (pmbus) fix a typo in Kconfig SENSORS_IR35221 option
        hwmon: (acpi_power_meter) Fix potential memory leak in acpi_power_meter_add()
        hwmon: (max6697) Make sure the OVERT mask is set correctly
        hwmon: (pmbus) Fix page vs. register when accessing fans
        hwmon: (bt1-pvt) Mark is_visible functions static
        hwmon: (bt1-pvt) Define Temp- and Volt-to-N poly as maybe-unused
      6f216714
    • L
      Merge branch 'akpm' (patches from Andrew) · bc2391e7
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "Subsystems affected by this patch series: mm/hugetlb, samples, mm/cma,
        mm/vmalloc, mm/pagealloc"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm/page_alloc: fix documentation error
        vmalloc: fix the owner argument for the new __vmalloc_node_range callers
        mm/cma.c: use exact_nid true to fix possible per-numa cma leak
        samples/vfs: avoid warning in statx override
        mm/hugetlb.c: fix pages per hugetlb calculation
      bc2391e7
    • J
      mm/page_alloc: fix documentation error · 8beeae86
      Joel Savitz 提交于
      When I increased the upper bound of the min_free_kbytes value in
      ee8eb9a5 ("mm/page_alloc: increase default min_free_kbytes bound") I
      forgot to tweak the above comment to reflect the new value.  This patch
      fixes that mistake.
      Signed-off-by: NJoel Savitz <jsavitz@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Cc: Matthew Wilcox <willy@infradead.org>
      Cc: Rafael Aquini <aquini@redhat.com>
      Cc: Fabrizio D'Angelo <fdangelo@redhat.com>
      Link: http://lkml.kernel.org/r/20200624221236.29560-1-jsavitz@redhat.comSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8beeae86
    • C
      vmalloc: fix the owner argument for the new __vmalloc_node_range callers · a3a66c38
      Christoph Hellwig 提交于
      Fix the recently added new __vmalloc_node_range callers to pass the
      correct values as the owner for display in /proc/vmallocinfo.
      
      Fixes: 800e26b8 ("x86/hyperv: allocate the hypercall page with only read and execute bits")
      Fixes: 10d5e97c ("arm64: use PAGE_KERNEL_ROX directly in alloc_insn_page")
      Fixes: 7a0e27b2 ("mm: remove vmalloc_exec")
      Reported-by: NArd Biesheuvel <ardb@kernel.org>
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Link: http://lkml.kernel.org/r/20200627075649.2455097-1-hch@lst.deSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a3a66c38
    • B
      mm/cma.c: use exact_nid true to fix possible per-numa cma leak · 40366bd7
      Barry Song 提交于
      Calling cma_declare_contiguous_nid() with false exact_nid for per-numa
      reservation can easily cause cma leak and various confusion.  For example,
      mm/hugetlb.c is trying to reserve per-numa cma for gigantic pages.  But it
      can easily leak cma and make users confused when system has memoryless
      nodes.
      
      In case the system has 4 numa nodes, and only numa node0 has memory.  if
      we set hugetlb_cma=4G in bootargs, mm/hugetlb.c will get 4 cma areas for 4
      different numa nodes.  since exact_nid=false in current code, all 4 numa
      nodes will get cma successfully from node0, but hugetlb_cma[1 to 3] will
      never be available to hugepage will only allocate memory from
      hugetlb_cma[0].
      
      In case the system has 4 numa nodes, both numa node0&2 has memory, other
      nodes have no memory.  if we set hugetlb_cma=4G in bootargs, mm/hugetlb.c
      will get 4 cma areas for 4 different numa nodes.  since exact_nid=false in
      current code, all 4 numa nodes will get cma successfully from node0 or 2,
      but hugetlb_cma[1] and [3] will never be available to hugepage as
      mm/hugetlb.c will only allocate memory from hugetlb_cma[0] and
      hugetlb_cma[2].  This causes permanent leak of the cma areas which are
      supposed to be used by memoryless node.
      
      Of cource we can workaround the issue by letting mm/hugetlb.c scan all cma
      areas in alloc_gigantic_page() even node_mask includes node0 only.  that
      means when node_mask includes node0 only, we can get page from
      hugetlb_cma[1] to hugetlb_cma[3].  But this will cause kernel crash in
      free_gigantic_page() while it wants to free page by:
      cma_release(hugetlb_cma[page_to_nid(page)], page, 1 << order)
      
      On the other hand, exact_nid=false won't consider numa distance, it might
      be not that useful to leverage cma areas on remote nodes.  I feel it is
      much simpler to make exact_nid true to make everything clear.  After that,
      memoryless nodes won't be able to reserve per-numa CMA from other nodes
      which have memory.
      
      Fixes: cf11e85f ("mm: hugetlb: optionally allocate gigantic hugepages using cma")
      Signed-off-by: NBarry Song <song.bao.hua@hisilicon.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Acked-by: NRoman Gushchin <guro@fb.com>
      Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
      Cc: Aslan Bakirov <aslan@fb.com>
      Cc: Michal Hocko <mhocko@kernel.org>
      Cc: Andreas Schaufler <andreas.schaufler@gmx.de>
      Cc: Mike Kravetz <mike.kravetz@oracle.com>
      Cc: Rik van Riel <riel@surriel.com>
      Cc: Joonsoo Kim <js1304@gmail.com>
      Cc: Robin Murphy <robin.murphy@arm.com>
      Cc: <stable@vger.kernel.org>
      Link: http://lkml.kernel.org/r/20200628074345.27228-1-song.bao.hua@hisilicon.comSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      40366bd7
    • K
      samples/vfs: avoid warning in statx override · c3eeaae9
      Kees Cook 提交于
      Something changed recently to uncover this warning:
      
        samples/vfs/test-statx.c:24:15: warning: `struct foo' declared inside parameter list will not be visible outside of this definition or declaration
           24 | #define statx foo
              |               ^~~
      
      Which is due the use of "struct statx" (here, "struct foo") in a function
      prototype argument list before it has been defined:
      
       int
       # 56 "/usr/include/x86_64-linux-gnu/bits/statx-generic.h"
          foo
       # 56 "/usr/include/x86_64-linux-gnu/bits/statx-generic.h" 3 4
                (int __dirfd, const char *__restrict __path, int __flags,
                  unsigned int __mask, struct
       # 57 "/usr/include/x86_64-linux-gnu/bits/statx-generic.h"
                                             foo
       # 57 "/usr/include/x86_64-linux-gnu/bits/statx-generic.h" 3 4
                                                   *__restrict __buf)
         __attribute__ ((__nothrow__ , __leaf__)) __attribute__ ((__nonnull__ (2, 5)));
      
      Add explicit struct before #include to avoid warning.
      
      Fixes: f1b5618e ("vfs: Add a sample program for the new mount API")
      Signed-off-by: NKees Cook <keescook@chromium.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Cc: Miklos Szeredi <mszeredi@redhat.com>
      Cc: Al Viro <viro@zeniv.linux.org.uk>
      Cc: David Howells <dhowells@redhat.com>
      Link: http://lkml.kernel.org/r/202006282213.C516EA6@keescookSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c3eeaae9
    • M
      mm/hugetlb.c: fix pages per hugetlb calculation · 1139d336
      Mike Kravetz 提交于
      The routine hpage_nr_pages() was incorrectly used to calculate the number
      of base pages in a hugetlb page.  hpage_nr_pages is designed to be called
      for THP pages and will return HPAGE_PMD_NR for hugetlb pages of any size.
      
      Due to the context in which hpage_nr_pages was called, it is unlikely to
      produce a user visible error.  The routine with the incorrect call is only
      exercised in the case of hugetlb memory error or migration.  In addition,
      this would need to be on an architecture which supports huge page sizes
      less than PMD_SIZE.  And, the vma containing the huge page would also need
      to smaller than PMD_SIZE.
      
      Fixes: c0d0381a ("hugetlbfs: use i_mmap_rwsem for more pmd sharing synchronization")
      Reported-by: NMatthew Wilcox (Oracle) <willy@infradead.org>
      Signed-off-by: NMike Kravetz <mike.kravetz@oracle.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Reviewed-by: NMatthew Wilcox (Oracle) <willy@infradead.org>
      Cc: Michal Hocko <mhocko@kernel.org>
      Cc: "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
      Cc: <stable@vger.kernel.org>
      Link: http://lkml.kernel.org/r/20200629185003.97202-1-mike.kravetz@oracle.comSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      1139d336
    • L
      Merge tag 'xfs-5.8-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 0c7d7d1f
      Linus Torvalds 提交于
      Pull xfs fix from Darrick Wong:
       "Fix a use-after-free bug when the fs shuts down"
      
      * tag 'xfs-5.8-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix use-after-free on CIL context on shutdown
      0c7d7d1f
    • L
      Merge tag 'pci-v5.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 7fec3ce5
      Linus Torvalds 提交于
      Pull PCI fix from Bjorn Helgaas:
       "Fix a pcie_find_root_port() simplification that broke power management
        because it didn't handle the edge case of finding the Root Port of a
        Root Port itself (Mika Westerberg)""
      
      * tag 'pci-v5.8-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Make pcie_find_root_port() work for Root Ports
      7fec3ce5
    • L
      Merge tag 'acpi-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 718b7a57
      Linus Torvalds 提交于
      Pull ACPI updates from Rafael Wysocki:
       "Add a new device ID for Intel Tiger Lake to the DPTF battery
        participant driver (Srinivas Pandruvada) and fix the Tiger Lake fan
        device ID (Sumeet Pawnikar)"
      
      * tag 'acpi-5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: fan: Fix Tiger Lake ACPI device ID
        ACPI: DPTF: Add battery participant for TigerLake
      718b7a57
    • L
      Merge tag 'gfs2-v5.8-rc3.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · bf2d6369
      Linus Torvalds 提交于
      Pull gfs2 fixes from Andreas Gruenbacher:
       "Various gfs2 fixes"
      
      * tag 'gfs2-v5.8-rc3.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: The freeze glock should never be frozen
        gfs2: When freezing gfs2, use GL_EXACT and not GL_NOCACHE
        gfs2: read-only mounts should grab the sd_freeze_gl glock
        gfs2: freeze should work on read-only mounts
        gfs2: eliminate GIF_ORDERED in favor of list_empty
        gfs2: Don't sleep during glock hash walk
        gfs2: fix trans slab error when withdraw occurs inside log_flush
        gfs2: Don't return NULL from gfs2_inode_lookup
      bf2d6369
    • L
      Merge tag 'drm-fixes-2020-07-03' of git://anongit.freedesktop.org/drm/drm · 1d428714
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Pretty usual rc4 pull: two usual amdgpu, i915 pulls, and some misc arm
        driver fixes.
      
        The bigger bit is including the asm sources for some GPU shaders that
        were contained in the i915 driver, otherwise it's pretty much business
        as usual.
      
        dma-buf:
         - fix a use-after-free bug
      
        amdgpu:
         - Fix for vega20 boards without RAS support
         - DC bandwidth revalidation fix
         - Fix Renoir vram info fetching
         - Fix hwmon freq printing
      
        i915:
         - GVT fixes
            - Two missed MMIO handler fixes for SKL/CFL
            - Fix mask register bits check
            - Fix one lockdep error for debugfs entry access
         - Include asm sources for render cache clear batches
      
        msm:
         - memleak fix
         - display block fix
         - address space fixes
      
        exynos:
         - error value and reference count fix
         - error print removal
      
        sun4i:
         - remove HPD polling"
      
      * tag 'drm-fixes-2020-07-03' of git://anongit.freedesktop.org/drm/drm: (22 commits)
        drm/amdgpu: use %u rather than %d for sclk/mclk
        drm/amdgpu/atomfirmware: fix vram_info fetching for renoir
        drm/amd/display: Only revalidate bandwidth on medium and fast updates
        drm: sun4i: hdmi: Remove extra HPD polling
        drm/i915: Include asm sources for {ivb, hsw}_clear_kernel.c
        drm/exynos: fix ref count leak in mic_pre_enable
        drm/exynos: Properly propagate return value in drm_iommu_attach_device()
        drm/exynos: Remove dev_err() on platform_get_irq() failure
        drm/amd/powerplay: Fix NULL dereference in lock_bus() on Vega20 w/o RAS
        dma-buf: Move dma_buf_release() from fops to dentry_ops
        drm/msm: Fix up the rest of the messed up address sizes
        drm/msm: Fix setup of a6xx create_address_space.
        drm/msm: Fix address space size after refactor.
        drm/i915/gvt: Use GFP_ATOMIC instead of GFP_KERNEL in atomic context
        drm/i915/gvt: Fix incorrect check of enabled bits in mask registers
        drm/i915/gvt: Fix two CFL MMIO handling caused by regression.
        drm/i915/gvt: Add one missing MMIO handler for D_SKL_PLUS
        drm/msm: Fix 0xfffflub in "Refactor address space initialization"
        drm/msm/dpu: allow initialization of encoder locks during encoder init
        drm/msm/dpu: fix error return code in dpu_encoder_init
        ...
      1d428714
  2. 03 7月, 2020 17 次提交
  3. 02 7月, 2020 10 次提交