mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-02-07 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

scoutfs: add cache reading limit to _set_batch

Browse Source 
Add an end argument to _set_batch to specify the limit of
items we'll read into the cache.

And it turns out that the loop in _set_batch that meant to cache all the
items covered by the batch didn't try hard enough.  It would stop once
the first key was covered but didn't make sure that the coverage
extended to cover last.  This can happen if segment boundaries happen to
fall within the items that make up the batch.  Fix it up while we're in
here.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2017-07-13 10:27:35 -07:00
parent 0b64a4c83f
commit d78ed098a7
3 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
kmod/src/item.c
View File

@@ -1125,12 +1125,13 @@ out:
* batch item does have an existing item.
*/
int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
struct scoutfs_key_buf *start,
struct scoutfs_key_buf *end, int sif)
struct scoutfs_key_buf *first,
struct scoutfs_key_buf *last, int sif,
struct scoutfs_key_buf *end)
{
struct scoutfs_sb_info *sbi = SCOUTFS_SB(sb);
struct item_cache *cac = sbi->item_cache;
struct scoutfs_key_buf *missing;
struct scoutfs_key_buf *range_end;
SCOUTFS_DECLARE_KVEC(del_val);
struct cached_item *exist;
struct cached_item *item;
@@ -1147,21 +1148,31 @@ int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
return -EINVAL;
}
trace_scoutfs_item_set_batch(sb, start, end);
trace_scoutfs_item_set_batch(sb, first, last);
if (WARN_ON_ONCE(scoutfs_key_compare(start, end) > 0))
if (WARN_ON_ONCE(scoutfs_key_compare(first, last) > 0) ||
WARN_ON_ONCE(scoutfs_key_compare(end, last) < 0))
return -EINVAL;
missing = scoutfs_key_alloc(sb, SCOUTFS_MAX_KEY_SIZE);
if (!missing)
range_end = scoutfs_key_alloc(sb, SCOUTFS_MAX_KEY_SIZE);
if (!range_end)
return -ENOMEM;
spin_lock_irqsave(&cac->lock, flags);
while (!check_range(sb, &cac->ranges, start, missing)) {
/* make sure all of first through last are cached */
scoutfs_key_copy(range_end, first);
for (;;) {
if (check_range(sb, &cac->ranges, range_end, range_end)) {
if (scoutfs_key_compare(range_end, last) >= 0)
break;
/* start reading from hole starting at range_end */
} else {
scoutfs_key_copy(range_end, first);
}
spin_unlock_irqrestore(&cac->lock, flags);
ret = scoutfs_manifest_read_items(sb, start, missing);
ret = scoutfs_manifest_read_items(sb, range_end, end);
spin_lock_irqsave(&cac->lock, flags);
if (ret)
@@ -1172,7 +1183,7 @@ int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
if (!list_empty(list) && (sif & (SIF_EXCLUSIVE | SIF_REPLACE))) {
item = list_first_entry(list, struct cached_item, entry);
exist = item_for_next(&cac->items, start, NULL, end);
exist = item_for_next(&cac->items, first, NULL, last);
while (item) {
/* compare keys, with bias to finding _REPLACE err */
@@ -1193,7 +1204,7 @@ int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
item = NULL;
} else if (cmp > 0) {
exist = next_item_node(&cac->items, exist, end);
exist = next_item_node(&cac->items, exist, last);
} else {
/* cmp == 0 */
@@ -1207,8 +1218,8 @@ int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
}
/* delete everything in the range */
for (exist = item_for_next(&cac->items, start, NULL, end);
exist; exist = next_item_node(&cac->items, exist, end)) {
for (exist = item_for_next(&cac->items, first, NULL, last);
exist; exist = next_item_node(&cac->items, exist, last)) {
scoutfs_kvec_init_null(del_val);
become_deletion_item(sb, cac, exist, del_val);
@@ -1225,7 +1236,7 @@ int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
ret = 0;
out:
spin_unlock_irqrestore(&cac->lock, flags);
scoutfs_key_free(sb, missing);
scoutfs_key_free(sb, range_end);
return ret;
}

5
kmod/src/item.h
View File

@@ -45,8 +45,9 @@ int scoutfs_item_insert_batch(struct super_block *sb, struct list_head *list,
struct scoutfs_key_buf *start,
struct scoutfs_key_buf *end);
int scoutfs_item_set_batch(struct super_block *sb, struct list_head *list,
struct scoutfs_key_buf *start,
struct scoutfs_key_buf *end, int sif);
struct scoutfs_key_buf *first,
struct scoutfs_key_buf *last, int sif,
struct scoutfs_key_buf *end);
void scoutfs_item_free_batch(struct super_block *sb, struct list_head *list);
bool scoutfs_item_has_dirty(struct super_block *sb);

2
kmod/src/xattr.c
View File

@@ -324,7 +324,7 @@ static int scoutfs_xattr_set(struct dentry *dentry, const char *name,
down_write(&si->xattr_rwsem);
ret = scoutfs_dirty_inode_item(inode) ?:
scoutfs_item_set_batch(sb, &list, key, last, sif);
scoutfs_item_set_batch(sb, &list, key, last, sif, lck->end);
if (ret == 0) {
/* XXX do these want i_mutex or anything? */
inode_inc_iversion(inode);