ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/ftl: Remove band from active/pending queue

Browse Source 
In case high priority band was added
for relocation it should be removed
from active/pending queue if it was
already on one of them.

Change-Id: Id0591b1d3a4174dd05eb1c32227e4d3b3a9cbcd0
Signed-off-by: Wojciech Malikowski <wojciech.malikowski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/458057
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
This commit is contained in:
Wojciech Malikowski 2019-06-14 05:58:49 -04:00 committed by Darek Stojaczyk
parent 2cc6bd2a26
commit 76cff6da81
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/ftl/ftl_reloc.c
View File

@ -539,10 +539,10 @@ ftl_reloc_release(struct ftl_band_reloc *breloc)
struct ftl_reloc *reloc = breloc->parent;
struct ftl_band *band = breloc->band;
if (band->high_prio) {
if (band->high_prio && breloc->num_lbks == 0) {
band->high_prio = 0;
TAILQ_REMOVE(&reloc->prio_queue, breloc, entry);
} else {
} else if (!band->high_prio) {
TAILQ_REMOVE(&reloc->active_queue, breloc, entry);
}
@ -553,7 +553,7 @@ ftl_reloc_release(struct ftl_band_reloc *breloc)
breloc->active = 0;
reloc->num_active--;
if (breloc->num_lbks) {
if (!band->high_prio && breloc->num_lbks) {
TAILQ_INSERT_TAIL(&reloc->pending_queue, breloc, entry);
return;
}
@ -785,6 +785,23 @@ ftl_reloc_add(struct ftl_reloc *reloc, struct ftl_band *band, size_t offset,
}
if (prio) {
struct ftl_band_reloc *iter_breloc;
/* If priority band is already on pending or active queue, remove it from it */
TAILQ_FOREACH(iter_breloc, &reloc->pending_queue, entry) {
if (breloc == iter_breloc) {
TAILQ_REMOVE(&reloc->pending_queue, breloc, entry);
break;
}
}
TAILQ_FOREACH(iter_breloc, &reloc->active_queue, entry) {
if (breloc == iter_breloc) {
TAILQ_REMOVE(&reloc->active_queue, breloc, entry);
break;
}
}
TAILQ_INSERT_TAIL(&reloc->prio_queue, breloc, entry);
ftl_band_acquire_lba_map(breloc->band);
}