X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_dlimit.h;h=c34e68cd5b98c40acc464a29c5bb2a4853b0cdec;hb=refs%2Fheads%2Fvserver;hp=d80c563f6dbcd4c25db2f5c7ac1016dcb33ead7c;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9;p=linux-2.6.git diff --git a/include/linux/vs_dlimit.h b/include/linux/vs_dlimit.h index d80c563f6..c34e68cd5 100644 --- a/include/linux/vs_dlimit.h +++ b/include/linux/vs_dlimit.h @@ -1,21 +1,9 @@ -#ifndef _VX_VS_DLIMIT_H -#define _VX_VS_DLIMIT_H +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H - -// #define VX_DEBUG - -#include -#include -#include - -#include "vserver/context.h" #include "vserver/dlimit.h" - -#if defined(VX_DEBUG) -#define vxdprintk(x...) printk("vxd: " x) -#else -#define vxdprintk(x...) -#endif +#include "vserver/base.h" +#include "vserver/debug.h" #define get_dl_info(i) __get_dl_info(i,__FILE__,__LINE__) @@ -25,44 +13,43 @@ static inline struct dl_info *__get_dl_info(struct dl_info *dli, { if (!dli) return NULL; - vxdprintk("get_dl_info(%p[#%d.%d])\t%s:%d\n", - dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0, + vxlprintk(VXD_CBIT(dlim, 4), "get_dl_info(%p[#%d.%d])", + dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0, _file, _line); atomic_inc(&dli->dl_usecnt); return dli; } -#define free_dl_info(i) \ - call_rcu(&i->dl_rcu, rcu_free_dl_info, i); +#define free_dl_info(i) \ + call_rcu(&i->dl_rcu, rcu_free_dl_info); #define put_dl_info(i) __put_dl_info(i,__FILE__,__LINE__) -static inline void __put_dl_info(struct dl_info *dli, const char *_file, int _line) +static inline void __put_dl_info(struct dl_info *dli, + const char *_file, int _line) { if (!dli) return; - vxdprintk("put_dl_info(%p[#%d.%d])\t%s:%d\n", - dli, dli?dli->dl_xid:0, dli?atomic_read(&dli->dl_usecnt):0, + vxlprintk(VXD_CBIT(dlim, 4), "put_dl_info(%p[#%d.%d])", + dli, dli?dli->dl_tag:0, dli?atomic_read(&dli->dl_usecnt):0, _file, _line); if (atomic_dec_and_test(&dli->dl_usecnt)) free_dl_info(dli); } -extern int vx_debug_dlimit; - -#define __dlimit_char(d) ((d)?'*':' ') +#define __dlimit_char(d) ((d)?'*':' ') static inline int __dl_alloc_space(struct super_block *sb, - xid_t xid, dlsize_t nr, const char *file, int line) + tag_t tag, dlsize_t nr, const char *file, int line) { struct dl_info *dli = NULL; int ret = 0; if (nr == 0) goto out; - dli = locate_dl_info(sb, xid); + dli = locate_dl_info(sb, tag); if (!dli) goto out; @@ -73,40 +60,45 @@ static inline int __dl_alloc_space(struct super_block *sb, spin_unlock(&dli->dl_lock); put_dl_info(dli); out: - if (vx_debug_dlimit) - printk("ALLOC (%p,#%d)%c %lld bytes (%d)@ %s:%d\n", - sb, xid, __dlimit_char(dli), nr, ret, file, line); + vxlprintk(VXD_CBIT(dlim, 1), + "ALLOC (%p,#%d)%c %lld bytes (%d)", + sb, tag, __dlimit_char(dli), (long long)nr, + ret, file, line); return ret; } static inline void __dl_free_space(struct super_block *sb, - xid_t xid, dlsize_t nr, const char *file, int line) + tag_t tag, dlsize_t nr, const char *_file, int _line) { struct dl_info *dli = NULL; if (nr == 0) goto out; - dli = locate_dl_info(sb, xid); + dli = locate_dl_info(sb, tag); if (!dli) goto out; spin_lock(&dli->dl_lock); - dli->dl_space_used -= nr; + if (dli->dl_space_used > nr) + dli->dl_space_used -= nr; + else + dli->dl_space_used = 0; spin_unlock(&dli->dl_lock); put_dl_info(dli); out: - if (vx_debug_dlimit) - printk("FREE (%p,#%d)%c %lld bytes @ %s:%d\n", - sb, xid, __dlimit_char(dli), nr, file, line); + vxlprintk(VXD_CBIT(dlim, 1), + "FREE (%p,#%d)%c %lld bytes", + sb, tag, __dlimit_char(dli), (long long)nr, + _file, _line); } static inline int __dl_alloc_inode(struct super_block *sb, - xid_t xid, const char *file, int line) + tag_t tag, const char *_file, int _line) { struct dl_info *dli; int ret = 0; - dli = locate_dl_info(sb, xid); + dli = locate_dl_info(sb, tag); if (!dli) goto out; @@ -117,51 +109,97 @@ static inline int __dl_alloc_inode(struct super_block *sb, spin_unlock(&dli->dl_lock); put_dl_info(dli); out: - if (vx_debug_dlimit) - printk("ALLOC (%p,#%d)%c inode (%d)@ %s:%d\n", - sb, xid, __dlimit_char(dli), ret, file, line); + vxlprintk(VXD_CBIT(dlim, 0), + "ALLOC (%p,#%d)%c inode (%d)", + sb, tag, __dlimit_char(dli), ret, _file, _line); return ret; } static inline void __dl_free_inode(struct super_block *sb, - xid_t xid, const char *file, int line) + tag_t tag, const char *_file, int _line) { struct dl_info *dli; - dli = locate_dl_info(sb, xid); + dli = locate_dl_info(sb, tag); if (!dli) goto out; spin_lock(&dli->dl_lock); - dli->dl_inodes_used--; + if (dli->dl_inodes_used > 1) + dli->dl_inodes_used--; + else + dli->dl_inodes_used = 0; spin_unlock(&dli->dl_lock); put_dl_info(dli); out: - if (vx_debug_dlimit) - printk("FREE (%p,#%d)%c inode @ %s:%d\n", - sb, xid, __dlimit_char(dli), file, line); + vxlprintk(VXD_CBIT(dlim, 0), + "FREE (%p,#%d)%c inode", + sb, tag, __dlimit_char(dli), _file, _line); +} + +static inline void __dl_adjust_block(struct super_block *sb, tag_t tag, + unsigned long long *free_blocks, unsigned long long *root_blocks, + const char *_file, int _line) +{ + struct dl_info *dli; + uint64_t broot, bfree; + + dli = locate_dl_info(sb, tag); + if (!dli) + return; + + spin_lock(&dli->dl_lock); + broot = (dli->dl_space_total - + (dli->dl_space_total >> 10) * dli->dl_nrlmult) + >> sb->s_blocksize_bits; + bfree = (dli->dl_space_total - dli->dl_space_used) + >> sb->s_blocksize_bits; + spin_unlock(&dli->dl_lock); + + vxlprintk(VXD_CBIT(dlim, 2), + "ADJUST: %lld,%lld on %lld,%lld [mult=%d]", + (long long)bfree, (long long)broot, + *free_blocks, *root_blocks, dli->dl_nrlmult, + _file, _line); + if (free_blocks) { + if (*free_blocks > bfree) + *free_blocks = bfree; + } + if (root_blocks) { + if (*root_blocks > broot) + *root_blocks = broot; + } + put_dl_info(dli); } +#define DLIMIT_ALLOC_SPACE(in, bytes) \ + __dl_alloc_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) +#define DLIMIT_FREE_SPACE(in, bytes) \ + __dl_free_space((in)->i_sb, (in)->i_tag, (dlsize_t)(bytes), \ + __FILE__, __LINE__ ) -#define DLIMIT_ALLOC_BLOCK(sb, xid, nr) \ - __dl_alloc_space(sb, xid, \ - ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \ +#define DLIMIT_ALLOC_BLOCK(in, nr) \ + __dl_alloc_space((in)->i_sb, (in)->i_tag, \ + ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \ __FILE__, __LINE__ ) -#define DLIMIT_FREE_BLOCK(sb, xid, nr) \ - __dl_free_space(sb, xid, \ - ((dlsize_t)(nr)) << (sb)->s_blocksize_bits, \ +#define DLIMIT_FREE_BLOCK(in, nr) \ + __dl_free_space((in)->i_sb, (in)->i_tag, \ + ((dlsize_t)(nr)) << (in)->i_sb->s_blocksize_bits, \ __FILE__, __LINE__ ) -#define DLIMIT_ALLOC_INODE(sb, xid) \ - __dl_alloc_inode(sb, xid, __FILE__, __LINE__ ) -#define DLIMIT_FREE_INODE(sb, xid) \ - __dl_free_inode(sb, xid, __FILE__, __LINE__ ) +#define DLIMIT_ALLOC_INODE(in) \ + __dl_alloc_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ ) + +#define DLIMIT_FREE_INODE(in) \ + __dl_free_inode((in)->i_sb, (in)->i_tag, __FILE__, __LINE__ ) -#define DLIMIT_ADJUST_BLOCK(sb, xid, fb, rb) +#define DLIMIT_ADJUST_BLOCK(sb, tag, fb, rb) \ + __dl_adjust_block(sb, tag, fb, rb, __FILE__, __LINE__ ) #else