From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A482A2DFF34; Tue, 17 Jun 2025 16:15:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176933; cv=none; b=XY2eP9ixAAnerRQmC18vUgdGWvfQCtYjhq6BPJdBO4TrI3svzNvCVnnR3pezJ7Y4m8K5umK75zGCgxt0tRUAEvABAPQ3PexDJ0m5nWuYtmlRrnI6njyPGTZMiLMk7zWVrNyI+uThIV0gsest5aHjeSC9ooETd/5AHMLAl18MnG0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176933; c=relaxed/simple; bh=eiJD/keCcVBN8g8KSdR/16ufiqZVfwsjWcbJYjM+9L8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=afFy8Foxr2QX/ijgIeW/DvLLp2mxtqGfszHBDLya0I/xgIeBLXV+mWoXe+yTTahMOFpEKac6+w4VRtPTSB3a0ePsT3ywE6cTf7NqSv9v97FNQJyQLd2qnvtsOuVoOTjXvIf6HtqhHotY1L+LBOCU+w388rsgtzfLuBfYrcX2Zc0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mn3Nn34V; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mn3Nn34V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 07501C4CEE3; Tue, 17 Jun 2025 16:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750176933; bh=eiJD/keCcVBN8g8KSdR/16ufiqZVfwsjWcbJYjM+9L8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mn3Nn34VBSrisZzb1iLCkToR+wkcc73fAoTztjvCtT71Knw4X7d6tozYSvyJsqZNe rqwfP7L208nMKZKzghM77fMXH2OYGfXEoG7M3O3zNywpWjfbOS6xDMkhIl5w/tFD1f v4X+HRqkL0f9gJK87Q0BZ5YVVEouV9S4mhze/xy8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kent Overstreet , Benjamin Marzinski , Mikulas Patocka , Sasha Levin Subject: [PATCH 6.12 281/512] dm-flakey: error all IOs when num_features is absent Date: Tue, 17 Jun 2025 17:24:07 +0200 Message-ID: <20250617152430.983831399@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152419.512865572@linuxfoundation.org> References: <20250617152419.512865572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Benjamin Marzinski [ Upstream commit 40ed054f39bc99eac09871c33198e501f4acdf24 ] dm-flakey would error all IOs if num_features was 0, but if it was absent, dm-flakey would never error any IO. Fix this so that no num_features works the same as num_features set to 0. Fixes: aa7d7bc99fed7 ("dm flakey: add an "error_reads" option") Reported-by: Kent Overstreet Signed-off-by: Benjamin Marzinski Signed-off-by: Mikulas Patocka Signed-off-by: Sasha Levin --- drivers/md/dm-flakey.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index b690905ab89ff..806a80dd3bd9b 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -53,8 +53,8 @@ struct per_bio_data { static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, struct dm_target *ti) { - int r; - unsigned int argc; + int r = 0; + unsigned int argc = 0; const char *arg_name; static const struct dm_arg _args[] = { @@ -65,14 +65,13 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, {0, PROBABILITY_BASE, "Invalid random corrupt argument"}, }; - /* No feature arguments supplied. */ - if (!as->argc) - return 0; - - r = dm_read_arg_group(_args, as, &argc, &ti->error); - if (r) + if (as->argc && (r = dm_read_arg_group(_args, as, &argc, &ti->error))) return r; + /* No feature arguments supplied. */ + if (!argc) + goto error_all_io; + while (argc) { arg_name = dm_shift_arg(as); argc--; @@ -217,6 +216,7 @@ static int parse_features(struct dm_arg_set *as, struct flakey_c *fc, if (!fc->corrupt_bio_byte && !test_bit(ERROR_READS, &fc->flags) && !test_bit(DROP_WRITES, &fc->flags) && !test_bit(ERROR_WRITES, &fc->flags) && !fc->random_read_corrupt && !fc->random_write_corrupt) { +error_all_io: set_bit(ERROR_WRITES, &fc->flags); set_bit(ERROR_READS, &fc->flags); } -- 2.39.5