From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: axboe@kernel.dk, lucho@ionkov.net, jack@suse.cz,
ericvh@gmail.com, tytso@mit.edu, rminnich@sandia.gov,
viro@zeniv.linux.org.uk
Cc: martin.petersen@oracle.com, neilb@suse.de, david@fromorbit.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
adilger.kernel@dilger.ca, bharrosh@panasas.com,
jlayton@samba.org, v9fs-developer@lists.sourceforge.net,
linux-ext4@vger.kernel.org
Subject: [PATCH 1/4] bdi: Track users that require stable page writes
Date: Tue, 20 Nov 2012 18:00:34 -0800 [thread overview]
Message-ID: <20121121020034.10225.51692.stgit@blackbox.djwong.org> (raw)
In-Reply-To: <20121121020027.10225.43206.stgit@blackbox.djwong.org>
This creates a per-backing-device counter that tracks the number of users which
require pages to be held immutable during writeout. Eventually it will be used
to waive wait_for_page_writeback() if nobody requires stable pages.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
Documentation/ABI/testing/sysfs-class-bdi | 7 ++++++
block/blk-integrity.c | 4 +++
include/linux/backing-dev.h | 16 +++++++++++++
include/linux/blkdev.h | 15 ++++++++++++
mm/backing-dev.c | 36 +++++++++++++++++++++++++++++
5 files changed, 78 insertions(+)
diff --git a/Documentation/ABI/testing/sysfs-class-bdi b/Documentation/ABI/testing/sysfs-class-bdi
index 5f50097..218a618 100644
--- a/Documentation/ABI/testing/sysfs-class-bdi
+++ b/Documentation/ABI/testing/sysfs-class-bdi
@@ -48,3 +48,10 @@ max_ratio (read-write)
most of the write-back cache. For example in case of an NFS
mount that is prone to get stuck, or a FUSE mount which cannot
be trusted to play fair.
+
+stable_pages_required (read-write)
+
+ If set, the backing device requires that all pages comprising a write
+ request must not be changed until writeout is complete. The system
+ administrator can turn this on if the hardware does not do so already.
+ However, once enabled, this flag cannot be disabled.
diff --git a/block/blk-integrity.c b/block/blk-integrity.c
index da2a818..cf2dd95 100644
--- a/block/blk-integrity.c
+++ b/block/blk-integrity.c
@@ -420,6 +420,8 @@ int blk_integrity_register(struct gendisk *disk, struct blk_integrity *template)
} else
bi->name = bi_unsupported_name;
+ queue_require_stable_pages(disk->queue);
+
return 0;
}
EXPORT_SYMBOL(blk_integrity_register);
@@ -438,6 +440,8 @@ void blk_integrity_unregister(struct gendisk *disk)
if (!disk || !disk->integrity)
return;
+ queue_unrequire_stable_pages(disk->queue);
+
bi = disk->integrity;
kobject_uevent(&bi->kobj, KOBJ_REMOVE);
diff --git a/include/linux/backing-dev.h b/include/linux/backing-dev.h
index 2a9a9ab..af19704 100644
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
@@ -253,6 +253,7 @@ int bdi_set_max_ratio(struct backing_dev_info *bdi, unsigned int max_ratio);
#define BDI_CAP_EXEC_MAP 0x00000040
#define BDI_CAP_NO_ACCT_WB 0x00000080
#define BDI_CAP_SWAP_BACKED 0x00000100
+#define BDI_CAP_STABLE_WRITES 0x00000200
#define BDI_CAP_VMFLAGS \
(BDI_CAP_READ_MAP | BDI_CAP_WRITE_MAP | BDI_CAP_EXEC_MAP)
@@ -307,6 +308,21 @@ long wait_iff_congested(struct zone *zone, int sync, long timeout);
int pdflush_proc_obsolete(struct ctl_table *table, int write,
void __user *buffer, size_t *lenp, loff_t *ppos);
+static inline void bdi_require_stable_pages(struct backing_dev_info *bdi)
+{
+ bdi->capabilities |= BDI_CAP_STABLE_WRITES;
+}
+
+static inline void bdi_unrequire_stable_pages(struct backing_dev_info *bdi)
+{
+ bdi->capabilities &= ~BDI_CAP_STABLE_WRITES;
+}
+
+static inline bool bdi_cap_stable_pages_required(struct backing_dev_info *bdi)
+{
+ return bdi->capabilities & BDI_CAP_STABLE_WRITES;
+}
+
static inline bool bdi_cap_writeback_dirty(struct backing_dev_info *bdi)
{
return !(bdi->capabilities & BDI_CAP_NO_WRITEBACK);
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 1756001..a1c6e91 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -458,6 +458,21 @@ struct request_queue {
(1 << QUEUE_FLAG_SAME_COMP) | \
(1 << QUEUE_FLAG_ADD_RANDOM))
+static inline void queue_require_stable_pages(struct request_queue *q)
+{
+ bdi_require_stable_pages(&q->backing_dev_info);
+}
+
+static inline void queue_unrequire_stable_pages(struct request_queue *q)
+{
+ bdi_unrequire_stable_pages(&q->backing_dev_info);
+}
+
+static inline int queue_requires_stable_pages(struct request_queue *q)
+{
+ return bdi_cap_stable_pages_required(&q->backing_dev_info);
+}
+
static inline void queue_lockdep_assert_held(struct request_queue *q)
{
if (q->queue_lock)
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index d3ca2b3..fd6e5b5 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -221,12 +221,48 @@ static ssize_t max_ratio_store(struct device *dev,
}
BDI_SHOW(max_ratio, bdi->max_ratio)
+static ssize_t stable_pages_required_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct backing_dev_info *bdi = dev_get_drvdata(dev);
+ unsigned int spw;
+ ssize_t ret;
+
+ ret = kstrtouint(buf, 10, &spw);
+ if (ret < 0)
+ return ret;
+
+ /*
+ * SPW could be enabled due to hw requirement, so don't
+ * let users disable it.
+ */
+ if (bdi_cap_stable_pages_required(bdi) && spw == 0)
+ return -EINVAL;
+
+ if (spw != 0)
+ bdi_require_stable_pages(bdi);
+
+ return count;
+}
+
+static ssize_t stable_pages_required_show(struct device *dev,
+ struct device_attribute *attr,
+ char *page)
+{
+ struct backing_dev_info *bdi = dev_get_drvdata(dev);
+
+ return snprintf(page, PAGE_SIZE-1, "%d\n",
+ bdi_cap_stable_pages_required(bdi) ? 1 : 0);
+}
+
#define __ATTR_RW(attr) __ATTR(attr, 0644, attr##_show, attr##_store)
static struct device_attribute bdi_dev_attrs[] = {
__ATTR_RW(read_ahead_kb),
__ATTR_RW(min_ratio),
__ATTR_RW(max_ratio),
+ __ATTR_RW(stable_pages_required),
__ATTR_NULL,
};
next prev parent reply other threads:[~2012-11-21 2:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 2:00 [PATCH v2.1 0/3] mm/fs: Implement faster stable page writes on filesystems Darrick J. Wong
2012-11-21 2:00 ` Darrick J. Wong [this message]
2012-11-21 7:54 ` [PATCH 1/4] bdi: Track users that require stable page writes Christoph Hellwig
2012-11-21 10:52 ` Christoph Hellwig
2012-11-21 10:56 ` Christoph Hellwig
2012-11-21 21:52 ` Darrick J. Wong
2012-11-21 22:06 ` NeilBrown
2012-11-22 2:33 ` [PATCH] " Darrick J. Wong
2012-11-22 7:08 ` Christoph Hellwig
2012-11-21 2:00 ` [PATCH 2/4] mm: Only enforce stable page writes if the backing device requires it Darrick J. Wong
2012-11-21 10:57 ` Christoph Hellwig
2012-11-21 2:00 ` [PATCH 3/4] 9pfs: Fix filesystem to wait for stable page writeback Darrick J. Wong
2012-11-21 2:00 ` [PATCH 4/4] ext3: Warn if mounting rw on a disk requiring stable page writes Darrick J. Wong
2012-11-21 2:15 ` Jan Kara
2012-11-21 21:13 ` Darrick J. Wong
2012-11-21 21:33 ` Jan Kara
2012-11-21 21:47 ` NeilBrown
2012-11-22 1:47 ` Darrick J. Wong
2012-11-22 2:36 ` [RFC PATCH 1/2] mm: Introduce page flag to indicate stable page status Darrick J. Wong
2012-11-22 2:36 ` [RFC PATCH 2/2] jbd: Stabilize pages during writes when in ordered mode Darrick J. Wong
2012-11-22 9:19 ` Jan Kara
2012-11-22 9:12 ` [PATCH 4/4] ext3: Warn if mounting rw on a disk requiring stable page writes Jan Kara
2012-11-27 2:17 ` Darrick J. Wong
2012-12-05 12:12 ` Jan Kara
2012-12-08 1:09 ` Darrick J. Wong
2012-12-10 10:41 ` Jan Kara
2012-11-22 23:15 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121121020034.10225.51692.stgit@blackbox.djwong.org \
--to=darrick.wong@oracle.com \
--cc=adilger.kernel@dilger.ca \
--cc=axboe@kernel.dk \
--cc=bharrosh@panasas.com \
--cc=david@fromorbit.com \
--cc=ericvh@gmail.com \
--cc=jack@suse.cz \
--cc=jlayton@samba.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucho@ionkov.net \
--cc=martin.petersen@oracle.com \
--cc=neilb@suse.de \
--cc=rminnich@sandia.gov \
--cc=tytso@mit.edu \
--cc=v9fs-developer@lists.sourceforge.net \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).