RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if: adapt to new queue_lock type

This commit is contained in:
Thomas Schoebel-Theuer 2021-01-29 20:59:08 +01:00
parent b85bc0f576
commit 4b6163463d
3 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/compat.h
View File

@ -174,6 +174,13 @@ extern int _compat_unlink(
#define MARS_HAS_BIO_THROTTLED
#endif
/* adapt to 0d945c1f966b2bcb67bb12be749da0a7fb00201b
* detected via 8f4236d9008b0973a8281256ccfde6913cdec6cb
*/
#ifdef QUEUE_FLAG_BYPASS
#define MARS_HAS_OLD_QUEUE_LOCK
#endif
/* IO accounting */
/* adapt to 394ffa503bc40e32d7f54a9b817264e81ce131b4

30
kernel/mars_if.c
View File

@ -308,7 +308,11 @@ void _if_unplug(struct if_input *input)
MARS_IO("plugged_count = %d\n", atomic_read(&input->plugged_count));
down(&input->kick_sem);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_lock(&input->req_lock, flags);
#else
traced_lock(&input->q->queue_lock, flags);
#endif
#ifdef USE_TIMER
del_timer(&input->timer);
#endif
@ -317,7 +321,11 @@ void _if_unplug(struct if_input *input)
list_replace_init(&input->plug_anchor, &tmp_list);
atomic_set(&input->plugged_count, 0);
}
traced_unlock(&input->req_lock, flags);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_unlock(&input->req_lock, flags);
#else
traced_unlock(&input->q->queue_lock, flags);
#endif
up(&input->kick_sem);
while (!list_empty(&tmp_list)) {
@ -773,9 +781,17 @@ void if_make_request(struct request_queue *q, struct bio *bio)
list_add_tail(&mref_a->hash_head, &input->hash_table[hash_index].hash_anchor);
traced_unlock(&input->hash_table[hash_index].hash_lock, flags);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_lock(&input->req_lock, flags);
#else
traced_lock(&input->q->queue_lock, flags);
#endif
list_add_tail(&mref_a->plug_head, &input->plug_anchor);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_unlock(&input->req_lock, flags);
#else
traced_unlock(&input->q->queue_lock, flags);
#endif
} // !mref
pos += this_len;
@ -818,7 +834,11 @@ err:
#ifdef USE_TIMER
else {
unsigned long flags;
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_lock(&input->req_lock, flags);
#else
traced_lock(&input->q->queue_lock, flags);
#endif
if (timer_pending(&input->timer)) {
del_timer(&input->timer);
}
@ -826,7 +846,11 @@ err:
input->timer.data = (unsigned long)input;
input->timer.expires = jiffies + USE_TIMER;
add_timer(&input->timer);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
traced_unlock(&input->req_lock, flags);
#else
traced_unlock(&input->q->queue_lock, flags);
#endif
}
#endif
@ -1104,8 +1128,10 @@ static int if_switch(struct if_brick *brick)
MARS_DBG("unplug_fn\n");
q->unplug_fn = if_unplug;
#endif
#ifdef MARS_HAS_OLD_QUEUE_LOCK
MARS_DBG("queue_lock\n");
q->queue_lock = &input->req_lock; // needed!
#endif
input->bdev = bdget(MKDEV(disk->major, minor));
/* we have no partitions. we contain only ourselves. */
@ -1431,7 +1457,9 @@ static int if_input_construct(struct if_input *input)
}
INIT_LIST_HEAD(&input->plug_anchor);
sema_init(&input->kick_sem, 1);
#ifdef MARS_HAS_OLD_QUEUE_LOCK
spin_lock_init(&input->req_lock);
#endif
atomic_set(&input->plugged_count, 0);
#ifdef USE_TIMER
init_timer(&input->timer);

2
kernel/mars_if.h
View File

@ -91,7 +91,9 @@ struct if_input {
atomic_t total_mref_write_count;
#endif
/* private */
#ifdef MARS_HAS_OLD_QUEUE_LOCK
spinlock_t req_lock;
#endif
struct semaphore kick_sem;
struct if_hash_anchor *hash_table;
};