1. 23 Jan, 2022 23 commits
  2. 22 Jan, 2022 17 commits
    • Minghao Chi's avatar
      perf tools: Remove redundant err variable · f0ac5b85
      Minghao Chi authored
      Return value from perf_event__process_tracing_data() directly instead
      of taking this in another redundant variable.
      Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
      Signed-off-by: default avatarMinghao Chi <chi.minghao@zte.com.cn>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: http://lore.kernel.org/lkml/20220112080109.666800-1-chi.minghao@zte.com.cnSigned-off-by: default avatarCGEL ZTE <cgel.zte@gmail.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      f0ac5b85
    • John Garry's avatar
      perf test: Add parse-events test for aliases with hyphens · b4a7276c
      John Garry authored
      Add a test which allows us to test parsing an event alias with hyphens.
      
      Since these events typically do not exist on most host systems, add the
      alias to the fake pmu.
      
      Function perf_pmu__test_parse_init() has terms added to match known test
      aliases.
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Acked-by: default avatarIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Qi Liu <liuqi115@huawei.com>
      Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
      Cc: linuxarm@huawei.com
      Link: https://lore.kernel.org/r/1642432215-234089-4-git-send-email-john.garry@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      b4a7276c
    • John Garry's avatar
      perf test: Add pmu-events test for aliases with hyphens · 34fa67e7
      John Garry authored
      Add a test for aliases with hyphens in the name to ensure that the
      pmu-events tables are as expects. There should be no reason why these sort
      of aliases would be treated differently, but no harm in checking.
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Acked-by: default avatarIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Qi Liu <liuqi115@huawei.com>
      Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
      Cc: linuxarm@huawei.com
      Link: https://lore.kernel.org/r/1642432215-234089-3-git-send-email-john.garry@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      34fa67e7
    • John Garry's avatar
      perf parse-events: Support event alias in form foo-bar-baz · 864bc8c9
      John Garry authored
      Event aliasing for events whose name in the form foo-bar-baz is not
      supported, while foo-bar, foo_bar_baz, and other combinations are, i.e.
      two hyphens are not supported.
      
      The HiSilicon D06 platform has events in such form:
      
        $ ./perf list sdir-home-migrate
      
        List of pre-defined events (to be used in -e):
      
        uncore hha:
          sdir-home-migrate
         [Unit: hisi_sccl,hha]
      
        $ sudo ./perf stat -e sdir-home-migrate
        event syntax error: 'sdir-home-migrate'
                                \___ parser error
        Run 'perf list' for a list of valid events
      
         Usage: perf stat [<options>] [<command>]
      
         -e, --event <event>event selector. use 'perf list' to list available events
      
      To support, add an extra PMU event symbol type for "baz", and add a new
      rule in the bison file.
      Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
      Acked-by: default avatarIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Qi Liu <liuqi115@huawei.com>
      Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
      Cc: linuxarm@huawei.com
      Link: https://lore.kernel.org/r/1642432215-234089-2-git-send-email-john.garry@huawei.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      864bc8c9
    • German Gomez's avatar
      perf evsel: Override attr->sample_period for non-libpfm4 events · 3606c0e1
      German Gomez authored
      A previous patch preventing "attr->sample_period" values from being
      overridden in pfm events changed a related behaviour in arm-spe.
      
      Before said patch:
      
        perf record -c 10000 -e arm_spe_0// -- sleep 1
      
      Would yield an SPE event with period=10000. After the patch, the period
      in "-c 10000" was being ignored because the arm-spe code initializes
      sample_period to a non-zero value.
      
      This patch restores the previous behaviour for non-libpfm4 events.
      
      Fixes: ae5dcc8a (“perf record: Prevent override of attr->sample_period for libpfm4 events”)
      Reported-by: default avatarChase Conklin <chase.conklin@arm.com>
      Signed-off-by: default avatarGerman Gomez <german.gomez@arm.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John Fastabend <john.fastabend@gmail.com>
      Cc: KP Singh <kpsingh@kernel.org>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Martin KaFai Lau <kafai@fb.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Song Liu <songliubraving@fb.com>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Yonghong Song <yhs@fb.com>
      Cc: bpf@vger.kernel.org
      Cc: netdev@vger.kernel.org
      Link: http://lore.kernel.org/lkml/20220118144054.2541-1-german.gomez@arm.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      3606c0e1
    • Lv Ruyi's avatar
      perf cpumap: Remove duplicate include in cpumap.h · 24ead7c2
      Lv Ruyi authored
      Remove all but the first include of stdbool.h from cpumap.h.
      Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
      Signed-off-by: default avatarLv Ruyi <lv.ruyi@zte.com.cn>
      Acked-by: default avatarIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: James Clark <james.clark@arm.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: https://lore.kernel.org/r/20220117083730.863200-1-lv.ruyi@zte.com.cnSigned-off-by: default avatarCGEL ZTE <cgel.zte@gmail.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      24ead7c2
    • Ian Rogers's avatar
      perf cpumap: Migrate to libperf cpumap api · 44028699
      Ian Rogers authored
      Switch from directly accessing the perf_cpu_map to using the appropriate
      libperf API when possible. Using the API simplifies the job of
      refactoring use of perf_cpu_map.
      Signed-off-by: default avatarIan Rogers <irogers@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: André Almeida <andrealmeid@collabora.com>
      Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      Cc: Darren Hart <dvhart@infradead.org>
      Cc: Davidlohr Bueso <dave@stgolabs.net>
      Cc: Dmitriy Vyukov <dvyukov@google.com>
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: German Gomez <german.gomez@arm.com>
      Cc: James Clark <james.clark@arm.com>
      Cc: Jin Yao <yao.jin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John Garry <john.garry@huawei.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Leo Yan <leo.yan@linaro.org>
      Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Masami Hiramatsu <mhiramat@kernel.org>
      Cc: Miaoqian Lin <linmq006@gmail.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Riccardo Mancini <rickyman7@gmail.com>
      Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
      Cc: Song Liu <song@kernel.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
      Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Thomas Richter <tmricht@linux.ibm.com>
      Cc: Yury Norov <yury.norov@gmail.com>
      Link: http://lore.kernel.org/lkml/20220122045811.3402706-3-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      44028699
    • Ian Rogers's avatar
      perf python: Fix cpu_map__item() building · 1d1d9af2
      Ian Rogers authored
      Value should be built as an integer.
      
      Switch some uses of perf_cpu_map to use the library API.
      
      Fixes: 6d18804b ("perf cpumap: Give CPUs their own type")
      Signed-off-by: default avatarIan Rogers <irogers@google.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: André Almeida <andrealmeid@collabora.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
      Cc: Darren Hart <dvhart@infradead.org>
      Cc: Davidlohr Bueso <dave@stgolabs.net>
      Cc: Dmitriy Vyukov <dvyukov@google.com>
      Cc: Eric Dumazet <edumazet@google.com>
      Cc: German Gomez <german.gomez@arm.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: James Clark <james.clark@arm.com>
      Cc: Jin Yao <yao.jin@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John Garry <john.garry@huawei.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Leo Yan <leo.yan@linaro.org>
      Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Masami Hiramatsu <mhiramat@kernel.org>
      Cc: Miaoqian Lin <linmq006@gmail.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Riccardo Mancini <rickyman7@gmail.com>
      Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
      Cc: Song Liu <song@kernel.org>
      Cc: Stephane Eranian <eranian@google.com>
      Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
      Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Thomas Richter <tmricht@linux.ibm.com>
      Cc: Yury Norov <yury.norov@gmail.com>
      Link: http://lore.kernel.org/lkml/20220122045811.3402706-2-irogers@google.comSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      1d1d9af2
    • Yao Jin's avatar
      perf script: Fix printing 'phys_addr' failure issue · 9edcde68
      Yao Jin authored
      Perf script was failed to print the phys_addr for SPE profiling.
      One 'dummy' event is added by SPE profiling but it doesn't have PHYS_ADDR
      attribute set, perf script then exits with error.
      
      Now referring to 'addr', use evsel__do_check_stype() to check the type.
      
      Before:
      
        # perf record -e arm_spe_0/branch_filter=0,ts_enable=1,pa_enable=1,load_filter=1,jitter=0,\
      		store_filter=0,min_latency=0,event_filter=2/ -p 4064384 -- sleep 3
        # perf script -F pid,tid,addr,phys_addr
        Samples for 'dummy:u' event do not have PHYS_ADDR attribute set. Cannot print 'phys_addr' field.
      
      After:
      
        # perf record -e arm_spe_0/branch_filter=0,ts_enable=1,pa_enable=1,load_filter=1,jitter=0,\
      		store_filter=0,min_latency=0,event_filter=2/ -p 4064384 -- sleep 3
        # perf script -F pid,tid,addr,phys_addr
        4064384/4064384 ffff802f921be0d0      2f921be0d0
        4064384/4064384 ffff802f921be0d0      2f921be0d0
      Reviewed-by: default avatarGerman Gomez <german.gomez@arm.com>
      Signed-off-by: default avatarYao Jin <jinyao5@huawei.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Hanjun Guo <guohanjun@huawei.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lore.kernel.org/lkml/20220121065954.2121900-1-liwei391@huawei.comSigned-off-by: default avatarWei Li <liwei391@huawei.com>
      Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
      9edcde68
    • Masahiro Yamada's avatar
      certs: Fix build error when CONFIG_MODULE_SIG_KEY is empty · e6340b65
      Masahiro Yamada authored
      Since b8c96a6b ("certs: simplify $(srctree)/ handling and remove
      config_filename macro"), when CONFIG_MODULE_SIG_KEY is empty,
      signing_key.x509 fails to build:
      
          CERT    certs/signing_key.x509
        Usage: extract-cert <source> <dest>
        make[1]: *** [certs/Makefile:78: certs/signing_key.x509] Error 2
        make: *** [Makefile:1831: certs] Error 2
      
      Pass "" to the first argument of extract-cert to fix the build error.
      
      Link: https://lore.kernel.org/linux-kbuild/20220120094606.2skuyb26yjlnu66q@lion.mk-sys.cz/T/#u
      Fixes: b8c96a6b ("certs: simplify $(srctree)/ handling and remove config_filename macro")
      Reported-by: default avatarMichal Kubecek <mkubecek@suse.cz>
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      Tested-by: default avatarMichal Kubecek <mkubecek@suse.cz>
      e6340b65
    • Masahiro Yamada's avatar
      certs: Fix build error when CONFIG_MODULE_SIG_KEY is PKCS#11 URI · ad29a2fb
      Masahiro Yamada authored
      When CONFIG_MODULE_SIG_KEY is PKCS#11 URL (pkcs11:*), signing_key.x509
      fails to build:
      
        certs/Makefile:77: *** target pattern contains no '%'.  Stop.
      
      Due to the typo, $(X509_DEP) contains a colon.
      
      Fix it.
      
      Fixes: b8c96a6b ("certs: simplify $(srctree)/ handling and remove config_filename macro")
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      ad29a2fb
    • Masahiro Yamada's avatar
      Revert "Makefile: Do not quote value for CONFIG_CC_IMPLICIT_FALLTHROUGH" · e92e2634
      Masahiro Yamada authored
      This reverts commit cd8c917a.
      
      Commit 129ab0d2 ("kbuild: do not quote string values in
      include/config/auto.conf") provided the final solution.
      
      Now reverting the temporary workaround.
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      e92e2634
    • Dmitry V. Levin's avatar
      usr/include/Makefile: add linux/nfc.h to the compile-test coverage · 10756dc5
      Dmitry V. Levin authored
      As linux/nfc.h userspace compilation was finally fixed by commits
      79b69a83 ("nfc: uapi: use kernel size_t to fix user-space builds")
      and 7175f02c ("uapi: fix linux/nfc.h userspace compilation errors"),
      there is no need to keep the compile-test exception for it in
      usr/include/Makefile.
      Signed-off-by: default avatarDmitry V. Levin <ldv@altlinux.org>
      Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
      10756dc5
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · 1c522832
      Linus Torvalds authored
      Merge yet more updates from Andrew Morton:
       "This is the post-linux-next queue. Material which was based on or
        dependent upon material which was in -next.
      
        69 patches.
      
        Subsystems affected by this patch series: mm (migration and zsmalloc),
        sysctl, proc, and lib"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (69 commits)
        mm: hide the FRONTSWAP Kconfig symbol
        frontswap: remove support for multiple ops
        mm: mark swap_lock and swap_active_head static
        frontswap: simplify frontswap_register_ops
        frontswap: remove frontswap_test
        mm: simplify try_to_unuse
        frontswap: remove the frontswap exports
        frontswap: simplify frontswap_init
        frontswap: remove frontswap_curr_pages
        frontswap: remove frontswap_shrink
        frontswap: remove frontswap_tmem_exclusive_gets
        frontswap: remove frontswap_writethrough
        mm: remove cleancache
        lib/stackdepot: always do filter_irq_stacks() in stack_depot_save()
        lib/stackdepot: allow optional init and stack_table allocation by kvmalloc()
        proc: remove PDE_DATA() completely
        fs: proc: store PDE()->data into inode->i_private
        zsmalloc: replace get_cpu_var with local_lock
        zsmalloc: replace per zpage lock with pool->migrate_lock
        locking/rwlocks: introduce write_lock_nested
        ...
      1c522832
    • Linus Torvalds's avatar
      Merge tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 · 8205ae32
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
      
       - multichannel fixes, addressing additional reconnect and DFS scenarios
      
       - reenabling fscache support (indexing rewrite, metadata caching e.g.)
      
       - send additional version information during NTLMSSP negotiate to
         improve debugging
      
       - fix for a mount race
      
       - DFS fixes
      
       - fix for a memory leak for stable
      
      * tag '5.17-rc-part2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: update internal module number
        smb3: send NTLMSSP version information
        cifs: Support fscache indexing rewrite
        cifs: cifs_ses_mark_for_reconnect should also update reconnect bits
        cifs: update tcpStatus during negotiate and sess setup
        cifs: make status checks in version independent callers
        cifs: remove repeated state change in dfs tree connect
        cifs: fix the cifs_reconnect path for DFS
        cifs: remove unused variable ses_selected
        cifs: protect all accesses to chan_* with chan_lock
        cifs: fix the connection state transitions with multichannel
        cifs: check reconnects for channels of active tcons too
        smb3: add new defines from protocol specification
        cifs: serialize all mount attempts
        cifs: quirk for STATUS_OBJECT_NAME_INVALID returned for non-ASCII dfs refs
        cifs: alloc_path_with_tree_prefix: do not append sep. if the path is empty
        cifs: clean up an inconsistent indenting
        cifs: free ntlmsspblob allocated in negotiate
      8205ae32
    • Linus Torvalds's avatar
      Merge tag 'xfs-5.17-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 1cb69c80
      Linus Torvalds authored
      Pull xfs fixes from Darrick Wong:
       "One of the patches removes some dead code from xfs_ioctl32.h and the
        other fixes broken workqueue flushing in the inode garbage collector.
      
         - Minor cleanup of ioctl32 cruft
      
         - Clean up open coded inodegc workqueue function calls"
      
      * tag 'xfs-5.17-merge-7' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: flush inodegc workqueue tasks before cancel
        xfs: remove unused xfs_ioctl32.h declarations
      1cb69c80
    • Linus Torvalds's avatar
      Merge tag 'fscache-fixes-20220121' of... · 7fd350f6
      Linus Torvalds authored
      Merge tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
      
      Pull more fscache updates from David Howells:
       "A set of fixes and minor updates for the fscache rewrite:
      
         - Fix mishandling of volume collisions (the wait condition is
           inverted and so it was only waiting if the volume collision was
           already resolved).
      
         - Fix miscalculation of whether there's space available in
           cachefiles.
      
         - Make sure a default cache name is set on a cache if the user hasn't
           set one by the time they bind the cache.
      
         - Adjust the way the backing inode is presented in tracepoints, add a
           tracepoint for mkdir and trace directory lookup.
      
         - Add a tracepoint for failure to set the active file mark.
      
         - Add an explanation of the checks made on the backing filesystem.
      
         - Check that the backing filesystem supports tmpfile.
      
         - Document how the page-release cancellation of the read-skip
           optimisation works.
      
        And I've included a change for netfslib:
      
         - Make ops->init_rreq() optional"
      
      * tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        netfs: Make ops->init_rreq() optional
        fscache: Add a comment explaining how page-release optimisation works
        cachefiles: Check that the backing filesystem supports tmpfiles
        cachefiles: Explain checks in a comment
        cachefiles: Trace active-mark failure
        cachefiles: Make some tracepoint adjustments
        cachefiles: set default tag name if it's unspecified
        cachefiles: Calculate the blockshift in terms of bytes, not pages
        fscache: Fix the volume collision wait condition
      7fd350f6