Merge tag 'staging-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO driver updates from Greg KH:
"Here is the big staging/iio driver update for 5.4-rc1.
Lots of churn here, with a few driver/filesystems moving out of
staging finally:
- erofs moved out of staging
- greybus core code moved out of staging
Along with that, a new filesytem has been added:
- extfat
to provide support for those devices requiring that filesystem (i.e.
transfer devices to/from windows systems or printers)
Other than that, there a number of new IIO drivers, and lots and lots
and lots of staging driver cleanups and minor fixes as people continue
to dig into those for easy changes.
All of these have been in linux-next for a while with no reported
issues"
* tag 'staging-5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (453 commits)
Staging: gasket: Use temporaries to reduce line length.
Staging: octeon: Avoid several usecases of strcpy
staging: vhciq_core: replace snprintf with scnprintf
staging: wilc1000: avoid twice IRQ handler execution for each single interrupt
staging: wilc1000: remove unused interrupt status handling code
staging: fbtft: make several arrays static const, makes object smaller
staging: rtl8188eu: make two arrays static const, makes object smaller
staging: rtl8723bs: core: Remove Macro "IS_MAC_ADDRESS_BROADCAST"
dt-bindings: anybus-controller: move to staging/ tree
staging: emxx_udc: remove local TRUE/FALSE definition
staging: wilc1000: look for rtc_clk clock
staging: dt-bindings: wilc1000: add optional rtc_clk property
staging: nvec: make use of devm_platform_ioremap_resource
staging: exfat: drop unused function parameter
Staging: exfat: Avoid use of strcpy
staging: exfat: use integer constants
staging: exfat: cleanup spacing for casts
staging: exfat: cleanup spacing for operators
staging: rtl8723bs: hal: remove redundant variable n
staging: pi433: Fix typo in documentation
...
This commit is contained in:
Linus Torvalds
259
include/trace/events/erofs.h
Normal file
259
include/trace/events/erofs.h
Normal file
@@ -0,0 +1,259 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0-only */
|
||||
#undef TRACE_SYSTEM
|
||||
#define TRACE_SYSTEM erofs
|
||||
|
||||
#if !defined(_TRACE_EROFS_H) || defined(TRACE_HEADER_MULTI_READ)
|
||||
#define _TRACE_EROFS_H
|
||||
|
||||
#include <linux/tracepoint.h>
|
||||
#include <linux/fs.h>
|
||||
|
||||
struct erofs_map_blocks;
|
||||
|
||||
#define show_dev(dev) MAJOR(dev), MINOR(dev)
|
||||
#define show_dev_nid(entry) show_dev(entry->dev), entry->nid
|
||||
|
||||
#define show_file_type(type) \
|
||||
__print_symbolic(type, \
|
||||
{ 0, "FILE" }, \
|
||||
{ 1, "DIR" })
|
||||
|
||||
#define show_map_flags(flags) __print_flags(flags, "|", \
|
||||
{ EROFS_GET_BLOCKS_RAW, "RAW" })
|
||||
|
||||
#define show_mflags(flags) __print_flags(flags, "", \
|
||||
{ EROFS_MAP_MAPPED, "M" }, \
|
||||
{ EROFS_MAP_META, "I" }, \
|
||||
{ EROFS_MAP_ZIPPED, "Z" })
|
||||
|
||||
TRACE_EVENT(erofs_lookup,
|
||||
|
||||
TP_PROTO(struct inode *dir, struct dentry *dentry, unsigned int flags),
|
||||
|
||||
TP_ARGS(dir, dentry, flags),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(dev_t, dev )
|
||||
__field(erofs_nid_t, nid )
|
||||
__field(const char *, name )
|
||||
__field(unsigned int, flags )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = dir->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(dir)->nid;
|
||||
__entry->name = dentry->d_name.name;
|
||||
__entry->flags = flags;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), pnid = %llu, name:%s, flags:%x",
|
||||
show_dev_nid(__entry),
|
||||
__entry->name,
|
||||
__entry->flags)
|
||||
);
|
||||
|
||||
TRACE_EVENT(erofs_fill_inode,
|
||||
TP_PROTO(struct inode *inode, int isdir),
|
||||
TP_ARGS(inode, isdir),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(dev_t, dev )
|
||||
__field(erofs_nid_t, nid )
|
||||
__field(erofs_blk_t, blkaddr )
|
||||
__field(unsigned int, ofs )
|
||||
__field(int, isdir )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = inode->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(inode)->nid;
|
||||
__entry->blkaddr = erofs_blknr(iloc(EROFS_I_SB(inode), __entry->nid));
|
||||
__entry->ofs = erofs_blkoff(iloc(EROFS_I_SB(inode), __entry->nid));
|
||||
__entry->isdir = isdir;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu, blkaddr %u ofs %u, isdir %d",
|
||||
show_dev_nid(__entry),
|
||||
__entry->blkaddr, __entry->ofs,
|
||||
__entry->isdir)
|
||||
);
|
||||
|
||||
TRACE_EVENT(erofs_readpage,
|
||||
|
||||
TP_PROTO(struct page *page, bool raw),
|
||||
|
||||
TP_ARGS(page, raw),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(dev_t, dev )
|
||||
__field(erofs_nid_t, nid )
|
||||
__field(int, dir )
|
||||
__field(pgoff_t, index )
|
||||
__field(int, uptodate)
|
||||
__field(bool, raw )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = page->mapping->host->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(page->mapping->host)->nid;
|
||||
__entry->dir = S_ISDIR(page->mapping->host->i_mode);
|
||||
__entry->index = page->index;
|
||||
__entry->uptodate = PageUptodate(page);
|
||||
__entry->raw = raw;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu, %s, index = %lu, uptodate = %d "
|
||||
"raw = %d",
|
||||
show_dev_nid(__entry),
|
||||
show_file_type(__entry->dir),
|
||||
(unsigned long)__entry->index,
|
||||
__entry->uptodate,
|
||||
__entry->raw)
|
||||
);
|
||||
|
||||
TRACE_EVENT(erofs_readpages,
|
||||
|
||||
TP_PROTO(struct inode *inode, struct page *page, unsigned int nrpage,
|
||||
bool raw),
|
||||
|
||||
TP_ARGS(inode, page, nrpage, raw),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field(dev_t, dev )
|
||||
__field(erofs_nid_t, nid )
|
||||
__field(pgoff_t, start )
|
||||
__field(unsigned int, nrpage )
|
||||
__field(bool, raw )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = inode->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(inode)->nid;
|
||||
__entry->start = page->index;
|
||||
__entry->nrpage = nrpage;
|
||||
__entry->raw = raw;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu, start = %lu nrpage = %u raw = %d",
|
||||
show_dev_nid(__entry),
|
||||
(unsigned long)__entry->start,
|
||||
__entry->nrpage,
|
||||
__entry->raw)
|
||||
);
|
||||
|
||||
DECLARE_EVENT_CLASS(erofs__map_blocks_enter,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned int flags),
|
||||
|
||||
TP_ARGS(inode, map, flags),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( dev_t, dev )
|
||||
__field( erofs_nid_t, nid )
|
||||
__field( erofs_off_t, la )
|
||||
__field( u64, llen )
|
||||
__field( unsigned int, flags )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = inode->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(inode)->nid;
|
||||
__entry->la = map->m_la;
|
||||
__entry->llen = map->m_llen;
|
||||
__entry->flags = flags;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu, la %llu llen %llu flags %s",
|
||||
show_dev_nid(__entry),
|
||||
__entry->la, __entry->llen,
|
||||
__entry->flags ? show_map_flags(__entry->flags) : "NULL")
|
||||
);
|
||||
|
||||
DEFINE_EVENT(erofs__map_blocks_enter, erofs_map_blocks_flatmode_enter,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned flags),
|
||||
|
||||
TP_ARGS(inode, map, flags)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(erofs__map_blocks_enter, z_erofs_map_blocks_iter_enter,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned int flags),
|
||||
|
||||
TP_ARGS(inode, map, flags)
|
||||
);
|
||||
|
||||
DECLARE_EVENT_CLASS(erofs__map_blocks_exit,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned int flags, int ret),
|
||||
|
||||
TP_ARGS(inode, map, flags, ret),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( dev_t, dev )
|
||||
__field( erofs_nid_t, nid )
|
||||
__field( unsigned int, flags )
|
||||
__field( erofs_off_t, la )
|
||||
__field( erofs_off_t, pa )
|
||||
__field( u64, llen )
|
||||
__field( u64, plen )
|
||||
__field( unsigned int, mflags )
|
||||
__field( int, ret )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = inode->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(inode)->nid;
|
||||
__entry->flags = flags;
|
||||
__entry->la = map->m_la;
|
||||
__entry->pa = map->m_pa;
|
||||
__entry->llen = map->m_llen;
|
||||
__entry->plen = map->m_plen;
|
||||
__entry->mflags = map->m_flags;
|
||||
__entry->ret = ret;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu, flags %s "
|
||||
"la %llu pa %llu llen %llu plen %llu mflags %s ret %d",
|
||||
show_dev_nid(__entry),
|
||||
__entry->flags ? show_map_flags(__entry->flags) : "NULL",
|
||||
__entry->la, __entry->pa, __entry->llen, __entry->plen,
|
||||
show_mflags(__entry->mflags), __entry->ret)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(erofs__map_blocks_exit, erofs_map_blocks_flatmode_exit,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned flags, int ret),
|
||||
|
||||
TP_ARGS(inode, map, flags, ret)
|
||||
);
|
||||
|
||||
DEFINE_EVENT(erofs__map_blocks_exit, z_erofs_map_blocks_iter_exit,
|
||||
TP_PROTO(struct inode *inode, struct erofs_map_blocks *map,
|
||||
unsigned int flags, int ret),
|
||||
|
||||
TP_ARGS(inode, map, flags, ret)
|
||||
);
|
||||
|
||||
TRACE_EVENT(erofs_destroy_inode,
|
||||
TP_PROTO(struct inode *inode),
|
||||
|
||||
TP_ARGS(inode),
|
||||
|
||||
TP_STRUCT__entry(
|
||||
__field( dev_t, dev )
|
||||
__field( erofs_nid_t, nid )
|
||||
),
|
||||
|
||||
TP_fast_assign(
|
||||
__entry->dev = inode->i_sb->s_dev;
|
||||
__entry->nid = EROFS_I(inode)->nid;
|
||||
),
|
||||
|
||||
TP_printk("dev = (%d,%d), nid = %llu", show_dev_nid(__entry))
|
||||
);
|
||||
|
||||
#endif /* _TRACE_EROFS_H */
|
||||
|
||||
/* This part must be outside protection */
|
||||
#include <trace/define_trace.h>
|
||||
Reference in New Issue
Block a user