lkml.org 
[lkml]   [2003]   [Apr]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [Bug 601] New: BUG when running ipcs after huge page shm
On Fri, Apr 18, 2003 at 01:48:29PM -0700, Martin J. Bligh wrote:
> http://bugme.osdl.org/show_bug.cgi?id=601
> Summary: BUG when running ipcs after huge page shm
> Kernel Version: 2.5.67-bk current
> Status: NEW
> Severity: normal
> Owner: akpm@digeo.com
> Submitter: plars@austin.ibm.com

Trivial. We must remember to check for hugetlb in shm_get_stat().

-- wli


diff -urpN linux-2.5.67-bk9/ipc/shm.c shmstat-2.5.67-bk9-2/ipc/shm.c
--- linux-2.5.67-bk9/ipc/shm.c 2003-04-07 10:31:20.000000000 -0700
+++ shmstat-2.5.67-bk9-2/ipc/shm.c 2003-04-18 15:53:38.000000000 -0700
@@ -361,27 +361,35 @@ static inline unsigned long copy_shminfo
}
}

-static void shm_get_stat (unsigned long *rss, unsigned long *swp)
+static void shm_get_stat(unsigned long *rss, unsigned long *swp)
{
- struct shmem_inode_info *info;
int i;

*rss = 0;
*swp = 0;

- for(i = 0; i <= shm_ids.max_id; i++) {
- struct shmid_kernel* shp;
- struct inode * inode;
+ for (i = 0; i <= shm_ids.max_id; i++) {
+ struct shmid_kernel *shp;
+ struct inode *inode;

shp = shm_get(i);
- if(shp == NULL)
+ if(!shp)
continue;
+
inode = shp->shm_file->f_dentry->d_inode;
- info = SHMEM_I(inode);
- spin_lock (&info->lock);
- *rss += inode->i_mapping->nrpages;
- *swp += info->swapped;
- spin_unlock (&info->lock);
+
+ if (is_file_hugepages(shp->shm_file)) {
+ struct address_space *mapping = inode->i_mapping;
+ spin_lock(&mapping->page_lock);
+ *rss += (HPAGE_SIZE/PAGE_SIZE)*mapping->nrpages;
+ spin_unlock(&mapping->page_lock);
+ } else {
+ struct shmem_inode_info *info = SHMEM_I(inode);
+ spin_lock(&info->lock);
+ *rss += inode->i_mapping->nrpages;
+ *swp += info->swapped;
+ spin_unlock(&info->lock);
+ }
}
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:34    [from the cache]
©2003-2011 Jasper Spaans. Advertise on this site