linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Btrfs: igrab inode in writepage
@ 2015-10-22 19:05 Josef Bacik
  2015-10-23  2:14 ` Liu Bo
  0 siblings, 1 reply; 2+ messages in thread
From: Josef Bacik @ 2015-10-22 19:05 UTC (permalink / raw)
  To: linux-btrfs, kernel-team

We hit this panic on a few of our boxes this week where we have an
ordered_extent with an NULL inode.  We do an igrab() of the inode in writepages,
but weren't doing it in writepage which can be called directly from the VM on
dirty pages.  If the inode has been unlinked then we could have I_FREEING set
which means igrab() would return NULL and we get this panic.  Fix this by trying
to igrab in btrfs_writepage, and if it returns NULL then just redirty the page
and return AOP_WRITEPAGE_ACTIVATE; so the VM knows it wasn't successful.  Thanks,

Signed-off-by: Josef Bacik <jbacik@fb.com>
---
 fs/btrfs/inode.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index a0fa725..4d1fdc2 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -8438,15 +8438,28 @@ int btrfs_readpage(struct file *file, struct page *page)
 static int btrfs_writepage(struct page *page, struct writeback_control *wbc)
 {
 	struct extent_io_tree *tree;
-
+	struct inode *inode = page->mapping->host;
+	int ret;
 
 	if (current->flags & PF_MEMALLOC) {
 		redirty_page_for_writepage(wbc, page);
 		unlock_page(page);
 		return 0;
 	}
+
+	/*
+	 * If we are under memory pressure we will call this directly from the
+	 * VM, we need to make sure we have the inode referenced for the ordered
+	 * extent.  If not just return like we didn't do anything.
+	 */
+	if (!igrab(inode)) {
+		redirty_page_for_writepage(wbc, page);
+		return AOP_WRITEPAGE_ACTIVATE;
+	}
 	tree = &BTRFS_I(page->mapping->host)->io_tree;
-	return extent_write_full_page(tree, page, btrfs_get_extent, wbc);
+	ret = extent_write_full_page(tree, page, btrfs_get_extent, wbc);
+	btrfs_add_delayed_iput(inode);
+	return ret;
 }
 
 static int btrfs_writepages(struct address_space *mapping,
-- 
2.1.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Btrfs: igrab inode in writepage
  2015-10-22 19:05 [PATCH] Btrfs: igrab inode in writepage Josef Bacik
@ 2015-10-23  2:14 ` Liu Bo
  0 siblings, 0 replies; 2+ messages in thread
From: Liu Bo @ 2015-10-23  2:14 UTC (permalink / raw)
  To: Josef Bacik, linux-btrfs, kernel-team

On 10/23/2015 03:05 AM, Josef Bacik wrote:
> We hit this panic on a few of our boxes this week where we have an
> ordered_extent with an NULL inode.  We do an igrab() of the inode in writepages,
> but weren't doing it in writepage which can be called directly from the VM on
> dirty pages.  If the inode has been unlinked then we could have I_FREEING set
> which means igrab() would return NULL and we get this panic.  Fix this by trying
> to igrab in btrfs_writepage, and if it returns NULL then just redirty the page
> and return AOP_WRITEPAGE_ACTIVATE; so the VM knows it wasn't successful.  Thanks,
>

Reviewed-by: Liu Bo <bo.li.liu@oracle.com>

thanks,

-Liubo

> Signed-off-by: Josef Bacik <jbacik@fb.com>
> ---
>   fs/btrfs/inode.c | 17 +++++++++++++++--
>   1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index a0fa725..4d1fdc2 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -8438,15 +8438,28 @@ int btrfs_readpage(struct file *file, struct page *page)
>   static int btrfs_writepage(struct page *page, struct writeback_control *wbc)
>   {
>   	struct extent_io_tree *tree;
> -
> +	struct inode *inode = page->mapping->host;
> +	int ret;
>
>   	if (current->flags & PF_MEMALLOC) {
>   		redirty_page_for_writepage(wbc, page);
>   		unlock_page(page);
>   		return 0;
>   	}
> +
> +	/*
> +	 * If we are under memory pressure we will call this directly from the
> +	 * VM, we need to make sure we have the inode referenced for the ordered
> +	 * extent.  If not just return like we didn't do anything.
> +	 */
> +	if (!igrab(inode)) {
> +		redirty_page_for_writepage(wbc, page);
> +		return AOP_WRITEPAGE_ACTIVATE;
> +	}
>   	tree = &BTRFS_I(page->mapping->host)->io_tree;
> -	return extent_write_full_page(tree, page, btrfs_get_extent, wbc);
> +	ret = extent_write_full_page(tree, page, btrfs_get_extent, wbc);
> +	btrfs_add_delayed_iput(inode);
> +	return ret;
>   }
>
>   static int btrfs_writepages(struct address_space *mapping,
>


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2015-10-23  2:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22 19:05 [PATCH] Btrfs: igrab inode in writepage Josef Bacik
2015-10-23  2:14 ` Liu Bo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).