mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'akpm' (patches from Andrew)
Merge yet more updates from Andrew Morton: - the rest of ocfs2 - various hotfixes, mainly MM - quite a bit of misc stuff - drivers, fork, exec, signals, etc. - printk updates - firmware - checkpatch - nilfs2 - more kexec stuff than usual - rapidio updates - w1 things * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (111 commits) ipc: delete "nr_ipc_ns" kcov: allow more fine-grained coverage instrumentation init/Kconfig: add clarification for out-of-tree modules config: add android config fragments init/Kconfig: ban CONFIG_LOCALVERSION_AUTO with allmodconfig relay: add global mode support for buffer-only channels init: allow blacklisting of module_init functions w1:omap_hdq: fix regression w1: add helper macro module_w1_family w1: remove need for ida and use PLATFORM_DEVID_AUTO rapidio/switches: add driver for IDT gen3 switches powerpc/fsl_rio: apply changes for RIO spec rev 3 rapidio: modify for rev.3 specification changes rapidio: change inbound window size type to u64 rapidio/idt_gen2: fix locking warning rapidio: fix error handling in mbox request/release functions rapidio/tsi721_dma: advance queue processing from transfer submit call rapidio/tsi721: add messaging mbox selector parameter rapidio/tsi721: add PCIe MRRS override parameter rapidio/tsi721_dma: add channel mask and queue size parameters ...
This commit is contained in:
Linus Torvalds
commit
d52bd54db8
206 changed files with 5749 additions and 2012 deletions
|
|
@ -38,6 +38,7 @@ struct cpu_vfs_cap_data {
|
|||
struct file;
|
||||
struct inode;
|
||||
struct dentry;
|
||||
struct task_struct;
|
||||
struct user_namespace;
|
||||
|
||||
extern const kernel_cap_t __cap_empty_set;
|
||||
|
|
|
|||
|
|
@ -579,7 +579,7 @@ static inline int cpumask_parselist_user(const char __user *buf, int len,
|
|||
}
|
||||
|
||||
/**
|
||||
* cpumask_parse - extract a cpumask from from a string
|
||||
* cpumask_parse - extract a cpumask from a string
|
||||
* @buf: the buffer to extract from
|
||||
* @dstp: the cpumask to set.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -47,6 +47,8 @@ int request_firmware_nowait(
|
|||
void (*cont)(const struct firmware *fw, void *context));
|
||||
int request_firmware_direct(const struct firmware **fw, const char *name,
|
||||
struct device *device);
|
||||
int request_firmware_into_buf(const struct firmware **firmware_p,
|
||||
const char *name, struct device *device, void *buf, size_t size);
|
||||
|
||||
void release_firmware(const struct firmware *fw);
|
||||
#else
|
||||
|
|
@ -75,5 +77,11 @@ static inline int request_firmware_direct(const struct firmware **fw,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
static inline int request_firmware_into_buf(const struct firmware **firmware_p,
|
||||
const char *name, struct device *device, void *buf, size_t size)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -2652,6 +2652,7 @@ extern int do_pipe_flags(int *, int);
|
|||
#define __kernel_read_file_id(id) \
|
||||
id(UNKNOWN, unknown) \
|
||||
id(FIRMWARE, firmware) \
|
||||
id(FIRMWARE_PREALLOC_BUFFER, firmware) \
|
||||
id(MODULE, kernel-module) \
|
||||
id(KEXEC_IMAGE, kexec-image) \
|
||||
id(KEXEC_INITRAMFS, kexec-initramfs) \
|
||||
|
|
|
|||
|
|
@ -77,12 +77,6 @@
|
|||
#define __refdata __section(.ref.data)
|
||||
#define __refconst __constsection(.ref.rodata)
|
||||
|
||||
/* compatibility defines */
|
||||
#define __init_refok __ref
|
||||
#define __initdata_refok __refdata
|
||||
#define __exit_refok __ref
|
||||
|
||||
|
||||
#ifdef MODULE
|
||||
#define __exitused
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -63,8 +63,6 @@ struct ipc_namespace {
|
|||
};
|
||||
|
||||
extern struct ipc_namespace init_ipc_ns;
|
||||
extern atomic_t nr_ipc_ns;
|
||||
|
||||
extern spinlock_t mq_lock;
|
||||
|
||||
#ifdef CONFIG_SYSVIPC
|
||||
|
|
|
|||
|
|
@ -56,6 +56,7 @@ void kasan_cache_destroy(struct kmem_cache *cache);
|
|||
void kasan_poison_slab(struct page *page);
|
||||
void kasan_unpoison_object_data(struct kmem_cache *cache, void *object);
|
||||
void kasan_poison_object_data(struct kmem_cache *cache, void *object);
|
||||
void kasan_init_slab_obj(struct kmem_cache *cache, const void *object);
|
||||
|
||||
void kasan_kmalloc_large(const void *ptr, size_t size, gfp_t flags);
|
||||
void kasan_kfree_large(const void *ptr);
|
||||
|
|
@ -102,6 +103,8 @@ static inline void kasan_unpoison_object_data(struct kmem_cache *cache,
|
|||
void *object) {}
|
||||
static inline void kasan_poison_object_data(struct kmem_cache *cache,
|
||||
void *object) {}
|
||||
static inline void kasan_init_slab_obj(struct kmem_cache *cache,
|
||||
const void *object) {}
|
||||
|
||||
static inline void kasan_kmalloc_large(void *ptr, size_t size, gfp_t flags) {}
|
||||
static inline void kasan_kfree_large(const void *ptr) {}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@
|
|||
#include <linux/log2.h>
|
||||
#include <linux/typecheck.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/dynamic_debug.h>
|
||||
#include <asm/byteorder.h>
|
||||
#include <uapi/linux/kernel.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
|
||||
#if !defined(__ASSEMBLY__)
|
||||
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <uapi/linux/kexec.h>
|
||||
|
||||
#ifdef CONFIG_KEXEC_CORE
|
||||
|
|
@ -41,7 +43,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef KEXEC_CONTROL_MEMORY_GFP
|
||||
#define KEXEC_CONTROL_MEMORY_GFP GFP_KERNEL
|
||||
#define KEXEC_CONTROL_MEMORY_GFP (GFP_KERNEL | __GFP_NORETRY)
|
||||
#endif
|
||||
|
||||
#ifndef KEXEC_CONTROL_PAGE_SIZE
|
||||
|
|
@ -228,12 +230,13 @@ extern void *kexec_purgatory_get_symbol_addr(struct kimage *image,
|
|||
extern void __crash_kexec(struct pt_regs *);
|
||||
extern void crash_kexec(struct pt_regs *);
|
||||
int kexec_should_crash(struct task_struct *);
|
||||
int kexec_crash_loaded(void);
|
||||
void crash_save_cpu(struct pt_regs *regs, int cpu);
|
||||
void crash_save_vmcoreinfo(void);
|
||||
void arch_crash_save_vmcoreinfo(void);
|
||||
__printf(1, 2)
|
||||
void vmcoreinfo_append_str(const char *fmt, ...);
|
||||
unsigned long paddr_vmcoreinfo_note(void);
|
||||
phys_addr_t paddr_vmcoreinfo_note(void);
|
||||
|
||||
#define VMCOREINFO_OSRELEASE(value) \
|
||||
vmcoreinfo_append_str("OSRELEASE=%s\n", value)
|
||||
|
|
@ -318,12 +321,51 @@ int __weak arch_kexec_apply_relocations(const Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
|
|||
void arch_kexec_protect_crashkres(void);
|
||||
void arch_kexec_unprotect_crashkres(void);
|
||||
|
||||
#ifndef page_to_boot_pfn
|
||||
static inline unsigned long page_to_boot_pfn(struct page *page)
|
||||
{
|
||||
return page_to_pfn(page);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef boot_pfn_to_page
|
||||
static inline struct page *boot_pfn_to_page(unsigned long boot_pfn)
|
||||
{
|
||||
return pfn_to_page(boot_pfn);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef phys_to_boot_phys
|
||||
static inline unsigned long phys_to_boot_phys(phys_addr_t phys)
|
||||
{
|
||||
return phys;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef boot_phys_to_phys
|
||||
static inline phys_addr_t boot_phys_to_phys(unsigned long boot_phys)
|
||||
{
|
||||
return boot_phys;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline unsigned long virt_to_boot_phys(void *addr)
|
||||
{
|
||||
return phys_to_boot_phys(__pa((unsigned long)addr));
|
||||
}
|
||||
|
||||
static inline void *boot_phys_to_virt(unsigned long entry)
|
||||
{
|
||||
return phys_to_virt(boot_phys_to_phys(entry));
|
||||
}
|
||||
|
||||
#else /* !CONFIG_KEXEC_CORE */
|
||||
struct pt_regs;
|
||||
struct task_struct;
|
||||
static inline void __crash_kexec(struct pt_regs *regs) { }
|
||||
static inline void crash_kexec(struct pt_regs *regs) { }
|
||||
static inline int kexec_should_crash(struct task_struct *p) { return 0; }
|
||||
static inline int kexec_crash_loaded(void) { return 0; }
|
||||
#define kexec_in_progress false
|
||||
#endif /* CONFIG_KEXEC_CORE */
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ static inline void vm_unacct_memory(long pages)
|
|||
*
|
||||
* Returns true if the prot flags are valid
|
||||
*/
|
||||
static inline int arch_validate_prot(unsigned long prot)
|
||||
static inline bool arch_validate_prot(unsigned long prot)
|
||||
{
|
||||
return (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM)) == 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,934 +0,0 @@
|
|||
/*
|
||||
* nilfs2_fs.h - NILFS2 on-disk structures and common declarations.
|
||||
*
|
||||
* Copyright (C) 2005-2008 Nippon Telegraph and Telephone Corporation.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published
|
||||
* by the Free Software Foundation; either version 2.1 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* Written by Koji Sato and Ryusuke Konishi.
|
||||
*/
|
||||
/*
|
||||
* linux/include/linux/ext2_fs.h
|
||||
*
|
||||
* Copyright (C) 1992, 1993, 1994, 1995
|
||||
* Remy Card (card@masi.ibp.fr)
|
||||
* Laboratoire MASI - Institut Blaise Pascal
|
||||
* Universite Pierre et Marie Curie (Paris VI)
|
||||
*
|
||||
* from
|
||||
*
|
||||
* linux/include/linux/minix_fs.h
|
||||
*
|
||||
* Copyright (C) 1991, 1992 Linus Torvalds
|
||||
*/
|
||||
|
||||
#ifndef _LINUX_NILFS_FS_H
|
||||
#define _LINUX_NILFS_FS_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/ioctl.h>
|
||||
#include <linux/magic.h>
|
||||
#include <linux/bug.h>
|
||||
|
||||
|
||||
#define NILFS_INODE_BMAP_SIZE 7
|
||||
/**
|
||||
* struct nilfs_inode - structure of an inode on disk
|
||||
* @i_blocks: blocks count
|
||||
* @i_size: size in bytes
|
||||
* @i_ctime: creation time (seconds)
|
||||
* @i_mtime: modification time (seconds)
|
||||
* @i_ctime_nsec: creation time (nano seconds)
|
||||
* @i_mtime_nsec: modification time (nano seconds)
|
||||
* @i_uid: user id
|
||||
* @i_gid: group id
|
||||
* @i_mode: file mode
|
||||
* @i_links_count: links count
|
||||
* @i_flags: file flags
|
||||
* @i_bmap: block mapping
|
||||
* @i_xattr: extended attributes
|
||||
* @i_generation: file generation (for NFS)
|
||||
* @i_pad: padding
|
||||
*/
|
||||
struct nilfs_inode {
|
||||
__le64 i_blocks;
|
||||
__le64 i_size;
|
||||
__le64 i_ctime;
|
||||
__le64 i_mtime;
|
||||
__le32 i_ctime_nsec;
|
||||
__le32 i_mtime_nsec;
|
||||
__le32 i_uid;
|
||||
__le32 i_gid;
|
||||
__le16 i_mode;
|
||||
__le16 i_links_count;
|
||||
__le32 i_flags;
|
||||
__le64 i_bmap[NILFS_INODE_BMAP_SIZE];
|
||||
#define i_device_code i_bmap[0]
|
||||
__le64 i_xattr;
|
||||
__le32 i_generation;
|
||||
__le32 i_pad;
|
||||
};
|
||||
|
||||
#define NILFS_MIN_INODE_SIZE 128
|
||||
|
||||
/**
|
||||
* struct nilfs_super_root - structure of super root
|
||||
* @sr_sum: check sum
|
||||
* @sr_bytes: byte count of the structure
|
||||
* @sr_flags: flags (reserved)
|
||||
* @sr_nongc_ctime: write time of the last segment not for cleaner operation
|
||||
* @sr_dat: DAT file inode
|
||||
* @sr_cpfile: checkpoint file inode
|
||||
* @sr_sufile: segment usage file inode
|
||||
*/
|
||||
struct nilfs_super_root {
|
||||
__le32 sr_sum;
|
||||
__le16 sr_bytes;
|
||||
__le16 sr_flags;
|
||||
__le64 sr_nongc_ctime;
|
||||
struct nilfs_inode sr_dat;
|
||||
struct nilfs_inode sr_cpfile;
|
||||
struct nilfs_inode sr_sufile;
|
||||
};
|
||||
|
||||
#define NILFS_SR_MDT_OFFSET(inode_size, i) \
|
||||
((unsigned long)&((struct nilfs_super_root *)0)->sr_dat + \
|
||||
(inode_size) * (i))
|
||||
#define NILFS_SR_DAT_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size, 0)
|
||||
#define NILFS_SR_CPFILE_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size, 1)
|
||||
#define NILFS_SR_SUFILE_OFFSET(inode_size) NILFS_SR_MDT_OFFSET(inode_size, 2)
|
||||
#define NILFS_SR_BYTES(inode_size) NILFS_SR_MDT_OFFSET(inode_size, 3)
|
||||
|
||||
/*
|
||||
* Maximal mount counts
|
||||
*/
|
||||
#define NILFS_DFL_MAX_MNT_COUNT 50 /* 50 mounts */
|
||||
|
||||
/*
|
||||
* File system states (sbp->s_state, nilfs->ns_mount_state)
|
||||
*/
|
||||
#define NILFS_VALID_FS 0x0001 /* Unmounted cleanly */
|
||||
#define NILFS_ERROR_FS 0x0002 /* Errors detected */
|
||||
#define NILFS_RESIZE_FS 0x0004 /* Resize required */
|
||||
|
||||
/*
|
||||
* Mount flags (sbi->s_mount_opt)
|
||||
*/
|
||||
#define NILFS_MOUNT_ERROR_MODE 0x0070 /* Error mode mask */
|
||||
#define NILFS_MOUNT_ERRORS_CONT 0x0010 /* Continue on errors */
|
||||
#define NILFS_MOUNT_ERRORS_RO 0x0020 /* Remount fs ro on errors */
|
||||
#define NILFS_MOUNT_ERRORS_PANIC 0x0040 /* Panic on errors */
|
||||
#define NILFS_MOUNT_BARRIER 0x1000 /* Use block barriers */
|
||||
#define NILFS_MOUNT_STRICT_ORDER 0x2000 /*
|
||||
* Apply strict in-order
|
||||
* semantics also for data
|
||||
*/
|
||||
#define NILFS_MOUNT_NORECOVERY 0x4000 /*
|
||||
* Disable write access during
|
||||
* mount-time recovery
|
||||
*/
|
||||
#define NILFS_MOUNT_DISCARD 0x8000 /* Issue DISCARD requests */
|
||||
|
||||
|
||||
/**
|
||||
* struct nilfs_super_block - structure of super block on disk
|
||||
*/
|
||||
struct nilfs_super_block {
|
||||
/*00*/ __le32 s_rev_level; /* Revision level */
|
||||
__le16 s_minor_rev_level; /* minor revision level */
|
||||
__le16 s_magic; /* Magic signature */
|
||||
|
||||
__le16 s_bytes; /*
|
||||
* Bytes count of CRC calculation
|
||||
* for this structure. s_reserved
|
||||
* is excluded.
|
||||
*/
|
||||
__le16 s_flags; /* flags */
|
||||
__le32 s_crc_seed; /* Seed value of CRC calculation */
|
||||
/*10*/ __le32 s_sum; /* Check sum of super block */
|
||||
|
||||
__le32 s_log_block_size; /*
|
||||
* Block size represented as follows
|
||||
* blocksize =
|
||||
* 1 << (s_log_block_size + 10)
|
||||
*/
|
||||
__le64 s_nsegments; /* Number of segments in filesystem */
|
||||
/*20*/ __le64 s_dev_size; /* block device size in bytes */
|
||||
__le64 s_first_data_block; /* 1st seg disk block number */
|
||||
/*30*/ __le32 s_blocks_per_segment; /* number of blocks per full segment */
|
||||
__le32 s_r_segments_percentage; /* Reserved segments percentage */
|
||||
|
||||
__le64 s_last_cno; /* Last checkpoint number */
|
||||
/*40*/ __le64 s_last_pseg; /* disk block addr pseg written last */
|
||||
__le64 s_last_seq; /* seq. number of seg written last */
|
||||
/*50*/ __le64 s_free_blocks_count; /* Free blocks count */
|
||||
|
||||
__le64 s_ctime; /*
|
||||
* Creation time (execution time of
|
||||
* newfs)
|
||||
*/
|
||||
/*60*/ __le64 s_mtime; /* Mount time */
|
||||
__le64 s_wtime; /* Write time */
|
||||
/*70*/ __le16 s_mnt_count; /* Mount count */
|
||||
__le16 s_max_mnt_count; /* Maximal mount count */
|
||||
__le16 s_state; /* File system state */
|
||||
__le16 s_errors; /* Behaviour when detecting errors */
|
||||
__le64 s_lastcheck; /* time of last check */
|
||||
|
||||
/*80*/ __le32 s_checkinterval; /* max. time between checks */
|
||||
__le32 s_creator_os; /* OS */
|
||||
__le16 s_def_resuid; /* Default uid for reserved blocks */
|
||||
__le16 s_def_resgid; /* Default gid for reserved blocks */
|
||||
__le32 s_first_ino; /* First non-reserved inode */
|
||||
|
||||
/*90*/ __le16 s_inode_size; /* Size of an inode */
|
||||
__le16 s_dat_entry_size; /* Size of a dat entry */
|
||||
__le16 s_checkpoint_size; /* Size of a checkpoint */
|
||||
__le16 s_segment_usage_size; /* Size of a segment usage */
|
||||
|
||||
/*98*/ __u8 s_uuid[16]; /* 128-bit uuid for volume */
|
||||
/*A8*/ char s_volume_name[80]; /* volume name */
|
||||
|
||||
/*F8*/ __le32 s_c_interval; /* Commit interval of segment */
|
||||
__le32 s_c_block_max; /*
|
||||
* Threshold of data amount for
|
||||
* the segment construction
|
||||
*/
|
||||
/*100*/ __le64 s_feature_compat; /* Compatible feature set */
|
||||
__le64 s_feature_compat_ro; /* Read-only compatible feature set */
|
||||
__le64 s_feature_incompat; /* Incompatible feature set */
|
||||
__u32 s_reserved[186]; /* padding to the end of the block */
|
||||
};
|
||||
|
||||
/*
|
||||
* Codes for operating systems
|
||||
*/
|
||||
#define NILFS_OS_LINUX 0
|
||||
/* Codes from 1 to 4 are reserved to keep compatibility with ext2 creator-OS */
|
||||
|
||||
/*
|
||||
* Revision levels
|
||||
*/
|
||||
#define NILFS_CURRENT_REV 2 /* current major revision */
|
||||
#define NILFS_MINOR_REV 0 /* minor revision */
|
||||
#define NILFS_MIN_SUPP_REV 2 /* minimum supported revision */
|
||||
|
||||
/*
|
||||
* Feature set definitions
|
||||
*
|
||||
* If there is a bit set in the incompatible feature set that the kernel
|
||||
* doesn't know about, it should refuse to mount the filesystem.
|
||||
*/
|
||||
#define NILFS_FEATURE_COMPAT_RO_BLOCK_COUNT 0x00000001ULL
|
||||
|
||||
#define NILFS_FEATURE_COMPAT_SUPP 0ULL
|
||||
#define NILFS_FEATURE_COMPAT_RO_SUPP NILFS_FEATURE_COMPAT_RO_BLOCK_COUNT
|
||||
#define NILFS_FEATURE_INCOMPAT_SUPP 0ULL
|
||||
|
||||
/*
|
||||
* Bytes count of super_block for CRC-calculation
|
||||
*/
|
||||
#define NILFS_SB_BYTES \
|
||||
((long)&((struct nilfs_super_block *)0)->s_reserved)
|
||||
|
||||
/*
|
||||
* Special inode number
|
||||
*/
|
||||
#define NILFS_ROOT_INO 2 /* Root file inode */
|
||||
#define NILFS_DAT_INO 3 /* DAT file */
|
||||
#define NILFS_CPFILE_INO 4 /* checkpoint file */
|
||||
#define NILFS_SUFILE_INO 5 /* segment usage file */
|
||||
#define NILFS_IFILE_INO 6 /* ifile */
|
||||
#define NILFS_ATIME_INO 7 /* Atime file (reserved) */
|
||||
#define NILFS_XATTR_INO 8 /* Xattribute file (reserved) */
|
||||
#define NILFS_SKETCH_INO 10 /* Sketch file */
|
||||
#define NILFS_USER_INO 11 /* Fisrt user's file inode number */
|
||||
|
||||
#define NILFS_SB_OFFSET_BYTES 1024 /* byte offset of nilfs superblock */
|
||||
|
||||
#define NILFS_SEG_MIN_BLOCKS 16 /*
|
||||
* Minimum number of blocks in
|
||||
* a full segment
|
||||
*/
|
||||
#define NILFS_PSEG_MIN_BLOCKS 2 /*
|
||||
* Minimum number of blocks in
|
||||
* a partial segment
|
||||
*/
|
||||
#define NILFS_MIN_NRSVSEGS 8 /*
|
||||
* Minimum number of reserved
|
||||
* segments
|
||||
*/
|
||||
|
||||
/*
|
||||
* We call DAT, cpfile, and sufile root metadata files. Inodes of
|
||||
* these files are written in super root block instead of ifile, and
|
||||
* garbage collector doesn't keep any past versions of these files.
|
||||
*/
|
||||
#define NILFS_ROOT_METADATA_FILE(ino) \
|
||||
((ino) >= NILFS_DAT_INO && (ino) <= NILFS_SUFILE_INO)
|
||||
|
||||
/*
|
||||
* bytes offset of secondary super block
|
||||
*/
|
||||
#define NILFS_SB2_OFFSET_BYTES(devsize) ((((devsize) >> 12) - 1) << 12)
|
||||
|
||||
/*
|
||||
* Maximal count of links to a file
|
||||
*/
|
||||
#define NILFS_LINK_MAX 32000
|
||||
|
||||
/*
|
||||
* Structure of a directory entry
|
||||
* (Same as ext2)
|
||||
*/
|
||||
|
||||
#define NILFS_NAME_LEN 255
|
||||
|
||||
/*
|
||||
* Block size limitations
|
||||
*/
|
||||
#define NILFS_MIN_BLOCK_SIZE 1024
|
||||
#define NILFS_MAX_BLOCK_SIZE 65536
|
||||
|
||||
/*
|
||||
* The new version of the directory entry. Since V0 structures are
|
||||
* stored in intel byte order, and the name_len field could never be
|
||||
* bigger than 255 chars, it's safe to reclaim the extra byte for the
|
||||
* file_type field.
|
||||
*/
|
||||
struct nilfs_dir_entry {
|
||||
__le64 inode; /* Inode number */
|
||||
__le16 rec_len; /* Directory entry length */
|
||||
__u8 name_len; /* Name length */
|
||||
__u8 file_type; /* Dir entry type (file, dir, etc) */
|
||||
char name[NILFS_NAME_LEN]; /* File name */
|
||||
char pad;
|
||||
};
|
||||
|
||||
/*
|
||||
* NILFS directory file types. Only the low 3 bits are used. The
|
||||
* other bits are reserved for now.
|
||||
*/
|
||||
enum {
|
||||
NILFS_FT_UNKNOWN,
|
||||
NILFS_FT_REG_FILE,
|
||||
NILFS_FT_DIR,
|
||||
NILFS_FT_CHRDEV,
|
||||
NILFS_FT_BLKDEV,
|
||||
NILFS_FT_FIFO,
|
||||
NILFS_FT_SOCK,
|
||||
NILFS_FT_SYMLINK,
|
||||
NILFS_FT_MAX
|
||||
};
|
||||
|
||||
/*
|
||||
* NILFS_DIR_PAD defines the directory entries boundaries
|
||||
*
|
||||
* NOTE: It must be a multiple of 8
|
||||
*/
|
||||
#define NILFS_DIR_PAD 8
|
||||
#define NILFS_DIR_ROUND (NILFS_DIR_PAD - 1)
|
||||
#define NILFS_DIR_REC_LEN(name_len) (((name_len) + 12 + NILFS_DIR_ROUND) & \
|
||||
~NILFS_DIR_ROUND)
|
||||
#define NILFS_MAX_REC_LEN ((1<<16)-1)
|
||||
|
||||
static inline unsigned int nilfs_rec_len_from_disk(__le16 dlen)
|
||||
{
|
||||
unsigned int len = le16_to_cpu(dlen);
|
||||
|
||||
#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)
|
||||
if (len == NILFS_MAX_REC_LEN)
|
||||
return 1 << 16;
|
||||
#endif
|
||||
return len;
|
||||
}
|
||||
|
||||
static inline __le16 nilfs_rec_len_to_disk(unsigned int len)
|
||||
{
|
||||
#if !defined(__KERNEL__) || (PAGE_SIZE >= 65536)
|
||||
if (len == (1 << 16))
|
||||
return cpu_to_le16(NILFS_MAX_REC_LEN);
|
||||
else if (len > (1 << 16))
|
||||
BUG();
|
||||
#endif
|
||||
return cpu_to_le16(len);
|
||||
}
|
||||
|
||||
/**
|
||||
* struct nilfs_finfo - file information
|
||||
* @fi_ino: inode number
|
||||
* @fi_cno: checkpoint number
|
||||
* @fi_nblocks: number of blocks (including intermediate blocks)
|
||||
* @fi_ndatablk: number of file data blocks
|
||||
*/
|
||||
struct nilfs_finfo {
|
||||
__le64 fi_ino;
|
||||
__le64 fi_cno;
|
||||
__le32 fi_nblocks;
|
||||
__le32 fi_ndatablk;
|
||||
/* array of virtual block numbers */
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_binfo_v - information for the block to which a virtual block number is assigned
|
||||
* @bi_vblocknr: virtual block number
|
||||
* @bi_blkoff: block offset
|
||||
*/
|
||||
struct nilfs_binfo_v {
|
||||
__le64 bi_vblocknr;
|
||||
__le64 bi_blkoff;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_binfo_dat - information for the block which belongs to the DAT file
|
||||
* @bi_blkoff: block offset
|
||||
* @bi_level: level
|
||||
* @bi_pad: padding
|
||||
*/
|
||||
struct nilfs_binfo_dat {
|
||||
__le64 bi_blkoff;
|
||||
__u8 bi_level;
|
||||
__u8 bi_pad[7];
|
||||
};
|
||||
|
||||
/**
|
||||
* union nilfs_binfo: block information
|
||||
* @bi_v: nilfs_binfo_v structure
|
||||
* @bi_dat: nilfs_binfo_dat structure
|
||||
*/
|
||||
union nilfs_binfo {
|
||||
struct nilfs_binfo_v bi_v;
|
||||
struct nilfs_binfo_dat bi_dat;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_segment_summary - segment summary header
|
||||
* @ss_datasum: checksum of data
|
||||
* @ss_sumsum: checksum of segment summary
|
||||
* @ss_magic: magic number
|
||||
* @ss_bytes: size of this structure in bytes
|
||||
* @ss_flags: flags
|
||||
* @ss_seq: sequence number
|
||||
* @ss_create: creation timestamp
|
||||
* @ss_next: next segment
|
||||
* @ss_nblocks: number of blocks
|
||||
* @ss_nfinfo: number of finfo structures
|
||||
* @ss_sumbytes: total size of segment summary in bytes
|
||||
* @ss_pad: padding
|
||||
* @ss_cno: checkpoint number
|
||||
*/
|
||||
struct nilfs_segment_summary {
|
||||
__le32 ss_datasum;
|
||||
__le32 ss_sumsum;
|
||||
__le32 ss_magic;
|
||||
__le16 ss_bytes;
|
||||
__le16 ss_flags;
|
||||
__le64 ss_seq;
|
||||
__le64 ss_create;
|
||||
__le64 ss_next;
|
||||
__le32 ss_nblocks;
|
||||
__le32 ss_nfinfo;
|
||||
__le32 ss_sumbytes;
|
||||
__le32 ss_pad;
|
||||
__le64 ss_cno;
|
||||
/* array of finfo structures */
|
||||
};
|
||||
|
||||
#define NILFS_SEGSUM_MAGIC 0x1eaffa11 /* segment summary magic number */
|
||||
|
||||
/*
|
||||
* Segment summary flags
|
||||
*/
|
||||
#define NILFS_SS_LOGBGN 0x0001 /* begins a logical segment */
|
||||
#define NILFS_SS_LOGEND 0x0002 /* ends a logical segment */
|
||||
#define NILFS_SS_SR 0x0004 /* has super root */
|
||||
#define NILFS_SS_SYNDT 0x0008 /* includes data only updates */
|
||||
#define NILFS_SS_GC 0x0010 /* segment written for cleaner operation */
|
||||
|
||||
/**
|
||||
* struct nilfs_btree_node - B-tree node
|
||||
* @bn_flags: flags
|
||||
* @bn_level: level
|
||||
* @bn_nchildren: number of children
|
||||
* @bn_pad: padding
|
||||
*/
|
||||
struct nilfs_btree_node {
|
||||
__u8 bn_flags;
|
||||
__u8 bn_level;
|
||||
__le16 bn_nchildren;
|
||||
__le32 bn_pad;
|
||||
};
|
||||
|
||||
/* flags */
|
||||
#define NILFS_BTREE_NODE_ROOT 0x01
|
||||
|
||||
/* level */
|
||||
#define NILFS_BTREE_LEVEL_DATA 0
|
||||
#define NILFS_BTREE_LEVEL_NODE_MIN (NILFS_BTREE_LEVEL_DATA + 1)
|
||||
#define NILFS_BTREE_LEVEL_MAX 14 /* Max level (exclusive) */
|
||||
|
||||
/**
|
||||
* struct nilfs_palloc_group_desc - block group descriptor
|
||||
* @pg_nfrees: number of free entries in block group
|
||||
*/
|
||||
struct nilfs_palloc_group_desc {
|
||||
__le32 pg_nfrees;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_dat_entry - disk address translation entry
|
||||
* @de_blocknr: block number
|
||||
* @de_start: start checkpoint number
|
||||
* @de_end: end checkpoint number
|
||||
* @de_rsv: reserved for future use
|
||||
*/
|
||||
struct nilfs_dat_entry {
|
||||
__le64 de_blocknr;
|
||||
__le64 de_start;
|
||||
__le64 de_end;
|
||||
__le64 de_rsv;
|
||||
};
|
||||
|
||||
#define NILFS_MIN_DAT_ENTRY_SIZE 32
|
||||
|
||||
/**
|
||||
* struct nilfs_snapshot_list - snapshot list
|
||||
* @ssl_next: next checkpoint number on snapshot list
|
||||
* @ssl_prev: previous checkpoint number on snapshot list
|
||||
*/
|
||||
struct nilfs_snapshot_list {
|
||||
__le64 ssl_next;
|
||||
__le64 ssl_prev;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_checkpoint - checkpoint structure
|
||||
* @cp_flags: flags
|
||||
* @cp_checkpoints_count: checkpoints count in a block
|
||||
* @cp_snapshot_list: snapshot list
|
||||
* @cp_cno: checkpoint number
|
||||
* @cp_create: creation timestamp
|
||||
* @cp_nblk_inc: number of blocks incremented by this checkpoint
|
||||
* @cp_inodes_count: inodes count
|
||||
* @cp_blocks_count: blocks count
|
||||
* @cp_ifile_inode: inode of ifile
|
||||
*/
|
||||
struct nilfs_checkpoint {
|
||||
__le32 cp_flags;
|
||||
__le32 cp_checkpoints_count;
|
||||
struct nilfs_snapshot_list cp_snapshot_list;
|
||||
__le64 cp_cno;
|
||||
__le64 cp_create;
|
||||
__le64 cp_nblk_inc;
|
||||
__le64 cp_inodes_count;
|
||||
__le64 cp_blocks_count;
|
||||
|
||||
/*
|
||||
* Do not change the byte offset of ifile inode.
|
||||
* To keep the compatibility of the disk format,
|
||||
* additional fields should be added behind cp_ifile_inode.
|
||||
*/
|
||||
struct nilfs_inode cp_ifile_inode;
|
||||
};
|
||||
|
||||
#define NILFS_MIN_CHECKPOINT_SIZE (64 + NILFS_MIN_INODE_SIZE)
|
||||
|
||||
/* checkpoint flags */
|
||||
enum {
|
||||
NILFS_CHECKPOINT_SNAPSHOT,
|
||||
NILFS_CHECKPOINT_INVALID,
|
||||
NILFS_CHECKPOINT_SKETCH,
|
||||
NILFS_CHECKPOINT_MINOR,
|
||||
};
|
||||
|
||||
#define NILFS_CHECKPOINT_FNS(flag, name) \
|
||||
static inline void \
|
||||
nilfs_checkpoint_set_##name(struct nilfs_checkpoint *cp) \
|
||||
{ \
|
||||
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) | \
|
||||
(1UL << NILFS_CHECKPOINT_##flag)); \
|
||||
} \
|
||||
static inline void \
|
||||
nilfs_checkpoint_clear_##name(struct nilfs_checkpoint *cp) \
|
||||
{ \
|
||||
cp->cp_flags = cpu_to_le32(le32_to_cpu(cp->cp_flags) & \
|
||||
~(1UL << NILFS_CHECKPOINT_##flag)); \
|
||||
} \
|
||||
static inline int \
|
||||
nilfs_checkpoint_##name(const struct nilfs_checkpoint *cp) \
|
||||
{ \
|
||||
return !!(le32_to_cpu(cp->cp_flags) & \
|
||||
(1UL << NILFS_CHECKPOINT_##flag)); \
|
||||
}
|
||||
|
||||
NILFS_CHECKPOINT_FNS(SNAPSHOT, snapshot)
|
||||
NILFS_CHECKPOINT_FNS(INVALID, invalid)
|
||||
NILFS_CHECKPOINT_FNS(MINOR, minor)
|
||||
|
||||
/**
|
||||
* struct nilfs_cpinfo - checkpoint information
|
||||
* @ci_flags: flags
|
||||
* @ci_pad: padding
|
||||
* @ci_cno: checkpoint number
|
||||
* @ci_create: creation timestamp
|
||||
* @ci_nblk_inc: number of blocks incremented by this checkpoint
|
||||
* @ci_inodes_count: inodes count
|
||||
* @ci_blocks_count: blocks count
|
||||
* @ci_next: next checkpoint number in snapshot list
|
||||
*/
|
||||
struct nilfs_cpinfo {
|
||||
__u32 ci_flags;
|
||||
__u32 ci_pad;
|
||||
__u64 ci_cno;
|
||||
__u64 ci_create;
|
||||
__u64 ci_nblk_inc;
|
||||
__u64 ci_inodes_count;
|
||||
__u64 ci_blocks_count;
|
||||
__u64 ci_next;
|
||||
};
|
||||
|
||||
#define NILFS_CPINFO_FNS(flag, name) \
|
||||
static inline int \
|
||||
nilfs_cpinfo_##name(const struct nilfs_cpinfo *cpinfo) \
|
||||
{ \
|
||||
return !!(cpinfo->ci_flags & (1UL << NILFS_CHECKPOINT_##flag)); \
|
||||
}
|
||||
|
||||
NILFS_CPINFO_FNS(SNAPSHOT, snapshot)
|
||||
NILFS_CPINFO_FNS(INVALID, invalid)
|
||||
NILFS_CPINFO_FNS(MINOR, minor)
|
||||
|
||||
|
||||
/**
|
||||
* struct nilfs_cpfile_header - checkpoint file header
|
||||
* @ch_ncheckpoints: number of checkpoints
|
||||
* @ch_nsnapshots: number of snapshots
|
||||
* @ch_snapshot_list: snapshot list
|
||||
*/
|
||||
struct nilfs_cpfile_header {
|
||||
__le64 ch_ncheckpoints;
|
||||
__le64 ch_nsnapshots;
|
||||
struct nilfs_snapshot_list ch_snapshot_list;
|
||||
};
|
||||
|
||||
#define NILFS_CPFILE_FIRST_CHECKPOINT_OFFSET \
|
||||
((sizeof(struct nilfs_cpfile_header) + \
|
||||
sizeof(struct nilfs_checkpoint) - 1) / \
|
||||
sizeof(struct nilfs_checkpoint))
|
||||
|
||||
/**
|
||||
* struct nilfs_segment_usage - segment usage
|
||||
* @su_lastmod: last modified timestamp
|
||||
* @su_nblocks: number of blocks in segment
|
||||
* @su_flags: flags
|
||||
*/
|
||||
struct nilfs_segment_usage {
|
||||
__le64 su_lastmod;
|
||||
__le32 su_nblocks;
|
||||
__le32 su_flags;
|
||||
};
|
||||
|
||||
#define NILFS_MIN_SEGMENT_USAGE_SIZE 16
|
||||
|
||||
/* segment usage flag */
|
||||
enum {
|
||||
NILFS_SEGMENT_USAGE_ACTIVE,
|
||||
NILFS_SEGMENT_USAGE_DIRTY,
|
||||
NILFS_SEGMENT_USAGE_ERROR,
|
||||
|
||||
/* ... */
|
||||
};
|
||||
|
||||
#define NILFS_SEGMENT_USAGE_FNS(flag, name) \
|
||||
static inline void \
|
||||
nilfs_segment_usage_set_##name(struct nilfs_segment_usage *su) \
|
||||
{ \
|
||||
su->su_flags = cpu_to_le32(le32_to_cpu(su->su_flags) | \
|
||||
(1UL << NILFS_SEGMENT_USAGE_##flag));\
|
||||
} \
|
||||
static inline void \
|
||||
nilfs_segment_usage_clear_##name(struct nilfs_segment_usage *su) \
|
||||
{ \
|
||||
su->su_flags = \
|
||||
cpu_to_le32(le32_to_cpu(su->su_flags) & \
|
||||
~(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
||||
} \
|
||||
static inline int \
|
||||
nilfs_segment_usage_##name(const struct nilfs_segment_usage *su) \
|
||||
{ \
|
||||
return !!(le32_to_cpu(su->su_flags) & \
|
||||
(1UL << NILFS_SEGMENT_USAGE_##flag)); \
|
||||
}
|
||||
|
||||
NILFS_SEGMENT_USAGE_FNS(ACTIVE, active)
|
||||
NILFS_SEGMENT_USAGE_FNS(DIRTY, dirty)
|
||||
NILFS_SEGMENT_USAGE_FNS(ERROR, error)
|
||||
|
||||
static inline void
|
||||
nilfs_segment_usage_set_clean(struct nilfs_segment_usage *su)
|
||||
{
|
||||
su->su_lastmod = cpu_to_le64(0);
|
||||
su->su_nblocks = cpu_to_le32(0);
|
||||
su->su_flags = cpu_to_le32(0);
|
||||
}
|
||||
|
||||
static inline int
|
||||
nilfs_segment_usage_clean(const struct nilfs_segment_usage *su)
|
||||
{
|
||||
return !le32_to_cpu(su->su_flags);
|
||||
}
|
||||
|
||||
/**
|
||||
* struct nilfs_sufile_header - segment usage file header
|
||||
* @sh_ncleansegs: number of clean segments
|
||||
* @sh_ndirtysegs: number of dirty segments
|
||||
* @sh_last_alloc: last allocated segment number
|
||||
*/
|
||||
struct nilfs_sufile_header {
|
||||
__le64 sh_ncleansegs;
|
||||
__le64 sh_ndirtysegs;
|
||||
__le64 sh_last_alloc;
|
||||
/* ... */
|
||||
};
|
||||
|
||||
#define NILFS_SUFILE_FIRST_SEGMENT_USAGE_OFFSET \
|
||||
((sizeof(struct nilfs_sufile_header) + \
|
||||
sizeof(struct nilfs_segment_usage) - 1) / \
|
||||
sizeof(struct nilfs_segment_usage))
|
||||
|
||||
/**
|
||||
* nilfs_suinfo - segment usage information
|
||||
* @sui_lastmod: timestamp of last modification
|
||||
* @sui_nblocks: number of written blocks in segment
|
||||
* @sui_flags: segment usage flags
|
||||
*/
|
||||
struct nilfs_suinfo {
|
||||
__u64 sui_lastmod;
|
||||
__u32 sui_nblocks;
|
||||
__u32 sui_flags;
|
||||
};
|
||||
|
||||
#define NILFS_SUINFO_FNS(flag, name) \
|
||||
static inline int \
|
||||
nilfs_suinfo_##name(const struct nilfs_suinfo *si) \
|
||||
{ \
|
||||
return si->sui_flags & (1UL << NILFS_SEGMENT_USAGE_##flag); \
|
||||
}
|
||||
|
||||
NILFS_SUINFO_FNS(ACTIVE, active)
|
||||
NILFS_SUINFO_FNS(DIRTY, dirty)
|
||||
NILFS_SUINFO_FNS(ERROR, error)
|
||||
|
||||
static inline int nilfs_suinfo_clean(const struct nilfs_suinfo *si)
|
||||
{
|
||||
return !si->sui_flags;
|
||||
}
|
||||
|
||||
/* ioctl */
|
||||
/**
|
||||
* nilfs_suinfo_update - segment usage information update
|
||||
* @sup_segnum: segment number
|
||||
* @sup_flags: flags for which fields are active in sup_sui
|
||||
* @sup_reserved: reserved necessary for alignment
|
||||
* @sup_sui: segment usage information
|
||||
*/
|
||||
struct nilfs_suinfo_update {
|
||||
__u64 sup_segnum;
|
||||
__u32 sup_flags;
|
||||
__u32 sup_reserved;
|
||||
struct nilfs_suinfo sup_sui;
|
||||
};
|
||||
|
||||
enum {
|
||||
NILFS_SUINFO_UPDATE_LASTMOD,
|
||||
NILFS_SUINFO_UPDATE_NBLOCKS,
|
||||
NILFS_SUINFO_UPDATE_FLAGS,
|
||||
__NR_NILFS_SUINFO_UPDATE_FIELDS,
|
||||
};
|
||||
|
||||
#define NILFS_SUINFO_UPDATE_FNS(flag, name) \
|
||||
static inline void \
|
||||
nilfs_suinfo_update_set_##name(struct nilfs_suinfo_update *sup) \
|
||||
{ \
|
||||
sup->sup_flags |= 1UL << NILFS_SUINFO_UPDATE_##flag; \
|
||||
} \
|
||||
static inline void \
|
||||
nilfs_suinfo_update_clear_##name(struct nilfs_suinfo_update *sup) \
|
||||
{ \
|
||||
sup->sup_flags &= ~(1UL << NILFS_SUINFO_UPDATE_##flag); \
|
||||
} \
|
||||
static inline int \
|
||||
nilfs_suinfo_update_##name(const struct nilfs_suinfo_update *sup) \
|
||||
{ \
|
||||
return !!(sup->sup_flags & (1UL << NILFS_SUINFO_UPDATE_##flag));\
|
||||
}
|
||||
|
||||
NILFS_SUINFO_UPDATE_FNS(LASTMOD, lastmod)
|
||||
NILFS_SUINFO_UPDATE_FNS(NBLOCKS, nblocks)
|
||||
NILFS_SUINFO_UPDATE_FNS(FLAGS, flags)
|
||||
|
||||
enum {
|
||||
NILFS_CHECKPOINT,
|
||||
NILFS_SNAPSHOT,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_cpmode - change checkpoint mode structure
|
||||
* @cm_cno: checkpoint number
|
||||
* @cm_mode: mode of checkpoint
|
||||
* @cm_pad: padding
|
||||
*/
|
||||
struct nilfs_cpmode {
|
||||
__u64 cm_cno;
|
||||
__u32 cm_mode;
|
||||
__u32 cm_pad;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_argv - argument vector
|
||||
* @v_base: pointer on data array from userspace
|
||||
* @v_nmembs: number of members in data array
|
||||
* @v_size: size of data array in bytes
|
||||
* @v_flags: flags
|
||||
* @v_index: start number of target data items
|
||||
*/
|
||||
struct nilfs_argv {
|
||||
__u64 v_base;
|
||||
__u32 v_nmembs; /* number of members */
|
||||
__u16 v_size; /* size of members */
|
||||
__u16 v_flags;
|
||||
__u64 v_index;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_period - period of checkpoint numbers
|
||||
* @p_start: start checkpoint number (inclusive)
|
||||
* @p_end: end checkpoint number (exclusive)
|
||||
*/
|
||||
struct nilfs_period {
|
||||
__u64 p_start;
|
||||
__u64 p_end;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_cpstat - checkpoint statistics
|
||||
* @cs_cno: checkpoint number
|
||||
* @cs_ncps: number of checkpoints
|
||||
* @cs_nsss: number of snapshots
|
||||
*/
|
||||
struct nilfs_cpstat {
|
||||
__u64 cs_cno;
|
||||
__u64 cs_ncps;
|
||||
__u64 cs_nsss;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_sustat - segment usage statistics
|
||||
* @ss_nsegs: number of segments
|
||||
* @ss_ncleansegs: number of clean segments
|
||||
* @ss_ndirtysegs: number of dirty segments
|
||||
* @ss_ctime: creation time of the last segment
|
||||
* @ss_nongc_ctime: creation time of the last segment not for GC
|
||||
* @ss_prot_seq: least sequence number of segments which must not be reclaimed
|
||||
*/
|
||||
struct nilfs_sustat {
|
||||
__u64 ss_nsegs;
|
||||
__u64 ss_ncleansegs;
|
||||
__u64 ss_ndirtysegs;
|
||||
__u64 ss_ctime;
|
||||
__u64 ss_nongc_ctime;
|
||||
__u64 ss_prot_seq;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_vinfo - virtual block number information
|
||||
* @vi_vblocknr: virtual block number
|
||||
* @vi_start: start checkpoint number (inclusive)
|
||||
* @vi_end: end checkpoint number (exclusive)
|
||||
* @vi_blocknr: disk block number
|
||||
*/
|
||||
struct nilfs_vinfo {
|
||||
__u64 vi_vblocknr;
|
||||
__u64 vi_start;
|
||||
__u64 vi_end;
|
||||
__u64 vi_blocknr;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_vdesc - descriptor of virtual block number
|
||||
* @vd_ino: inode number
|
||||
* @vd_cno: checkpoint number
|
||||
* @vd_vblocknr: virtual block number
|
||||
* @vd_period: period of checkpoint numbers
|
||||
* @vd_blocknr: disk block number
|
||||
* @vd_offset: logical block offset inside a file
|
||||
* @vd_flags: flags (data or node block)
|
||||
* @vd_pad: padding
|
||||
*/
|
||||
struct nilfs_vdesc {
|
||||
__u64 vd_ino;
|
||||
__u64 vd_cno;
|
||||
__u64 vd_vblocknr;
|
||||
struct nilfs_period vd_period;
|
||||
__u64 vd_blocknr;
|
||||
__u64 vd_offset;
|
||||
__u32 vd_flags;
|
||||
__u32 vd_pad;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct nilfs_bdesc - descriptor of disk block number
|
||||
* @bd_ino: inode number
|
||||
* @bd_oblocknr: disk block address (for skipping dead blocks)
|
||||
* @bd_blocknr: disk block address
|
||||
* @bd_offset: logical block offset inside a file
|
||||
* @bd_level: level in the b-tree organization
|
||||
* @bd_pad: padding
|
||||
*/
|
||||
struct nilfs_bdesc {
|
||||
__u64 bd_ino;
|
||||
__u64 bd_oblocknr;
|
||||
__u64 bd_blocknr;
|
||||
__u64 bd_offset;
|
||||
__u32 bd_level;
|
||||
__u32 bd_pad;
|
||||
};
|
||||
|
||||
#define NILFS_IOCTL_IDENT 'n'
|
||||
|
||||
#define NILFS_IOCTL_CHANGE_CPMODE \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x80, struct nilfs_cpmode)
|
||||
#define NILFS_IOCTL_DELETE_CHECKPOINT \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x81, __u64)
|
||||
#define NILFS_IOCTL_GET_CPINFO \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x82, struct nilfs_argv)
|
||||
#define NILFS_IOCTL_GET_CPSTAT \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x83, struct nilfs_cpstat)
|
||||
#define NILFS_IOCTL_GET_SUINFO \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x84, struct nilfs_argv)
|
||||
#define NILFS_IOCTL_GET_SUSTAT \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x85, struct nilfs_sustat)
|
||||
#define NILFS_IOCTL_GET_VINFO \
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x86, struct nilfs_argv)
|
||||
#define NILFS_IOCTL_GET_BDESCS \
|
||||
_IOWR(NILFS_IOCTL_IDENT, 0x87, struct nilfs_argv)
|
||||
#define NILFS_IOCTL_CLEAN_SEGMENTS \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x88, struct nilfs_argv[5])
|
||||
#define NILFS_IOCTL_SYNC \
|
||||
_IOR(NILFS_IOCTL_IDENT, 0x8A, __u64)
|
||||
#define NILFS_IOCTL_RESIZE \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x8B, __u64)
|
||||
#define NILFS_IOCTL_SET_ALLOC_RANGE \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x8C, __u64[2])
|
||||
#define NILFS_IOCTL_SET_SUINFO \
|
||||
_IOW(NILFS_IOCTL_IDENT, 0x8D, struct nilfs_argv)
|
||||
|
||||
#endif /* _LINUX_NILFS_FS_H */
|
||||
|
|
@ -61,6 +61,11 @@ static inline void console_verbose(void)
|
|||
console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
|
||||
}
|
||||
|
||||
/* strlen("ratelimit") + 1 */
|
||||
#define DEVKMSG_STR_MAX_SIZE 10
|
||||
extern char devkmsg_log_str[];
|
||||
struct ctl_table;
|
||||
|
||||
struct va_format {
|
||||
const char *fmt;
|
||||
va_list *va;
|
||||
|
|
@ -175,6 +180,10 @@ extern int printk_delay_msec;
|
|||
extern int dmesg_restrict;
|
||||
extern int kptr_restrict;
|
||||
|
||||
extern int
|
||||
devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,
|
||||
size_t *lenp, loff_t *ppos);
|
||||
|
||||
extern void wake_up_klogd(void);
|
||||
|
||||
char *log_buf_addr_get(void);
|
||||
|
|
@ -257,21 +266,39 @@ extern asmlinkage void dump_stack(void) __cold;
|
|||
* and other debug macros are compiled out unless either DEBUG is defined
|
||||
* or CONFIG_DYNAMIC_DEBUG is set.
|
||||
*/
|
||||
#define pr_emerg(fmt, ...) \
|
||||
printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_alert(fmt, ...) \
|
||||
printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_crit(fmt, ...) \
|
||||
printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_err(fmt, ...) \
|
||||
printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_warning(fmt, ...) \
|
||||
printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_warn pr_warning
|
||||
#define pr_notice(fmt, ...) \
|
||||
printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_info(fmt, ...) \
|
||||
printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||
|
||||
#ifdef CONFIG_PRINTK
|
||||
|
||||
asmlinkage __printf(1, 2) __cold void __pr_emerg(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_alert(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_crit(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_err(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_warn(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_notice(const char *fmt, ...);
|
||||
asmlinkage __printf(1, 2) __cold void __pr_info(const char *fmt, ...);
|
||||
|
||||
#define pr_emerg(fmt, ...) __pr_emerg(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_alert(fmt, ...) __pr_alert(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_crit(fmt, ...) __pr_crit(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_err(fmt, ...) __pr_err(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_warn(fmt, ...) __pr_warn(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_notice(fmt, ...) __pr_notice(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_info(fmt, ...) __pr_info(pr_fmt(fmt), ##__VA_ARGS__)
|
||||
|
||||
#else
|
||||
|
||||
#define pr_emerg(fmt, ...) printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_alert(fmt, ...) printk(KERN_ALERT pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_crit(fmt, ...) printk(KERN_CRIT pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_err(fmt, ...) printk(KERN_ERR pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_warn(fmt, ...) printk(KERN_WARNING pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_notice(fmt, ...) printk(KERN_NOTICE pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#define pr_info(fmt, ...) printk(KERN_INFO pr_fmt(fmt), ##__VA_ARGS__)
|
||||
|
||||
#endif
|
||||
|
||||
#define pr_warning pr_warn
|
||||
|
||||
/*
|
||||
* Like KERN_CONT, pr_cont() should only be used when continuing
|
||||
* a line with no newline ('\n') enclosed. Otherwise it defaults
|
||||
|
|
@ -289,10 +316,11 @@ extern asmlinkage void dump_stack(void) __cold;
|
|||
no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
|
||||
#endif
|
||||
|
||||
#include <linux/dynamic_debug.h>
|
||||
|
||||
/* If you are writing a driver, please use dev_dbg instead */
|
||||
#if defined(CONFIG_DYNAMIC_DEBUG)
|
||||
#include <linux/dynamic_debug.h>
|
||||
|
||||
/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */
|
||||
#define pr_debug(fmt, ...) \
|
||||
dynamic_pr_debug(fmt, ##__VA_ARGS__)
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* 00 - data pointer
|
||||
* 01 - internal entry
|
||||
* 10 - exceptional entry
|
||||
* 11 - locked exceptional entry
|
||||
* 11 - this bit combination is currently unused/reserved
|
||||
*
|
||||
* The internal entry may be a pointer to the next level in the tree, a
|
||||
* sibling entry, or an indicator that the entry in this slot has been moved
|
||||
|
|
|
|||
|
|
@ -2,11 +2,15 @@
|
|||
#define _LINUX_RATELIMIT_H
|
||||
|
||||
#include <linux/param.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#define DEFAULT_RATELIMIT_INTERVAL (5 * HZ)
|
||||
#define DEFAULT_RATELIMIT_BURST 10
|
||||
|
||||
/* issue num suppressed message on exit */
|
||||
#define RATELIMIT_MSG_ON_RELEASE BIT(0)
|
||||
|
||||
struct ratelimit_state {
|
||||
raw_spinlock_t lock; /* protect the state */
|
||||
|
||||
|
|
@ -15,6 +19,7 @@ struct ratelimit_state {
|
|||
int printed;
|
||||
int missed;
|
||||
unsigned long begin;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
#define RATELIMIT_STATE_INIT(name, interval_init, burst_init) { \
|
||||
|
|
@ -34,12 +39,35 @@ struct ratelimit_state {
|
|||
static inline void ratelimit_state_init(struct ratelimit_state *rs,
|
||||
int interval, int burst)
|
||||
{
|
||||
memset(rs, 0, sizeof(*rs));
|
||||
|
||||
raw_spin_lock_init(&rs->lock);
|
||||
rs->interval = interval;
|
||||
rs->burst = burst;
|
||||
rs->printed = 0;
|
||||
rs->missed = 0;
|
||||
rs->begin = 0;
|
||||
rs->interval = interval;
|
||||
rs->burst = burst;
|
||||
}
|
||||
|
||||
static inline void ratelimit_default_init(struct ratelimit_state *rs)
|
||||
{
|
||||
return ratelimit_state_init(rs, DEFAULT_RATELIMIT_INTERVAL,
|
||||
DEFAULT_RATELIMIT_BURST);
|
||||
}
|
||||
|
||||
static inline void ratelimit_state_exit(struct ratelimit_state *rs)
|
||||
{
|
||||
if (!(rs->flags & RATELIMIT_MSG_ON_RELEASE))
|
||||
return;
|
||||
|
||||
if (rs->missed) {
|
||||
pr_warn("%s: %d output lines suppressed due to ratelimiting\n",
|
||||
current->comm, rs->missed);
|
||||
rs->missed = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
ratelimit_set_flags(struct ratelimit_state *rs, unsigned long flags)
|
||||
{
|
||||
rs->flags = flags;
|
||||
}
|
||||
|
||||
extern struct ratelimit_state printk_ratelimit_state;
|
||||
|
|
|
|||
|
|
@ -163,6 +163,7 @@ enum rio_device_state {
|
|||
* @dst_ops: Destination operation capabilities
|
||||
* @comp_tag: RIO component tag
|
||||
* @phys_efptr: RIO device extended features pointer
|
||||
* @phys_rmap: LP-Serial Register Map Type (1 or 2)
|
||||
* @em_efptr: RIO Error Management features pointer
|
||||
* @dma_mask: Mask of bits of RIO address this device implements
|
||||
* @driver: Driver claiming this device
|
||||
|
|
@ -193,6 +194,7 @@ struct rio_dev {
|
|||
u32 dst_ops;
|
||||
u32 comp_tag;
|
||||
u32 phys_efptr;
|
||||
u32 phys_rmap;
|
||||
u32 em_efptr;
|
||||
u64 dma_mask;
|
||||
struct rio_driver *driver; /* RIO driver claiming this device */
|
||||
|
|
@ -237,11 +239,6 @@ struct rio_dbell {
|
|||
void *dev_id;
|
||||
};
|
||||
|
||||
enum rio_phy_type {
|
||||
RIO_PHY_PARALLEL,
|
||||
RIO_PHY_SERIAL,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct rio_mport - RIO master port info
|
||||
* @dbells: List of doorbell events
|
||||
|
|
@ -259,8 +256,8 @@ enum rio_phy_type {
|
|||
* @id: Port ID, unique among all ports
|
||||
* @index: Port index, unique among all port interfaces of the same type
|
||||
* @sys_size: RapidIO common transport system size
|
||||
* @phy_type: RapidIO phy type
|
||||
* @phys_efptr: RIO port extended features pointer
|
||||
* @phys_rmap: LP-Serial EFB Register Mapping type (1 or 2).
|
||||
* @name: Port name string
|
||||
* @dev: device structure associated with an mport
|
||||
* @priv: Master port private data
|
||||
|
|
@ -289,8 +286,8 @@ struct rio_mport {
|
|||
* 0 - Small size. 256 devices.
|
||||
* 1 - Large size, 65536 devices.
|
||||
*/
|
||||
enum rio_phy_type phy_type; /* RapidIO phy type */
|
||||
u32 phys_efptr;
|
||||
u32 phys_rmap;
|
||||
unsigned char name[RIO_MAX_MPORT_NAME];
|
||||
struct device dev;
|
||||
void *priv; /* Master port private data */
|
||||
|
|
@ -425,7 +422,7 @@ struct rio_ops {
|
|||
int (*add_inb_buffer)(struct rio_mport *mport, int mbox, void *buf);
|
||||
void *(*get_inb_message)(struct rio_mport *mport, int mbox);
|
||||
int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
|
||||
u64 rstart, u32 size, u32 flags);
|
||||
u64 rstart, u64 size, u32 flags);
|
||||
void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
|
||||
int (*query_mport)(struct rio_mport *mport,
|
||||
struct rio_mport_attr *attr);
|
||||
|
|
|
|||
|
|
@ -38,5 +38,7 @@
|
|||
#define RIO_DID_IDTVPS1616 0x0377
|
||||
#define RIO_DID_IDTSPS1616 0x0378
|
||||
#define RIO_DID_TSI721 0x80ab
|
||||
#define RIO_DID_IDTRXS1632 0x80e5
|
||||
#define RIO_DID_IDTRXS2448 0x80e6
|
||||
|
||||
#endif /* LINUX_RIO_IDS_H */
|
||||
|
|
|
|||
|
|
@ -42,9 +42,11 @@
|
|||
#define RIO_PEF_INB_MBOX2 0x00200000 /* [II, <= 1.2] Mailbox 2 */
|
||||
#define RIO_PEF_INB_MBOX3 0x00100000 /* [II, <= 1.2] Mailbox 3 */
|
||||
#define RIO_PEF_INB_DOORBELL 0x00080000 /* [II, <= 1.2] Doorbells */
|
||||
#define RIO_PEF_DEV32 0x00001000 /* [III] PE supports Common TRansport Dev32 */
|
||||
#define RIO_PEF_EXT_RT 0x00000200 /* [III, 1.3] Extended route table support */
|
||||
#define RIO_PEF_STD_RT 0x00000100 /* [III, 1.3] Standard route table support */
|
||||
#define RIO_PEF_CTLS 0x00000010 /* [III] CTLS */
|
||||
#define RIO_PEF_CTLS 0x00000010 /* [III] Common Transport Large System (< rev.3) */
|
||||
#define RIO_PEF_DEV16 0x00000010 /* [III] PE Supports Common Transport Dev16 (rev.3) */
|
||||
#define RIO_PEF_EXT_FEATURES 0x00000008 /* [I] EFT_PTR valid */
|
||||
#define RIO_PEF_ADDR_66 0x00000004 /* [I] 66 bits */
|
||||
#define RIO_PEF_ADDR_50 0x00000002 /* [I] 50 bits */
|
||||
|
|
@ -194,70 +196,101 @@
|
|||
#define RIO_GET_BLOCK_ID(x) (x & RIO_EFB_ID_MASK)
|
||||
|
||||
/* Extended Feature Block IDs */
|
||||
#define RIO_EFB_PAR_EP_ID 0x0001 /* [IV] LP/LVDS EP Devices */
|
||||
#define RIO_EFB_PAR_EP_REC_ID 0x0002 /* [IV] LP/LVDS EP Recovery Devices */
|
||||
#define RIO_EFB_PAR_EP_FREE_ID 0x0003 /* [IV] LP/LVDS EP Free Devices */
|
||||
#define RIO_EFB_SER_EP_ID_V13P 0x0001 /* [VI] LP/Serial EP Devices, RapidIO Spec ver 1.3 and above */
|
||||
#define RIO_EFB_SER_EP_REC_ID_V13P 0x0002 /* [VI] LP/Serial EP Recovery Devices, RapidIO Spec ver 1.3 and above */
|
||||
#define RIO_EFB_SER_EP_FREE_ID_V13P 0x0003 /* [VI] LP/Serial EP Free Devices, RapidIO Spec ver 1.3 and above */
|
||||
#define RIO_EFB_SER_EP_ID 0x0004 /* [VI] LP/Serial EP Devices */
|
||||
#define RIO_EFB_SER_EP_REC_ID 0x0005 /* [VI] LP/Serial EP Recovery Devices */
|
||||
#define RIO_EFB_SER_EP_FREE_ID 0x0006 /* [VI] LP/Serial EP Free Devices */
|
||||
#define RIO_EFB_SER_EP_FREC_ID 0x0009 /* [VI] LP/Serial EP Free Recovery Devices */
|
||||
#define RIO_EFB_SER_EP_M1_ID 0x0001 /* [VI] LP-Serial EP Devices, Map I */
|
||||
#define RIO_EFB_SER_EP_SW_M1_ID 0x0002 /* [VI] LP-Serial EP w SW Recovery Devices, Map I */
|
||||
#define RIO_EFB_SER_EPF_M1_ID 0x0003 /* [VI] LP-Serial EP Free Devices, Map I */
|
||||
#define RIO_EFB_SER_EP_ID 0x0004 /* [VI] LP-Serial EP Devices, RIO 1.2 */
|
||||
#define RIO_EFB_SER_EP_REC_ID 0x0005 /* [VI] LP-Serial EP w SW Recovery Devices, RIO 1.2 */
|
||||
#define RIO_EFB_SER_EP_FREE_ID 0x0006 /* [VI] LP-Serial EP Free Devices, RIO 1.2 */
|
||||
#define RIO_EFB_ERR_MGMNT 0x0007 /* [VIII] Error Management Extensions */
|
||||
#define RIO_EFB_SER_EPF_SW_M1_ID 0x0009 /* [VI] LP-Serial EP Free w SW Recovery Devices, Map I */
|
||||
#define RIO_EFB_SW_ROUTING_TBL 0x000E /* [III] Switch Routing Table Block */
|
||||
#define RIO_EFB_SER_EP_M2_ID 0x0011 /* [VI] LP-Serial EP Devices, Map II */
|
||||
#define RIO_EFB_SER_EP_SW_M2_ID 0x0012 /* [VI] LP-Serial EP w SW Recovery Devices, Map II */
|
||||
#define RIO_EFB_SER_EPF_M2_ID 0x0013 /* [VI] LP-Serial EP Free Devices, Map II */
|
||||
#define RIO_EFB_ERR_MGMNT_HS 0x0017 /* [VIII] Error Management Extensions, Hot-Swap only */
|
||||
#define RIO_EFB_SER_EPF_SW_M2_ID 0x0019 /* [VI] LP-Serial EP Free w SW Recovery Devices, Map II */
|
||||
|
||||
/*
|
||||
* Physical 8/16 LP-LVDS
|
||||
* ID=0x0001, Generic End Point Devices
|
||||
* ID=0x0002, Generic End Point Devices, software assisted recovery option
|
||||
* ID=0x0003, Generic End Point Free Devices
|
||||
*
|
||||
* Physical LP-Serial
|
||||
* ID=0x0004, Generic End Point Devices
|
||||
* ID=0x0005, Generic End Point Devices, software assisted recovery option
|
||||
* ID=0x0006, Generic End Point Free Devices
|
||||
* Physical LP-Serial Registers Definitions
|
||||
* Parameters in register macros:
|
||||
* n - port number, m - Register Map Type (1 or 2)
|
||||
*/
|
||||
#define RIO_PORT_MNT_HEADER 0x0000
|
||||
#define RIO_PORT_REQ_CTL_CSR 0x0020
|
||||
#define RIO_PORT_RSP_CTL_CSR 0x0024 /* 0x0001/0x0002 */
|
||||
#define RIO_PORT_LINKTO_CTL_CSR 0x0020 /* Serial */
|
||||
#define RIO_PORT_RSPTO_CTL_CSR 0x0024 /* Serial */
|
||||
#define RIO_PORT_RSP_CTL_CSR 0x0024
|
||||
#define RIO_PORT_LINKTO_CTL_CSR 0x0020
|
||||
#define RIO_PORT_RSPTO_CTL_CSR 0x0024
|
||||
#define RIO_PORT_GEN_CTL_CSR 0x003c
|
||||
#define RIO_PORT_GEN_HOST 0x80000000
|
||||
#define RIO_PORT_GEN_MASTER 0x40000000
|
||||
#define RIO_PORT_GEN_DISCOVERED 0x20000000
|
||||
#define RIO_PORT_N_MNT_REQ_CSR(x) (0x0040 + x*0x20) /* 0x0002 */
|
||||
#define RIO_PORT_N_MNT_REQ_CSR(n, m) (0x40 + (n) * (0x20 * (m)))
|
||||
#define RIO_MNT_REQ_CMD_RD 0x03 /* Reset-device command */
|
||||
#define RIO_MNT_REQ_CMD_IS 0x04 /* Input-status command */
|
||||
#define RIO_PORT_N_MNT_RSP_CSR(x) (0x0044 + x*0x20) /* 0x0002 */
|
||||
#define RIO_PORT_N_MNT_RSP_CSR(n, m) (0x44 + (n) * (0x20 * (m)))
|
||||
#define RIO_PORT_N_MNT_RSP_RVAL 0x80000000 /* Response Valid */
|
||||
#define RIO_PORT_N_MNT_RSP_ASTAT 0x000007e0 /* ackID Status */
|
||||
#define RIO_PORT_N_MNT_RSP_LSTAT 0x0000001f /* Link Status */
|
||||
#define RIO_PORT_N_ACK_STS_CSR(x) (0x0048 + x*0x20) /* 0x0002 */
|
||||
#define RIO_PORT_N_ACK_STS_CSR(n) (0x48 + (n) * 0x20) /* Only in RM-I */
|
||||
#define RIO_PORT_N_ACK_CLEAR 0x80000000
|
||||
#define RIO_PORT_N_ACK_INBOUND 0x3f000000
|
||||
#define RIO_PORT_N_ACK_OUTSTAND 0x00003f00
|
||||
#define RIO_PORT_N_ACK_OUTBOUND 0x0000003f
|
||||
#define RIO_PORT_N_CTL2_CSR(x) (0x0054 + x*0x20)
|
||||
#define RIO_PORT_N_CTL2_CSR(n, m) (0x54 + (n) * (0x20 * (m)))
|
||||
#define RIO_PORT_N_CTL2_SEL_BAUD 0xf0000000
|
||||
#define RIO_PORT_N_ERR_STS_CSR(x) (0x0058 + x*0x20)
|
||||
#define RIO_PORT_N_ERR_STS_PW_OUT_ES 0x00010000 /* Output Error-stopped */
|
||||
#define RIO_PORT_N_ERR_STS_PW_INP_ES 0x00000100 /* Input Error-stopped */
|
||||
#define RIO_PORT_N_ERR_STS_CSR(n, m) (0x58 + (n) * (0x20 * (m)))
|
||||
#define RIO_PORT_N_ERR_STS_OUT_ES 0x00010000 /* Output Error-stopped */
|
||||
#define RIO_PORT_N_ERR_STS_INP_ES 0x00000100 /* Input Error-stopped */
|
||||
#define RIO_PORT_N_ERR_STS_PW_PEND 0x00000010 /* Port-Write Pending */
|
||||
#define RIO_PORT_N_ERR_STS_PORT_UA 0x00000008 /* Port Unavailable */
|
||||
#define RIO_PORT_N_ERR_STS_PORT_ERR 0x00000004
|
||||
#define RIO_PORT_N_ERR_STS_PORT_OK 0x00000002
|
||||
#define RIO_PORT_N_ERR_STS_PORT_UNINIT 0x00000001
|
||||
#define RIO_PORT_N_CTL_CSR(x) (0x005c + x*0x20)
|
||||
#define RIO_PORT_N_CTL_CSR(n, m) (0x5c + (n) * (0x20 * (m)))
|
||||
#define RIO_PORT_N_CTL_PWIDTH 0xc0000000
|
||||
#define RIO_PORT_N_CTL_PWIDTH_1 0x00000000
|
||||
#define RIO_PORT_N_CTL_PWIDTH_4 0x40000000
|
||||
#define RIO_PORT_N_CTL_IPW 0x38000000 /* Initialized Port Width */
|
||||
#define RIO_PORT_N_CTL_P_TYP_SER 0x00000001
|
||||
#define RIO_PORT_N_CTL_LOCKOUT 0x00000002
|
||||
#define RIO_PORT_N_CTL_EN_RX_SER 0x00200000
|
||||
#define RIO_PORT_N_CTL_EN_TX_SER 0x00400000
|
||||
#define RIO_PORT_N_CTL_EN_RX_PAR 0x08000000
|
||||
#define RIO_PORT_N_CTL_EN_TX_PAR 0x40000000
|
||||
#define RIO_PORT_N_CTL_EN_RX 0x00200000
|
||||
#define RIO_PORT_N_CTL_EN_TX 0x00400000
|
||||
#define RIO_PORT_N_OB_ACK_CSR(n) (0x60 + (n) * 0x40) /* Only in RM-II */
|
||||
#define RIO_PORT_N_OB_ACK_CLEAR 0x80000000
|
||||
#define RIO_PORT_N_OB_ACK_OUTSTD 0x00fff000
|
||||
#define RIO_PORT_N_OB_ACK_OUTBND 0x00000fff
|
||||
#define RIO_PORT_N_IB_ACK_CSR(n) (0x64 + (n) * 0x40) /* Only in RM-II */
|
||||
#define RIO_PORT_N_IB_ACK_INBND 0x00000fff
|
||||
|
||||
/*
|
||||
* Device-based helper macros for serial port register access.
|
||||
* d - pointer to rapidio device object, n - port number
|
||||
*/
|
||||
|
||||
#define RIO_DEV_PORT_N_MNT_REQ_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_MNT_REQ_CSR(n, d->phys_rmap))
|
||||
|
||||
#define RIO_DEV_PORT_N_MNT_RSP_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_MNT_RSP_CSR(n, d->phys_rmap))
|
||||
|
||||
#define RIO_DEV_PORT_N_ACK_STS_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_ACK_STS_CSR(n))
|
||||
|
||||
#define RIO_DEV_PORT_N_CTL2_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_CTL2_CSR(n, d->phys_rmap))
|
||||
|
||||
#define RIO_DEV_PORT_N_ERR_STS_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_ERR_STS_CSR(n, d->phys_rmap))
|
||||
|
||||
#define RIO_DEV_PORT_N_CTL_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_CTL_CSR(n, d->phys_rmap))
|
||||
|
||||
#define RIO_DEV_PORT_N_OB_ACK_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_OB_ACK_CSR(n))
|
||||
|
||||
#define RIO_DEV_PORT_N_IB_ACK_CSR(d, n) \
|
||||
(d->phys_efptr + RIO_PORT_N_IB_ACK_CSR(n))
|
||||
|
||||
/*
|
||||
* Error Management Extensions (RapidIO 1.3+, Part 8)
|
||||
|
|
@ -268,6 +301,7 @@
|
|||
/* General EM Registers (Common for all Ports) */
|
||||
|
||||
#define RIO_EM_EFB_HEADER 0x000 /* Error Management Extensions Block Header */
|
||||
#define RIO_EM_EMHS_CAR 0x004 /* EM Functionality CAR */
|
||||
#define RIO_EM_LTL_ERR_DETECT 0x008 /* Logical/Transport Layer Error Detect CSR */
|
||||
#define RIO_EM_LTL_ERR_EN 0x00c /* Logical/Transport Layer Error Enable CSR */
|
||||
#define REM_LTL_ERR_ILLTRAN 0x08000000 /* Illegal Transaction decode */
|
||||
|
|
@ -278,15 +312,33 @@
|
|||
#define RIO_EM_LTL_ADDR_CAP 0x014 /* Logical/Transport Layer Address Capture CSR */
|
||||
#define RIO_EM_LTL_DEVID_CAP 0x018 /* Logical/Transport Layer Device ID Capture CSR */
|
||||
#define RIO_EM_LTL_CTRL_CAP 0x01c /* Logical/Transport Layer Control Capture CSR */
|
||||
#define RIO_EM_LTL_DID32_CAP 0x020 /* Logical/Transport Layer Dev32 DestID Capture CSR */
|
||||
#define RIO_EM_LTL_SID32_CAP 0x024 /* Logical/Transport Layer Dev32 source ID Capture CSR */
|
||||
#define RIO_EM_PW_TGT_DEVID 0x028 /* Port-write Target deviceID CSR */
|
||||
#define RIO_EM_PW_TGT_DEVID_D16M 0xff000000 /* Port-write Target DID16 MSB */
|
||||
#define RIO_EM_PW_TGT_DEVID_D8 0x00ff0000 /* Port-write Target DID16 LSB or DID8 */
|
||||
#define RIO_EM_PW_TGT_DEVID_DEV16 0x00008000 /* Port-write Target DID16 LSB or DID8 */
|
||||
#define RIO_EM_PW_TGT_DEVID_DEV32 0x00004000 /* Port-write Target DID16 LSB or DID8 */
|
||||
#define RIO_EM_PKT_TTL 0x02c /* Packet Time-to-live CSR */
|
||||
#define RIO_EM_PKT_TTL_VAL 0xffff0000 /* Packet Time-to-live value */
|
||||
#define RIO_EM_PW_TGT32_DEVID 0x030 /* Port-write Dev32 Target deviceID CSR */
|
||||
#define RIO_EM_PW_TX_CTRL 0x034 /* Port-write Transmission Control CSR */
|
||||
#define RIO_EM_PW_TX_CTRL_PW_DIS 0x00000001 /* Port-write Transmission Disable bit */
|
||||
|
||||
/* Per-Port EM Registers */
|
||||
|
||||
#define RIO_EM_PN_ERR_DETECT(x) (0x040 + x*0x40) /* Port N Error Detect CSR */
|
||||
#define REM_PED_IMPL_SPEC 0x80000000
|
||||
#define REM_PED_LINK_OK2U 0x40000000 /* Link OK to Uninit transition */
|
||||
#define REM_PED_LINK_UPDA 0x20000000 /* Link Uninit Packet Discard Active */
|
||||
#define REM_PED_LINK_U2OK 0x10000000 /* Link Uninit to OK transition */
|
||||
#define REM_PED_LINK_TO 0x00000001
|
||||
|
||||
#define RIO_EM_PN_ERRRATE_EN(x) (0x044 + x*0x40) /* Port N Error Rate Enable CSR */
|
||||
#define RIO_EM_PN_ERRRATE_EN_OK2U 0x40000000 /* Enable notification for OK2U */
|
||||
#define RIO_EM_PN_ERRRATE_EN_UPDA 0x20000000 /* Enable notification for UPDA */
|
||||
#define RIO_EM_PN_ERRRATE_EN_U2OK 0x10000000 /* Enable notification for U2OK */
|
||||
|
||||
#define RIO_EM_PN_ATTRIB_CAP(x) (0x048 + x*0x40) /* Port N Attributes Capture CSR */
|
||||
#define RIO_EM_PN_PKT_CAP_0(x) (0x04c + x*0x40) /* Port N Packet/Control Symbol Capture 0 CSR */
|
||||
#define RIO_EM_PN_PKT_CAP_1(x) (0x050 + x*0x40) /* Port N Packet Capture 1 CSR */
|
||||
|
|
@ -294,5 +346,50 @@
|
|||
#define RIO_EM_PN_PKT_CAP_3(x) (0x058 + x*0x40) /* Port N Packet Capture 3 CSR */
|
||||
#define RIO_EM_PN_ERRRATE(x) (0x068 + x*0x40) /* Port N Error Rate CSR */
|
||||
#define RIO_EM_PN_ERRRATE_TR(x) (0x06c + x*0x40) /* Port N Error Rate Threshold CSR */
|
||||
#define RIO_EM_PN_LINK_UDT(x) (0x070 + x*0x40) /* Port N Link Uninit Discard Timer CSR */
|
||||
#define RIO_EM_PN_LINK_UDT_TO 0xffffff00 /* Link Uninit Timeout value */
|
||||
|
||||
/*
|
||||
* Switch Routing Table Register Block ID=0x000E (RapidIO 3.0+, part 3)
|
||||
* Register offsets are defined from beginning of the block.
|
||||
*/
|
||||
|
||||
/* Broadcast Routing Table Control CSR */
|
||||
#define RIO_BC_RT_CTL_CSR 0x020
|
||||
#define RIO_RT_CTL_THREE_LVL 0x80000000
|
||||
#define RIO_RT_CTL_DEV32_RT_CTRL 0x40000000
|
||||
#define RIO_RT_CTL_MC_MASK_SZ 0x03000000 /* 3.0+ Part 11: Multicast */
|
||||
|
||||
/* Broadcast Level 0 Info CSR */
|
||||
#define RIO_BC_RT_LVL0_INFO_CSR 0x030
|
||||
#define RIO_RT_L0I_NUM_GR 0xff000000
|
||||
#define RIO_RT_L0I_GR_PTR 0x00fffc00
|
||||
|
||||
/* Broadcast Level 1 Info CSR */
|
||||
#define RIO_BC_RT_LVL1_INFO_CSR 0x034
|
||||
#define RIO_RT_L1I_NUM_GR 0xff000000
|
||||
#define RIO_RT_L1I_GR_PTR 0x00fffc00
|
||||
|
||||
/* Broadcast Level 2 Info CSR */
|
||||
#define RIO_BC_RT_LVL2_INFO_CSR 0x038
|
||||
#define RIO_RT_L2I_NUM_GR 0xff000000
|
||||
#define RIO_RT_L2I_GR_PTR 0x00fffc00
|
||||
|
||||
/* Per-Port Routing Table registers.
|
||||
* Register fields defined in the broadcast section above are
|
||||
* applicable to the corresponding registers below.
|
||||
*/
|
||||
#define RIO_SPx_RT_CTL_CSR(x) (0x040 + (0x20 * x))
|
||||
#define RIO_SPx_RT_LVL0_INFO_CSR(x) (0x50 + (0x20 * x))
|
||||
#define RIO_SPx_RT_LVL1_INFO_CSR(x) (0x54 + (0x20 * x))
|
||||
#define RIO_SPx_RT_LVL2_INFO_CSR(x) (0x58 + (0x20 * x))
|
||||
|
||||
/* Register Formats for Routing Table Group entry.
|
||||
* Register offsets are calculated using GR_PTR field in the corresponding
|
||||
* table Level_N and group/entry numbers (see RapidIO 3.0+ Part 3).
|
||||
*/
|
||||
#define RIO_RT_Ln_ENTRY_IMPL_DEF 0xf0000000
|
||||
#define RIO_RT_Ln_ENTRY_RTE_VAL 0x000003ff
|
||||
#define RIO_RT_ENTRY_DROP_PKT 0x300
|
||||
|
||||
#endif /* LINUX_RIO_REGS_H */
|
||||
|
|
|
|||
|
|
@ -1547,6 +1547,9 @@ struct task_struct {
|
|||
/* unserialized, strictly 'current' */
|
||||
unsigned in_execve:1; /* bit to tell LSMs we're in execve */
|
||||
unsigned in_iowait:1;
|
||||
#if !defined(TIF_RESTORE_SIGMASK)
|
||||
unsigned restore_sigmask:1;
|
||||
#endif
|
||||
#ifdef CONFIG_MEMCG
|
||||
unsigned memcg_may_oom:1;
|
||||
#ifndef CONFIG_SLOB
|
||||
|
|
@ -2680,6 +2683,66 @@ extern void sigqueue_free(struct sigqueue *);
|
|||
extern int send_sigqueue(struct sigqueue *, struct task_struct *, int group);
|
||||
extern int do_sigaction(int, struct k_sigaction *, struct k_sigaction *);
|
||||
|
||||
#ifdef TIF_RESTORE_SIGMASK
|
||||
/*
|
||||
* Legacy restore_sigmask accessors. These are inefficient on
|
||||
* SMP architectures because they require atomic operations.
|
||||
*/
|
||||
|
||||
/**
|
||||
* set_restore_sigmask() - make sure saved_sigmask processing gets done
|
||||
*
|
||||
* This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code
|
||||
* will run before returning to user mode, to process the flag. For
|
||||
* all callers, TIF_SIGPENDING is already set or it's no harm to set
|
||||
* it. TIF_RESTORE_SIGMASK need not be in the set of bits that the
|
||||
* arch code will notice on return to user mode, in case those bits
|
||||
* are scarce. We set TIF_SIGPENDING here to ensure that the arch
|
||||
* signal code always gets run when TIF_RESTORE_SIGMASK is set.
|
||||
*/
|
||||
static inline void set_restore_sigmask(void)
|
||||
{
|
||||
set_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
WARN_ON(!test_thread_flag(TIF_SIGPENDING));
|
||||
}
|
||||
static inline void clear_restore_sigmask(void)
|
||||
{
|
||||
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
static inline bool test_restore_sigmask(void)
|
||||
{
|
||||
return test_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
static inline bool test_and_clear_restore_sigmask(void)
|
||||
{
|
||||
return test_and_clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
|
||||
#else /* TIF_RESTORE_SIGMASK */
|
||||
|
||||
/* Higher-quality implementation, used if TIF_RESTORE_SIGMASK doesn't exist. */
|
||||
static inline void set_restore_sigmask(void)
|
||||
{
|
||||
current->restore_sigmask = true;
|
||||
WARN_ON(!test_thread_flag(TIF_SIGPENDING));
|
||||
}
|
||||
static inline void clear_restore_sigmask(void)
|
||||
{
|
||||
current->restore_sigmask = false;
|
||||
}
|
||||
static inline bool test_restore_sigmask(void)
|
||||
{
|
||||
return current->restore_sigmask;
|
||||
}
|
||||
static inline bool test_and_clear_restore_sigmask(void)
|
||||
{
|
||||
if (!current->restore_sigmask)
|
||||
return false;
|
||||
current->restore_sigmask = false;
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
static inline void restore_saved_sigmask(void)
|
||||
{
|
||||
if (test_and_clear_restore_sigmask())
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include <uapi/linux/sysctl.h>
|
||||
|
||||
/* For the /proc/sys support */
|
||||
struct completion;
|
||||
struct ctl_table;
|
||||
struct nsproxy;
|
||||
struct ctl_table_root;
|
||||
|
|
|
|||
|
|
@ -105,47 +105,6 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
|
|||
|
||||
#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
|
||||
|
||||
#if defined TIF_RESTORE_SIGMASK && !defined HAVE_SET_RESTORE_SIGMASK
|
||||
/*
|
||||
* An arch can define its own version of set_restore_sigmask() to get the
|
||||
* job done however works, with or without TIF_RESTORE_SIGMASK.
|
||||
*/
|
||||
#define HAVE_SET_RESTORE_SIGMASK 1
|
||||
|
||||
/**
|
||||
* set_restore_sigmask() - make sure saved_sigmask processing gets done
|
||||
*
|
||||
* This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code
|
||||
* will run before returning to user mode, to process the flag. For
|
||||
* all callers, TIF_SIGPENDING is already set or it's no harm to set
|
||||
* it. TIF_RESTORE_SIGMASK need not be in the set of bits that the
|
||||
* arch code will notice on return to user mode, in case those bits
|
||||
* are scarce. We set TIF_SIGPENDING here to ensure that the arch
|
||||
* signal code always gets run when TIF_RESTORE_SIGMASK is set.
|
||||
*/
|
||||
static inline void set_restore_sigmask(void)
|
||||
{
|
||||
set_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
WARN_ON(!test_thread_flag(TIF_SIGPENDING));
|
||||
}
|
||||
static inline void clear_restore_sigmask(void)
|
||||
{
|
||||
clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
static inline bool test_restore_sigmask(void)
|
||||
{
|
||||
return test_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
static inline bool test_and_clear_restore_sigmask(void)
|
||||
{
|
||||
return test_and_clear_thread_flag(TIF_RESTORE_SIGMASK);
|
||||
}
|
||||
#endif /* TIF_RESTORE_SIGMASK && !HAVE_SET_RESTORE_SIGMASK */
|
||||
|
||||
#ifndef HAVE_SET_RESTORE_SIGMASK
|
||||
#error "no set_restore_sigmask() provided and default one won't work"
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* _LINUX_THREAD_INFO_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue