From 08f87f769b595151be1afeff53e144f543faa614 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 06 Dec 2023 09:51:13 +0000
Subject: [PATCH] add dts config
---
kernel/fs/incfs/data_mgmt.h | 223 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 189 insertions(+), 34 deletions(-)
diff --git a/kernel/fs/incfs/data_mgmt.h b/kernel/fs/incfs/data_mgmt.h
index 2726867..2227913 100644
--- a/kernel/fs/incfs/data_mgmt.h
+++ b/kernel/fs/incfs/data_mgmt.h
@@ -10,49 +10,71 @@
#include <linux/types.h>
#include <linux/mutex.h>
#include <linux/spinlock.h>
+#include <linux/rcupdate.h>
#include <linux/completion.h>
#include <linux/wait.h>
+#include <linux/zstd.h>
#include <crypto/hash.h>
+#include <linux/rwsem.h>
#include <uapi/linux/incrementalfs.h>
#include "internal.h"
+#include "pseudo_files.h"
#define SEGMENTS_PER_FILE 3
enum LOG_RECORD_TYPE {
FULL,
SAME_FILE,
+ SAME_FILE_CLOSE_BLOCK,
+ SAME_FILE_CLOSE_BLOCK_SHORT,
SAME_FILE_NEXT_BLOCK,
SAME_FILE_NEXT_BLOCK_SHORT,
};
struct full_record {
- enum LOG_RECORD_TYPE type : 2; /* FULL */
- u32 block_index : 30;
+ enum LOG_RECORD_TYPE type : 3; /* FULL */
+ u32 block_index : 29;
incfs_uuid_t file_id;
u64 absolute_ts_us;
-} __packed; /* 28 bytes */
+ uid_t uid;
+} __packed; /* 32 bytes */
-struct same_file_record {
- enum LOG_RECORD_TYPE type : 2; /* SAME_FILE */
- u32 block_index : 30;
- u32 relative_ts_us; /* max 2^32 us ~= 1 hour (1:11:30) */
-} __packed; /* 12 bytes */
+struct same_file {
+ enum LOG_RECORD_TYPE type : 3; /* SAME_FILE */
+ u32 block_index : 29;
+ uid_t uid;
+ u16 relative_ts_us; /* max 2^16 us ~= 64 ms */
+} __packed; /* 10 bytes */
-struct same_file_next_block {
- enum LOG_RECORD_TYPE type : 2; /* SAME_FILE_NEXT_BLOCK */
- u32 relative_ts_us : 30; /* max 2^30 us ~= 15 min (17:50) */
+struct same_file_close_block {
+ enum LOG_RECORD_TYPE type : 3; /* SAME_FILE_CLOSE_BLOCK */
+ u16 relative_ts_us : 13; /* max 2^13 us ~= 8 ms */
+ s16 block_index_delta;
} __packed; /* 4 bytes */
-struct same_file_next_block_short {
- enum LOG_RECORD_TYPE type : 2; /* SAME_FILE_NEXT_BLOCK_SHORT */
- u16 relative_ts_us : 14; /* max 2^14 us ~= 16 ms */
+struct same_file_close_block_short {
+ enum LOG_RECORD_TYPE type : 3; /* SAME_FILE_CLOSE_BLOCK_SHORT */
+ u8 relative_ts_tens_us : 5; /* max 2^5*10 us ~= 320 us */
+ s8 block_index_delta;
} __packed; /* 2 bytes */
+
+struct same_file_next_block {
+ enum LOG_RECORD_TYPE type : 3; /* SAME_FILE_NEXT_BLOCK */
+ u16 relative_ts_us : 13; /* max 2^13 us ~= 8 ms */
+} __packed; /* 2 bytes */
+
+struct same_file_next_block_short {
+ enum LOG_RECORD_TYPE type : 3; /* SAME_FILE_NEXT_BLOCK_SHORT */
+ u8 relative_ts_tens_us : 5; /* max 2^5*10 us ~= 320 us */
+} __packed; /* 1 byte */
union log_record {
struct full_record full_record;
- struct same_file_record same_file_record;
+ struct same_file same_file;
+ struct same_file_close_block same_file_close_block;
+ struct same_file_close_block_short same_file_close_block_short;
struct same_file_next_block same_file_next_block;
struct same_file_next_block_short same_file_next_block_short;
};
@@ -99,8 +121,8 @@
unsigned int readahead_pages;
unsigned int read_log_pages;
unsigned int read_log_wakeup_count;
- bool no_backing_file_cache;
- bool no_backing_file_readahead;
+ bool report_uid;
+ char *sysfs_name;
};
struct mount_info {
@@ -109,6 +131,14 @@
struct path mi_backing_dir_path;
struct dentry *mi_index_dir;
+ /* For stacking mounts, if true, this indicates if the index dir needs
+ * to be freed for this SB otherwise it was created by lower level SB */
+ bool mi_index_free;
+
+ struct dentry *mi_incomplete_dir;
+ /* For stacking mounts, if true, this indicates if the incomplete dir
+ * needs to be freed for this SB. Similar to mi_index_free */
+ bool mi_incomplete_free;
const struct cred *mi_owner;
@@ -123,13 +153,13 @@
wait_queue_head_t mi_pending_reads_notif_wq;
/*
- * Protects:
+ * Protects - RCU safe:
* - reads_list_head
* - mi_pending_reads_count
* - mi_last_pending_read_number
* - data_file_segment.reads_list_head
*/
- struct mutex mi_pending_reads_mutex;
+ spinlock_t pending_read_lock;
/* List of active pending_read objects */
struct list_head mi_reads_list_head;
@@ -146,11 +176,67 @@
/* Temporary buffer for read logger. */
struct read_log mi_log;
- void *log_xattr;
- size_t log_xattr_size;
+ /* SELinux needs special xattrs on our pseudo files */
+ struct mem_range pseudo_file_xattr[PSEUDO_FILE_COUNT];
- void *pending_read_xattr;
- size_t pending_read_xattr_size;
+ /* A queue of waiters who want to be notified about blocks_written */
+ wait_queue_head_t mi_blocks_written_notif_wq;
+
+ /* Number of blocks written since mount */
+ atomic_t mi_blocks_written;
+
+ /* Per UID read timeouts */
+ spinlock_t mi_per_uid_read_timeouts_lock;
+ struct incfs_per_uid_read_timeouts *mi_per_uid_read_timeouts;
+ int mi_per_uid_read_timeouts_size;
+
+ /* zstd workspace */
+ struct mutex mi_zstd_workspace_mutex;
+ void *mi_zstd_workspace;
+ ZSTD_DStream *mi_zstd_stream;
+ struct delayed_work mi_zstd_cleanup_work;
+
+ /* sysfs node */
+ struct incfs_sysfs_node *mi_sysfs_node;
+
+ /* Last error information */
+ struct mutex mi_le_mutex;
+ incfs_uuid_t mi_le_file_id;
+ u64 mi_le_time_us;
+ u32 mi_le_page;
+ u32 mi_le_errno;
+ uid_t mi_le_uid;
+
+ /* Number of reads timed out */
+ u32 mi_reads_failed_timed_out;
+
+ /* Number of reads failed because hash verification failed */
+ u32 mi_reads_failed_hash_verification;
+
+ /* Number of reads failed for another reason */
+ u32 mi_reads_failed_other;
+
+ /* Number of reads delayed because page had to be fetched */
+ u32 mi_reads_delayed_pending;
+
+ /* Total time waiting for pages to be fetched */
+ u64 mi_reads_delayed_pending_us;
+
+ /*
+ * Number of reads delayed because of per-uid min_time_us or
+ * min_pending_time_us settings
+ */
+ u32 mi_reads_delayed_min;
+
+ /* Total time waiting because of per-uid min_time_us or
+ * min_pending_time_us settings.
+ *
+ * Note that if a read is initially delayed because we have to wait for
+ * the page, then further delayed because of min_pending_time_us
+ * setting, this counter gets incremented by only the further delay
+ * time.
+ */
+ u64 mi_reads_delayed_min_us;
};
struct data_file_block {
@@ -172,17 +258,20 @@
int serial_number;
+ uid_t uid;
+
struct list_head mi_reads_list;
struct list_head segment_reads_list;
+
+ struct rcu_head rcu;
};
struct data_file_segment {
wait_queue_head_t new_data_arrival_wq;
/* Protects reads and writes from the blockmap */
- /* Good candidate for read/write mutex */
- struct mutex blockmap_mutex;
+ struct rw_semaphore rwsem;
/* List of active pending_read objects belonging to this segment */
/* Protected by mount_info.pending_reads_mutex */
@@ -232,11 +321,50 @@
/* Total number of blocks, data + hash */
int df_total_block_count;
- struct file_attr n_attr;
+ /* For mapped files, the offset into the actual file */
+ loff_t df_mapped_offset;
+ /* Number of data blocks written to file */
+ atomic_t df_data_blocks_written;
+
+ /* Number of data blocks in the status block */
+ u32 df_initial_data_blocks_written;
+
+ /* Number of hash blocks written to file */
+ atomic_t df_hash_blocks_written;
+
+ /* Number of hash blocks in the status block */
+ u32 df_initial_hash_blocks_written;
+
+ /* Offset to status metadata header */
+ loff_t df_status_offset;
+
+ /*
+ * Mutex acquired while enabling verity. Note that df_hash_tree is set
+ * by enable verity.
+ *
+ * The backing file mutex bc_mutex may be taken while this mutex is
+ * held.
+ */
+ struct mutex df_enable_verity;
+
+ /*
+ * Set either at construction time or during enabling verity. In the
+ * latter case, set via smp_store_release, so use smp_load_acquire to
+ * read it.
+ */
struct mtree *df_hash_tree;
+ /* Guaranteed set if df_hash_tree is set. */
struct incfs_df_signature *df_signature;
+
+ /*
+ * The verity file digest, set when verity is enabled and the file has
+ * been opened
+ */
+ struct mem_range df_verity_file_digest;
+
+ struct incfs_df_verity_signature *df_verity_signature;
};
struct dir_file {
@@ -259,6 +387,23 @@
struct path backing_path;
};
+enum FILL_PERMISSION {
+ CANT_FILL = 0,
+ CAN_FILL = 1,
+};
+
+struct incfs_file_data {
+ /* Does this file handle have INCFS_IOC_FILL_BLOCKS permission */
+ enum FILL_PERMISSION fd_fill_permission;
+
+ /* If INCFS_IOC_GET_FILLED_BLOCKS has been called, where are we */
+ int fd_get_block_pos;
+
+ /* And how many filled blocks are there up to that point */
+ int fd_filled_data_blocks;
+ int fd_filled_hash_blocks;
+};
+
struct mount_info *incfs_alloc_mount_info(struct super_block *sb,
struct mount_options *options,
struct path *backing_dir_path);
@@ -268,19 +413,29 @@
void incfs_free_mount_info(struct mount_info *mi);
+char *file_id_to_str(incfs_uuid_t id);
+struct dentry *incfs_lookup_dentry(struct dentry *parent, const char *name);
struct data_file *incfs_open_data_file(struct mount_info *mi, struct file *bf);
void incfs_free_data_file(struct data_file *df);
-
-int incfs_scan_metadata_chain(struct data_file *df);
struct dir_file *incfs_open_dir_file(struct mount_info *mi, struct file *bf);
void incfs_free_dir_file(struct dir_file *dir);
+struct incfs_read_data_file_timeouts {
+ u32 min_time_us;
+ u32 min_pending_time_us;
+ u32 max_pending_time_us;
+};
+
ssize_t incfs_read_data_file_block(struct mem_range dst, struct file *f,
- int index, int timeout_ms,
- struct mem_range tmp);
+ int index, struct mem_range tmp,
+ struct incfs_read_data_file_timeouts *timeouts);
+
+ssize_t incfs_read_merkle_tree_blocks(struct mem_range dst,
+ struct data_file *df, size_t offset);
int incfs_get_filled_blocks(struct data_file *df,
+ struct incfs_file_data *fd,
struct incfs_get_filled_blocks_args *arg);
int incfs_read_file_signature(struct data_file *df, struct mem_range dst);
@@ -300,11 +455,13 @@
*/
int incfs_collect_pending_reads(struct mount_info *mi, int sn_lowerbound,
struct incfs_pending_read_info *reads,
- int reads_size);
+ struct incfs_pending_read_info2 *reads2,
+ int reads_size, int *new_max_sn);
int incfs_collect_logged_reads(struct mount_info *mi,
struct read_log_state *start_state,
struct incfs_pending_read_info *reads,
+ struct incfs_pending_read_info2 *reads2,
int reads_size);
struct read_log_state incfs_get_log_state(struct mount_info *mi);
int incfs_get_uncollected_logs_count(struct mount_info *mi,
@@ -315,7 +472,7 @@
if (!inode)
return NULL;
- if (inode->i_sb->s_magic != (long) INCFS_MAGIC_NUMBER) {
+ if (inode->i_sb->s_magic != INCFS_MAGIC_NUMBER) {
/* This inode doesn't belong to us. */
pr_warn_once("incfs: %s on an alien inode.", __func__);
return NULL;
@@ -388,7 +545,5 @@
return 0;
return 1 + (size - 1) / INCFS_DATA_FILE_BLOCK_SIZE;
}
-
-bool incfs_equal_ranges(struct mem_range lhs, struct mem_range rhs);
#endif /* _INCFS_DATA_MGMT_H */
--
Gitblit v1.6.2