Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull AFS updates from Al Viro: "AFS series, with some iov_iter bits included" * 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (26 commits) missing bits of "iov_iter: Separate type from direction and use accessor functions" afs: Probe multiple fileservers simultaneously afs: Fix callback handling afs: Eliminate the address pointer from the address list cursor afs: Allow dumping of server cursor on operation failure afs: Implement YFS support in the fs client afs: Expand data structure fields to support YFS afs: Get the target vnode in afs_rmdir() and get a callback on it afs: Calc callback expiry in op reply delivery afs: Fix FS.FetchStatus delivery from updating wrong vnode afs: Implement the YFS cache manager service afs: Remove callback details from afs_callback_break struct afs: Commit the status on a new file/dir/symlink afs: Increase to 64-bit volume ID and 96-bit vnode ID for YFS afs: Don't invoke the server to read data beyond EOF afs: Add a couple of tracepoints to log I/O errors afs: Handle EIO from delivery function afs: Fix TTL on VL server and address lists afs: Implement VL server rotation afs: Improve FS server rotation error handling ...
This commit is contained in:
Linus Torvalds
@@ -21,15 +21,16 @@ struct kvec {
|
||||
size_t iov_len;
|
||||
};
|
||||
|
||||
enum {
|
||||
enum iter_type {
|
||||
ITER_IOVEC = 0,
|
||||
ITER_KVEC = 2,
|
||||
ITER_BVEC = 4,
|
||||
ITER_PIPE = 8,
|
||||
ITER_DISCARD = 16,
|
||||
};
|
||||
|
||||
struct iov_iter {
|
||||
int type;
|
||||
unsigned int type;
|
||||
size_t iov_offset;
|
||||
size_t count;
|
||||
union {
|
||||
@@ -47,6 +48,41 @@ struct iov_iter {
|
||||
};
|
||||
};
|
||||
|
||||
static inline enum iter_type iov_iter_type(const struct iov_iter *i)
|
||||
{
|
||||
return i->type & ~(READ | WRITE);
|
||||
}
|
||||
|
||||
static inline bool iter_is_iovec(const struct iov_iter *i)
|
||||
{
|
||||
return iov_iter_type(i) == ITER_IOVEC;
|
||||
}
|
||||
|
||||
static inline bool iov_iter_is_kvec(const struct iov_iter *i)
|
||||
{
|
||||
return iov_iter_type(i) == ITER_KVEC;
|
||||
}
|
||||
|
||||
static inline bool iov_iter_is_bvec(const struct iov_iter *i)
|
||||
{
|
||||
return iov_iter_type(i) == ITER_BVEC;
|
||||
}
|
||||
|
||||
static inline bool iov_iter_is_pipe(const struct iov_iter *i)
|
||||
{
|
||||
return iov_iter_type(i) == ITER_PIPE;
|
||||
}
|
||||
|
||||
static inline bool iov_iter_is_discard(const struct iov_iter *i)
|
||||
{
|
||||
return iov_iter_type(i) == ITER_DISCARD;
|
||||
}
|
||||
|
||||
static inline unsigned char iov_iter_rw(const struct iov_iter *i)
|
||||
{
|
||||
return i->type & (READ | WRITE);
|
||||
}
|
||||
|
||||
/*
|
||||
* Total number of bytes covered by an iovec.
|
||||
*
|
||||
@@ -74,7 +110,8 @@ static inline struct iovec iov_iter_iovec(const struct iov_iter *iter)
|
||||
}
|
||||
|
||||
#define iov_for_each(iov, iter, start) \
|
||||
if (!((start).type & (ITER_BVEC | ITER_PIPE))) \
|
||||
if (iov_iter_type(start) == ITER_IOVEC || \
|
||||
iov_iter_type(start) == ITER_KVEC) \
|
||||
for (iter = (start); \
|
||||
(iter).count && \
|
||||
((iov = iov_iter_iovec(&(iter))), 1); \
|
||||
@@ -181,14 +218,15 @@ size_t copy_to_iter_mcsafe(void *addr, size_t bytes, struct iov_iter *i)
|
||||
size_t iov_iter_zero(size_t bytes, struct iov_iter *);
|
||||
unsigned long iov_iter_alignment(const struct iov_iter *i);
|
||||
unsigned long iov_iter_gap_alignment(const struct iov_iter *i);
|
||||
void iov_iter_init(struct iov_iter *i, int direction, const struct iovec *iov,
|
||||
void iov_iter_init(struct iov_iter *i, unsigned int direction, const struct iovec *iov,
|
||||
unsigned long nr_segs, size_t count);
|
||||
void iov_iter_kvec(struct iov_iter *i, int direction, const struct kvec *kvec,
|
||||
void iov_iter_kvec(struct iov_iter *i, unsigned int direction, const struct kvec *kvec,
|
||||
unsigned long nr_segs, size_t count);
|
||||
void iov_iter_bvec(struct iov_iter *i, int direction, const struct bio_vec *bvec,
|
||||
void iov_iter_bvec(struct iov_iter *i, unsigned int direction, const struct bio_vec *bvec,
|
||||
unsigned long nr_segs, size_t count);
|
||||
void iov_iter_pipe(struct iov_iter *i, int direction, struct pipe_inode_info *pipe,
|
||||
void iov_iter_pipe(struct iov_iter *i, unsigned int direction, struct pipe_inode_info *pipe,
|
||||
size_t count);
|
||||
void iov_iter_discard(struct iov_iter *i, unsigned int direction, size_t count);
|
||||
ssize_t iov_iter_get_pages(struct iov_iter *i, struct page **pages,
|
||||
size_t maxsize, unsigned maxpages, size_t *start);
|
||||
ssize_t iov_iter_get_pages_alloc(struct iov_iter *i, struct page ***pages,
|
||||
@@ -202,19 +240,6 @@ static inline size_t iov_iter_count(const struct iov_iter *i)
|
||||
return i->count;
|
||||
}
|
||||
|
||||
static inline bool iter_is_iovec(const struct iov_iter *i)
|
||||
{
|
||||
return !(i->type & (ITER_BVEC | ITER_KVEC | ITER_PIPE));
|
||||
}
|
||||
|
||||
/*
|
||||
* Get one of READ or WRITE out of iter->type without any other flags OR'd in
|
||||
* with it.
|
||||
*
|
||||
* The ?: is just for type safety.
|
||||
*/
|
||||
#define iov_iter_rw(i) ((0 ? (struct iov_iter *)0 : (i))->type & (READ | WRITE))
|
||||
|
||||
/*
|
||||
* Cap the iov_iter by given limit; note that the second argument is
|
||||
* *not* the new size - it's upper limit for such. Passing it a value
|
||||
|
||||
@@ -54,6 +54,35 @@ enum afs_fs_operation {
|
||||
afs_FS_StoreData64 = 65538, /* AFS Store file data */
|
||||
afs_FS_GiveUpAllCallBacks = 65539, /* AFS Give up all our callbacks on a server */
|
||||
afs_FS_GetCapabilities = 65540, /* AFS Get FS server capabilities */
|
||||
|
||||
yfs_FS_FetchData = 130, /* YFS Fetch file data */
|
||||
yfs_FS_FetchACL = 64131, /* YFS Fetch file ACL */
|
||||
yfs_FS_FetchStatus = 64132, /* YFS Fetch file status */
|
||||
yfs_FS_StoreACL = 64134, /* YFS Store file ACL */
|
||||
yfs_FS_StoreStatus = 64135, /* YFS Store file status */
|
||||
yfs_FS_RemoveFile = 64136, /* YFS Remove a file */
|
||||
yfs_FS_CreateFile = 64137, /* YFS Create a file */
|
||||
yfs_FS_Rename = 64138, /* YFS Rename or move a file or directory */
|
||||
yfs_FS_Symlink = 64139, /* YFS Create a symbolic link */
|
||||
yfs_FS_Link = 64140, /* YFS Create a hard link */
|
||||
yfs_FS_MakeDir = 64141, /* YFS Create a directory */
|
||||
yfs_FS_RemoveDir = 64142, /* YFS Remove a directory */
|
||||
yfs_FS_GetVolumeStatus = 64149, /* YFS Get volume status information */
|
||||
yfs_FS_SetVolumeStatus = 64150, /* YFS Set volume status information */
|
||||
yfs_FS_SetLock = 64156, /* YFS Request a file lock */
|
||||
yfs_FS_ExtendLock = 64157, /* YFS Extend a file lock */
|
||||
yfs_FS_ReleaseLock = 64158, /* YFS Release a file lock */
|
||||
yfs_FS_Lookup = 64161, /* YFS lookup file in directory */
|
||||
yfs_FS_FlushCPS = 64165,
|
||||
yfs_FS_FetchOpaqueACL = 64168,
|
||||
yfs_FS_WhoAmI = 64170,
|
||||
yfs_FS_RemoveACL = 64171,
|
||||
yfs_FS_RemoveFile2 = 64173,
|
||||
yfs_FS_StoreOpaqueACL2 = 64174,
|
||||
yfs_FS_InlineBulkStatus = 64536, /* YFS Fetch multiple file statuses with errors */
|
||||
yfs_FS_FetchData64 = 64537, /* YFS Fetch file data */
|
||||
yfs_FS_StoreData64 = 64538, /* YFS Store file data */
|
||||
yfs_FS_UpdateSymlink = 64540,
|
||||
};
|
||||
|
||||
enum afs_vl_operation {
|
||||
@@ -84,6 +113,44 @@ enum afs_edit_dir_reason {
|
||||
afs_edit_dir_for_unlink,
|
||||
};
|
||||
|
||||
enum afs_eproto_cause {
|
||||
afs_eproto_bad_status,
|
||||
afs_eproto_cb_count,
|
||||
afs_eproto_cb_fid_count,
|
||||
afs_eproto_file_type,
|
||||
afs_eproto_ibulkst_cb_count,
|
||||
afs_eproto_ibulkst_count,
|
||||
afs_eproto_motd_len,
|
||||
afs_eproto_offline_msg_len,
|
||||
afs_eproto_volname_len,
|
||||
afs_eproto_yvl_fsendpt4_len,
|
||||
afs_eproto_yvl_fsendpt6_len,
|
||||
afs_eproto_yvl_fsendpt_num,
|
||||
afs_eproto_yvl_fsendpt_type,
|
||||
afs_eproto_yvl_vlendpt4_len,
|
||||
afs_eproto_yvl_vlendpt6_len,
|
||||
afs_eproto_yvl_vlendpt_type,
|
||||
};
|
||||
|
||||
enum afs_io_error {
|
||||
afs_io_error_cm_reply,
|
||||
afs_io_error_extract,
|
||||
afs_io_error_fs_probe_fail,
|
||||
afs_io_error_vl_lookup_fail,
|
||||
afs_io_error_vl_probe_fail,
|
||||
};
|
||||
|
||||
enum afs_file_error {
|
||||
afs_file_error_dir_bad_magic,
|
||||
afs_file_error_dir_big,
|
||||
afs_file_error_dir_missing_page,
|
||||
afs_file_error_dir_over_end,
|
||||
afs_file_error_dir_small,
|
||||
afs_file_error_dir_unmarked_ext,
|
||||
afs_file_error_mntpt,
|
||||
afs_file_error_writeback_fail,
|
||||
};
|
||||
|
||||
#endif /* end __AFS_DECLARE_TRACE_ENUMS_ONCE_ONLY */
|
||||
|
||||
/*
|
||||
@@ -119,7 +186,34 @@ enum afs_edit_dir_reason {
|
||||
EM(afs_FS_FetchData64, "FS.FetchData64") \
|
||||
EM(afs_FS_StoreData64, "FS.StoreData64") \
|
||||
EM(afs_FS_GiveUpAllCallBacks, "FS.GiveUpAllCallBacks") \
|
||||
E_(afs_FS_GetCapabilities, "FS.GetCapabilities")
|
||||
EM(afs_FS_GetCapabilities, "FS.GetCapabilities") \
|
||||
EM(yfs_FS_FetchACL, "YFS.FetchACL") \
|
||||
EM(yfs_FS_FetchStatus, "YFS.FetchStatus") \
|
||||
EM(yfs_FS_StoreACL, "YFS.StoreACL") \
|
||||
EM(yfs_FS_StoreStatus, "YFS.StoreStatus") \
|
||||
EM(yfs_FS_RemoveFile, "YFS.RemoveFile") \
|
||||
EM(yfs_FS_CreateFile, "YFS.CreateFile") \
|
||||
EM(yfs_FS_Rename, "YFS.Rename") \
|
||||
EM(yfs_FS_Symlink, "YFS.Symlink") \
|
||||
EM(yfs_FS_Link, "YFS.Link") \
|
||||
EM(yfs_FS_MakeDir, "YFS.MakeDir") \
|
||||
EM(yfs_FS_RemoveDir, "YFS.RemoveDir") \
|
||||
EM(yfs_FS_GetVolumeStatus, "YFS.GetVolumeStatus") \
|
||||
EM(yfs_FS_SetVolumeStatus, "YFS.SetVolumeStatus") \
|
||||
EM(yfs_FS_SetLock, "YFS.SetLock") \
|
||||
EM(yfs_FS_ExtendLock, "YFS.ExtendLock") \
|
||||
EM(yfs_FS_ReleaseLock, "YFS.ReleaseLock") \
|
||||
EM(yfs_FS_Lookup, "YFS.Lookup") \
|
||||
EM(yfs_FS_FlushCPS, "YFS.FlushCPS") \
|
||||
EM(yfs_FS_FetchOpaqueACL, "YFS.FetchOpaqueACL") \
|
||||
EM(yfs_FS_WhoAmI, "YFS.WhoAmI") \
|
||||
EM(yfs_FS_RemoveACL, "YFS.RemoveACL") \
|
||||
EM(yfs_FS_RemoveFile2, "YFS.RemoveFile2") \
|
||||
EM(yfs_FS_StoreOpaqueACL2, "YFS.StoreOpaqueACL2") \
|
||||
EM(yfs_FS_InlineBulkStatus, "YFS.InlineBulkStatus") \
|
||||
EM(yfs_FS_FetchData64, "YFS.FetchData64") \
|
||||
EM(yfs_FS_StoreData64, "YFS.StoreData64") \
|
||||
E_(yfs_FS_UpdateSymlink, "YFS.UpdateSymlink")
|
||||
|
||||
#define afs_vl_operations \
|
||||
EM(afs_VL_GetEntryByNameU, "VL.GetEntryByNameU") \
|
||||
@@ -146,6 +240,40 @@ enum afs_edit_dir_reason {
|
||||
EM(afs_edit_dir_for_symlink, "Symlnk") \
|
||||
E_(afs_edit_dir_for_unlink, "Unlink")
|
||||
|
||||
#define afs_eproto_causes \
|
||||
EM(afs_eproto_bad_status, "BadStatus") \
|
||||
EM(afs_eproto_cb_count, "CbCount") \
|
||||
EM(afs_eproto_cb_fid_count, "CbFidCount") \
|
||||
EM(afs_eproto_file_type, "FileTYpe") \
|
||||
EM(afs_eproto_ibulkst_cb_count, "IBS.CbCount") \
|
||||
EM(afs_eproto_ibulkst_count, "IBS.FidCount") \
|
||||
EM(afs_eproto_motd_len, "MotdLen") \
|
||||
EM(afs_eproto_offline_msg_len, "OfflineMsgLen") \
|
||||
EM(afs_eproto_volname_len, "VolNameLen") \
|
||||
EM(afs_eproto_yvl_fsendpt4_len, "YVL.FsEnd4Len") \
|
||||
EM(afs_eproto_yvl_fsendpt6_len, "YVL.FsEnd6Len") \
|
||||
EM(afs_eproto_yvl_fsendpt_num, "YVL.FsEndCount") \
|
||||
EM(afs_eproto_yvl_fsendpt_type, "YVL.FsEndType") \
|
||||
EM(afs_eproto_yvl_vlendpt4_len, "YVL.VlEnd4Len") \
|
||||
EM(afs_eproto_yvl_vlendpt6_len, "YVL.VlEnd6Len") \
|
||||
E_(afs_eproto_yvl_vlendpt_type, "YVL.VlEndType")
|
||||
|
||||
#define afs_io_errors \
|
||||
EM(afs_io_error_cm_reply, "CM_REPLY") \
|
||||
EM(afs_io_error_extract, "EXTRACT") \
|
||||
EM(afs_io_error_fs_probe_fail, "FS_PROBE_FAIL") \
|
||||
EM(afs_io_error_vl_lookup_fail, "VL_LOOKUP_FAIL") \
|
||||
E_(afs_io_error_vl_probe_fail, "VL_PROBE_FAIL")
|
||||
|
||||
#define afs_file_errors \
|
||||
EM(afs_file_error_dir_bad_magic, "DIR_BAD_MAGIC") \
|
||||
EM(afs_file_error_dir_big, "DIR_BIG") \
|
||||
EM(afs_file_error_dir_missing_page, "DIR_MISSING_PAGE") \
|
||||
EM(afs_file_error_dir_over_end, "DIR_ENT_OVER_END") \
|
||||
EM(afs_file_error_dir_small, "DIR_SMALL") \
|
||||
EM(afs_file_error_dir_unmarked_ext, "DIR_UNMARKED_EXT") \
|
||||
EM(afs_file_error_mntpt, "MNTPT_READ_FAILED") \
|
||||
E_(afs_file_error_writeback_fail, "WRITEBACK_FAILED")
|
||||
|
||||
/*
|
||||
* Export enum symbols via userspace.
|
||||
@@ -160,6 +288,9 @@ afs_fs_operations;
|
||||
afs_vl_operations;
|
||||
afs_edit_dir_ops;
|
||||
afs_edit_dir_reasons;
|
||||
afs_eproto_causes;
|
||||
afs_io_errors;
|
||||
afs_file_errors;
|
||||
|
||||
/*
|
||||
* Now redefine the EM() and E_() macros to map the enums to the strings that
|
||||
@@ -170,17 +301,16 @@ afs_edit_dir_reasons;
|
||||
#define EM(a, b) { a, b },
|
||||
#define E_(a, b) { a, b }
|
||||
|
||||
TRACE_EVENT(afs_recv_data,
|
||||
TP_PROTO(struct afs_call *call, unsigned count, unsigned offset,
|
||||
TRACE_EVENT(afs_receive_data,
|
||||
TP_PROTO(struct afs_call *call, struct iov_iter *iter,
|
||||
bool want_more, int ret),
|
||||
|
||||
TP_ARGS(call, count, offset, want_more, ret),
|
||||
TP_ARGS(call, iter, want_more, ret),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(loff_t, remain )
|
||||
__field(unsigned int, call )
|
||||
__field(enum afs_call_state, state )
|
||||
__field(unsigned int, count )
|
||||
__field(unsigned int, offset )
|
||||
__field(unsigned short, unmarshall )
|
||||
__field(bool, want_more )
|
||||
__field(int, ret )
|
||||
@@ -190,17 +320,18 @@ TRACE_EVENT(afs_recv_data,
|
||||
__entry->call = call->debug_id;
|
||||
__entry->state = call->state;
|
||||
__entry->unmarshall = call->unmarshall;
|
||||
__entry->count = count;
|
||||
__entry->offset = offset;
|
||||
__entry->remain = iov_iter_count(iter);
|
||||
__entry->want_more = want_more;
|
||||
__entry->ret = ret;
|
||||
),
|
||||
|
||||
TP_printk("c=%08x s=%u u=%u %u/%u wm=%u ret=%d",
|
||||
TP_printk("c=%08x r=%llu u=%u w=%u s=%u ret=%d",
|
||||
__entry->call,
|
||||
__entry->state, __entry->unmarshall,
|
||||
__entry->offset, __entry->count,
|
||||
__entry->want_more, __entry->ret)
|
||||
__entry->remain,
|
||||
__entry->unmarshall,
|
||||
__entry->want_more,
|
||||
__entry->state,
|
||||
__entry->ret)
|
||||
);
|
||||
|
||||
TRACE_EVENT(afs_notify_call,
|
||||
@@ -301,7 +432,7 @@ TRACE_EVENT(afs_make_fs_call,
|
||||
}
|
||||
),
|
||||
|
||||
TP_printk("c=%08x %06x:%06x:%06x %s",
|
||||
TP_printk("c=%08x %06llx:%06llx:%06x %s",
|
||||
__entry->call,
|
||||
__entry->fid.vid,
|
||||
__entry->fid.vnode,
|
||||
@@ -555,24 +686,70 @@ TRACE_EVENT(afs_edit_dir,
|
||||
);
|
||||
|
||||
TRACE_EVENT(afs_protocol_error,
|
||||
TP_PROTO(struct afs_call *call, int error, const void *where),
|
||||
TP_PROTO(struct afs_call *call, int error, enum afs_eproto_cause cause),
|
||||
|
||||
TP_ARGS(call, error, cause),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, call )
|
||||
__field(int, error )
|
||||
__field(enum afs_eproto_cause, cause )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->call = call ? call->debug_id : 0;
|
||||
__entry->error = error;
|
||||
__entry->cause = cause;
|
||||
),
|
||||
|
||||
TP_printk("c=%08x r=%d %s",
|
||||
__entry->call, __entry->error,
|
||||
__print_symbolic(__entry->cause, afs_eproto_causes))
|
||||
);
|
||||
|
||||
TRACE_EVENT(afs_io_error,
|
||||
TP_PROTO(unsigned int call, int error, enum afs_io_error where),
|
||||
|
||||
TP_ARGS(call, error, where),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(unsigned int, call )
|
||||
__field(int, error )
|
||||
__field(const void *, where )
|
||||
__field(enum afs_io_error, where )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->call = call ? call->debug_id : 0;
|
||||
__entry->call = call;
|
||||
__entry->error = error;
|
||||
__entry->where = where;
|
||||
),
|
||||
|
||||
TP_printk("c=%08x r=%d sp=%pSR",
|
||||
__entry->call, __entry->error, __entry->where)
|
||||
TP_printk("c=%08x r=%d %s",
|
||||
__entry->call, __entry->error,
|
||||
__print_symbolic(__entry->where, afs_io_errors))
|
||||
);
|
||||
|
||||
TRACE_EVENT(afs_file_error,
|
||||
TP_PROTO(struct afs_vnode *vnode, int error, enum afs_file_error where),
|
||||
|
||||
TP_ARGS(vnode, error, where),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field_struct(struct afs_fid, fid )
|
||||
__field(int, error )
|
||||
__field(enum afs_file_error, where )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->fid = vnode->fid;
|
||||
__entry->error = error;
|
||||
__entry->where = where;
|
||||
),
|
||||
|
||||
TP_printk("%llx:%llx:%x r=%d %s",
|
||||
__entry->fid.vid, __entry->fid.vnode, __entry->fid.unique,
|
||||
__entry->error,
|
||||
__print_symbolic(__entry->where, afs_file_errors))
|
||||
);
|
||||
|
||||
TRACE_EVENT(afs_cm_no_server,
|
||||
|
||||
Reference in New Issue
Block a user