|
 |
d67611 |
From 12fe6c7cdd768f87ce6e903a2bbfb0c0591585c5 Mon Sep 17 00:00:00 2001
|
|
|
d67611 |
From: Kazuhito Hagio <k-hagio-ab@nec.com>
|
|
|
d67611 |
Date: Fri, 10 Jun 2022 11:49:47 +0900
|
|
|
d67611 |
Subject: [PATCH 15/18] sbitmapq: Fix for sbitmap_queue without
|
|
|
d67611 |
min_shallow_depth member
|
|
|
d67611 |
|
|
|
d67611 |
The sbitmap_queue.min_shallow_depth member was added by kernel commit
|
|
|
d67611 |
a327553965de ("sbitmap: fix missed wakeups caused by sbitmap_queue_get_shallow()")
|
|
|
d67611 |
at Linux 4.18. Without the patch, on earlier kernels the "sbitmapq"
|
|
|
d67611 |
command fails with the following error:
|
|
|
d67611 |
|
|
|
d67611 |
crash> sbitmapq ffff89bb7638ee50
|
|
|
d67611 |
|
|
|
d67611 |
sbitmapq: invalid structure member offset: sbitmap_queue_min_shallow_depth
|
|
|
d67611 |
FILE: sbitmap.c LINE: 398 FUNCTION: sbitmap_queue_context_load()
|
|
|
d67611 |
|
|
|
d67611 |
Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
|
|
|
d67611 |
Signed-off-by: Lianbo Jiang <lijiang@redhat.com>
|
|
|
d67611 |
---
|
|
|
d67611 |
sbitmap.c | 6 ++++--
|
|
|
d67611 |
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
d67611 |
|
|
|
d67611 |
diff --git a/sbitmap.c b/sbitmap.c
|
|
|
d67611 |
index c9f7209f9e3e..bb2f19e6207b 100644
|
|
|
d67611 |
--- a/sbitmap.c
|
|
|
d67611 |
+++ b/sbitmap.c
|
|
|
d67611 |
@@ -371,7 +371,8 @@ static void sbitmap_queue_show(const struct sbitmap_queue_context *sqc,
|
|
|
d67611 |
else if (VALID_MEMBER(sbitmap_round_robin)) /* 5.13 and later */
|
|
|
d67611 |
fprintf(fp, "round_robin = %d\n", sc->round_robin);
|
|
|
d67611 |
|
|
|
d67611 |
- fprintf(fp, "min_shallow_depth = %u\n", sqc->min_shallow_depth);
|
|
|
d67611 |
+ if (VALID_MEMBER(sbitmap_queue_min_shallow_depth)) /* 4.18 and later */
|
|
|
d67611 |
+ fprintf(fp, "min_shallow_depth = %u\n", sqc->min_shallow_depth);
|
|
|
d67611 |
}
|
|
|
d67611 |
|
|
|
d67611 |
static void sbitmap_queue_context_load(ulong addr, struct sbitmap_queue_context *sqc)
|
|
|
d67611 |
@@ -395,7 +396,8 @@ static void sbitmap_queue_context_load(ulong addr, struct sbitmap_queue_context
|
|
|
d67611 |
sqc->ws_active = INT(sbitmap_queue_buf + OFFSET(sbitmap_queue_ws_active));
|
|
|
d67611 |
if (VALID_MEMBER(sbitmap_queue_round_robin))
|
|
|
d67611 |
sqc->round_robin = BOOL(sbitmap_queue_buf + OFFSET(sbitmap_queue_round_robin));
|
|
|
d67611 |
- sqc->min_shallow_depth = UINT(sbitmap_queue_buf + OFFSET(sbitmap_queue_min_shallow_depth));
|
|
|
d67611 |
+ if (VALID_MEMBER(sbitmap_queue_min_shallow_depth))
|
|
|
d67611 |
+ sqc->min_shallow_depth = UINT(sbitmap_queue_buf + OFFSET(sbitmap_queue_min_shallow_depth));
|
|
|
d67611 |
|
|
|
d67611 |
FREEBUF(sbitmap_queue_buf);
|
|
|
d67611 |
}
|
|
|
d67611 |
--
|
|
|
d67611 |
2.30.2
|
|
|
d67611 |
|