xfs
[Top] [All Lists]

review: catch large memory allocations

To: xfs@xxxxxxxxxxx
Subject: review: catch large memory allocations
From: Nathan Scott <nathans@xxxxxxx>
Date: Wed, 2 Aug 2006 17:04:31 +1000
Sender: xfs-bounce@xxxxxxxxxxx
User-agent: Mutt/1.2.5i
As discussed the other day, this is primarily a debugging patch
to catch allocations that are unexpectedly large or dipping into
vmalloc space.

cheers.

-- 
Nathan


Index: xfs-linux/linux-2.4/kmem.c
===================================================================
--- xfs-linux.orig/linux-2.4/kmem.c     2006-08-02 13:54:44.183452250 +1000
+++ xfs-linux/linux-2.4/kmem.c  2006-08-02 13:59:38.934868500 +1000
@@ -53,6 +53,19 @@ kmem_alloc(size_t size, int flags)
        int     retries = 0, lflags = kmem_flags_convert(flags);
        void    *ptr;
 
+#ifdef DEBUG
+       if (unlikely(!(flags & KM_LARGE) && (size > PAGE_SIZE))) {
+               printk(KERN_WARNING "Large %s attempt, size=%ld\n",
+                       __FUNCTION__, (long)size);
+               dump_stack();
+       }
+       if (unlikely(size >= MAX_SLAB_SIZE)) {
+               printk(KERN_WARNING "%s using vmalloc, size=%ld\n",
+                       __FUNCTION__, (long)size);
+               dump_stack();
+       }
+#endif
+
        do {
                if (size < MAX_SLAB_SIZE || retries > MAX_VMALLOCS)
                        ptr = kmalloc(size, lflags);
Index: xfs-linux/linux-2.6/kmem.c
===================================================================
--- xfs-linux.orig/linux-2.6/kmem.c     2006-08-02 13:54:44.311460250 +1000
+++ xfs-linux/linux-2.6/kmem.c  2006-08-02 13:59:47.419398750 +1000
@@ -34,6 +34,19 @@ kmem_alloc(size_t size, unsigned int __n
        gfp_t   lflags = kmem_flags_convert(flags);
        void    *ptr;
 
+#ifdef DEBUG
+       if (unlikely(!(flags & KM_LARGE) && (size > PAGE_SIZE))) {
+               printk(KERN_WARNING "Large %s attempt, size=%ld\n",
+                       __FUNCTION__, (long)size);
+               dump_stack();
+       }
+       if (unlikely(size >= MAX_SLAB_SIZE)) {
+               printk(KERN_WARNING "%s using vmalloc, size=%ld\n",
+                       __FUNCTION__, (long)size);
+               dump_stack();
+       }
+#endif
+
        do {
                if (size < MAX_SLAB_SIZE || retries > MAX_VMALLOCS)
                        ptr = kmalloc(size, lflags);
Index: xfs-linux/linux-2.4/xfs_lrw.h
===================================================================
--- xfs-linux.orig/linux-2.4/xfs_lrw.h  2006-08-02 13:54:44.215454250 +1000
+++ xfs-linux/linux-2.4/xfs_lrw.h       2006-08-02 13:54:48.087696250 +1000
@@ -31,7 +31,7 @@ struct xfs_iomap;
 /*
  * Defines for the trace mechanisms in xfs_lrw.c.
  */
-#define        XFS_RW_KTRACE_SIZE      128
+#define        XFS_RW_KTRACE_SIZE      64
 
 #define        XFS_READ_ENTER          1
 #define        XFS_WRITE_ENTER         2
Index: xfs-linux/linux-2.6/xfs_lrw.h
===================================================================
--- xfs-linux.orig/linux-2.6/xfs_lrw.h  2006-08-02 13:54:44.343462250 +1000
+++ xfs-linux/linux-2.6/xfs_lrw.h       2006-08-02 13:54:48.131699000 +1000
@@ -31,7 +31,7 @@ struct xfs_iomap;
 /*
  * Defines for the trace mechanisms in xfs_lrw.c.
  */
-#define        XFS_RW_KTRACE_SIZE      128
+#define        XFS_RW_KTRACE_SIZE      64
 
 #define        XFS_READ_ENTER          1
 #define        XFS_WRITE_ENTER         2
Index: xfs-linux/linux-2.6/kmem.h
===================================================================
--- xfs-linux.orig/linux-2.6/kmem.h     2006-08-02 13:54:44.375464250 +1000
+++ xfs-linux/linux-2.6/kmem.h  2006-08-02 13:54:48.187702500 +1000
@@ -30,6 +30,7 @@
 #define KM_NOSLEEP     0x0002u
 #define KM_NOFS                0x0004u
 #define KM_MAYFAIL     0x0008u
+#define KM_LARGE       0x0010u
 
 /*
  * We use a special process flag to avoid recursive callbacks into
@@ -41,7 +42,7 @@ kmem_flags_convert(unsigned int __nocast
 {
        gfp_t   lflags;
 
-       BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL));
+       BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL|KM_LARGE));
 
        if (flags & KM_NOSLEEP) {
                lflags = GFP_ATOMIC | __GFP_NOWARN;
Index: xfs-linux/linux-2.4/kmem.h
===================================================================
--- xfs-linux.orig/linux-2.4/kmem.h     2006-08-02 13:54:44.247456250 +1000
+++ xfs-linux/linux-2.4/kmem.h  2006-08-02 13:54:48.211704000 +1000
@@ -29,6 +29,7 @@
 #define KM_NOSLEEP     0x0002
 #define KM_NOFS                0x0004
 #define KM_MAYFAIL     0x0008
+#define KM_LARGE       0x0010
 
 /*
  * We use a special process flag to avoid recursive callbacks into
@@ -40,7 +41,7 @@ kmem_flags_convert(int flags)
 {
        int     lflags;
 
-       BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL));
+       BUG_ON(flags & ~(KM_SLEEP|KM_NOSLEEP|KM_NOFS|KM_MAYFAIL|KM_LARGE));
 
        if (flags & KM_NOSLEEP) {
                lflags = GFP_ATOMIC;
Index: xfs-linux/support/ktrace.c
===================================================================
--- xfs-linux.orig/support/ktrace.c     2006-08-02 13:54:44.447468750 +1000
+++ xfs-linux/support/ktrace.c  2006-08-02 13:54:48.231705250 +1000
@@ -75,7 +75,7 @@ ktrace_alloc(int nentries, unsigned int 
                                                            sleep);
        } else {
                ktep = (ktrace_entry_t*)kmem_zalloc((nentries * sizeof(*ktep)),
-                                                           sleep);
+                                                           sleep | KM_LARGE);
        }
 
        if (ktep == NULL) {
Index: xfs-linux/linux-2.6/xfs_buf.c
===================================================================
--- xfs-linux.orig/linux-2.6/xfs_buf.c  2006-08-02 13:54:44.411466500 +1000
+++ xfs-linux/linux-2.6/xfs_buf.c       2006-08-02 13:54:48.259707000 +1000
@@ -773,7 +773,7 @@ xfs_buf_get_noaddr(
        _xfs_buf_initialize(bp, target, 0, len, 0);
 
  try_again:
-       data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL);
+       data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL | KM_LARGE);
        if (unlikely(data == NULL))
                goto fail_free_buf;
 
Index: xfs-linux/linux-2.4/xfs_buf.c
===================================================================
--- xfs-linux.orig/linux-2.4/xfs_buf.c  2006-08-02 13:54:44.283458500 +1000
+++ xfs-linux/linux-2.4/xfs_buf.c       2006-08-02 13:54:48.283708500 +1000
@@ -875,7 +875,7 @@ xfs_buf_get_noaddr(
        _xfs_buf_initialize(bp, target, 0, len, XBF_FORCEIO);
 
  try_again:
-       data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL);
+       data = kmem_alloc(malloc_len, KM_SLEEP | KM_MAYFAIL | KM_LARGE);
        if (unlikely(data == NULL))
                goto fail_free_buf;
 
Index: xfs-linux/xfs_log.c
===================================================================
--- xfs-linux.orig/xfs_log.c    2006-08-02 13:54:44.475470500 +1000
+++ xfs-linux/xfs_log.c 2006-08-02 13:54:48.367713750 +1000
@@ -1226,7 +1226,7 @@ xlog_alloc_log(xfs_mount_t        *mp,
                          kmem_zalloc(sizeof(xlog_in_core_t), KM_SLEEP);
                iclog = *iclogp;
                iclog->hic_data = (xlog_in_core_2_t *)
-                         kmem_zalloc(iclogsize, KM_SLEEP);
+                         kmem_zalloc(iclogsize, KM_SLEEP | KM_LARGE);
 
                iclog->ic_prev = prev_iclog;
                prev_iclog = iclog;
Index: xfs-linux/xfs_iget.c
===================================================================
--- xfs-linux.orig/xfs_iget.c   2006-08-02 13:54:44.507472500 +1000
+++ xfs-linux/xfs_iget.c        2006-08-02 13:54:48.387715000 +1000
@@ -50,7 +50,7 @@ void
 xfs_ihash_init(xfs_mount_t *mp)
 {
        __uint64_t      icount;
-       uint            i, flags = KM_SLEEP | KM_MAYFAIL;
+       uint            i, flags = KM_SLEEP | KM_MAYFAIL | KM_LARGE;
 
        if (!mp->m_ihsize) {
                icount = mp->m_maxicount ? mp->m_maxicount :
@@ -95,7 +95,7 @@ xfs_chash_init(xfs_mount_t *mp)
        mp->m_chsize = min_t(uint, mp->m_chsize, mp->m_ihsize);
        mp->m_chash = (xfs_chash_t *)kmem_zalloc(mp->m_chsize
                                                 * sizeof(xfs_chash_t),
-                                                KM_SLEEP);
+                                                KM_SLEEP | KM_LARGE);
        for (i = 0; i < mp->m_chsize; i++) {
                spinlock_init(&mp->m_chash[i].ch_lock,"xfshash");
        }
Index: xfs-linux/quota/xfs_qm.c
===================================================================
--- xfs-linux.orig/quota/xfs_qm.c       2006-08-02 13:54:44.551475250 +1000
+++ xfs-linux/quota/xfs_qm.c    2006-08-02 13:54:48.431717750 +1000
@@ -112,17 +112,17 @@ xfs_Gqm_init(void)
 {
        xfs_dqhash_t    *udqhash, *gdqhash;
        xfs_qm_t        *xqm;
-       uint            i, hsize, flags = KM_SLEEP | KM_MAYFAIL;
+       uint            i, hsize, flags = KM_SLEEP | KM_MAYFAIL | KM_LARGE;
 
        /*
         * Initialize the dquot hash tables.
         */
        hsize = XFS_QM_HASHSIZE_HIGH;
-       while (!(udqhash = kmem_zalloc(hsize * sizeof(xfs_dqhash_t), flags))) {
+       while (!(udqhash = kmem_zalloc(hsize * sizeof(*udqhash), flags))) {
                if ((hsize >>= 1) <= XFS_QM_HASHSIZE_LOW)
                        flags = KM_SLEEP;
        }
-       gdqhash = kmem_zalloc(hsize * sizeof(xfs_dqhash_t), KM_SLEEP);
+       gdqhash = kmem_zalloc(hsize * sizeof(*gdqhash), KM_SLEEP | KM_LARGE);
        ndquot = hsize << 8;
 
        xqm = kmem_zalloc(sizeof(xfs_qm_t), KM_SLEEP);


<Prev in Thread] Current Thread [Next in Thread>