mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-08 21:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using inode index key type as array index

Browse Source 
The code that updates inode index items on behalf of indexed fields uses
an array to track changes in the fields.  Those array indexes were the
raw key type values.

We're about to introduce some sparse space between all the key values so
that we have some room to add keys in the future at arbitrary sort
positions amongst the previous keys.

We don't want the inode index item updating code to keep using raw types
as array indices when the type values are no longer small dense values.
We introduce indirection from type values to array indices to keep the
tracking array in the in-memory inode struct small.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2021-10-25 15:10:55 -07:00
parent 20ac2e35fa
commit e38beee85a
3 changed files with 48 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kmod/src/format.h
View File

@@ -604,7 +604,6 @@ struct scoutfs_log_merge_freeing {
/* inode index zone */
#define SCOUTFS_INODE_INDEX_META_SEQ_TYPE 1
#define SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE 2
#define SCOUTFS_INODE_INDEX_NR 3 /* don't forget to update */
/* orphan zone, redundant type used for clarity */
#define SCOUTFS_ORPHAN_TYPE 1

61
kmod/src/inode.c
View File

@@ -186,6 +186,37 @@ static void set_inode_ops(struct inode *inode)
mapping_set_gfp_mask(inode->i_mapping, GFP_USER);
}
static unsigned int item_index_arr_ind(u8 type)
{
switch (type) {
case SCOUTFS_INODE_INDEX_META_SEQ_TYPE: return 0; break;
case SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE: return 1; break;
/* should never get here, we control callers, not untrusted data */
default: BUG(); break;
}
}
static void set_item_major(struct scoutfs_inode_info *si, u8 type, __le64 maj)
{
unsigned int ind = item_index_arr_ind(type);
si->item_majors[ind] = le64_to_cpu(maj);
}
static u64 get_item_major(struct scoutfs_inode_info *si, u8 type)
{
unsigned int ind = item_index_arr_ind(type);
return si->item_majors[ind];
}
static u64 get_item_minor(struct scoutfs_inode_info *si, u8 type)
{
unsigned int ind = item_index_arr_ind(type);
return si->item_minors[ind];
}
/*
* The caller has ensured that the fields in the incoming scoutfs inode
* reflect both the inode item and the inode index items. This happens
@@ -202,10 +233,8 @@ static void set_item_info(struct scoutfs_inode_info *si,
memset(si->item_minors, 0, sizeof(si->item_minors));
si->have_item = true;
si->item_majors[SCOUTFS_INODE_INDEX_META_SEQ_TYPE] =
le64_to_cpu(sinode->meta_seq);
si->item_majors[SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE] =
le64_to_cpu(sinode->data_seq);
set_item_major(si, SCOUTFS_INODE_INDEX_META_SEQ_TYPE, sinode->meta_seq);
set_item_major(si, SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE, sinode->data_seq);
}
static void load_inode(struct inode *inode, struct scoutfs_inode *cinode)
@@ -795,16 +824,14 @@ static bool will_del_index(struct scoutfs_inode_info *si,
u8 type, u64 major, u32 minor)
{
return si && si->have_item &&
(si->item_majors[type] != major ||
si->item_minors[type] != minor);
(get_item_major(si, type) != major || get_item_minor(si, type) != minor);
}
static bool will_ins_index(struct scoutfs_inode_info *si,
u8 type, u64 major, u32 minor)
{
return !si || !si->have_item ||
(si->item_majors[type] != major ||
si->item_minors[type] != minor);
(get_item_major(si, type) != major || get_item_minor(si, type) != minor);
}
static bool inode_has_index(umode_t mode, u8 type)
@@ -912,14 +939,14 @@ static int update_index_items(struct super_block *sb,
if (ret || !will_del_index(si, type, major, minor))
return ret;
trace_scoutfs_delete_index_item(sb, type, si->item_majors[type],
si->item_minors[type], ino);
trace_scoutfs_delete_index_item(sb, type, get_item_major(si, type),
get_item_minor(si, type), ino);
scoutfs_inode_init_index_key(&del, type, si->item_majors[type],
si->item_minors[type], ino);
scoutfs_inode_init_index_key(&del, type, get_item_major(si, type),
get_item_minor(si, type), ino);
del_lock = find_index_lock(lock_list, type, si->item_majors[type],
si->item_minors[type], ino);
del_lock = find_index_lock(lock_list, type, get_item_major(si, type),
get_item_minor(si, type), ino);
ret = scoutfs_item_delete_force(sb, &del, del_lock);
if (ret) {
err = scoutfs_item_delete(sb, &ins, ins_lock);
@@ -1056,8 +1083,8 @@ static int prepare_index_items(struct scoutfs_inode_info *si,
}
if (will_del_index(si, type, major, minor)) {
ret = add_index_lock(list, ino, type, si->item_majors[type],
si->item_minors[type]);
ret = add_index_lock(list, ino, type, get_item_major(si, type),
get_item_minor(si, type));
if (ret)
return ret;
}
@@ -1076,7 +1103,7 @@ static u64 upd_data_seq(struct scoutfs_sb_info *sbi,
if (!si || !si->have_item || set_data_seq)
return sbi->trans_seq;
return si->item_majors[SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE];
return get_item_major(si, SCOUTFS_INODE_INDEX_DATA_SEQ_TYPE);
}
/*

6
kmod/src/inode.h
View File

@@ -9,6 +9,8 @@
struct scoutfs_lock;
#define SCOUTFS_INODE_NR_INDICES 2
struct scoutfs_inode_info {
/* read or initialized for each inode instance */
u64 ino;
@@ -38,8 +40,8 @@ struct scoutfs_inode_info {
*/
struct mutex item_mutex;
bool have_item;
u64 item_majors[SCOUTFS_INODE_INDEX_NR];
u32 item_minors[SCOUTFS_INODE_INDEX_NR];
u64 item_majors[SCOUTFS_INODE_NR_INDICES];
u32 item_minors[SCOUTFS_INODE_NR_INDICES];
/* updated at on each new lock acquisition */
atomic64_t last_refreshed;