From: Martin Brandenburg <martin@omnibond.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
devel@lists.orangefs.org
Cc: Martin Brandenburg <martin@omnibond.com>
Subject: [PATCH 16/17] orangefs: use kmem_cache for orangefs_write_request
Date: Mon, 17 Sep 2018 20:10:53 +0000 [thread overview]
Message-ID: <20180917201054.3530-17-martin@omnibond.com> (raw)
In-Reply-To: <20180917201054.3530-1-martin@omnibond.com>
Signed-off-by: Martin Brandenburg <martin@omnibond.com>
---
fs/orangefs/inode.c | 10 +++++-----
fs/orangefs/orangefs-cache.c | 24 ++++++++++++++++++++++--
fs/orangefs/orangefs-kernel.h | 6 ++++--
fs/orangefs/orangefs-mod.c | 10 +++++-----
4 files changed, 36 insertions(+), 14 deletions(-)
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index efb00cd50b61..178734920e45 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -66,7 +66,7 @@ static int orangefs_writepage_locked(struct page *page,
ret = 0;
if (wr) {
ClearPagePrivate(page);
- kfree(wr);
+ wr_release(wr);
}
}
end_page_writeback(page);
@@ -126,7 +126,7 @@ static int update_wr(struct page *page, loff_t pos, unsigned len, int mwrite)
else
wr->len = wr->pos + wr->len - wr->pos;
} else {
- wr = kmalloc(sizeof *wr, GFP_KERNEL);
+ wr = wr_alloc();
if (wr) {
wr->pos = pos;
wr->len = len;
@@ -272,7 +272,7 @@ static void orangefs_invalidatepage(struct page *page,
/* XXX prove */
if (offset == 0 && length == PAGE_SIZE) {
ClearPagePrivate(page);
- kfree(wr);
+ wr_release(wr);
} else if (wr->pos - page_offset(page) < offset &&
wr->pos - page_offset(page) + wr->len > offset + length) {
wbc.range_start = page_file_offset(page);
@@ -284,7 +284,7 @@ static void orangefs_invalidatepage(struct page *page,
return;
} else {
ClearPagePrivate(page);
- kfree(wr);
+ wr_release(wr);
}
} else if (wr->pos - page_offset(page) < offset &&
wr->pos - page_offset(page) + wr->len <= offset + length) {
@@ -299,7 +299,7 @@ static void orangefs_invalidatepage(struct page *page,
* entire write range is to be invalidated.
*/
ClearPagePrivate(page);
- kfree(wr);
+ wr_release(wr);
}
}
return;
diff --git a/fs/orangefs/orangefs-cache.c b/fs/orangefs/orangefs-cache.c
index 3b6982bf6bcf..cfb405ca8aa5 100644
--- a/fs/orangefs/orangefs-cache.c
+++ b/fs/orangefs/orangefs-cache.c
@@ -16,8 +16,9 @@ static DEFINE_SPINLOCK(next_tag_value_lock);
/* a cache for orangefs upcall/downcall operations */
static struct kmem_cache *op_cache;
+static struct kmem_cache *wr_cache;
-int op_cache_initialize(void)
+int orangefs_caches_initialize(void)
{
op_cache = kmem_cache_create("orangefs_op_cache",
sizeof(struct orangefs_kernel_op_s),
@@ -34,12 +35,21 @@ int op_cache_initialize(void)
spin_lock(&next_tag_value_lock);
next_tag_value = 100;
spin_unlock(&next_tag_value_lock);
+
+ wr_cache = kmem_cache_create("orangefs_wr_cache",
+ sizeof(struct orangefs_write_request), 0, ORANGEFS_CACHE_CREATE_FLAGS, NULL);
+ if (!wr_cache) {
+ gossip_err("Cannot create orangefs_wr_cache\n");
+ return -ENOMEM;
+ }
+
return 0;
}
-int op_cache_finalize(void)
+int orangefs_caches_finalize(void)
{
kmem_cache_destroy(op_cache);
+ kmem_cache_destroy(wr_cache);
return 0;
}
@@ -162,3 +172,13 @@ void op_release(struct orangefs_kernel_op_s *orangefs_op)
gossip_err("NULL pointer in op_release\n");
}
}
+
+struct orangefs_write_request *wr_alloc(void)
+{
+ return kmem_cache_zalloc(wr_cache, GFP_KERNEL);
+}
+
+void wr_release(struct orangefs_write_request *wr)
+{
+ kmem_cache_free(wr_cache, wr);
+}
diff --git a/fs/orangefs/orangefs-kernel.h b/fs/orangefs/orangefs-kernel.h
index 2e9726d1de7d..256851bab7a5 100644
--- a/fs/orangefs/orangefs-kernel.h
+++ b/fs/orangefs/orangefs-kernel.h
@@ -311,11 +311,13 @@ static inline int match_handle(struct orangefs_khandle resp_handle,
/*
* defined in orangefs-cache.c
*/
-int op_cache_initialize(void);
-int op_cache_finalize(void);
+int orangefs_caches_initialize(void);
+int orangefs_caches_finalize(void);
struct orangefs_kernel_op_s *op_alloc(__s32 type);
void orangefs_new_tag(struct orangefs_kernel_op_s *op);
char *get_opname_string(struct orangefs_kernel_op_s *new_op);
+struct orangefs_write_request *wr_alloc(void);
+void wr_release(struct orangefs_write_request *);
int orangefs_inode_cache_initialize(void);
int orangefs_inode_cache_finalize(void);
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c
index 85ef87245a87..c7373e682653 100644
--- a/fs/orangefs/orangefs-mod.c
+++ b/fs/orangefs/orangefs-mod.c
@@ -87,13 +87,13 @@ static int __init orangefs_init(void)
slot_timeout_secs = 0;
/* initialize global book keeping data structures */
- ret = op_cache_initialize();
+ ret = orangefs_caches_initialize();
if (ret < 0)
goto out;
ret = orangefs_inode_cache_initialize();
if (ret < 0)
- goto cleanup_op;
+ goto cleanup_caches;
orangefs_htable_ops_in_progress =
kcalloc(hash_table_size, sizeof(struct list_head), GFP_KERNEL);
@@ -172,8 +172,8 @@ static int __init orangefs_init(void)
cleanup_inode:
orangefs_inode_cache_finalize();
-cleanup_op:
- op_cache_finalize();
+cleanup_caches:
+ orangefs_caches_finalize();
out:
return ret;
@@ -194,7 +194,7 @@ static void __exit orangefs_exit(void)
BUG_ON(!list_empty(&orangefs_htable_ops_in_progress[i]));
orangefs_inode_cache_finalize();
- op_cache_finalize();
+ orangefs_caches_finalize();
kfree(orangefs_htable_ops_in_progress);
--
2.19.0
next prev parent reply other threads:[~2018-09-18 1:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-17 20:10 [PATCH 00/17] orangefs: page cache Martin Brandenburg
2018-09-17 20:10 ` [PATCH 01/17] orangefs: implement xattr cache Martin Brandenburg
2018-09-17 20:10 ` [PATCH 02/17] orangefs: do not invalidate attributes on inode create Martin Brandenburg
2018-09-17 20:10 ` [PATCH 03/17] orangefs: simply orangefs_inode_getattr interface Martin Brandenburg
2018-09-17 20:10 ` [PATCH 04/17] orangefs: update attributes rather than relying on server Martin Brandenburg
2018-09-17 20:10 ` [PATCH 05/17] orangefs: hold i_lock during inode_getattr Martin Brandenburg
2018-09-17 20:10 ` [PATCH 06/17] orangefs: set up and use backing_dev_info Martin Brandenburg
2018-09-17 20:10 ` [PATCH 07/17] orangefs: let setattr write to cached inode Martin Brandenburg
2018-09-17 20:10 ` [PATCH 08/17] orangefs: reorganize setattr functions to track attribute changes Martin Brandenburg
2018-09-17 20:10 ` [PATCH 09/17] orangefs: remove orangefs_readpages Martin Brandenburg
2018-09-17 20:10 ` [PATCH 10/17] orangefs: service ops done for writeback are not killable Martin Brandenburg
2018-09-17 20:10 ` [PATCH 11/17] orangefs: migrate to generic_file_read_iter Martin Brandenburg
2018-09-17 20:10 ` [PATCH 12/17] orangefs: implement writepage Martin Brandenburg
2018-09-17 20:10 ` [PATCH 13/17] orangefs: skip inode writeout if nothing to write Martin Brandenburg
2018-09-17 20:10 ` [PATCH 14/17] orangefs: write range tracking Martin Brandenburg
2018-09-17 20:10 ` [PATCH 15/17] orangefs: avoid fsync service operation on flush Martin Brandenburg
2018-09-17 20:10 ` Martin Brandenburg [this message]
2018-09-17 20:10 ` [PATCH 17/17] orangefs: implement writepages Martin Brandenburg
2018-09-18 21:46 ` martin
2018-09-20 18:31 ` [PATCH 00/17] orangefs: page cache Mike Marshall
2018-10-01 20:03 ` Andreas Dilger
2018-10-02 17:58 ` Mike Marshall
2018-10-02 20:13 ` martin
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=20180917201054.3530-17-martin@omnibond.com \
--to=martin@omnibond.com \
--cc=devel@lists.orangefs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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).