From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Joe Thornber <ejt@redhat.com>,
Mike Snitzer <snitzer@redhat.com>
Subject: [PATCH 3.14 20/52] dm thin: fix missing out-of-data-space to write mode transition if blocks are released
Date: Tue, 6 Jan 2015 18:06:48 -0800 [thread overview]
Message-ID: <20150107020558.426173824@linuxfoundation.org> (raw)
In-Reply-To: <20150107020555.043793795@linuxfoundation.org>
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Joe Thornber <ejt@redhat.com>
commit 2c43fd26e46734430122b8d2ad3024bb532df3ef upstream.
Discard bios and thin device deletion have the potential to release data
blocks. If the thin-pool is in out-of-data-space mode, and blocks were
released, transition the thin-pool back to full write mode.
The correct time to do this is just after the thin-pool metadata commit.
It cannot be done before the commit because the space maps will not
allow immediate reuse of the data blocks in case there's a rollback
following power failure.
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/md/dm-thin.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
--- a/drivers/md/dm-thin.c
+++ b/drivers/md/dm-thin.c
@@ -916,6 +916,24 @@ static void schedule_zero(struct thin_c
}
}
+static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);
+
+static void check_for_space(struct pool *pool)
+{
+ int r;
+ dm_block_t nr_free;
+
+ if (get_pool_mode(pool) != PM_OUT_OF_DATA_SPACE)
+ return;
+
+ r = dm_pool_get_free_block_count(pool->pmd, &nr_free);
+ if (r)
+ return;
+
+ if (nr_free)
+ set_pool_mode(pool, PM_WRITE);
+}
+
/*
* A non-zero return indicates read_only or fail_io mode.
* Many callers don't care about the return value.
@@ -930,6 +948,8 @@ static int commit(struct pool *pool)
r = dm_pool_commit_metadata(pool->pmd);
if (r)
metadata_operation_failed(pool, "dm_pool_commit_metadata", r);
+ else
+ check_for_space(pool);
return r;
}
@@ -948,8 +968,6 @@ static void check_low_water_mark(struct
}
}
-static void set_pool_mode(struct pool *pool, enum pool_mode new_mode);
-
static int alloc_data_block(struct thin_c *tc, dm_block_t *result)
{
int r;
next prev parent reply other threads:[~2015-01-07 2:43 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-07 2:06 [PATCH 3.14 00/52] 3.14.28-stable review Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 01/52] isofs: Fix infinite looping over CE entries Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 02/52] x86/tls: Validate TLS entries to protect espfix Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 03/52] x86/tls: Disallow unusual TLS segments Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 04/52] x86_64, switch_to(): Load TLS descriptors before switching DS and ES Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 05/52] x86, kvm: Clear paravirt_enabled on KVM guests for espfix32s benefit Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 06/52] md/bitmap: always wait for writes on unplug Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 07/52] mfd: tc6393xb: Fail ohci suspend if full state restore is required Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 08/52] mmc: dw_mmc: avoid write to CDTHRCTL on older versions Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 09/52] mmc: block: add newline to sysfs display of force_ro Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 10/52] mmc: sdhci-pci-o2micro: Fix Dell E5440 issue Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 11/52] megaraid_sas: corrected return of wait_event from abort frame path Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 12/52] scsi: correct return values for .eh_abort_handler implementations Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 13/52] nfs41: fix nfs4_proc_layoutget error handling Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 14/52] dm bufio: fix memleak when using a dm_buffers inline bio Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 15/52] dm crypt: use memzero_explicit for on-stack buffer Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 16/52] dm cache: only use overwrite optimisation for promotion when in writeback mode Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 17/52] dm cache: dirty flag was mistakenly being cleared when promoting via overwrite Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 18/52] dm space map metadata: fix sm_bootstrap_get_nr_blocks() Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 19/52] dm thin: fix inability to discard blocks when in out-of-data-space mode Greg Kroah-Hartman
2015-01-07 2:06 ` Greg Kroah-Hartman [this message]
2015-01-07 2:06 ` [PATCH 3.14 21/52] arm64: Add COMPAT_HWCAP_LPAE Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 22/52] ARM: tegra: Re-add removed SoC id macro to tegra_resume() Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 24/52] x86/tls: Dont validate lm in set_thread_area() after all Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 25/52] isofs: Fix unchecked printing of ER records Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 26/52] KEYS: Fix stale key registration at error path Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 28/52] mac80211: free management frame keys when removing station Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 29/52] mnt: Fix a memory stomp in umount Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 30/52] thermal: Fix error path in thermal_init() Greg Kroah-Hartman
2015-01-07 2:06 ` [PATCH 3.14 31/52] mnt: Implicitly add MNT_NODEV on remount when it was implicitly added by mount Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 32/52] mnt: Update unprivileged remount test Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 33/52] umount: Disallow unprivileged mount force Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 34/52] groups: Consolidate the setgroups permission checks Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 35/52] userns: Document what the invariant required for safe unprivileged mappings Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 36/52] userns: Dont allow setgroups until a gid mapping has been setablished Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 37/52] userns: Dont allow unprivileged creation of gid mappings Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 38/52] userns: Check euid no fsuid when establishing an unprivileged uid mapping Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 39/52] userns: Only allow the creator of the userns unprivileged mappings Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 40/52] userns: Rename id_map_mutex to userns_state_mutex Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 41/52] userns: Add a knob to disable setgroups on a per user namespace basis Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 42/52] userns: Allow setting gid_maps without privilege when setgroups is disabled Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 43/52] userns: Unbreak the unprivileged remount tests Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 44/52] audit: restore AUDIT_LOGINUID unset ABI Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 45/52] crypto: af_alg - fix backlog handling Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 46/52] ncpfs: return proper error from NCP_IOC_SETROOT ioctl Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 47/52] exit: pidns: alloc_pid() leaks pid_namespace if child_reaper is exiting Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 48/52] udf: Verify symlink size before loading it Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 49/52] eCryptfs: Force RO mount when encrypted view is enabled Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 50/52] eCryptfs: Remove buggy and unnecessary write in file name decode routine Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 51/52] Btrfs: do not move em to modified list when unpinning Greg Kroah-Hartman
2015-01-07 2:07 ` [PATCH 3.14 52/52] Btrfs: fix fs corruption on transaction abort if device supports discard Greg Kroah-Hartman
2015-01-07 13:42 ` [PATCH 3.14 00/52] 3.14.28-stable review Guenter Roeck
2015-01-07 23:34 ` Shuah Khan
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=20150107020558.426173824@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=ejt@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=snitzer@redhat.com \
--cc=stable@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).