[PATCH 5/8] writeback: increment page wait count when waiting

[Jens Axboe]

If we end up waiting on a page that is dirty or marked writeback,
then increment the corresponding bdi_writeback counter.

Signed-off-by: Jens Axboe 
---
 mm/filemap.c | 42 +++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index f2479af09da9..a8854a083b71 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -764,37 +764,73 @@ wait_queue_head_t *page_waitqueue(struct page *page)
 }
 EXPORT_SYMBOL(page_waitqueue);
 
+static bool inc_dirty_wait(struct page *page)
+{
+   if (!page->mapping || !PageDirty(page) || !PageWriteback(page))
+   return false;
+   else {
+   struct bdi_writeback *wb = inode_to_wb(page->mapping->host);
+
+   atomic_inc(>dirty_sleeping);
+   return true;
+   }
+}
+
+static void dec_dirty_wait(struct page *page)
+{
+   struct bdi_writeback *wb = inode_to_wb(page->mapping->host);
+
+   atomic_dec(>dirty_sleeping);
+}
+
 void wait_on_page_bit(struct page *page, int bit_nr)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
 
-   if (test_bit(bit_nr, >flags))
+   if (test_bit(bit_nr, >flags)) {
+   bool did_inc = inc_dirty_wait(page);
__wait_on_bit(page_waitqueue(page), , bit_wait_io,
TASK_UNINTERRUPTIBLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   }
 }
 EXPORT_SYMBOL(wait_on_page_bit);
 
 int wait_on_page_bit_killable(struct page *page, int bit_nr)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
+   bool did_inc;
+   int ret;
 
if (!test_bit(bit_nr, >flags))
return 0;
 
-   return __wait_on_bit(page_waitqueue(page), ,
+   did_inc = inc_dirty_wait(page);
+   ret = __wait_on_bit(page_waitqueue(page), ,
 bit_wait_io, TASK_KILLABLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   return ret;
 }
 
 int wait_on_page_bit_killable_timeout(struct page *page,
   int bit_nr, unsigned long timeout)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
+   bool did_inc;
+   int ret;
 
wait.key.timeout = jiffies + timeout;
if (!test_bit(bit_nr, >flags))
return 0;
-   return __wait_on_bit(page_waitqueue(page), ,
+
+   did_inc = inc_dirty_wait(page);
+   ret = __wait_on_bit(page_waitqueue(page), ,
 bit_wait_io_timeout, TASK_KILLABLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   return ret;
 }
 EXPORT_SYMBOL_GPL(wait_on_page_bit_killable_timeout);
 
-- 
2.8.0.rc4.6.g7e4ba36

[PATCH 5/8] writeback: increment page wait count when waiting

[Jens Axboe]

If we end up waiting on a page that is dirty or marked writeback,
then increment the corresponding bdi_writeback counter.

Signed-off-by: Jens Axboe 
---
 mm/filemap.c | 42 +++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/mm/filemap.c b/mm/filemap.c
index f2479af09da9..a8854a083b71 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -764,37 +764,73 @@ wait_queue_head_t *page_waitqueue(struct page *page)
 }
 EXPORT_SYMBOL(page_waitqueue);
 
+static bool inc_dirty_wait(struct page *page)
+{
+   if (!page->mapping || !PageDirty(page) || !PageWriteback(page))
+   return false;
+   else {
+   struct bdi_writeback *wb = inode_to_wb(page->mapping->host);
+
+   atomic_inc(>dirty_sleeping);
+   return true;
+   }
+}
+
+static void dec_dirty_wait(struct page *page)
+{
+   struct bdi_writeback *wb = inode_to_wb(page->mapping->host);
+
+   atomic_dec(>dirty_sleeping);
+}
+
 void wait_on_page_bit(struct page *page, int bit_nr)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
 
-   if (test_bit(bit_nr, >flags))
+   if (test_bit(bit_nr, >flags)) {
+   bool did_inc = inc_dirty_wait(page);
__wait_on_bit(page_waitqueue(page), , bit_wait_io,
TASK_UNINTERRUPTIBLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   }
 }
 EXPORT_SYMBOL(wait_on_page_bit);
 
 int wait_on_page_bit_killable(struct page *page, int bit_nr)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
+   bool did_inc;
+   int ret;
 
if (!test_bit(bit_nr, >flags))
return 0;
 
-   return __wait_on_bit(page_waitqueue(page), ,
+   did_inc = inc_dirty_wait(page);
+   ret = __wait_on_bit(page_waitqueue(page), ,
 bit_wait_io, TASK_KILLABLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   return ret;
 }
 
 int wait_on_page_bit_killable_timeout(struct page *page,
   int bit_nr, unsigned long timeout)
 {
DEFINE_WAIT_BIT(wait, >flags, bit_nr);
+   bool did_inc;
+   int ret;
 
wait.key.timeout = jiffies + timeout;
if (!test_bit(bit_nr, >flags))
return 0;
-   return __wait_on_bit(page_waitqueue(page), ,
+
+   did_inc = inc_dirty_wait(page);
+   ret = __wait_on_bit(page_waitqueue(page), ,
 bit_wait_io_timeout, TASK_KILLABLE);
+   if (did_inc)
+   dec_dirty_wait(page);
+   return ret;
 }
 EXPORT_SYMBOL_GPL(wait_on_page_bit_killable_timeout);
 
-- 
2.8.0.rc4.6.g7e4ba36