GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/1 GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
Hi,
When GFS2's directory management code allocates buffers for a directory hash table, if it can't get the memory it needs, it currently gives an bad return code. Rather than giving an error, this patch allows it to use virtual memory rather than kernel memory for the hash table. This should make it possible for directories to function properly, even when kernel memory becomes very fragmented.
Regards,
Bob Peterson
Red Hat File Systems
---
fs/gfs2/dir.c +31 -8
@@ -355,21 +355,30 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip) } hc =kmalloc (hsize,GFP_NOFS ); - ret = -ENOMEM ; +if (hc ==NULL ) + hc =vmalloc (hsize); +if (hc ==NULL )return ERR_PTR (-ENOMEM ); ret =gfs2_dir_read_data (ip, hc, hsize);if (ret <0 ) { -kfree (hc); +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc);return ERR_PTR (ret); }spin_lock (&inode->i_lock); -if (ip->i_hash_cache) -kfree (hc); -else +if (ip->i_hash_cache) { +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc); + }else { ip->i_hash_cache = hc; + }spin_unlock (&inode->i_lock);return ip->i_hash_cache;
@@ -385,7 +394,10 @@ void gfs2_dir_hash_inval(struct gfs2_inode *ip) {__be64 *hc = ip->i_hash_cache; ip->i_hash_cache =NULL ; -kfree (hc); +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc); }static inline int gfs2_dirent_sentinel (const struct gfs2_dirent *dent)
@@ -1114,6 +1126,9 @@ static int dir_double_exhash(struct gfs2_inode *dip)return PTR_ERR (hc); h = hc2 =kmalloc (hsize_bytes *2 ,GFP_NOFS ); +if (hc2 ==NULL ) + hc2 =vmalloc (hsize_bytes *2 ); +if (!hc2)return -ENOMEM ;
@@ -1145,7 +1160,10 @@ fail:gfs2_dinode_out (dip, dibh->b_data);brelse (dibh); out_kfree: -kfree (hc2); +if (is_vmalloc_addr (hc2)) +vfree (hc2); +else +kfree (hc2);return error; }
@@ -1846,6 +1864,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,memset (&rlist,0 ,sizeof (struct gfs2_rgrp_list )); ht =kzalloc (size,GFP_NOFS ); +if (ht ==NULL ) + ht =vzalloc (size);if (!ht)return -ENOMEM ;
@@ -1933,7 +1953,10 @@ out_rlist:gfs2_rlist_free (&rlist);gfs2_quota_unhold (dip); out: -kfree (ht); +if (is_vmalloc_addr (ht)) +vfree (ht); +else +kfree (ht);return error; }
PATCH 1/1 GFS2: Fall back to vmalloc if kmalloc fails for dir hash tables
Hi,
Quoted 22 lines · Bob Peterson
Hi,
When GFS2's directory management code allocates buffers for a directory hash table, if it can't get the memory it needs, it currently gives an bad return code. Rather than giving an error, this patch allows it to use virtual memory rather than kernel memory for the hash table. This should make it possible for directories to function properly, even when kernel memory becomes very fragmented.
Regards,
Bob Peterson
Red Hat File SystemsSigned-off-by Bob Peterson <[email protected]>---
fs/gfs2/dir.c +0
-0
fs/gfs2/dir.c static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip) · line 357
Quoted 3 lines
fs/gfs2/dir.c +0
-0@@ -355,21 +355,30 @@ static __be64 *gfs2_dir_get_hash_table(struct gfs2_inode *ip) } hc =kmalloc (hsize,GFP_NOFS );
This should have GFP_NOWARN in addition to GFP_NOFS I think. Otherwise looks good,
Steve.
Quoted 88 lines
fs/gfs2/dir.c +31
-8- ret = -ENOMEM ; +if (hc ==NULL ) + hc =vmalloc (hsize); +if (hc ==NULL )return ERR_PTR (-ENOMEM ); ret =gfs2_dir_read_data (ip, hc, hsize);if (ret <0 ) { -kfree (hc); +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc);return ERR_PTR (ret); }spin_lock (&inode->i_lock); -if (ip->i_hash_cache) -kfree (hc); -else +if (ip->i_hash_cache) { +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc); + }else { ip->i_hash_cache = hc; + }spin_unlock (&inode->i_lock);return ip->i_hash_cache;@@ -385,7 +394,10 @@ void gfs2_dir_hash_inval(struct gfs2_inode *ip) {__be64 *hc = ip->i_hash_cache; ip->i_hash_cache =NULL ; -kfree (hc); +if (is_vmalloc_addr (hc)) +vfree (hc); +else +kfree (hc); }static inline int gfs2_dirent_sentinel (const struct gfs2_dirent *dent)@@ -1114,6 +1126,9 @@ static int dir_double_exhash(struct gfs2_inode *dip)return PTR_ERR (hc); h = hc2 =kmalloc (hsize_bytes *2 ,GFP_NOFS ); +if (hc2 ==NULL ) + hc2 =vmalloc (hsize_bytes *2 ); +if (!hc2)return -ENOMEM ;@@ -1145,7 +1160,10 @@ fail:gfs2_dinode_out (dip, dibh->b_data);brelse (dibh); out_kfree: -kfree (hc2); +if (is_vmalloc_addr (hc2)) +vfree (hc2); +else +kfree (hc2);return error; }@@ -1846,6 +1864,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,memset (&rlist,0 ,sizeof (struct gfs2_rgrp_list )); ht =kzalloc (size,GFP_NOFS ); +if (ht ==NULL ) + ht =vzalloc (size);if (!ht)return -ENOMEM ;@@ -1933,7 +1953,10 @@ out_rlist:gfs2_rlist_free (&rlist);gfs2_quota_unhold (dip); out: -kfree (ht); +if (is_vmalloc_addr (ht)) +vfree (ht); +else +kfree (ht);return error; }