1. 24 Mar, 2023 3 commits
    • Darrick J. Wong's avatar
      xfs: fix mismerged tracepoints · 4dfb02d5
      Darrick J. Wong authored
      At some point in between sending this patch to the list and merging it
      into for-next, the tracepoints got all mixed up because I've
      over-reliant on automated tools not sucking.  The end result is that the
      tracepoints are all wrong, so fix them.
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      4dfb02d5
    • Darrick J. Wong's avatar
      xfs: clear incore AGFL_RESET state if it's not needed · e2e63b07
      Darrick J. Wong authored
      Prior to commit 7ac2ff8b, when we loaded the incore perag structure
      with information from the AGF header, we would set or clear the
      pagf_agfl_reset field based on whether or not the AGFL list was
      misaligned within the block.  IOWs, it's an incore state bit that's
      supposed to cache something in the ondisk metadata.  Therefore, the code
      still needs to support clearing the incore bit if (somehow) the AGFL
      were to correct itself.
      
      It turns out that xfs_repair does exactly this -- phase 4 loads the AGF
      to scan the rmapbt for corrupt records, which can set NEEDS_AGFL_RESET.
      The scan unsets AGF_INIT but doesn't unset NEEDS_AGFL_RESET.  Phase 5
      totally rewrites the AGFL and fixes the alignment problem, didn't clear
      NEEDS_AGFL_RESET historically, and reloads the perag state to fix the
      freelist.  This results in the AGFL being reset based on stale data,
      which then causes the new AGFL blocks to be leaked.  A subsequent
      xfs_repair -n then complains about the leaks.
      
      One could argue that phase 5 ought to clear this bit directly when it
      reloads the perag AGF data after rewriting the AGFL, but libxfs used to
      handle this for us, so it should go back to doing that.
      
      Found by fuzzing flfirst = ones in xfs/352.
      
      Fixes: 7ac2ff8b ("xfs: perags need atomic operational state")
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      e2e63b07
    • Darrick J. Wong's avatar
      xfs: pass the correct cursor to xfs_iomap_prealloc_size · fcde88af
      Darrick J. Wong authored
      In xfs_buffered_write_iomap_begin, @icur is the iext cursor for the data
      fork and @ccur is the cursor for the cow fork.  Pass in whichever cursor
      corresponds to allocfork, because otherwise the xfs_iext_prev_extent
      call can use the data fork cursor to walk off the end of the cow fork
      structure.  Best case it returns the wrong results, worst case it does
      this:
      
      stack segment: 0000 [#1] PREEMPT SMP
      CPU: 2 PID: 3141909 Comm: fsstress Tainted: G        W          6.3.0-rc2-xfsx #6.3.0-rc2 7bf5cc2e98997627cae5c930d890aba3aeec65dd
      Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS ?-20171121_152543-x86-ol7-builder-01.us.oracle.com-4.el7.1 04/01/2014
      RIP: 0010:xfs_iext_prev+0x71/0x150 [xfs]
      RSP: 0018:ffffc90002233aa8 EFLAGS: 00010297
      RAX: 000000000000000f RBX: 000000000000000e RCX: 000000000000000c
      RDX: 0000000000000002 RSI: 000000000000000e RDI: ffff8883d0019ba0
      RBP: 989642409af8a7a7 R08: ffffea0000000001 R09: 0000000000000002
      R10: 0000000000000000 R11: 000000000000000c R12: ffffc90002233b00
      R13: ffff8883d0019ba0 R14: 989642409af8a6bf R15: 000ffffffffe0000
      FS:  00007fdf8115f740(0000) GS:ffff88843fd00000(0000) knlGS:0000000000000000
      CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
      CR2: 00007fdf8115e000 CR3: 0000000357256000 CR4: 00000000003506e0
      Call Trace:
       <TASK>
       xfs_iomap_prealloc_size.constprop.0.isra.0+0x1a6/0x410 [xfs 619a268fb2406d68bd34e007a816b27e70abc22c]
       xfs_buffered_write_iomap_begin+0xa87/0xc60 [xfs 619a268fb2406d68bd34e007a816b27e70abc22c]
       iomap_iter+0x132/0x2f0
       iomap_file_buffered_write+0x92/0x330
       xfs_file_buffered_write+0xb1/0x330 [xfs 619a268fb2406d68bd34e007a816b27e70abc22c]
       vfs_write+0x2eb/0x410
       ksys_write+0x65/0xe0
       do_syscall_64+0x2b/0x80
       entry_SYSCALL_64_after_hwframe+0x46/0xb0
      
      Found by xfs/538 in alwayscow mode, but this doesn't seem particular to
      that test.
      
      Fixes: 590b1651 ("xfs: refactor xfs_iomap_prealloc_size")
      Actually-Fixes: 66ae56a5 ("xfs: introduce an always_cow mode")
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      fcde88af
  2. 19 Mar, 2023 7 commits
    • Dave Chinner's avatar
      pcpcntr: remove percpu_counter_sum_all() · e9b60c7f
      Dave Chinner authored
      percpu_counter_sum_all() is now redundant as the race condition it
      was invented to handle is now dealt with by percpu_counter_sum()
      directly and all users of percpu_counter_sum_all() have been
      removed.
      
      Remove it.
      
      This effectively reverts the changes made in f689054a
      ("percpu_counter: add percpu_counter_sum_all interface") except for
      the cpumask iteration that fixes percpu_counter_sum() made earlier
      in this series.
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      e9b60c7f
    • Dave Chinner's avatar
      fork: remove use of percpu_counter_sum_all · 7ba85fba
      Dave Chinner authored
      This effectively reverts the change made in commit f689054a
      ("percpu_counter: add percpu_counter_sum_all interface") as the
      race condition percpu_counter_sum_all() was invented to avoid is
      now handled directly in percpu_counter_sum() and nobody needs to
      care about summing racing with cpu unplug anymore.
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      7ba85fba
    • Dave Chinner's avatar
      pcpcntrs: fix dying cpu summation race · 8b57b11c
      Dave Chinner authored
      In commit f689054a ("percpu_counter: add percpu_counter_sum_all
      interface") a race condition between a cpu dying and
      percpu_counter_sum() iterating online CPUs was identified. The
      solution was to iterate all possible CPUs for summation via
      percpu_counter_sum_all().
      
      We recently had a percpu_counter_sum() call in XFS trip over this
      same race condition and it fired a debug assert because the
      filesystem was unmounting and the counter *should* be zero just
      before we destroy it. That was reported here:
      
      https://lore.kernel.org/linux-kernel/20230314090649.326642-1-yebin@huaweicloud.com/
      
      likely as a result of running generic/648 which exercises
      filesystems in the presence of CPU online/offline events.
      
      The solution to use percpu_counter_sum_all() is an awful one. We
      use percpu counters and percpu_counter_sum() for accurate and
      reliable threshold detection for space management, so a summation
      race condition during these operations can result in overcommit of
      available space and that may result in filesystem shutdowns.
      
      As percpu_counter_sum_all() iterates all possible CPUs rather than
      just those online or even those present, the mask can include CPUs
      that aren't even installed in the machine, or in the case of
      machines that can hot-plug CPU capable nodes, even have physical
      sockets present in the machine.
      
      Fundamentally, this race condition is caused by the CPU being
      offlined being removed from the cpu_online_mask before the notifier
      that cleans up per-cpu state is run. Hence percpu_counter_sum() will
      not sum the count for a cpu currently being taken offline,
      regardless of whether the notifier has run or not. This is
      the root cause of the bug.
      
      The percpu counter notifier iterates all the registered counters,
      locks the counter and moves the percpu count to the global sum.
      This is serialised against other operations that move the percpu
      counter to the global sum as well as percpu_counter_sum() operations
      that sum the percpu counts while holding the counter lock.
      
      Hence the notifier is safe to run concurrently with sum operations,
      and the only thing we actually need to care about is that
      percpu_counter_sum() iterates dying CPUs. That's trivial to do,
      and when there are no CPUs dying, it has no addition overhead except
      for a cpumask_or() operation.
      
      This change makes percpu_counter_sum() always do the right thing in
      the presence of CPU hot unplug events and makes
      percpu_counter_sum_all() unnecessary. This, in turn, means that
      filesystems like XFS, ext4, and btrfs don't have to work out when
      they should use percpu_counter_sum() vs percpu_counter_sum_all() in
      their space accounting algorithms
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      8b57b11c
    • Dave Chinner's avatar
      cpumask: introduce for_each_cpu_or · 1470afef
      Dave Chinner authored
      Equivalent of for_each_cpu_and, except it ORs the two masks together
      so it iterates all the CPUs present in either mask.
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      1470afef
    • Darrick J. Wong's avatar
      xfs: test dir/attr hash when loading module · 3cfb9290
      Darrick J. Wong authored
      Back in the 6.2-rc1 days, Eric Whitney reported a fstests regression in
      ext4 against generic/454.  The cause of this test failure was the
      unfortunate combination of setting an xattr name containing UTF8 encoded
      emoji, an xattr hash function that accepted a char pointer with no
      explicit signedness, signed type extension of those chars to an int, and
      the 6.2 build tools maintainers deciding to mandate -funsigned-char
      across the board.  As a result, the ondisk extended attribute structure
      written out by 6.1 and 6.2 were not the same.
      
      This discrepancy, in fact, had been noticeable if a filesystem with such
      an xattr were moved between any two architectures that don't employ the
      same signedness of a raw "char" declaration.  The only reason anyone
      noticed is that x86 gcc defaults to signed, and no such -funsigned-char
      update was made to e2fsprogs, so e2fsck immediately started reporting
      data corruption.
      
      After a day and a half of discussing how to handle this use case (xattrs
      with bit 7 set anywhere in the name) without breaking existing users,
      Linus merged his own patch and didn't tell the maintainer.  None of the
      ext4 developers realized this until AUTOSEL announced that the commit
      had been backported to stable.
      
      In the end, this problem could have been detected much earlier if there
      had been any useful tests of hash function(s) in use inside ext4 to make
      sure that they always produce the same outputs given the same inputs.
      
      The XFS dirent/xattr name hash takes a uint8_t*, so I don't think it's
      vulnerable to this problem.  However, let's avoid all this drama by
      adding our own self test to check that the da hash produces the same
      outputs for a static pile of inputs on various platforms.  This enables
      us to fix any breakage that may result in a controlled fashion.  The
      buffer and test data are identical to the patches submitted to xfsprogs.
      
      Link: https://lore.kernel.org/linux-ext4/Y8bpkm3jA3bDm3eL@debian-BULLSEYE-live-builder-AMD64/
      Link: https://lore.kernel.org/linux-xfs/ZBUKCRR7xvIqPrpX@destitution/T/#md38272cc684e2c0d61494435ccbb91f022e8dee4Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
      3cfb9290
    • Darrick J. Wong's avatar
      xfs: add tracepoints for each of the externally visible allocators · e6fbb716
      Darrick J. Wong authored
      There are now five separate space allocator interfaces exposed to the
      rest of XFS for five different strategies to find space.  Add
      tracepoints for each of them so that I can tell from a trace dump
      exactly which ones got called and what happened underneath them.  Add a
      sixth so it's more obvious if an allocation actually happened.
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
      e6fbb716
    • Darrick J. Wong's avatar
      xfs: walk all AGs if TRYLOCK passed to xfs_alloc_vextent_iterate_ags · 9eb77596
      Darrick J. Wong authored
      Callers of xfs_alloc_vextent_iterate_ags that pass in the TRYLOCK flag
      want us to perform a non-blocking scan of the AGs for free space.  There
      are no ordering constraints for non-blocking AGF lock acquisition, so
      the scan can freely start over at AG 0 even when minimum_agno > 0.
      
      This manifests fairly reliably on xfs/294 on 6.3-rc2 with the parent
      pointer patchset applied and the realtime volume enabled.  I observed
      the following sequence as part of an xfs_dir_createname call:
      
      0. Fragment the free space, then allocate nearly all the free space in
         all AGs except AG 0.
      
      1. Create a directory in AG 2 and let it grow for a while.
      
      2. Try to allocate 2 blocks to expand the dirent part of a directory.
         The space will be allocated out of AG 0, but the allocation will not
         be contiguous.  This (I think) activates the LOWMODE allocator.
      
      3. The bmapi call decides to convert from extents to bmbt format and
         tries to allocate 1 block.  This allocation request calls
         xfs_alloc_vextent_start_ag with the inode number, which starts the
         scan at AG 2.  We ignore AG 0 (with all its free space) and instead
         scrape AG 2 and 3 for more space.  We find one block, but this now
         kicks t_highest_agno to 3.
      
      4. The createname call decides it needs to split the dabtree.  It tries
         to allocate even more space with xfs_alloc_vextent_start_ag, but now
         we're constrained to AG 3, and we don't find the space.  The
         createname returns ENOSPC and the filesystem shuts down.
      
      This change fixes the problem by making the trylock scan wrap around to
      AG 0 if it doesn't like the AGs that it finds.  Since the current
      transaction itself holds AGF 0, the trylock of AGF 0 will succeed, and
      we take space from the AG that has plenty.
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
      9eb77596
  3. 16 Mar, 2023 1 commit
  4. 05 Mar, 2023 11 commits
    • Dave Chinner's avatar
      xfs: fix off-by-one-block in xfs_discard_folio() · 8ac5b996
      Dave Chinner authored
      The recent writeback corruption fixes changed the code in
      xfs_discard_folio() to calculate a byte range to for punching
      delalloc extents. A mistake was made in using round_up(pos) for the
      end offset, because when pos points at the first byte of a block, it
      does not get rounded up to point to the end byte of the block. hence
      the punch range is short, and this leads to unexpected behaviour in
      certain cases in xfs_bmap_punch_delalloc_range.
      
      e.g. pos = 0 means we call xfs_bmap_punch_delalloc_range(0,0), so
      there is no previous extent and it rounds up the punch to the end of
      the delalloc extent it found at offset 0, not the end of the range
      given to xfs_bmap_punch_delalloc_range().
      
      Fix this by handling the zero block offset case correctly.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=217030
      Link: https://lore.kernel.org/linux-xfs/Y+vOfaxIWX1c%2Fyy9@bfoster/
      Fixes: 7348b322 ("xfs: xfs_bmap_punch_delalloc_range() should take a byte range")
      Reported-by: default avatarPengfei Xu <pengfei.xu@intel.com>
      Found-by: default avatarBrian Foster <bfoster@redhat.com>
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      8ac5b996
    • Dave Chinner's avatar
      xfs: quotacheck failure can race with background inode inactivation · 0c7273e4
      Dave Chinner authored
      The background inode inactivation can attached dquots to inodes, but
      this can race with a foreground quotacheck failure that leads to
      disabling quotas and freeing the mp->m_quotainfo structure. The
      background inode inactivation then tries to allocate a quota, tries
      to dereference mp->m_quotainfo, and crashes like so:
      
      XFS (loop1): Quotacheck: Unsuccessful (Error -5): Disabling quotas.
      xfs filesystem being mounted at /root/syzkaller.qCVHXV/0/file0 supports timestamps until 2038 (0x7fffffff)
      BUG: kernel NULL pointer dereference, address: 00000000000002a8
      ....
      CPU: 0 PID: 161 Comm: kworker/0:4 Not tainted 6.2.0-c9c3395d #1
      Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.0-0-gd239552ce722-prebuilt.qemu.org 04/01/2014
      Workqueue: xfs-inodegc/loop1 xfs_inodegc_worker
      RIP: 0010:xfs_dquot_alloc+0x95/0x1e0
      ....
      Call Trace:
       <TASK>
       xfs_qm_dqread+0x46/0x440
       xfs_qm_dqget_inode+0x154/0x500
       xfs_qm_dqattach_one+0x142/0x3c0
       xfs_qm_dqattach_locked+0x14a/0x170
       xfs_qm_dqattach+0x52/0x80
       xfs_inactive+0x186/0x340
       xfs_inodegc_worker+0xd3/0x430
       process_one_work+0x3b1/0x960
       worker_thread+0x52/0x660
       kthread+0x161/0x1a0
       ret_from_fork+0x29/0x50
       </TASK>
      ....
      
      Prevent this race by flushing all the queued background inode
      inactivations pending before purging all the cached dquots when
      quotacheck fails.
      Reported-by: default avatarPengfei Xu <pengfei.xu@intel.com>
      Signed-off-by: default avatarDave Chinner <dchinner@redhat.com>
      Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
      Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
      0c7273e4
    • Linus Torvalds's avatar
      Linux 6.3-rc1 · fe15c26e
      Linus Torvalds authored
      fe15c26e
    • Linus Torvalds's avatar
      cpumask: re-introduce constant-sized cpumask optimizations · 596ff4a0
      Linus Torvalds authored
      Commit aa47a7c2 ("lib/cpumask: deprecate nr_cpumask_bits") resulted
      in the cpumask operations potentially becoming hugely less efficient,
      because suddenly the cpumask was always considered to be variable-sized.
      
      The optimization was then later added back in a limited form by commit
      6f9c07be ("lib/cpumask: add FORCE_NR_CPUS config option"), but that
      FORCE_NR_CPUS option is not useful in a generic kernel and more of a
      special case for embedded situations with fixed hardware.
      
      Instead, just re-introduce the optimization, with some changes.
      
      Instead of depending on CPUMASK_OFFSTACK being false, and then always
      using the full constant cpumask width, this introduces three different
      cpumask "sizes":
      
       - the exact size (nr_cpumask_bits) remains identical to nr_cpu_ids.
      
         This is used for situations where we should use the exact size.
      
       - the "small" size (small_cpumask_bits) is the NR_CPUS constant if it
         fits in a single word and the bitmap operations thus end up able
         to trigger the "small_const_nbits()" optimizations.
      
         This is used for the operations that have optimized single-word
         cases that get inlined, notably the bit find and scanning functions.
      
       - the "large" size (large_cpumask_bits) is the NR_CPUS constant if it
         is an sufficiently small constant that makes simple "copy" and
         "clear" operations more efficient.
      
         This is arbitrarily set at four words or less.
      
      As a an example of this situation, without this fixed size optimization,
      cpumask_clear() will generate code like
      
              movl    nr_cpu_ids(%rip), %edx
              addq    $63, %rdx
              shrq    $3, %rdx
              andl    $-8, %edx
              callq   memset@PLT
      
      on x86-64, because it would calculate the "exact" number of longwords
      that need to be cleared.
      
      In contrast, with this patch, using a MAX_CPU of 64 (which is quite a
      reasonable value to use), the above becomes a single
      
      	movq $0,cpumask
      
      instruction instead, because instead of caring to figure out exactly how
      many CPU's the system has, it just knows that the cpumask will be a
      single word and can just clear it all.
      
      Note that this does end up tightening the rules a bit from the original
      version in another way: operations that set bits in the cpumask are now
      limited to the actual nr_cpu_ids limit, whereas we used to do the
      nr_cpumask_bits thing almost everywhere in the cpumask code.
      
      But if you just clear bits, or scan for bits, we can use the simpler
      compile-time constants.
      
      In the process, remove 'cpumask_complement()' and 'for_each_cpu_not()'
      which were not useful, and which fundamentally have to be limited to
      'nr_cpu_ids'.  Better remove them now than have somebody introduce use
      of them later.
      
      Of course, on x86-64 with MAXSMP there is no sane small compile-time
      constant for the cpumask sizes, and we end up using the actual CPU bits,
      and will generate the above kind of horrors regardless.  Please don't
      use MAXSMP unless you really expect to have machines with thousands of
      cores.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      596ff4a0
    • Linus Torvalds's avatar
      Merge tag 'v6.3-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · f915322f
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "Fix a regression in the caam driver"
      
      * tag 'v6.3-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: caam - Fix edesc/iv ordering mixup
      f915322f
    • Linus Torvalds's avatar
      Merge tag 'x86-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7f9ec7d8
      Linus Torvalds authored
      Pull x86 updates from Thomas Gleixner:
       "A small set of updates for x86:
      
         - Return -EIO instead of success when the certificate buffer for SEV
           guests is not large enough
      
         - Allow STIPB to be enabled with legacy IBSR. Legacy IBRS is cleared
           on return to userspace for performance reasons, but the leaves user
           space vulnerable to cross-thread attacks which STIBP prevents.
           Update the documentation accordingly"
      
      * tag 'x86-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        virt/sev-guest: Return -EIO if certificate buffer is not large enough
        Documentation/hw-vuln: Document the interaction between IBRS and STIBP
        x86/speculation: Allow enabling STIBP with legacy IBRS
      7f9ec7d8
    • Linus Torvalds's avatar
      Merge tag 'irq-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4e9c542c
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "A set of updates for the interrupt susbsystem:
      
         - Prevent possible NULL pointer derefences in
           irq_data_get_affinity_mask() and irq_domain_create_hierarchy()
      
         - Take the per device MSI lock before invoking code which relies on
           it being hold
      
         - Make sure that MSI descriptors are unreferenced before freeing
           them. This was overlooked when the platform MSI code was converted
           to use core infrastructure and results in a fals positive warning
      
         - Remove dead code in the MSI subsystem
      
         - Clarify the documentation for pci_msix_free_irq()
      
         - More kobj_type constification"
      
      * tag 'irq-urgent-2023-03-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        genirq/msi, platform-msi: Ensure that MSI descriptors are unreferenced
        genirq/msi: Drop dead domain name assignment
        irqdomain: Add missing NULL pointer check in irq_domain_create_hierarchy()
        genirq/irqdesc: Make kobj_type structures constant
        PCI/MSI: Clarify usage of pci_msix_free_irq()
        genirq/msi: Take the per-device MSI lock before validating the control structure
        genirq/ipi: Fix NULL pointer deref in irq_data_get_affinity_mask()
      4e9c542c
    • Linus Torvalds's avatar
      Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 1a90673e
      Linus Torvalds authored
      Pull vfs update from Al Viro:
       "Adding Christian Brauner as VFS co-maintainer"
      
      * tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        Adding VFS co-maintainer
      1a90673e
    • Linus Torvalds's avatar
      Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 1a8d05a7
      Linus Torvalds authored
      Pull VM_FAULT_RETRY fixes from Al Viro:
       "Some of the page fault handlers do not deal with the following case
        correctly:
      
         - handle_mm_fault() has returned VM_FAULT_RETRY
      
         - there is a pending fatal signal
      
         - fault had happened in kernel mode
      
        Correct action in such case is not "return unconditionally" - fatal
        signals are handled only upon return to userland and something like
        copy_to_user() would end up retrying the faulting instruction and
        triggering the same fault again and again.
      
        What we need to do in such case is to make the caller to treat that as
        failed uaccess attempt - handle exception if there is an exception
        handler for faulting instruction or oops if there isn't one.
      
        Over the years some architectures had been fixed and now are handling
        that case properly; some still do not. This series should fix the
        remaining ones.
      
        Status:
      
         - m68k, riscv, hexagon, parisc: tested/acked by maintainers.
      
         - alpha, sparc32, sparc64: tested locally - bug has been reproduced
           on the unpatched kernel and verified to be fixed by this series.
      
         - ia64, microblaze, nios2, openrisc: build, but otherwise completely
           untested"
      
      * tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        openrisc: fix livelock in uaccess
        nios2: fix livelock in uaccess
        microblaze: fix livelock in uaccess
        ia64: fix livelock in uaccess
        sparc: fix livelock in uaccess
        alpha: fix livelock in uaccess
        parisc: fix livelock in uaccess
        hexagon: fix livelock in uaccess
        riscv: fix livelock in uaccess
        m68k: fix livelock in uaccess
      1a8d05a7
    • Masahiro Yamada's avatar
      Remove Intel compiler support · 95207db8
      Masahiro Yamada authored
      include/linux/compiler-intel.h had no update in the past 3 years.
      
      We often forget about the third C compiler to build the kernel.
      
      For example, commit a0a12c3e ("asm goto: eradicate CC_HAS_ASM_GOTO")
      only mentioned GCC and Clang.
      
      init/Kconfig defines CC_IS_GCC and CC_IS_CLANG but not CC_IS_ICC,
      and nobody has reported any issue.
      
      I guess the Intel Compiler support is broken, and nobody is caring
      about it.
      
      Harald Arnesen pointed out ICC (classic Intel C/C++ compiler) is
      deprecated:
      
          $ icc -v
          icc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is
          deprecated and will be removed from product release in the second half
          of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommended
          compiler moving forward. Please transition to use this compiler. Use
          '-diag-disable=10441' to disable this message.
          icc version 2021.7.0 (gcc version 12.1.0 compatibility)
      
      Arnd Bergmann provided a link to the article, "Intel C/C++ compilers
      complete adoption of LLVM".
      
      lib/zstd/common/compiler.h and lib/zstd/compress/zstd_fast.c were kept
      untouched for better sync with https://github.com/facebook/zstd
      
      Link: https://www.intel.com/content/www/us/en/developer/articles/technical/adoption-of-llvm-complete-icx.htmlSigned-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Reviewed-by: default avatarNick Desaulniers <ndesaulniers@google.com>
      Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
      Reviewed-by: default avatarMiguel Ojeda <ojeda@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      95207db8
    • Al Viro's avatar
      Adding VFS co-maintainer · 3304f18b
      Al Viro authored
      Acked-by: default avatarChristian Brauner <brauner@kernel.org>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      3304f18b
  5. 04 Mar, 2023 8 commits
    • Linus Torvalds's avatar
      Merge tag 'i2c-for-6.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · b01fe98d
      Linus Torvalds authored
      Pull more i2c updates from Wolfram Sang:
       "Some improvements/fixes for the newly added GXP driver and a Kconfig
        dependency fix"
      
      * tag 'i2c-for-6.3-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: gxp: fix an error code in probe
        i2c: gxp: return proper error on address NACK
        i2c: gxp: remove "empty" switch statement
        i2c: Disable I2C_APPLE when I2C_PASEMI is a builtin
      b01fe98d
    • Linus Torvalds's avatar
      mm: avoid gcc complaint about pointer casting · e77d587a
      Linus Torvalds authored
      The migration code ends up temporarily stashing information of the wrong
      type in unused fields of the newly allocated destination folio.  That
      all works fine, but gcc does complain about the pointer type mis-use:
      
          mm/migrate.c: In function ‘__migrate_folio_extract’:
          mm/migrate.c:1050:20: note: randstruct: casting between randomized structure pointer types (ssa): ‘struct anon_vma’ and ‘struct address_space’
      
           1050 |         *anon_vmap = (void *)dst->mapping;
                |         ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~
      
      and gcc is actually right to complain since it really doesn't understand
      that this is a very temporary special case where this is ok.
      
      This could be fixed in different ways by just obfuscating the assignment
      sufficiently that gcc doesn't see what is going on, but the truly
      "proper C" way to do this is by explicitly using a union.
      
      Using unions for type conversions like this is normally hugely ugly and
      syntactically nasty, but this really is one of the few cases where we
      want to make it clear that we're not doing type conversion, we're really
      re-using the value bit-for-bit just using another type.
      
      IOW, this should not become a common pattern, but in this one case using
      that odd union is probably the best way to document to the compiler what
      is conceptually going on here.
      
      [ Side note: there are valid cases where we convert pointers to other
        pointer types, notably the whole "folio vs page" situation, where the
        types actually have fundamental commonalities.
      
        The fact that the gcc note is limited to just randomized structures
        means that we don't see equivalent warnings for those cases, but it
        migth also mean that we miss other cases where we do play these kinds
        of dodgy games, and this kind of explicit conversion might be a good
        idea. ]
      
      I verified that at least for an allmodconfig build on x86-64, this
      generates the exact same code, apart from line numbers and assembler
      comment changes.
      
      Fixes: 64c8902e ("migrate_pages: split unmap_and_move() to _unmap() and _move()")
      Cc: Huang, Ying <ying.huang@intel.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e77d587a
    • Linus Torvalds's avatar
      Merge tag 'mm-hotfixes-stable-2023-03-04-13-12' of... · 20fdfd55
      Linus Torvalds authored
      Merge tag 'mm-hotfixes-stable-2023-03-04-13-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
      
      Pull misc fixes from Andrew Morton:
       "17 hotfixes.
      
        Eight are for MM and seven are for other parts of the kernel. Seven
        are cc:stable and eight address post-6.3 issues or were judged
        unsuitable for -stable backporting"
      
      * tag 'mm-hotfixes-stable-2023-03-04-13-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
        mailmap: map Dikshita Agarwal's old address to his current one
        mailmap: map Vikash Garodia's old address to his current one
        fs/cramfs/inode.c: initialize file_ra_state
        fs: hfsplus: fix UAF issue in hfsplus_put_super
        panic: fix the panic_print NMI backtrace setting
        lib: parser: update documentation for match_NUMBER functions
        kasan, x86: don't rename memintrinsics in uninstrumented files
        kasan: test: fix test for new meminstrinsic instrumentation
        kasan: treat meminstrinsic as builtins in uninstrumented files
        kasan: emit different calls for instrumentable memintrinsics
        ocfs2: fix non-auto defrag path not working issue
        ocfs2: fix defrag path triggering jbd2 ASSERT
        mailmap: map Georgi Djakov's old Linaro address to his current one
        mm/hwpoison: convert TTU_IGNORE_HWPOISON to TTU_HWPOISON
        lib/zlib: DFLTCC deflate does not write all available bits for Z_NO_FLUSH
        mm/damon/paddr: fix missing folio_put()
        mm/mremap: fix dup_anon_vma() in vma_merge() case 4
      20fdfd55
    • Linus Torvalds's avatar
      Merge tag 'powerpc-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · c29214bc
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
      
       - Drop orphaned VAS MAINTAINERS entry
      
       - Fix build errors with clang and KCSAN
      
       - Avoid build errors seen with LD_DEAD_CODE_DATA_ELIMINATION together
         with recordmcount
      
      Thanks to Nathan Chancellor.
      
      * tag 'powerpc-6.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc: Avoid dead code/data elimination when using recordmcount
        powerpc/vmlinux.lds: Add .text.asan/tsan sections
        powerpc: Drop orphaned VAS MAINTAINERS entry
      c29214bc
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · d172859e
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A collection of various small fixes that have been gathered since the
        last PR.
      
        The majority of changes are for ASoC, and there is a small change in
        ASoC PCM core, but the rest are all for driver- specific fixes /
        quirks / updates"
      
      * tag 'sound-fix-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (32 commits)
        ALSA: ice1712: Delete unreachable code in aureon_add_controls()
        ALSA: ice1712: Do not left ice->gpio_mutex locked in aureon_add_controls()
        ALSA: hda/realtek: Add quirk for HP EliteDesk 800 G6 Tower PC
        ALSA: hda/realtek: Improve support for Dell Precision 3260
        ASoC: mediatek: mt8195: add missing initialization
        ASoC: mediatek: mt8188: add missing initialization
        ASoC: amd: yc: Add DMI entries to support HP OMEN 16-n0xxx (8A43)
        ASoC: zl38060 add gpiolib dependency
        ASoC: sam9g20ek: Disable capture unless building with microphone input
        ASoC: mt8192: Fix range for sidetone positive gain
        ASoC: mt8192: Report an error if when an invalid sidetone gain is written
        ASoC: mt8192: Fix event generation for controls
        ASoC: mt8192: Remove spammy log messages
        ASoC: mchp-pdmc: fix poc noise at capture startup
        ASoC: dt-bindings: sama7g5-pdmc: add microchip,startup-delay-us binding
        ASoC: soc-pcm: add option to start DMA after DAI
        ASoC: mt8183: Fix event generation for I2S DAI operations
        ASoC: mt8183: Remove spammy logging from I2S DAI driver
        ASoC: mt6358: Remove undefined HPx Mux enumeration values
        ASoC: mt6358: Validate Wake on Voice 2 writes
        ...
      d172859e
    • Linus Torvalds's avatar
      Merge tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 0988a0ea
      Linus Torvalds authored
      Pull more power supply updates from Sebastian Reichel:
      
       - Fix DT binding for Richtek RT9467
      
       - Fix a NULL pointer check in the power-supply core
      
       - Document meaning of absent "present" property
      
      * tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        dt-bindings: power: supply: Revise Richtek RT9467 compatible name
        ABI: testing: sysfs-class-power: Document absence of "present" property
        power: supply: fix null pointer check order in __power_supply_register
      0988a0ea
    • Linus Torvalds's avatar
      Merge tag '6.3-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6 · 3162745a
      Linus Torvalds authored
      Pull more cifs updates from Steve French:
      
       - xfstest generic/208 fix (memory leak)
      
       - minor netfs fix (to address smatch warning)
      
       - a DFS fix for stable
      
       - a reconnect race fix
      
       - two multichannel fixes
      
       - RDMA (smbdirect) fix
      
       - two additional writeback fixes from David
      
      * tag '6.3-rc-smb3-client-fixes-part2' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: Fix memory leak in direct I/O
        cifs: prevent data race in cifs_reconnect_tcon()
        cifs: improve checking of DFS links over STATUS_OBJECT_NAME_INVALID
        iov: Fix netfs_extract_user_to_sg()
        cifs: Fix cifs_write_back_from_locked_folio()
        cifs: reuse cifs_match_ipaddr for comparison of dstaddr too
        cifs: match even the scope id for ipv6 addresses
        cifs: Fix an uninitialised variable
        cifs: Add some missing xas_retry() calls
      3162745a
    • Linus Torvalds's avatar
      umh: simplify the capability pointer logic · e7783615
      Linus Torvalds authored
      The usermodehelper code uses two fake pointers for the two capability
      cases: CAP_BSET for reading and writing 'usermodehelper_bset', and
      CAP_PI to read and write 'usermodehelper_inheritable'.
      
      This seems to be a completely unnecessary indirection, since we could
      instead just use the pointers themselves, and never have to do any "if
      this then that" kind of logic.
      
      So just get rid of the fake pointer values, and use the real pointer
      values instead.
      Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
      Cc: Eric Biederman <ebiederm@xmission.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Kees Cook <keescook@chromium.org>
      Cc: Iurii Zaikin <yzaikin@google.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e7783615
  6. 03 Mar, 2023 10 commits
    • Linus Torvalds's avatar
      Merge tag 'cocci-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux · fb35342f
      Linus Torvalds authored
      Pull coccinelle updates from Julia Lawall:
       "Changes in make coccicheck and improve a semantic patch
      
        This makes a couple of changes in make coccicheck related to shell
        commands.
      
        It also updates the api/atomic_as_refcounter semantic patch to include
        WARNING in the output message, as done in other cases"
      
      * tag 'cocci-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux:
        scripts: coccicheck: Use /usr/bin/env
        scripts: coccicheck: Avoid warning about spurious escape
        coccinelle: api/atomic_as_refcounter: include message type in output
      fb35342f
    • Linus Torvalds's avatar
      Merge tag 'rust-fixes-6.3-rc1' of https://github.com/Rust-for-Linux/linux · 34c108a0
      Linus Torvalds authored
      Pull Rust fix from Miguel Ojeda:
       "A single build error fix: there was a change during the merge window
        to a C header parsed by the Rust bindings generator, introducing a
        type that it does not handle well.
      
        The fix tells the generator to treat the type as opaque (for now)"
      
      * tag 'rust-fixes-6.3-rc1' of https://github.com/Rust-for-Linux/linux:
        rust: bindgen: Add `alt_instr` as opaque type
      34c108a0
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 06caa751
      Linus Torvalds authored
      Pull more SCSI updates from James Bottomley:
       "Updates that missed the first pull, mostly because of needing more
        soak time.
      
        Driver updates (zfcp, ufs, mpi3mr, plus two ipr bug fixes), an
        enclosure services (ses) update (mostly bug fixes) and other minor bug
        fixes and changes"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (32 commits)
        scsi: zfcp: Trace when request remove fails after qdio send fails
        scsi: zfcp: Change the type of all fsf request id fields and variables to u64
        scsi: zfcp: Make the type for accessing request hashtable buckets size_t
        scsi: ufs: core: Simplify ufshcd_execute_start_stop()
        scsi: ufs: core: Rely on the block layer for setting RQF_PM
        scsi: core: Extend struct scsi_exec_args
        scsi: lpfc: Fix double word in comments
        scsi: core: Remove the /proc/scsi/${proc_name} directory earlier
        scsi: core: Fix a source code comment
        scsi: cxgbi: Remove unneeded version.h include
        scsi: qedi: Remove unneeded version.h include
        scsi: mpi3mr: Remove unneeded version.h include
        scsi: mpi3mr: Fix missing mrioc->evtack_cmds initialization
        scsi: mpi3mr: Use number of bits to manage bitmap sizes
        scsi: mpi3mr: Remove unnecessary memcpy() to alltgt_info->dmi
        scsi: mpi3mr: Fix issues in mpi3mr_get_all_tgt_info()
        scsi: mpi3mr: Fix an issue found by KASAN
        scsi: mpi3mr: Replace 1-element array with flex-array
        scsi: ipr: Work around fortify-string warning
        scsi: ipr: Make ipr_probe_ioa_part2() return void
        ...
      06caa751
    • Dan Carpenter's avatar
      i2c: gxp: fix an error code in probe · 65609d32
      Dan Carpenter authored
      This is passing IS_ERR() instead of PTR_ERR() so instead of an error
      code it prints and returns the number 1.
      
      Fixes: 4a55ed6f ("i2c: Add GXP SoC I2C Controller")
      Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
      Reviewed-by: default avatarNick Hawkins <nick.hawkins@hpe.com>
      Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
      65609d32
    • Wolfram Sang's avatar
      i2c: gxp: return proper error on address NACK · 4b3dfb0e
      Wolfram Sang authored
      According to Documentation/i2c/fault-codes.rst, NACK after sending an
      address should be -ENXIO.
      Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
      4b3dfb0e
    • Wolfram Sang's avatar
      i2c: gxp: remove "empty" switch statement · 1d092308
      Wolfram Sang authored
      There used to be error messages which had to go. Now, it only consists
      of 'break's, so it can go.
      Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
      1d092308
    • Benjamin Gray's avatar
      i2c: Disable I2C_APPLE when I2C_PASEMI is a builtin · a76d19e6
      Benjamin Gray authored
      The ppc64le_allmodconfig sets I2C_PASEMI=y and leaves COMPILE_TEST to
      default to y and I2C_APPLE to default to m, running into a known
      incompatible configuration that breaks the build [1]. Specifically,
      a common dependency (i2c-pasemi-core.o in this case) cannot be used by
      both builtin and module consumers.
      
      Disable I2C_APPLE when I2C_PASEMI is a builtin to prevent this.
      
      [1]: https://lore.kernel.org/all/202112061809.XT99aPrf-lkp@intel.comSuggested-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarBenjamin Gray <bgray@linux.ibm.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Acked-by: default avatarSven Peter <sven@svenpeter.dev>
      Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
      a76d19e6
    • Linus Torvalds's avatar
      Merge tag 'thermal-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 0a3f9a6b
      Linus Torvalds authored
      Pull more thermal control updates from Rafael Wysocki:
       "These fix two issues in the Intel thermal control drivers.
      
        Specifics:
      
         - Fix an error pointer dereference in the quark_dts Intel thermal
           driver (Dan Carpenter)
      
         - Fix the intel_bxt_pmic_thermal driver Kconfig entry to select
           REGMAP which is not user-visible instead of depending on it (Randy
           Dunlap)"
      
      * tag 'thermal-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        thermal: intel: BXT_PMIC: select REGMAP instead of depending on it
        thermal: intel: quark_dts: fix error pointer dereference
      0a3f9a6b
    • Linus Torvalds's avatar
      Merge tag 'acpi-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 44b6f565
      Linus Torvalds authored
      Pull more ACPI updates from Rafael Wysocki:
       "These update ACPI quirks for some x86 platforms and add an IRQ
        override quirk for one more system.
      
        Specifics:
      
         - Add an ACPI IRQ override quirk for Asus Expertbook B2402FBA
           (Vojtech Hejsek)
      
         - Drop a suspend-to-idle quirk for HP Elitebook G9 that is not needed
           any more after a firmware update (Mario Limonciello)
      
         - Add all Cezanne systems to the list for forcing StorageD3Enable,
           because they all need the same quirk (Mario Limonciello)"
      
      * tag 'acpi-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: x86: utils: Add Cezanne to the list for forcing StorageD3Enable
        ACPI: x86: Drop quirk for HP Elitebook
        ACPI: resource: Skip IRQ override on Asus Expertbook B2402FBA
      44b6f565
    • Linus Torvalds's avatar
      Merge tag 'pm-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · c8b4accf
      Linus Torvalds authored
      Pull more power management updates from Rafael Wysocki:
       "These update power capping (new hardware support and cleanup) and
        cpufreq (bug fixes, cleanups and intel_pstate adjustment for a new
        platform).
      
        Specifics:
      
         - Fix error handling in the apple-soc cpufreq driver (Dan Carpenter)
      
         - Change the log level of a message in the amd-pstate cpufreq driver
           so it is more visible to users (Kai-Heng Feng)
      
         - Adjust the balance_performance EPP value for Sapphire Rapids in the
           intel_pstate cpufreq driver (Srinivas Pandruvada)
      
         - Remove MODULE_LICENSE from 3 pieces of non-modular code (Nick
           Alcock)
      
         - Make a read-only kobj_type structure in the schedutil cpufreq
           governor constant (Thomas Weißschuh)
      
         - Add Add Power Limit4 support for Meteor Lake SoC to the Intel RAPL
           power capping driver (Sumeet Pawnikar)"
      
      * tag 'pm-6.3-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpufreq: apple-soc: Fix an IS_ERR() vs NULL check
        powercap: remove MODULE_LICENSE in non-modules
        cpufreq: intel_pstate: remove MODULE_LICENSE in non-modules
        powercap: RAPL: Add Power Limit4 support for Meteor Lake SoC
        cpufreq: amd-pstate: remove MODULE_LICENSE in non-modules
        cpufreq: schedutil: make kobj_type structure constant
        cpufreq: amd-pstate: Let user know amd-pstate is disabled
        cpufreq: intel_pstate: Adjust balance_performance EPP for Sapphire Rapids
      c8b4accf