From: Mike Christie <mchristi@redhat.com>
To: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
nab@linux-iscsi.org
Cc: Mike Christie <mchristi@redhat.com>
Subject: [PATCH 05/19] tcmu: merge common block release code
Date: Mon, 30 Oct 2017 03:44:25 +0000 [thread overview]
Message-ID: <1509335079-5276-6-git-send-email-mchristi@redhat.com> (raw)
In-Reply-To: <1509335079-5276-1-git-send-email-mchristi@redhat.com>
Have unmap_thread_fn use tcmu_blocks_release.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_user.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 4f666a5..a6205e4 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1301,21 +1301,19 @@ static int tcmu_check_and_free_pending_cmd(struct tcmu_cmd *cmd)
return -EINVAL;
}
-static void tcmu_blocks_release(struct tcmu_dev *udev)
+static void tcmu_blocks_release(struct radix_tree_root *blocks,
+ int start, int end)
{
int i;
struct page *page;
- /* Try to release all block pages */
- mutex_lock(&udev->cmdr_lock);
- for (i = 0; i <= udev->dbi_max; i++) {
- page = radix_tree_delete(&udev->data_blocks, i);
+ for (i = start; i < end; i++) {
+ page = radix_tree_delete(blocks, i);
if (page) {
__free_page(page);
atomic_dec(&global_db_count);
}
}
- mutex_unlock(&udev->cmdr_lock);
}
static void tcmu_dev_kref_release(struct kref *kref)
@@ -1339,7 +1337,9 @@ static void tcmu_dev_kref_release(struct kref *kref)
spin_unlock_irq(&udev->commands_lock);
WARN_ON(!all_expired);
- tcmu_blocks_release(udev);
+ mutex_lock(&udev->cmdr_lock);
+ tcmu_blocks_release(&udev->data_blocks, 0, udev->dbi_max + 1);
+ mutex_unlock(&udev->cmdr_lock);
call_rcu(&dev->rcu_head, tcmu_dev_call_rcu);
}
@@ -1976,8 +1976,6 @@ static int unmap_thread_fn(void *data)
struct tcmu_dev *udev;
loff_t off;
uint32_t start, end, block;
- struct page *page;
- int i;
while (!kthread_should_stop()) {
DEFINE_WAIT(__wait);
@@ -2025,13 +2023,7 @@ static int unmap_thread_fn(void *data)
unmap_mapping_range(udev->inode->i_mapping, off, 0, 1);
/* Release the block pages */
- for (i = start; i < end; i++) {
- page = radix_tree_delete(&udev->data_blocks, i);
- if (page) {
- __free_page(page);
- atomic_dec(&global_db_count);
- }
- }
+ tcmu_blocks_release(&udev->data_blocks, start, end);
mutex_unlock(&udev->cmdr_lock);
}
--
1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <mchristi@redhat.com>
To: martin.petersen@oracle.com, jejb@linux.vnet.ibm.com,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
nab@linux-iscsi.org
Cc: Mike Christie <mchristi@redhat.com>
Subject: [PATCH 05/19] tcmu: merge common block release code
Date: Sun, 29 Oct 2017 22:44:25 -0500 [thread overview]
Message-ID: <1509335079-5276-6-git-send-email-mchristi@redhat.com> (raw)
In-Reply-To: <1509335079-5276-1-git-send-email-mchristi@redhat.com>
Have unmap_thread_fn use tcmu_blocks_release.
Signed-off-by: Mike Christie <mchristi@redhat.com>
---
drivers/target/target_core_user.c | 24 ++++++++----------------
1 file changed, 8 insertions(+), 16 deletions(-)
diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c
index 4f666a5..a6205e4 100644
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@ -1301,21 +1301,19 @@ static int tcmu_check_and_free_pending_cmd(struct tcmu_cmd *cmd)
return -EINVAL;
}
-static void tcmu_blocks_release(struct tcmu_dev *udev)
+static void tcmu_blocks_release(struct radix_tree_root *blocks,
+ int start, int end)
{
int i;
struct page *page;
- /* Try to release all block pages */
- mutex_lock(&udev->cmdr_lock);
- for (i = 0; i <= udev->dbi_max; i++) {
- page = radix_tree_delete(&udev->data_blocks, i);
+ for (i = start; i < end; i++) {
+ page = radix_tree_delete(blocks, i);
if (page) {
__free_page(page);
atomic_dec(&global_db_count);
}
}
- mutex_unlock(&udev->cmdr_lock);
}
static void tcmu_dev_kref_release(struct kref *kref)
@@ -1339,7 +1337,9 @@ static void tcmu_dev_kref_release(struct kref *kref)
spin_unlock_irq(&udev->commands_lock);
WARN_ON(!all_expired);
- tcmu_blocks_release(udev);
+ mutex_lock(&udev->cmdr_lock);
+ tcmu_blocks_release(&udev->data_blocks, 0, udev->dbi_max + 1);
+ mutex_unlock(&udev->cmdr_lock);
call_rcu(&dev->rcu_head, tcmu_dev_call_rcu);
}
@@ -1976,8 +1976,6 @@ static int unmap_thread_fn(void *data)
struct tcmu_dev *udev;
loff_t off;
uint32_t start, end, block;
- struct page *page;
- int i;
while (!kthread_should_stop()) {
DEFINE_WAIT(__wait);
@@ -2025,13 +2023,7 @@ static int unmap_thread_fn(void *data)
unmap_mapping_range(udev->inode->i_mapping, off, 0, 1);
/* Release the block pages */
- for (i = start; i < end; i++) {
- page = radix_tree_delete(&udev->data_blocks, i);
- if (page) {
- __free_page(page);
- atomic_dec(&global_db_count);
- }
- }
+ tcmu_blocks_release(&udev->data_blocks, start, end);
mutex_unlock(&udev->cmdr_lock);
}
--
1.8.3.1
next prev parent reply other threads:[~2017-10-30 3:44 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-30 3:44 [PATCH 00/19] target/target_core_user: changes for 4.16 Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 01/19] tcmu: fix crash when removing the tcmu device v4 Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 02/19] tcmu: Add netlink command reply supported option for each device Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 03/19] tcmu: Use macro to call container_of in tcmu_cmd_time_out_show Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 04/19] tcmu: fix double se_cmd completion Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` Mike Christie [this message]
2017-10-30 3:44 ` [PATCH 05/19] tcmu: merge common block release code Mike Christie
2017-10-30 3:44 ` [PATCH 06/19] tcmu: split unmap_thread_fn Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 07/19] tcmu: fix unmap thread race Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 08/19] tcmu: move expired command completion to unmap thread Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 09/19] tcmu: remove commands_lock Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 10/19] tcmu: release blocks for partially setup cmds Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 11/19] tcmu: simplify scatter_data_area error handling Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 12/19] tcmu: fix free block calculation Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 13/19] tcmu: clean up the scatter helper Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 14/19] tcmu: prep queue_cmd_ring to be used by unmap wq Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 15/19] tcmu: simplify dbi thresh handling Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 16/19] tcmu: don't block submitting context for block waits Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 17/19] tcmu: make ring buffer timer configurable Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 18/19] tcmu: allow max block and global max blocks to be settable Mike Christie
2017-10-30 3:44 ` Mike Christie
2017-10-30 3:44 ` [PATCH 19/19] target: return SAM_STAT_TASK_SET_FULL for TCM_OUT_OF_RESOURCES Mike Christie
2017-10-30 3:44 ` Mike Christie
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=1509335079-5276-6-git-send-email-mchristi@redhat.com \
--to=mchristi@redhat.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=nab@linux-iscsi.org \
--cc=target-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.