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

copy: safeguard state initialization

This commit is contained in:
Thomas Schoebel-Theuer 2021-03-01 11:01:37 +01:00
parent 09ca8cce5c
commit 8b74860e7c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kernel/mars_copy.c
View File

@ -325,6 +325,11 @@ int _make_mref(struct copy_brick *brick, int index, int queue, void *data,
if (mref->ref_prio < MARS_PRIO_HIGH || mref->ref_prio > MARS_PRIO_LOW)
mref->ref_prio = brick->io_prio;
st = &GET_STATE(brick, index);
st->len = len;
WRITE_ONCE(st->table[queue], mref);
WRITE_ONCE(st->active[queue], true);
SETUP_CALLBACK(mref, copy_endio, mref_a);
input = queue ? brick->inputs[INPUT_B_COPY] : brick->inputs[INPUT_A_COPY];
@ -339,16 +344,15 @@ int _make_mref(struct copy_brick *brick, int index, int queue, void *data,
MARS_DBG("shorten len %d < %d\n", mref->ref_len, len);
}
if (queue == 0) {
GET_STATE(brick, index).len = mref->ref_len;
} else if (unlikely(mref->ref_len < GET_STATE(brick, index).len)) {
MARS_DBG("shorten len %d < %d at index %d\n", mref->ref_len, GET_STATE(brick, index).len, index);
GET_STATE(brick, index).len = mref->ref_len;
st->len = mref->ref_len;
} else if (unlikely(mref->ref_len < st->len)) {
MARS_DBG("shorten len %d < %d at index %d\n",
mref->ref_len,
st->len,
index);
st->len = mref->ref_len;
}
st = &GET_STATE(brick, index);
WRITE_ONCE(st->table[queue], mref);
WRITE_ONCE(st->active[queue], true);
if (flags & MREF_WRITE) {
atomic_inc(&brick->copy_write_flight);
atomic_inc(&global_copy_write_flight);