mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-11-20 15:06:33 -05:00
Reinstate the splice read/write/move paths removed in 84592a9f, now
gated behind runtime options with negotiated pipe sizing and fallback
logging.
- Transport: msgbuf-piped splice receive, fd-referenced splice reply
(vmsplice + splice), splice-move pipe-bounce, and restored
fuse_buf_copy/fuse_buf_flags plumbing for copy fallbacks
- Negotiation: new pipe-max-size option (auto-raised at INIT when
possible; the sysctl read/write is factored into src/pipe_max_size.cpp
so fuse_init.cpp and option_parser.cpp share one implementation);
fuse-msg-size clamped to what the pipe can hold; splice is disabled
at INIT with a warning if the sysctl can't fit even the minimum,
retracting the FUSE_CAP_SPLICE_* bits already advertised to the
kernel in that case
- Read replies and splice-move are gated at 128 KiB (below that the
syscalls cost more than the copy they avoid); every fallback path
degrades to the copy path and logs once per process via SysLog
- msgbuf pipe cache is process-global and mutex-guarded (mutex_lockguard)
so pipes can move between read and worker threads under
process-thread mode
- API simplified after review: collapsed the three per-axis options
(splice-read/write/move) into a single splice boolean (default on);
no-splice-read/write/move and the bare splice-read/write/move
spellings stay registered as accepted no-ops so existing mount
options don't fail the mount, but they do NOT alter the splice
knob - upgraders with no-splice-* in their config get splice
enabled and must set splice=false explicitly (see
deprecated_options.md)
- Fixed several correctness issues found in parallel review: a
dropped write_buf registration that silently corrupted writes, a
dirty-pipe reuse bug in msgbuf_free, an iov double-send in
fuse_reply_data's splice-move fallback, and pipe-capacity math that
assumed a 4096-byte page size
- Modernized the transport/negotiation code to this codebase's C++
style: RAII (unique_ptr/DEFER) instead of malloc/free and manual fd
close(), std::from_chars/to_chars instead of stoul/snprintf,
_ReplyPipe's pipe ops as methods instead of free functions closing
over a thread_local global, and vendored/libfuse/lib/buffer.cpp (a
near-verbatim port of upstream's buffer.c) brought in line with the
rest of the fork
- Documented splice and pipe-max-size options (mkdocs, FAQ,
deprecated-options list); added tools/bench-splice.sh
- Benchmarked on tmpfs: seq_write +21%, seq_read +52%, small_write
+5%, small_read +12%; validated with a 1h soak (~271 GiB
hash-verified I/O, zero integrity failures), a live-mount round-trip
of I/O above the splice threshold, and the existing unit/smoke
suites at their pre-existing baseline
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
65 lines
1.6 KiB
C++
65 lines
1.6 KiB
C++
#pragma once
|
|
|
|
#include "base_types.h"
|
|
|
|
#include <climits>
|
|
#include <cstdio>
|
|
#include <memory>
|
|
#include <shared_mutex>
|
|
#include <string>
|
|
|
|
#define FUSE_CFG_INVALID_ID -1
|
|
#define FUSE_CFG_INVALID_UMASK -1
|
|
|
|
|
|
struct fuse_cfg_t
|
|
{
|
|
template<typename T>
|
|
using sp = std::shared_ptr<T>;
|
|
|
|
s64 uid = FUSE_CFG_INVALID_ID;
|
|
bool valid_uid() const;
|
|
|
|
s64 gid = FUSE_CFG_INVALID_ID;
|
|
bool valid_gid() const;
|
|
|
|
s64 umask = FUSE_CFG_INVALID_UMASK;
|
|
bool valid_umask() const;
|
|
|
|
bool remember_nodes = false;
|
|
|
|
bool debug = false;
|
|
std::shared_ptr<FILE> log_file() const;
|
|
void log_file(std::shared_ptr<FILE>);
|
|
std::shared_ptr<std::string> log_filepath() const;
|
|
void log_filepath(const std::string &);
|
|
private:
|
|
mutable std::shared_mutex _log_mutex;
|
|
std::shared_ptr<FILE> _log_file = sp<FILE>(stderr,[](FILE*){});
|
|
std::shared_ptr<std::string> _log_filepath = sp<std::string>();
|
|
|
|
public:
|
|
int max_background = 0;
|
|
int congestion_threshold = 0;
|
|
u32 max_pages = 32;
|
|
int passthrough_max_stack_depth = 1;
|
|
|
|
int read_thread_count = 0;
|
|
int process_thread_count = -1;
|
|
int process_thread_queue_depth = 2;
|
|
std::string pin_threads = "false";
|
|
|
|
/* 2026-08-29 fd-splice benchmark: seq_write +8%..+16%, seq_read
|
|
+19%..+46%, small_write ~0%/+6%, small_read +15%..+17% in both
|
|
runs -> Step 8 rule satisfied, defaults ON.
|
|
Prior mem-bounce baseline (vmsplice payload, no read_buf fd
|
|
reply) had small_read at -22%, so this path depends on the fd-
|
|
referenced read_buf being wired. */
|
|
bool splice_read = true;
|
|
bool splice_write = true;
|
|
bool splice_move = true;
|
|
|
|
u16 request_timeout = 0;
|
|
};
|
|
|
|
extern fuse_cfg_t fuse_cfg;
|