3:05 a.m.
The current struct wait_queue_head was renamed by kernel commit
9d9d676f595b ("sched/wait: Standardize internal naming of wait-queue heads")
at Linux 4.13. Without the patch, on earlier kernels the "sbitmapq"
command fails with the following error:
crash> sbitmapq ffff8801790b3b50
depth = 128
busy = 0
bits_per_word = 32
...
sbitmapq: invalid structure member offset: wait_queue_head_head
FILE: sbitmap.c LINE: 344 FUNCTION: sbitmap_queue_show()
Signed-off-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
---
sbitmap.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sbitmap.c b/sbitmap.c
index bb2f19e6207b..be5d30a8ea88 100644
--- a/sbitmap.c
+++ b/sbitmap.c
@@ -341,7 +341,10 @@ static void sbitmap_queue_show(const struct sbitmap_queue_context
*sqc,
sbq_wait_state_size = SIZE(sbq_wait_state);
wait_cnt_off = OFFSET(sbq_wait_state_wait_cnt);
wait_off = OFFSET(sbq_wait_state_wait);
- list_head_off = OFFSET(wait_queue_head_head);
+ if (VALID_MEMBER(wait_queue_head_head)) /* 4.13 and later */
+ list_head_off = OFFSET(wait_queue_head_head);
+ else
+ list_head_off = OFFSET(__wait_queue_head_task_list);
sbq_wait_state_buf = GETBUF(sbq_wait_state_size);
--
2.31.1
3:07 a.m.
New subject: [PATCH 2/2] sbitmapq: Limit kernels without sbitmap again
commit 364b2e413c69 ("sbitmapq: remove struct and member validation
in sbitmapq_init()") lifted the use of the "sbitmapq" command
unconditionally. Without the patch, the command fails with the
following error on kernels without sbitmap:
crash> sbitmapq ffff88015796e550
sbitmapq: invalid structure member offset: sbitmap_queue_sb
FILE: sbitmap.c LINE: 385 FUNCTION: sbitmap_queue_context_load()
Now the command supports Linux 4.9 and later kernels since it was
abstracted out, so it can be limited by the non-existence of the
sbitmap structure.
Signed-off-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
---
sbitmap.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sbitmap.c b/sbitmap.c
index be5d30a8ea88..12d6512a1e4d 100644
--- a/sbitmap.c
+++ b/sbitmap.c
@@ -540,6 +540,10 @@ void sbitmapq_init(void)
STRUCT_SIZE_INIT(sbitmap_queue, "sbitmap_queue");
STRUCT_SIZE_INIT(sbq_wait_state, "sbq_wait_state");
+ /* sbitmap was abstracted out by commit 88459642cba4 on Linux 4.9. */
+ if (INVALID_SIZE(sbitmap))
+ command_not_supported();
+
MEMBER_OFFSET_INIT(sbitmap_word_depth, "sbitmap_word", "depth");
MEMBER_OFFSET_INIT(sbitmap_word_word, "sbitmap_word", "word");
MEMBER_OFFSET_INIT(sbitmap_word_cleared, "sbitmap_word",
"cleared");
--
2.31.1
8:41 p.m.
New subject: [PATCH 2/2] sbitmapq: Limit kernels without sbitmap again
Hi, Kazu
Thank you for the fix.
For these two patches:
[1] [PATCH 1/2] sbitmapq: Fix for kernels without struct wait_queue_head
[2] [PATCH 2/2] sbitmapq: Limit kernels without sbitmap again
Acked-by: Lianbo Jiang <lijiang(a)redhat.com>
On Fri, Jun 10, 2022 at 4:07 PM HAGIO KAZUHITO(萩尾 一仁) <k-hagio-ab(a)nec.com>
wrote:
commit 364b2e413c69 ("sbitmapq: remove struct and member
validation
in sbitmapq_init()") lifted the use of the "sbitmapq" command
unconditionally. Without the patch, the command fails with the
following error on kernels without sbitmap:
crash> sbitmapq ffff88015796e550
sbitmapq: invalid structure member offset: sbitmap_queue_sb
FILE: sbitmap.c LINE: 385 FUNCTION:
sbitmap_queue_context_load()
Now the command supports Linux 4.9 and later kernels since it was
abstracted out, so it can be limited by the non-existence of the
sbitmap structure.
Signed-off-by: Kazuhito Hagio <k-hagio-ab(a)nec.com>
---
sbitmap.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sbitmap.c b/sbitmap.c
index be5d30a8ea88..12d6512a1e4d 100644
--- a/sbitmap.c
+++ b/sbitmap.c
@@ -540,6 +540,10 @@ void sbitmapq_init(void)
STRUCT_SIZE_INIT(sbitmap_queue, "sbitmap_queue");
STRUCT_SIZE_INIT(sbq_wait_state, "sbq_wait_state");
+ /* sbitmap was abstracted out by commit 88459642cba4 on Linux 4.9.
*/
+ if (INVALID_SIZE(sbitmap))
+ command_not_supported();
+
MEMBER_OFFSET_INIT(sbitmap_word_depth, "sbitmap_word",
"depth");
MEMBER_OFFSET_INIT(sbitmap_word_word, "sbitmap_word",
"word");
MEMBER_OFFSET_INIT(sbitmap_word_cleared, "sbitmap_word",
"cleared");
--
2.31.1
3:33 a.m.
New subject: [PATCH 2/2] sbitmapq: Limit kernels without sbitmap again
On 2022/06/14 10:41, lijiang wrote:
Hi, Kazu
Thank you for the fix.
For these two patches:
[1] [PATCH 1/2] sbitmapq: Fix for kernels without struct wait_queue_head
[2] [PATCH 2/2] sbitmapq: Limit kernels without sbitmap again
Acked-by: Lianbo Jiang <lijiang(a)redhat.com <mailto:lijiang@redhat.com>>
Thanks, applied.
Kazu
>
> On Fri, Jun 10, 2022 at 4:07 PM HAGIO KAZUHITO(萩尾 一仁) <k-hagio-ab(a)nec.com
<mailto:k-hagio-ab@nec.com>> wrote:
>
> commit 364b2e413c69 ("sbitmapq: remove struct and member validation
> in sbitmapq_init()") lifted the use of the "sbitmapq" command
> unconditionally. Without the patch, the command fails with the
> following error on kernels without sbitmap:
>
> crash> sbitmapq ffff88015796e550
>
> sbitmapq: invalid structure member offset: sbitmap_queue_sb
> FILE: sbitmap.c LINE: 385 FUNCTION:
sbitmap_queue_context_load()
>
> Now the command supports Linux 4.9 and later kernels since it was
> abstracted out, so it can be limited by the non-existence of the
> sbitmap structure.
>
> Signed-off-by: Kazuhito Hagio <k-hagio-ab(a)nec.com
<mailto:k-hagio-ab@nec.com>>
> ---
> sbitmap.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/sbitmap.c b/sbitmap.c
> index be5d30a8ea88..12d6512a1e4d 100644
> --- a/sbitmap.c
> +++ b/sbitmap.c
> @@ -540,6 +540,10 @@ void sbitmapq_init(void)
> STRUCT_SIZE_INIT(sbitmap_queue, "sbitmap_queue");
> STRUCT_SIZE_INIT(sbq_wait_state, "sbq_wait_state");
>
> + /* sbitmap was abstracted out by commit 88459642cba4 on Linux 4.9. */
> + if (INVALID_SIZE(sbitmap))
> + command_not_supported();
> +
> MEMBER_OFFSET_INIT(sbitmap_word_depth, "sbitmap_word",
"depth");
> MEMBER_OFFSET_INIT(sbitmap_word_word, "sbitmap_word",
"word");
> MEMBER_OFFSET_INIT(sbitmap_word_cleared, "sbitmap_word",
"cleared");
> --
> 2.31.1
>
896
days inactive
900
days old
devel@lists.crash-utility.osci.io
3 comments
2 participants
participants (2)
-
HAGIO KAZUHITO(萩尾 一仁) -
lijiang