#include #include /* Internal data structures for ADFS */ #define ADFS_FREE_FRAG 0 #define ADFS_BAD_FRAG 1 #define ADFS_ROOT_FRAG 2 #define ADFS_NDA_OWNER_READ (1 << 0) #define ADFS_NDA_OWNER_WRITE (1 << 1) #define ADFS_NDA_LOCKED (1 << 2) #define ADFS_NDA_DIRECTORY (1 << 3) #define ADFS_NDA_EXECUTE (1 << 4) #define ADFS_NDA_PUBLIC_READ (1 << 5) #define ADFS_NDA_PUBLIC_WRITE (1 << 6) #include "dir_f.h" struct buffer_head; /* * adfs file system inode data in memory */ struct adfs_inode_info { loff_t mmu_private; unsigned long parent_id; /* object id of parent */ __u32 loadaddr; /* RISC OS load address */ __u32 execaddr; /* RISC OS exec address */ unsigned int filetype; /* RISC OS file type */ unsigned int attr; /* RISC OS permissions */ unsigned int stamped:1; /* RISC OS file has date/time */ struct inode vfs_inode; }; /* * Forward-declare this */ struct adfs_discmap; struct adfs_dir_ops; /* * ADFS file system superblock data in memory */ struct adfs_sb_info { union { struct { struct adfs_discmap *s_map; /* bh list containing map */ const struct adfs_dir_ops *s_dir; /* directory operations */ }; struct rcu_head rcu; /* used only at shutdown time */ }; kuid_t s_uid; /* owner uid */ kgid_t s_gid; /* owner gid */ umode_t s_owner_mask; /* ADFS owner perm -> unix perm */ umode_t s_other_mask; /* ADFS other perm -> unix perm */ int s_ftsuffix; /* ,xyz hex filetype suffix option */ __u32 s_ids_per_zone; /* max. no ids in one zone */ __u32 s_idlen; /* length of ID in map */ __u32 s_map_size; /* sector size of a map */ unsigned long s_size; /* total size (in blocks) of this fs */ signed int s_map2blk; /* shift left by this for map->sector*/ unsigned int s_log2sharesize;/* log2 share size */ __le32 s_version; /* disc format version */ unsigned int s_namelen; /* maximum number of characters in name */ }; static inline struct adfs_sb_info *ADFS_SB(struct super_block *sb) { return sb->s_fs_info; } static inline struct adfs_inode_info *ADFS_I(struct inode *inode) { return container_of(inode, struct adfs_inode_info, vfs_inode); } /* * Directory handling */ struct adfs_dir { struct super_block *sb; int nr_buffers; struct buffer_head *bh[4]; /* big directories need allocated buffers */ struct buffer_head **bh_fplus; unsigned int pos; unsigned int parent_id; struct adfs_dirheader dirhead; union adfs_dirtail dirtail; }; /* * This is the overall maximum name length */ #define ADFS_MAX_NAME_LEN (256 + 4) /* +4 for ,xyz hex filetype suffix */ struct object_info { __u32 parent_id; /* parent object id */ __u32 file_id; /* object id */ __u32 loadaddr; /* load address */ __u32 execaddr; /* execution address */ __u32 size; /* size */ __u8 attr; /* RISC OS attributes */ unsigned int name_len; /* name length */ char name[ADFS_MAX_NAME_LEN];/* file name */ /* RISC OS file type (12-bit: derived from loadaddr) */ __u16 filetype; }; /* RISC OS 12-bit filetype converts to ,xyz hex filename suffix */ static inline int append_filetype_suffix(char *buf, __u16 filetype) { if (filetype == 0xffff) /* no explicit 12-bit file type was set */ return 0; *buf++ = ','; *buf++ = hex_asc_lo(filetype >> 8); *buf++ = hex_asc_lo(filetype >> 4); *buf++ = hex_asc_lo(filetype >> 0); return 4; } struct adfs_dir_ops { int (*read)(struct super_block *sb, unsigned int id, unsigned int sz, struct adfs_dir *dir); int (*setpos)(struct adfs_dir *dir, unsigned int fpos); int (*getnext)(struct adfs_dir *dir, struct object_info *obj); int (*update)(struct adfs_dir *dir, struct object_info *obj); int (*create)(struct adfs_dir *dir, struct object_info *obj); int (*remove)(struct adfs_dir *dir, struct object_info *obj); int (*sync)(struct adfs_dir *dir); void (*free)(struct adfs_dir *dir); }; struct adfs_discmap { struct buffer_head *dm_bh; __u32 dm_startblk; unsigned int dm_startbit; unsigned int dm_endbit; }; /* Inode stuff */ struct inode *adfs_iget(struct super_block *sb, struct object_info *obj); int adfs_write_inode(struct inode *inode, struct writeback_control *wbc); int adfs_notify_change(struct dentry *dentry, struct iattr *attr); /* map.c */ extern int adfs_map_lookup(struct super_block *sb, unsigned int frag_id, unsigned int offset); extern unsigned int adfs_map_free(struct super_block *sb); /* Misc */ __printf(3, 4) void __adfs_error(struct super_block *sb, const char *function, const char *fmt, ...); #define adfs_error(sb, fmt...) __adfs_error(sb, __func__, fmt) /* super.c */ /* * Inodes and file operations */ /* dir_*.c */ extern const struct inode_operations adfs_dir_inode_operations; extern const struct file_operations adfs_dir_operations; extern const struct dentry_operations adfs_dentry_operations; extern const struct adfs_dir_ops adfs_f_dir_ops; extern const struct adfs_dir_ops adfs_fplus_dir_ops; extern int adfs_dir_update(struct super_block *sb, struct object_info *obj, int wait); /* file.c */ extern const struct inode_operations adfs_file_inode_operations; extern const struct file_operations adfs_file_operations; static inline __u32 signed_asl(__u32 val, signed int shift) { if (shift >= 0) val <<= shift; else val >>= -shift; return val; } /* * Calculate the address of a block in an object given the block offset * and the object identity. * * The root directory ID should always be looked up in the map [3.4] */ static inline int __adfs_block_map(struct super_block *sb, unsigned int object_id, unsigned int block) { if (object_id & 255) { unsigned int off; off = (object_id & 255) - 1; block += off << ADFS_SB(sb)->s_log2sharesize; } return adfs_map_lookup(sb, object_id >> 8, block); } 7e46ab3a538a565c79d26199'>diff)
dmaengine: pl330: fix double lock
The static bug finder EBA (http://www.iagoabal.eu/eba/) reported the following double-lock bug: Double lock: 1. spin_lock_irqsave(pch->lock, flags) at pl330_free_chan_resources:2236; 2. call to function `pl330_release_channel' immediately after; 3. call to function `dma_pl330_rqcb' in line 1753; 4. spin_lock_irqsave(pch->lock, flags) at dma_pl330_rqcb:1505. I have fixed it as suggested by Marek Szyprowski. First, I have replaced `pch->lock' with `pl330->lock' in functions `pl330_alloc_chan_resources' and `pl330_free_chan_resources'. This avoids the double-lock by acquiring a different lock than `dma_pl330_rqcb'. NOTE that, as a result, `pl330_free_chan_resources' executes `list_splice_tail_init' on `pch->work_list' under lock `pl330->lock', whereas in the rest of the code `pch->work_list' is protected by `pch->lock'. I don't know if this may cause race conditions. Similarly `pch->cyclic' is written by `pl330_alloc_chan_resources' under `pl330->lock' but read by `pl330_tx_submit' under `pch->lock'. Second, I have removed locking from `pl330_request_channel' and `pl330_release_channel' functions. Function `pl330_request_channel' is only called from `pl330_alloc_chan_resources', so the lock is already held. Function `pl330_release_channel' is called from `pl330_free_chan_resources', which already holds the lock, and from `pl330_del'. Function `pl330_del' is called in an error path of `pl330_probe' and at the end of `pl330_remove', but I assume that there cannot be concurrent accesses to the protected data at those points. Signed-off-by: Iago Abal <mail@iagoabal.eu> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'fs/xfs/xfs_trans_rmap.c')