* [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
@ 2023-12-05 13:20 Chaitanya Kumar Borah
2023-12-05 13:44 ` Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Chaitanya Kumar Borah @ 2023-12-05 13:20 UTC (permalink / raw)
To: intel-gfx; +Cc: Johannes Berg, Greg Kroah-Hartman
From: Johannes Berg <johannes.berg@intel.com>
This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers
vs. removal with lockdep"), it appears to have false positives and
really shouldn't have been in the -rc series with the fixes anyway.
topic/core-for-CI note: cherry-picked from
https://patchwork.kernel.org/project/linux-fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f690d383a89b13eb05667@changeid/
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/debugfs/file.c | 10 ----------
fs/debugfs/inode.c | 7 -------
fs/debugfs/internal.h | 6 ------
3 files changed, 23 deletions(-)
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index a5ade8c16375..5063434be0fc 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
kfree(fsd);
fsd = READ_ONCE(dentry->d_fsdata);
}
-#ifdef CONFIG_LOCKDEP
- fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd", dentry);
- lockdep_register_key(&fsd->key);
- lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?: "debugfs",
- &fsd->key, 0);
-#endif
INIT_LIST_HEAD(&fsd->cancellations);
mutex_init(&fsd->cancellations_mtx);
}
@@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
if (!refcount_inc_not_zero(&fsd->active_users))
return -EIO;
- lock_map_acquire_read(&fsd->lockdep_map);
-
return 0;
}
EXPORT_SYMBOL_GPL(debugfs_file_get);
@@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry)
{
struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
- lock_map_release(&fsd->lockdep_map);
-
if (refcount_dec_and_test(&fsd->active_users))
complete(&fsd->active_users_drained);
}
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index e4e7fe1bd9fb..034a617cb1a5 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry *dentry)
/* check it wasn't a dir (no fsdata) or automount (no real_fops) */
if (fsd && fsd->real_fops) {
-#ifdef CONFIG_LOCKDEP
- lockdep_unregister_key(&fsd->key);
- kfree(fsd->lock_name);
-#endif
WARN_ON(!list_empty(&fsd->cancellations));
mutex_destroy(&fsd->cancellations_mtx);
}
@@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry *dentry)
if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
return;
- lock_map_acquire(&fsd->lockdep_map);
- lock_map_release(&fsd->lockdep_map);
-
/* if we hit zero, just wait for all to finish */
if (!refcount_dec_and_test(&fsd->active_users)) {
wait_for_completion(&fsd->active_users_drained);
diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h
index 0c4c68cf161f..dae80c2a469e 100644
--- a/fs/debugfs/internal.h
+++ b/fs/debugfs/internal.h
@@ -7,7 +7,6 @@
#ifndef _DEBUGFS_INTERNAL_H_
#define _DEBUGFS_INTERNAL_H_
-#include <linux/lockdep.h>
#include <linux/list.h>
struct file_operations;
@@ -25,11 +24,6 @@ struct debugfs_fsdata {
struct {
refcount_t active_users;
struct completion active_users_drained;
-#ifdef CONFIG_LOCKDEP
- struct lockdep_map lockdep_map;
- struct lock_class_key key;
- char *lock_name;
-#endif
/* protect cancellations */
struct mutex cancellations_mtx;
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-05 13:20 [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep" Chaitanya Kumar Borah
@ 2023-12-05 13:44 ` Jani Nikula
2023-12-05 17:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2023-12-05 17:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2 siblings, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2023-12-05 13:44 UTC (permalink / raw)
To: Chaitanya Kumar Borah, intel-gfx; +Cc: Johannes Berg, Greg Kroah-Hartman
On Tue, 05 Dec 2023, Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers
> vs. removal with lockdep"), it appears to have false positives and
> really shouldn't have been in the -rc series with the fixes anyway.
>
> topic/core-for-CI note: cherry-picked from
> https://patchwork.kernel.org/project/linux-fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f690d383a89b13eb05667@changeid/
>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johannes, Greg, this is for our CI only, please ignore, and sorry for
the noise.
BR,
Jani.
> ---
> fs/debugfs/file.c | 10 ----------
> fs/debugfs/inode.c | 7 -------
> fs/debugfs/internal.h | 6 ------
> 3 files changed, 23 deletions(-)
>
> diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
> index a5ade8c16375..5063434be0fc 100644
> --- a/fs/debugfs/file.c
> +++ b/fs/debugfs/file.c
> @@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
> kfree(fsd);
> fsd = READ_ONCE(dentry->d_fsdata);
> }
> -#ifdef CONFIG_LOCKDEP
> - fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd", dentry);
> - lockdep_register_key(&fsd->key);
> - lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?: "debugfs",
> - &fsd->key, 0);
> -#endif
> INIT_LIST_HEAD(&fsd->cancellations);
> mutex_init(&fsd->cancellations_mtx);
> }
> @@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
> if (!refcount_inc_not_zero(&fsd->active_users))
> return -EIO;
>
> - lock_map_acquire_read(&fsd->lockdep_map);
> -
> return 0;
> }
> EXPORT_SYMBOL_GPL(debugfs_file_get);
> @@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry)
> {
> struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
>
> - lock_map_release(&fsd->lockdep_map);
> -
> if (refcount_dec_and_test(&fsd->active_users))
> complete(&fsd->active_users_drained);
> }
> diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
> index e4e7fe1bd9fb..034a617cb1a5 100644
> --- a/fs/debugfs/inode.c
> +++ b/fs/debugfs/inode.c
> @@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry *dentry)
>
> /* check it wasn't a dir (no fsdata) or automount (no real_fops) */
> if (fsd && fsd->real_fops) {
> -#ifdef CONFIG_LOCKDEP
> - lockdep_unregister_key(&fsd->key);
> - kfree(fsd->lock_name);
> -#endif
> WARN_ON(!list_empty(&fsd->cancellations));
> mutex_destroy(&fsd->cancellations_mtx);
> }
> @@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry *dentry)
> if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
> return;
>
> - lock_map_acquire(&fsd->lockdep_map);
> - lock_map_release(&fsd->lockdep_map);
> -
> /* if we hit zero, just wait for all to finish */
> if (!refcount_dec_and_test(&fsd->active_users)) {
> wait_for_completion(&fsd->active_users_drained);
> diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h
> index 0c4c68cf161f..dae80c2a469e 100644
> --- a/fs/debugfs/internal.h
> +++ b/fs/debugfs/internal.h
> @@ -7,7 +7,6 @@
>
> #ifndef _DEBUGFS_INTERNAL_H_
> #define _DEBUGFS_INTERNAL_H_
> -#include <linux/lockdep.h>
> #include <linux/list.h>
>
> struct file_operations;
> @@ -25,11 +24,6 @@ struct debugfs_fsdata {
> struct {
> refcount_t active_users;
> struct completion active_users_drained;
> -#ifdef CONFIG_LOCKDEP
> - struct lockdep_map lockdep_map;
> - struct lock_class_key key;
> - char *lock_name;
> -#endif
>
> /* protect cancellations */
> struct mutex cancellations_mtx;
--
Jani Nikula, Intel
^ permalink raw reply [flat|nested] 9+ messages in thread* [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-05 13:20 [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep" Chaitanya Kumar Borah
2023-12-05 13:44 ` Jani Nikula
@ 2023-12-05 17:10 ` Patchwork
2023-12-05 17:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-12-05 17:10 UTC (permalink / raw)
To: Chaitanya Kumar Borah; +Cc: intel-gfx
== Series Details ==
Series: Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
URL : https://patchwork.freedesktop.org/series/127359/
State : warning
== Summary ==
Error: dim checkpatch failed
de1bce6845d1 Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
-:12: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line (possible unwrapped commit description?)
#12:
https://patchwork.kernel.org/project/linux-fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f690d383a89b13eb05667@changeid/
total: 0 errors, 1 warnings, 0 checks, 65 lines checked
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-05 13:20 [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep" Chaitanya Kumar Borah
2023-12-05 13:44 ` Jani Nikula
2023-12-05 17:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
@ 2023-12-05 17:29 ` Patchwork
2 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2023-12-05 17:29 UTC (permalink / raw)
To: Chaitanya Kumar Borah; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 22015 bytes --]
== Series Details ==
Series: Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
URL : https://patchwork.freedesktop.org/series/127359/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_13982 -> Patchwork_127359v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_127359v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_127359v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them
to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/index.html
Participating hosts (37 -> 33)
------------------------------
Missing (4): bat-dg2-8 bat-kbl-2 bat-dg2-9 fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_127359v1:
### IGT changes ###
#### Possible regressions ####
* igt@kms_pipe_crc_basic@suspend-read-crc:
- bat-mtlp-6: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-6/igt@kms_pipe_crc_basic@suspend-read-crc.html
Known issues
------------
Here are the changes found in Patchwork_127359v1 that come from known issues:
### CI changes ###
#### Issues hit ####
* boot:
- fi-bsw-n3050: [PASS][2] -> [FAIL][3] ([i915#8293])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-bsw-n3050/boot.html
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-bsw-n3050/boot.html
- bat-jsl-1: [PASS][4] -> [FAIL][5] ([i915#8293])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-jsl-1/boot.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-jsl-1/boot.html
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- bat-adlp-6: NOTRUN -> [SKIP][6] ([i915#9318])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@debugfs_test@basic-hwmon.html
* igt@gem_lmem_swapping@basic:
- fi-apl-guc: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#4613]) +3 other tests skip
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-apl-guc/igt@gem_lmem_swapping@basic.html
- bat-jsl-3: NOTRUN -> [SKIP][8] ([i915#4613]) +3 other tests skip
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-jsl-3/igt@gem_lmem_swapping@basic.html
- fi-glk-j4005: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +3 other tests skip
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-glk-j4005/igt@gem_lmem_swapping@basic.html
- bat-adlp-9: NOTRUN -> [SKIP][10] ([i915#4613]) +3 other tests skip
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-9/igt@gem_lmem_swapping@basic.html
- fi-skl-guc: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#4613]) +3 other tests skip
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-skl-guc/igt@gem_lmem_swapping@basic.html
- fi-kbl-7567u: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#4613]) +3 other tests skip
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-7567u/igt@gem_lmem_swapping@basic.html
- fi-cfl-8700k: NOTRUN -> [SKIP][13] ([fdo#109271] / [i915#4613]) +3 other tests skip
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-8700k/igt@gem_lmem_swapping@basic.html
- fi-elk-e7500: NOTRUN -> [SKIP][14] ([fdo#109271]) +4 other tests skip
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-elk-e7500/igt@gem_lmem_swapping@basic.html
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-bsw-nick: NOTRUN -> [SKIP][15] ([fdo#109271]) +3 other tests skip
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-bsw-nick/igt@gem_lmem_swapping@parallel-random-engines.html
- fi-rkl-11600: NOTRUN -> [SKIP][16] ([i915#4613]) +3 other tests skip
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-rkl-11600/igt@gem_lmem_swapping@parallel-random-engines.html
- fi-tgl-1115g4: NOTRUN -> [SKIP][17] ([i915#4613]) +3 other tests skip
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-tgl-1115g4/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_lmem_swapping@random-engines:
- fi-skl-6600u: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#4613]) +3 other tests skip
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-skl-6600u/igt@gem_lmem_swapping@random-engines.html
- bat-adls-5: NOTRUN -> [SKIP][19] ([i915#4613]) +3 other tests skip
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adls-5/igt@gem_lmem_swapping@random-engines.html
* igt@gem_lmem_swapping@verify-random:
- fi-cfl-guc: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#4613]) +3 other tests skip
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-guc/igt@gem_lmem_swapping@verify-random.html
- bat-mtlp-6: NOTRUN -> [SKIP][21] ([i915#4613]) +3 other tests skip
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-6/igt@gem_lmem_swapping@verify-random.html
- fi-kbl-x1275: NOTRUN -> [SKIP][22] ([fdo#109271] / [i915#4613]) +3 other tests skip
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-x1275/igt@gem_lmem_swapping@verify-random.html
- fi-cfl-8109u: NOTRUN -> [SKIP][23] ([fdo#109271] / [i915#4613]) +3 other tests skip
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-8109u/igt@gem_lmem_swapping@verify-random.html
- fi-ivb-3770: NOTRUN -> [SKIP][24] ([fdo#109271]) +4 other tests skip
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-ivb-3770/igt@gem_lmem_swapping@verify-random.html
- bat-mtlp-8: NOTRUN -> [SKIP][25] ([i915#4613]) +3 other tests skip
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-8/igt@gem_lmem_swapping@verify-random.html
- fi-kbl-guc: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#4613]) +3 other tests skip
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-guc/igt@gem_lmem_swapping@verify-random.html
- fi-ilk-650: NOTRUN -> [SKIP][27] ([fdo#109271]) +4 other tests skip
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-ilk-650/igt@gem_lmem_swapping@verify-random.html
* igt@gem_tiled_pread_basic:
- bat-adlp-6: NOTRUN -> [SKIP][28] ([i915#3282])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@gem_tiled_pread_basic.html
* igt@i915_pm_rpm@module-reload:
- fi-blb-e6850: NOTRUN -> [SKIP][29] ([fdo#109271]) +4 other tests skip
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-blb-e6850/igt@i915_pm_rpm@module-reload.html
* igt@i915_selftest@live@hangcheck:
- bat-adls-5: NOTRUN -> [DMESG-WARN][30] ([i915#5591])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adls-5/igt@i915_selftest@live@hangcheck.html
* igt@i915_suspend@basic-s3-without-i915:
- fi-tgl-1115g4: NOTRUN -> [INCOMPLETE][31] ([i915#7443])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-tgl-1115g4/igt@i915_suspend@basic-s3-without-i915.html
- bat-atsm-1: NOTRUN -> [SKIP][32] ([i915#6645])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-atsm-1/igt@i915_suspend@basic-s3-without-i915.html
- bat-mtlp-6: NOTRUN -> [SKIP][33] ([i915#6645])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-6/igt@i915_suspend@basic-s3-without-i915.html
- fi-kbl-x1275: NOTRUN -> [SKIP][34] ([fdo#109271]) +1 other test skip
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-x1275/igt@i915_suspend@basic-s3-without-i915.html
- bat-mtlp-8: NOTRUN -> [SKIP][35] ([i915#6645])
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-8/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- bat-adlp-6: NOTRUN -> [SKIP][36] ([i915#4103] / [i915#5608]) +1 other test skip
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html
* igt@kms_dsc@dsc-basic:
- bat-adlp-6: NOTRUN -> [SKIP][37] ([i915#3555] / [i915#3840])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@kms_dsc@dsc-basic.html
* igt@kms_flip@basic-flip-vs-modeset@b-dp6:
- bat-adlp-11: [PASS][38] -> [FAIL][39] ([i915#6121]) +3 other tests fail
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adlp-11/igt@kms_flip@basic-flip-vs-modeset@b-dp6.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-11/igt@kms_flip@basic-flip-vs-modeset@b-dp6.html
* igt@kms_force_connector_basic@force-load-detect:
- bat-adlp-6: NOTRUN -> [SKIP][40] ([fdo#109285])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_hdmi_inject@inject-audio:
- fi-kbl-guc: [PASS][41] -> [FAIL][42] ([IGT#3])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-guc/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- fi-kbl-guc: NOTRUN -> [SKIP][43] ([fdo#109271])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-guc/igt@kms_pipe_crc_basic@suspend-read-crc.html
- bat-atsm-1: NOTRUN -> [SKIP][44] ([i915#1836])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-atsm-1/igt@kms_pipe_crc_basic@suspend-read-crc.html
* igt@kms_pm_backlight@basic-brightness@edp-1:
- bat-adlp-6: NOTRUN -> [ABORT][45] ([i915#8668])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@kms_pm_backlight@basic-brightness@edp-1.html
- bat-rplp-1: NOTRUN -> [ABORT][46] ([i915#8668])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-rplp-1/igt@kms_pm_backlight@basic-brightness@edp-1.html
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- fi-cfl-guc: [ABORT][47] ([i915#8213] / [i915#8668]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-cfl-guc/igt@core_hotunplug@unbind-rebind.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-guc/igt@core_hotunplug@unbind-rebind.html
- bat-mtlp-6: [ABORT][49] ([i915#8213] / [i915#8668]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-mtlp-6/igt@core_hotunplug@unbind-rebind.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-6/igt@core_hotunplug@unbind-rebind.html
- fi-kbl-x1275: [ABORT][51] ([i915#8213] / [i915#8668] / [i915#9793]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-kbl-x1275/igt@core_hotunplug@unbind-rebind.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-x1275/igt@core_hotunplug@unbind-rebind.html
- bat-mtlp-8: [ABORT][53] ([i915#8213] / [i915#8668]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-mtlp-8/igt@core_hotunplug@unbind-rebind.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-mtlp-8/igt@core_hotunplug@unbind-rebind.html
- fi-cfl-8700k: [ABORT][55] ([i915#8213] / [i915#8668]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-cfl-8700k/igt@core_hotunplug@unbind-rebind.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-8700k/igt@core_hotunplug@unbind-rebind.html
- fi-blb-e6850: [ABORT][57] ([i915#9793]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-blb-e6850/igt@core_hotunplug@unbind-rebind.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-blb-e6850/igt@core_hotunplug@unbind-rebind.html
- fi-rkl-11600: [ABORT][59] ([i915#8213]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-rkl-11600/igt@core_hotunplug@unbind-rebind.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-rkl-11600/igt@core_hotunplug@unbind-rebind.html
- fi-skl-6600u: [ABORT][61] ([i915#8668]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-skl-6600u/igt@core_hotunplug@unbind-rebind.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-skl-6600u/igt@core_hotunplug@unbind-rebind.html
- bat-adls-5: [ABORT][63] ([i915#9793]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adls-5/igt@core_hotunplug@unbind-rebind.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adls-5/igt@core_hotunplug@unbind-rebind.html
- fi-apl-guc: [ABORT][65] ([i915#8213] / [i915#8668]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-apl-guc/igt@core_hotunplug@unbind-rebind.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-apl-guc/igt@core_hotunplug@unbind-rebind.html
- bat-atsm-1: [ABORT][67] ([i915#8213]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-atsm-1/igt@core_hotunplug@unbind-rebind.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-atsm-1/igt@core_hotunplug@unbind-rebind.html
- bat-dg1-7: [ABORT][69] ([i915#8213]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-dg1-7/igt@core_hotunplug@unbind-rebind.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-dg1-7/igt@core_hotunplug@unbind-rebind.html
- bat-jsl-3: [ABORT][71] ([i915#9793]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-jsl-3/igt@core_hotunplug@unbind-rebind.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-jsl-3/igt@core_hotunplug@unbind-rebind.html
- fi-glk-j4005: [ABORT][73] ([i915#8213] / [i915#8668]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-glk-j4005/igt@core_hotunplug@unbind-rebind.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-glk-j4005/igt@core_hotunplug@unbind-rebind.html
- bat-adlp-9: [ABORT][75] ([i915#8213] / [i915#8668]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adlp-9/igt@core_hotunplug@unbind-rebind.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-9/igt@core_hotunplug@unbind-rebind.html
- fi-skl-guc: [ABORT][77] ([i915#8668]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-skl-guc/igt@core_hotunplug@unbind-rebind.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-skl-guc/igt@core_hotunplug@unbind-rebind.html
- bat-dg2-11: [ABORT][79] ([i915#8213]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-dg2-11/igt@core_hotunplug@unbind-rebind.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-dg2-11/igt@core_hotunplug@unbind-rebind.html
- fi-cfl-8109u: [ABORT][81] ([i915#8213] / [i915#8668]) -> [PASS][82]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-cfl-8109u/igt@core_hotunplug@unbind-rebind.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-cfl-8109u/igt@core_hotunplug@unbind-rebind.html
- fi-kbl-7567u: [ABORT][83] ([i915#8668] / [i915#9793]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-kbl-7567u/igt@core_hotunplug@unbind-rebind.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-7567u/igt@core_hotunplug@unbind-rebind.html
- fi-ivb-3770: [ABORT][85] ([i915#9793]) -> [PASS][86]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-ivb-3770/igt@core_hotunplug@unbind-rebind.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-ivb-3770/igt@core_hotunplug@unbind-rebind.html
- fi-elk-e7500: [ABORT][87] ([i915#9793]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-elk-e7500/igt@core_hotunplug@unbind-rebind.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-elk-e7500/igt@core_hotunplug@unbind-rebind.html
- fi-bsw-nick: [ABORT][89] ([i915#9793]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-bsw-nick/igt@core_hotunplug@unbind-rebind.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-bsw-nick/igt@core_hotunplug@unbind-rebind.html
- fi-kbl-guc: [ABORT][91] ([i915#8668] / [i915#9793]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-kbl-guc/igt@core_hotunplug@unbind-rebind.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-kbl-guc/igt@core_hotunplug@unbind-rebind.html
- fi-ilk-650: [ABORT][93] ([i915#9793]) -> [PASS][94]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-ilk-650/igt@core_hotunplug@unbind-rebind.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-ilk-650/igt@core_hotunplug@unbind-rebind.html
- fi-tgl-1115g4: [ABORT][95] ([i915#8213]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/fi-tgl-1115g4/igt@core_hotunplug@unbind-rebind.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/fi-tgl-1115g4/igt@core_hotunplug@unbind-rebind.html
* igt@i915_module_load@load:
- bat-adlp-6: [INCOMPLETE][97] ([i915#8449]) -> [PASS][98]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adlp-6/igt@i915_module_load@load.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-6/igt@i915_module_load@load.html
* igt@kms_cursor_legacy@basic-flip-before-cursor-atomic:
- bat-adlp-11: [DMESG-WARN][99] ([i915#6868]) -> [PASS][100]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adlp-11/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-11/igt@kms_cursor_legacy@basic-flip-before-cursor-atomic.html
* igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
- bat-adlp-11: [SKIP][101] -> [PASS][102]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-adlp-11/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-adlp-11/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html
* igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1:
- bat-rplp-1: [ABORT][103] ([i915#8668]) -> [PASS][104]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13982/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/bat-rplp-1/igt@kms_pipe_crc_basic@read-crc-frame-sequence@pipe-d-edp-1.html
[IGT#3]: https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/3
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[i915#1836]: https://gitlab.freedesktop.org/drm/intel/issues/1836
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5591]: https://gitlab.freedesktop.org/drm/intel/issues/5591
[i915#5608]: https://gitlab.freedesktop.org/drm/intel/issues/5608
[i915#6121]: https://gitlab.freedesktop.org/drm/intel/issues/6121
[i915#6645]: https://gitlab.freedesktop.org/drm/intel/issues/6645
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7443]: https://gitlab.freedesktop.org/drm/intel/issues/7443
[i915#8213]: https://gitlab.freedesktop.org/drm/intel/issues/8213
[i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293
[i915#8449]: https://gitlab.freedesktop.org/drm/intel/issues/8449
[i915#8668]: https://gitlab.freedesktop.org/drm/intel/issues/8668
[i915#9318]: https://gitlab.freedesktop.org/drm/intel/issues/9318
[i915#9793]: https://gitlab.freedesktop.org/drm/intel/issues/9793
Build changes
-------------
* Linux: CI_DRM_13982 -> Patchwork_127359v1
CI-20190529: 20190529
CI_DRM_13982: 16108300001d366d485520d91f9894a3d34d8fa2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7620: 6714b814e7f82743abf45c33361fbe057a22880a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_127359v1: 16108300001d366d485520d91f9894a3d34d8fa2 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
4f25d945fdd8 Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v1/index.html
[-- Attachment #2: Type: text/html, Size: 28618 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
@ 2023-12-06 6:47 Chaitanya Kumar Borah
2023-12-06 11:04 ` Shankar, Uma
0 siblings, 1 reply; 9+ messages in thread
From: Chaitanya Kumar Borah @ 2023-12-06 6:47 UTC (permalink / raw)
To: intel-gfx
From: Johannes Berg <johannes.berg@intel.com>
This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers
vs. removal with lockdep"), it appears to have false positives and
really shouldn't have been in the -rc series with the fixes anyway.
Link:https://patchwork.kernel.org/project/linux-fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f690d383a89b13eb05667@changeid/
Reference: https://gitlab.freedesktop.org/drm/intel/-/issues/9802
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
fs/debugfs/file.c | 10 ----------
fs/debugfs/inode.c | 7 -------
fs/debugfs/internal.h | 6 ------
3 files changed, 23 deletions(-)
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index a5ade8c16375..5063434be0fc 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
kfree(fsd);
fsd = READ_ONCE(dentry->d_fsdata);
}
-#ifdef CONFIG_LOCKDEP
- fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd", dentry);
- lockdep_register_key(&fsd->key);
- lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?: "debugfs",
- &fsd->key, 0);
-#endif
INIT_LIST_HEAD(&fsd->cancellations);
mutex_init(&fsd->cancellations_mtx);
}
@@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
if (!refcount_inc_not_zero(&fsd->active_users))
return -EIO;
- lock_map_acquire_read(&fsd->lockdep_map);
-
return 0;
}
EXPORT_SYMBOL_GPL(debugfs_file_get);
@@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry)
{
struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
- lock_map_release(&fsd->lockdep_map);
-
if (refcount_dec_and_test(&fsd->active_users))
complete(&fsd->active_users_drained);
}
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index e4e7fe1bd9fb..034a617cb1a5 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry *dentry)
/* check it wasn't a dir (no fsdata) or automount (no real_fops) */
if (fsd && fsd->real_fops) {
-#ifdef CONFIG_LOCKDEP
- lockdep_unregister_key(&fsd->key);
- kfree(fsd->lock_name);
-#endif
WARN_ON(!list_empty(&fsd->cancellations));
mutex_destroy(&fsd->cancellations_mtx);
}
@@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry *dentry)
if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
return;
- lock_map_acquire(&fsd->lockdep_map);
- lock_map_release(&fsd->lockdep_map);
-
/* if we hit zero, just wait for all to finish */
if (!refcount_dec_and_test(&fsd->active_users)) {
wait_for_completion(&fsd->active_users_drained);
diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h
index 0c4c68cf161f..dae80c2a469e 100644
--- a/fs/debugfs/internal.h
+++ b/fs/debugfs/internal.h
@@ -7,7 +7,6 @@
#ifndef _DEBUGFS_INTERNAL_H_
#define _DEBUGFS_INTERNAL_H_
-#include <linux/lockdep.h>
#include <linux/list.h>
struct file_operations;
@@ -25,11 +24,6 @@ struct debugfs_fsdata {
struct {
refcount_t active_users;
struct completion active_users_drained;
-#ifdef CONFIG_LOCKDEP
- struct lockdep_map lockdep_map;
- struct lock_class_key key;
- char *lock_name;
-#endif
/* protect cancellations */
struct mutex cancellations_mtx;
--
2.25.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-06 6:47 [Intel-gfx] [topic/core-for-CI] " Chaitanya Kumar Borah
@ 2023-12-06 11:04 ` Shankar, Uma
2023-12-06 19:41 ` Saarinen, Jani
0 siblings, 1 reply; 9+ messages in thread
From: Shankar, Uma @ 2023-12-06 11:04 UTC (permalink / raw)
To: Borah, Chaitanya Kumar, intel-gfx@lists.freedesktop.org
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> Chaitanya Kumar Borah
> Sent: Wednesday, December 6, 2023 12:17 PM
> To: intel-gfx@lists.freedesktop.org
> Subject: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs
> handlers vs. removal with lockdep"
>
> From: Johannes Berg <johannes.berg@intel.com>
>
> This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers vs.
> removal with lockdep"), it appears to have false positives and really shouldn't
> have been in the -rc series with the fixes anyway.
Acked-by: Uma Shankar <uma.shankar@intel.com>
Hi Chaitanya,
Please get the full CI run executed with this change, once its green we can
plan merge.
Regards,
Uma Shankar
> Link:https://patchwork.kernel.org/project/linux-
> fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f69
> 0d383a89b13eb05667@changeid/
> Reference: https://gitlab.freedesktop.org/drm/intel/-/issues/9802
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
> fs/debugfs/file.c | 10 ----------
> fs/debugfs/inode.c | 7 -------
> fs/debugfs/internal.h | 6 ------
> 3 files changed, 23 deletions(-)
>
> diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index
> a5ade8c16375..5063434be0fc 100644
> --- a/fs/debugfs/file.c
> +++ b/fs/debugfs/file.c
> @@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
> kfree(fsd);
> fsd = READ_ONCE(dentry->d_fsdata);
> }
> -#ifdef CONFIG_LOCKDEP
> - fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd",
> dentry);
> - lockdep_register_key(&fsd->key);
> - lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?:
> "debugfs",
> - &fsd->key, 0);
> -#endif
> INIT_LIST_HEAD(&fsd->cancellations);
> mutex_init(&fsd->cancellations_mtx);
> }
> @@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
> if (!refcount_inc_not_zero(&fsd->active_users))
> return -EIO;
>
> - lock_map_acquire_read(&fsd->lockdep_map);
> -
> return 0;
> }
> EXPORT_SYMBOL_GPL(debugfs_file_get);
> @@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry) {
> struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
>
> - lock_map_release(&fsd->lockdep_map);
> -
> if (refcount_dec_and_test(&fsd->active_users))
> complete(&fsd->active_users_drained);
> }
> diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index
> e4e7fe1bd9fb..034a617cb1a5 100644
> --- a/fs/debugfs/inode.c
> +++ b/fs/debugfs/inode.c
> @@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry
> *dentry)
>
> /* check it wasn't a dir (no fsdata) or automount (no real_fops) */
> if (fsd && fsd->real_fops) {
> -#ifdef CONFIG_LOCKDEP
> - lockdep_unregister_key(&fsd->key);
> - kfree(fsd->lock_name);
> -#endif
> WARN_ON(!list_empty(&fsd->cancellations));
> mutex_destroy(&fsd->cancellations_mtx);
> }
> @@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry
> *dentry)
> if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
> return;
>
> - lock_map_acquire(&fsd->lockdep_map);
> - lock_map_release(&fsd->lockdep_map);
> -
> /* if we hit zero, just wait for all to finish */
> if (!refcount_dec_and_test(&fsd->active_users)) {
> wait_for_completion(&fsd->active_users_drained);
> diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h index
> 0c4c68cf161f..dae80c2a469e 100644
> --- a/fs/debugfs/internal.h
> +++ b/fs/debugfs/internal.h
> @@ -7,7 +7,6 @@
>
> #ifndef _DEBUGFS_INTERNAL_H_
> #define _DEBUGFS_INTERNAL_H_
> -#include <linux/lockdep.h>
> #include <linux/list.h>
>
> struct file_operations;
> @@ -25,11 +24,6 @@ struct debugfs_fsdata {
> struct {
> refcount_t active_users;
> struct completion active_users_drained; -#ifdef
> CONFIG_LOCKDEP
> - struct lockdep_map lockdep_map;
> - struct lock_class_key key;
> - char *lock_name;
> -#endif
>
> /* protect cancellations */
> struct mutex cancellations_mtx;
> --
> 2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-06 11:04 ` Shankar, Uma
@ 2023-12-06 19:41 ` Saarinen, Jani
2023-12-06 21:32 ` Lucas De Marchi
0 siblings, 1 reply; 9+ messages in thread
From: Saarinen, Jani @ 2023-12-06 19:41 UTC (permalink / raw)
To: Shankar, Uma, Borah, Chaitanya Kumar,
intel-gfx@lists.freedesktop.org, Vivi, Rodrigo, De Marchi, Lucas
Hi,
> -----Original Message-----
> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Shankar,
> Uma
> Sent: Wednesday, December 6, 2023 1:05 PM
> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> gfx@lists.freedesktop.org
> Subject: Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs
> handlers vs. removal with lockdep"
>
>
>
> > -----Original Message-----
> > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
> > Chaitanya Kumar Borah
> > Sent: Wednesday, December 6, 2023 12:17 PM
> > To: intel-gfx@lists.freedesktop.org
> > Subject: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate
> > debugfs handlers vs. removal with lockdep"
> >
> > From: Johannes Berg <johannes.berg@intel.com>
> >
> > This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers vs.
> > removal with lockdep"), it appears to have false positives and really
> > shouldn't have been in the -rc series with the fixes anyway.
>
> Acked-by: Uma Shankar <uma.shankar@intel.com>
>
> Hi Chaitanya,
> Please get the full CI run executed with this change, once its green we can plan merge.
Just commented on "issues" (no real issues ) on BAT and asked to re-report but we really should use sometimes by-pass shards when we see regression on this magnitude.
This has big impact on core/gem tests https://intel-gfx-ci.01.org/tree/drm-tip/index.html?testfilter=module%7Cgem%7Ccore
Even on module load. I am leaning to break process and not wait to Full CI if someone who has merge rights (eg @Vivi, Rodrigo, @De Marchi, Lucas) agree here?
Br,
Jani
>
> Regards,
> Uma Shankar
>
> > Link:https://patchwork.kernel.org/project/linux-
> > fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f69
> > 0d383a89b13eb05667@changeid/
> > Reference: https://gitlab.freedesktop.org/drm/intel/-/issues/9802
> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > ---
> > fs/debugfs/file.c | 10 ----------
> > fs/debugfs/inode.c | 7 -------
> > fs/debugfs/internal.h | 6 ------
> > 3 files changed, 23 deletions(-)
> >
> > diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index
> > a5ade8c16375..5063434be0fc 100644
> > --- a/fs/debugfs/file.c
> > +++ b/fs/debugfs/file.c
> > @@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
> > kfree(fsd);
> > fsd = READ_ONCE(dentry->d_fsdata);
> > }
> > -#ifdef CONFIG_LOCKDEP
> > - fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd",
> > dentry);
> > - lockdep_register_key(&fsd->key);
> > - lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?:
> > "debugfs",
> > - &fsd->key, 0);
> > -#endif
> > INIT_LIST_HEAD(&fsd->cancellations);
> > mutex_init(&fsd->cancellations_mtx);
> > }
> > @@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
> > if (!refcount_inc_not_zero(&fsd->active_users))
> > return -EIO;
> >
> > - lock_map_acquire_read(&fsd->lockdep_map);
> > -
> > return 0;
> > }
> > EXPORT_SYMBOL_GPL(debugfs_file_get);
> > @@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry) {
> > struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
> >
> > - lock_map_release(&fsd->lockdep_map);
> > -
> > if (refcount_dec_and_test(&fsd->active_users))
> > complete(&fsd->active_users_drained);
> > }
> > diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index
> > e4e7fe1bd9fb..034a617cb1a5 100644
> > --- a/fs/debugfs/inode.c
> > +++ b/fs/debugfs/inode.c
> > @@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry
> > *dentry)
> >
> > /* check it wasn't a dir (no fsdata) or automount (no real_fops) */
> > if (fsd && fsd->real_fops) {
> > -#ifdef CONFIG_LOCKDEP
> > - lockdep_unregister_key(&fsd->key);
> > - kfree(fsd->lock_name);
> > -#endif
> > WARN_ON(!list_empty(&fsd->cancellations));
> > mutex_destroy(&fsd->cancellations_mtx);
> > }
> > @@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry
> > *dentry)
> > if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
> > return;
> >
> > - lock_map_acquire(&fsd->lockdep_map);
> > - lock_map_release(&fsd->lockdep_map);
> > -
> > /* if we hit zero, just wait for all to finish */
> > if (!refcount_dec_and_test(&fsd->active_users)) {
> > wait_for_completion(&fsd->active_users_drained);
> > diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h index
> > 0c4c68cf161f..dae80c2a469e 100644
> > --- a/fs/debugfs/internal.h
> > +++ b/fs/debugfs/internal.h
> > @@ -7,7 +7,6 @@
> >
> > #ifndef _DEBUGFS_INTERNAL_H_
> > #define _DEBUGFS_INTERNAL_H_
> > -#include <linux/lockdep.h>
> > #include <linux/list.h>
> >
> > struct file_operations;
> > @@ -25,11 +24,6 @@ struct debugfs_fsdata {
> > struct {
> > refcount_t active_users;
> > struct completion active_users_drained; -#ifdef
> CONFIG_LOCKDEP
> > - struct lockdep_map lockdep_map;
> > - struct lock_class_key key;
> > - char *lock_name;
> > -#endif
> >
> > /* protect cancellations */
> > struct mutex cancellations_mtx;
> > --
> > 2.25.1
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-06 19:41 ` Saarinen, Jani
@ 2023-12-06 21:32 ` Lucas De Marchi
2023-12-07 7:29 ` Saarinen, Jani
0 siblings, 1 reply; 9+ messages in thread
From: Lucas De Marchi @ 2023-12-06 21:32 UTC (permalink / raw)
To: Saarinen, Jani; +Cc: intel-gfx@lists.freedesktop.org, Vivi, Rodrigo
On Wed, Dec 06, 2023 at 07:41:04PM +0000, Jani Saarinen wrote:
>Hi,
>> -----Original Message-----
>> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Shankar,
>> Uma
>> Sent: Wednesday, December 6, 2023 1:05 PM
>> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
>> gfx@lists.freedesktop.org
>> Subject: Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs
>> handlers vs. removal with lockdep"
>>
>>
>>
>> > -----Original Message-----
>> > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of
>> > Chaitanya Kumar Borah
>> > Sent: Wednesday, December 6, 2023 12:17 PM
>> > To: intel-gfx@lists.freedesktop.org
>> > Subject: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate
>> > debugfs handlers vs. removal with lockdep"
>> >
>> > From: Johannes Berg <johannes.berg@intel.com>
>> >
>> > This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers vs.
>> > removal with lockdep"), it appears to have false positives and really
>> > shouldn't have been in the -rc series with the fixes anyway.
>>
>> Acked-by: Uma Shankar <uma.shankar@intel.com>
>>
>> Hi Chaitanya,
>> Please get the full CI run executed with this change, once its green we can plan merge.
>Just commented on "issues" (no real issues ) on BAT and asked to re-report but we really should use sometimes by-pass shards when we see regression on this magnitude.
>This has big impact on core/gem tests https://intel-gfx-ci.01.org/tree/drm-tip/index.html?testfilter=module%7Cgem%7Ccore
>Even on module load. I am leaning to break process and not wait to Full CI if someone who has merge rights (eg @Vivi, Rodrigo, @De Marchi, Lucas) agree here?
I think this is the convincing link:
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_127359v2/index.html?testfilter=module%7Cgem%7Ccore
Applied with ack on irc by Rodrigo.
Lucas De Marchi
>
>Br,
>Jani
>>
>> Regards,
>> Uma Shankar
>>
>> > Link:https://patchwork.kernel.org/project/linux-
>> > fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f69
>> > 0d383a89b13eb05667@changeid/
>> > Reference: https://gitlab.freedesktop.org/drm/intel/-/issues/9802
>> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
>> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> > ---
>> > fs/debugfs/file.c | 10 ----------
>> > fs/debugfs/inode.c | 7 -------
>> > fs/debugfs/internal.h | 6 ------
>> > 3 files changed, 23 deletions(-)
>> >
>> > diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index
>> > a5ade8c16375..5063434be0fc 100644
>> > --- a/fs/debugfs/file.c
>> > +++ b/fs/debugfs/file.c
>> > @@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
>> > kfree(fsd);
>> > fsd = READ_ONCE(dentry->d_fsdata);
>> > }
>> > -#ifdef CONFIG_LOCKDEP
>> > - fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd",
>> > dentry);
>> > - lockdep_register_key(&fsd->key);
>> > - lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?:
>> > "debugfs",
>> > - &fsd->key, 0);
>> > -#endif
>> > INIT_LIST_HEAD(&fsd->cancellations);
>> > mutex_init(&fsd->cancellations_mtx);
>> > }
>> > @@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
>> > if (!refcount_inc_not_zero(&fsd->active_users))
>> > return -EIO;
>> >
>> > - lock_map_acquire_read(&fsd->lockdep_map);
>> > -
>> > return 0;
>> > }
>> > EXPORT_SYMBOL_GPL(debugfs_file_get);
>> > @@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry) {
>> > struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
>> >
>> > - lock_map_release(&fsd->lockdep_map);
>> > -
>> > if (refcount_dec_and_test(&fsd->active_users))
>> > complete(&fsd->active_users_drained);
>> > }
>> > diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index
>> > e4e7fe1bd9fb..034a617cb1a5 100644
>> > --- a/fs/debugfs/inode.c
>> > +++ b/fs/debugfs/inode.c
>> > @@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct dentry
>> > *dentry)
>> >
>> > /* check it wasn't a dir (no fsdata) or automount (no real_fops) */
>> > if (fsd && fsd->real_fops) {
>> > -#ifdef CONFIG_LOCKDEP
>> > - lockdep_unregister_key(&fsd->key);
>> > - kfree(fsd->lock_name);
>> > -#endif
>> > WARN_ON(!list_empty(&fsd->cancellations));
>> > mutex_destroy(&fsd->cancellations_mtx);
>> > }
>> > @@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct dentry
>> > *dentry)
>> > if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
>> > return;
>> >
>> > - lock_map_acquire(&fsd->lockdep_map);
>> > - lock_map_release(&fsd->lockdep_map);
>> > -
>> > /* if we hit zero, just wait for all to finish */
>> > if (!refcount_dec_and_test(&fsd->active_users)) {
>> > wait_for_completion(&fsd->active_users_drained);
>> > diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h index
>> > 0c4c68cf161f..dae80c2a469e 100644
>> > --- a/fs/debugfs/internal.h
>> > +++ b/fs/debugfs/internal.h
>> > @@ -7,7 +7,6 @@
>> >
>> > #ifndef _DEBUGFS_INTERNAL_H_
>> > #define _DEBUGFS_INTERNAL_H_
>> > -#include <linux/lockdep.h>
>> > #include <linux/list.h>
>> >
>> > struct file_operations;
>> > @@ -25,11 +24,6 @@ struct debugfs_fsdata {
>> > struct {
>> > refcount_t active_users;
>> > struct completion active_users_drained; -#ifdef
>> CONFIG_LOCKDEP
>> > - struct lockdep_map lockdep_map;
>> > - struct lock_class_key key;
>> > - char *lock_name;
>> > -#endif
>> >
>> > /* protect cancellations */
>> > struct mutex cancellations_mtx;
>> > --
>> > 2.25.1
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep"
2023-12-06 21:32 ` Lucas De Marchi
@ 2023-12-07 7:29 ` Saarinen, Jani
0 siblings, 0 replies; 9+ messages in thread
From: Saarinen, Jani @ 2023-12-07 7:29 UTC (permalink / raw)
To: De Marchi, Lucas; +Cc: intel-gfx@lists.freedesktop.org, Vivi, Rodrigo
> -----Original Message-----
> From: De Marchi, Lucas <lucas.demarchi@intel.com>
> Sent: Wednesday, December 6, 2023 11:33 PM
> To: Saarinen, Jani <jani.saarinen@intel.com>
> Cc: Shankar, Uma <uma.shankar@intel.com>; Borah, Chaitanya Kumar
> <chaitanya.kumar.borah@intel.com>; intel-gfx@lists.freedesktop.org; Vivi, Rodrigo
> <rodrigo.vivi@intel.com>
> Subject: Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs
> handlers vs. removal with lockdep"
>
> On Wed, Dec 06, 2023 at 07:41:04PM +0000, Jani Saarinen wrote:
> >Hi,
> >> -----Original Message-----
> >> From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf
> >> Of Shankar, Uma
> >> Sent: Wednesday, December 6, 2023 1:05 PM
> >> To: Borah, Chaitanya Kumar <chaitanya.kumar.borah@intel.com>; intel-
> >> gfx@lists.freedesktop.org
> >> Subject: Re: [Intel-gfx] [topic/core-for-CI] Revert "debugfs:
> >> annotate debugfs handlers vs. removal with lockdep"
> >>
> >>
> >>
> >> > -----Original Message-----
> >> > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf
> >> > Of Chaitanya Kumar Borah
> >> > Sent: Wednesday, December 6, 2023 12:17 PM
> >> > To: intel-gfx@lists.freedesktop.org
> >> > Subject: [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate
> >> > debugfs handlers vs. removal with lockdep"
> >> >
> >> > From: Johannes Berg <johannes.berg@intel.com>
> >> >
> >> > This reverts commit f4acfcd4deb1 ("debugfs: annotate debugfs handlers vs.
> >> > removal with lockdep"), it appears to have false positives and
> >> > really shouldn't have been in the -rc series with the fixes anyway.
> >>
> >> Acked-by: Uma Shankar <uma.shankar@intel.com>
> >>
> >> Hi Chaitanya,
> >> Please get the full CI run executed with this change, once its green we can plan
> merge.
> >Just commented on "issues" (no real issues ) on BAT and asked to re-report but we
> really should use sometimes by-pass shards when we see regression on this
> magnitude.
> >This has big impact on core/gem tests
> >https://intel-gfx-ci.01.org/tree/drm-tip/index.html?testfilter=module%7
> >Cgem%7Ccore Even on module load. I am leaning to break process and not
> >wait to Full CI if someone who has merge rights (eg @Vivi, Rodrigo, @De Marchi,
> Lucas) agree here?
>
> I think this is the convincing link:
> https://intel-gfx-ci.01.org/tree/drm-
> tip/Patchwork_127359v2/index.html?testfilter=module%7Cgem%7Ccore
>
> Applied with ack on irc by Rodrigo.
Thank you!
>
> Lucas De Marchi
>
> >
> >Br,
> >Jani
> >>
> >> Regards,
> >> Uma Shankar
> >>
> >> > Link:https://patchwork.kernel.org/project/linux-
> >> > fsdevel/patch/20231202114936.fd55431ab160.I911aa53abeeca138126f69
> >> > 0d383a89b13eb05667@changeid/
> >> > Reference: https://gitlab.freedesktop.org/drm/intel/-/issues/9802
> >> > Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> >> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >> > ---
> >> > fs/debugfs/file.c | 10 ----------
> >> > fs/debugfs/inode.c | 7 -------
> >> > fs/debugfs/internal.h | 6 ------
> >> > 3 files changed, 23 deletions(-)
> >> >
> >> > diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index
> >> > a5ade8c16375..5063434be0fc 100644
> >> > --- a/fs/debugfs/file.c
> >> > +++ b/fs/debugfs/file.c
> >> > @@ -108,12 +108,6 @@ int debugfs_file_get(struct dentry *dentry)
> >> > kfree(fsd);
> >> > fsd = READ_ONCE(dentry->d_fsdata);
> >> > }
> >> > -#ifdef CONFIG_LOCKDEP
> >> > - fsd->lock_name = kasprintf(GFP_KERNEL, "debugfs:%pd",
> >> > dentry);
> >> > - lockdep_register_key(&fsd->key);
> >> > - lockdep_init_map(&fsd->lockdep_map, fsd->lock_name ?:
> >> > "debugfs",
> >> > - &fsd->key, 0);
> >> > -#endif
> >> > INIT_LIST_HEAD(&fsd->cancellations);
> >> > mutex_init(&fsd->cancellations_mtx);
> >> > }
> >> > @@ -132,8 +126,6 @@ int debugfs_file_get(struct dentry *dentry)
> >> > if (!refcount_inc_not_zero(&fsd->active_users))
> >> > return -EIO;
> >> >
> >> > - lock_map_acquire_read(&fsd->lockdep_map);
> >> > -
> >> > return 0;
> >> > }
> >> > EXPORT_SYMBOL_GPL(debugfs_file_get);
> >> > @@ -151,8 +143,6 @@ void debugfs_file_put(struct dentry *dentry) {
> >> > struct debugfs_fsdata *fsd = READ_ONCE(dentry->d_fsdata);
> >> >
> >> > - lock_map_release(&fsd->lockdep_map);
> >> > -
> >> > if (refcount_dec_and_test(&fsd->active_users))
> >> > complete(&fsd->active_users_drained);
> >> > }
> >> > diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index
> >> > e4e7fe1bd9fb..034a617cb1a5 100644
> >> > --- a/fs/debugfs/inode.c
> >> > +++ b/fs/debugfs/inode.c
> >> > @@ -243,10 +243,6 @@ static void debugfs_release_dentry(struct
> >> > dentry
> >> > *dentry)
> >> >
> >> > /* check it wasn't a dir (no fsdata) or automount (no real_fops) */
> >> > if (fsd && fsd->real_fops) {
> >> > -#ifdef CONFIG_LOCKDEP
> >> > - lockdep_unregister_key(&fsd->key);
> >> > - kfree(fsd->lock_name);
> >> > -#endif
> >> > WARN_ON(!list_empty(&fsd->cancellations));
> >> > mutex_destroy(&fsd->cancellations_mtx);
> >> > }
> >> > @@ -755,9 +751,6 @@ static void __debugfs_file_removed(struct
> >> > dentry
> >> > *dentry)
> >> > if ((unsigned long)fsd & DEBUGFS_FSDATA_IS_REAL_FOPS_BIT)
> >> > return;
> >> >
> >> > - lock_map_acquire(&fsd->lockdep_map);
> >> > - lock_map_release(&fsd->lockdep_map);
> >> > -
> >> > /* if we hit zero, just wait for all to finish */
> >> > if (!refcount_dec_and_test(&fsd->active_users)) {
> >> > wait_for_completion(&fsd->active_users_drained);
> >> > diff --git a/fs/debugfs/internal.h b/fs/debugfs/internal.h index
> >> > 0c4c68cf161f..dae80c2a469e 100644
> >> > --- a/fs/debugfs/internal.h
> >> > +++ b/fs/debugfs/internal.h
> >> > @@ -7,7 +7,6 @@
> >> >
> >> > #ifndef _DEBUGFS_INTERNAL_H_
> >> > #define _DEBUGFS_INTERNAL_H_
> >> > -#include <linux/lockdep.h>
> >> > #include <linux/list.h>
> >> >
> >> > struct file_operations;
> >> > @@ -25,11 +24,6 @@ struct debugfs_fsdata {
> >> > struct {
> >> > refcount_t active_users;
> >> > struct completion active_users_drained; -#ifdef
> >> CONFIG_LOCKDEP
> >> > - struct lockdep_map lockdep_map;
> >> > - struct lock_class_key key;
> >> > - char *lock_name;
> >> > -#endif
> >> >
> >> > /* protect cancellations */
> >> > struct mutex cancellations_mtx;
> >> > --
> >> > 2.25.1
> >
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-12-07 7:30 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-05 13:20 [Intel-gfx] [topic/core-for-CI] Revert "debugfs: annotate debugfs handlers vs. removal with lockdep" Chaitanya Kumar Borah
2023-12-05 13:44 ` Jani Nikula
2023-12-05 17:10 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2023-12-05 17:29 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-12-06 6:47 [Intel-gfx] [topic/core-for-CI] " Chaitanya Kumar Borah
2023-12-06 11:04 ` Shankar, Uma
2023-12-06 19:41 ` Saarinen, Jani
2023-12-06 21:32 ` Lucas De Marchi
2023-12-07 7:29 ` Saarinen, Jani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).