Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp241134pxf; Wed, 10 Mar 2021 05:27:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJyS5rT1clG+zYvDu5k+e7DneKGHkc+cHySFo/vH0/nMTdblIDyjoHdhdD5imVEbD9hkesgK X-Received: by 2002:aa7:da48:: with SMTP id w8mr3191420eds.81.1615382856031; Wed, 10 Mar 2021 05:27:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615382856; cv=none; d=google.com; s=arc-20160816; b=gXP19rgevRCNYmStj+cArT8YI8W/zcnwAI3MAkrTOvmYNFhaQzUwtm2FnyPxD815c/ MW7LYCOHAl0U7K12CGmTbEitgN0dPZGbtSYZB+uGkejfHJA9j5EwCe8KqO3fng3z/sp0 m75djfLWKHjt3Tb7raODDUAZkD3IiyuSEAkIm3JTp2And1cXzkGEq/3uohw2xTOa/2tZ 15ZVDmxHR1zdVCF3Zsoxgmva3tAsXHbGXtPC6lCjN8NvqMbQqlz1SodMqhZ1rPuOZp5S lISF5SR6kyCzBGhmx/URX6a61oSFew1UyIDGoVoPtcbG2+Dve2loznyC7YpY8RDxySAL cvvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=2jLgH8aOhSnGYE9P76OCPB8Lckni0UK3RaHOn/6nkN0=; b=EI27f9iUVkBFrrUtHM6eAAFoXmbMLLhzEKNHecj7QWiKaCdjdLVQuCZ1Zj0QDddc7c IYHvN7GyemrL07iMWC6iU3DW4sufd+0iAlcW04pOASc4OKyvUi0OHLF2PMuJn1cUh38O klxMDapnEoBMonvUyv/9mn87XFaqM6lSDIfG09ik9VUfwpOQltGhQEvCl0UzYhaDNubc ihu8cWzF0+NKIc+tvX8LuJa1ob50Edd2Mh8m6c8KPlQJMo3F7F7BDnxZtGNkON2OrQI/ PqYXdkR5KZwi3YhdHKLPEAwv8MQ6frvo3G5x9NaPwFc1cA2knVQwU6GyGfEszcjgyUR7 PLLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=076gHFKr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id de4si10997730ejc.539.2021.03.10.05.27.12; Wed, 10 Mar 2021 05:27:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=076gHFKr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbhCJN0X (ORCPT + 99 others); Wed, 10 Mar 2021 08:26:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:46188 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233019AbhCJNYr (ORCPT ); Wed, 10 Mar 2021 08:24:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1978A64FF3; Wed, 10 Mar 2021 13:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615382687; bh=2FQ1PFCH+YY7ZD63XupUtwhziafSB8yDlBbjuLUYCjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=076gHFKrSkOSHpydprcjr7RnCb5Ma7zmY5hC85fdpMsHOeLVFSd1V3fYwUdwvD346 h0MtzowYLaaTjiQTCNKB9ATZ+OJNJlbwIkyDYMqgLPCJGD21tv7P2bGR0VM/y6kTnF fE9bmtBly4C4Yv6nCRlTTMOR9GZH/4ISz7iVJoE8= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeffle Xu , Mike Snitzer Subject: [PATCH 5.4 04/24] dm table: fix zoned iterate_devices based device capability checks Date: Wed, 10 Mar 2021 14:24:16 +0100 Message-Id: <20210310132320.683496115@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210310132320.550932445@linuxfoundation.org> References: <20210310132320.550932445@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Jeffle Xu commit 24f6b6036c9eec21191646930ad42808e6180510 upstream. Fix dm_table_supports_zoned_model() and invert logic of both iterate_devices_callout_fn so that all devices' zoned capabilities are properly checked. Add one more parameter to dm_table_any_dev_attr(), which is actually used as the @data parameter of iterate_devices_callout_fn, so that dm_table_matches_zone_sectors() can be replaced by dm_table_any_dev_attr(). Fixes: dd88d313bef02 ("dm table: add zoned block devices validation") Cc: stable@vger.kernel.org Signed-off-by: Jeffle Xu Signed-off-by: Mike Snitzer [jeffle: also convert partial completion check] Signed-off-by: Greg Kroah-Hartman --- drivers/md/dm-table.c | 50 +++++++++++++++++--------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -1397,10 +1397,10 @@ struct dm_target *dm_table_find_target(s * should use the iteration structure like dm_table_supports_nowait() or * dm_table_supports_discards(). Or introduce dm_table_all_devs_attr() that * uses an @anti_func that handle semantics of counter examples, e.g. not - * capable of something. So: return !dm_table_any_dev_attr(t, anti_func); + * capable of something. So: return !dm_table_any_dev_attr(t, anti_func, data); */ static bool dm_table_any_dev_attr(struct dm_table *t, - iterate_devices_callout_fn func) + iterate_devices_callout_fn func, void *data) { struct dm_target *ti; unsigned int i; @@ -1409,7 +1409,7 @@ static bool dm_table_any_dev_attr(struct ti = dm_table_get_target(t, i); if (ti->type->iterate_devices && - ti->type->iterate_devices(ti, func, NULL)) + ti->type->iterate_devices(ti, func, data)) return true; } @@ -1452,13 +1452,13 @@ bool dm_table_has_no_data_devices(struct return true; } -static int device_is_zoned_model(struct dm_target *ti, struct dm_dev *dev, - sector_t start, sector_t len, void *data) +static int device_not_zoned_model(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) { struct request_queue *q = bdev_get_queue(dev->bdev); enum blk_zoned_model *zoned_model = data; - return q && blk_queue_zoned_model(q) == *zoned_model; + return !q || blk_queue_zoned_model(q) != *zoned_model; } static bool dm_table_supports_zoned_model(struct dm_table *t, @@ -1475,37 +1475,20 @@ static bool dm_table_supports_zoned_mode return false; if (!ti->type->iterate_devices || - !ti->type->iterate_devices(ti, device_is_zoned_model, &zoned_model)) + ti->type->iterate_devices(ti, device_not_zoned_model, &zoned_model)) return false; } return true; } -static int device_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev, - sector_t start, sector_t len, void *data) +static int device_not_matches_zone_sectors(struct dm_target *ti, struct dm_dev *dev, + sector_t start, sector_t len, void *data) { struct request_queue *q = bdev_get_queue(dev->bdev); unsigned int *zone_sectors = data; - return q && blk_queue_zone_sectors(q) == *zone_sectors; -} - -static bool dm_table_matches_zone_sectors(struct dm_table *t, - unsigned int zone_sectors) -{ - struct dm_target *ti; - unsigned i; - - for (i = 0; i < dm_table_get_num_targets(t); i++) { - ti = dm_table_get_target(t, i); - - if (!ti->type->iterate_devices || - !ti->type->iterate_devices(ti, device_matches_zone_sectors, &zone_sectors)) - return false; - } - - return true; + return !q || blk_queue_zone_sectors(q) != *zone_sectors; } static int validate_hardware_zoned_model(struct dm_table *table, @@ -1525,7 +1508,7 @@ static int validate_hardware_zoned_model if (!zone_sectors || !is_power_of_2(zone_sectors)) return -EINVAL; - if (!dm_table_matches_zone_sectors(table, zone_sectors)) { + if (dm_table_any_dev_attr(table, device_not_matches_zone_sectors, &zone_sectors)) { DMERR("%s: zone sectors is not consistent across all devices", dm_device_name(table->md)); return -EINVAL; @@ -1742,7 +1725,7 @@ static int device_is_partial_completion( static bool dm_table_does_not_support_partial_completion(struct dm_table *t) { - return !dm_table_any_dev_attr(t, device_is_partial_completion); + return !dm_table_any_dev_attr(t, device_is_partial_completion, NULL); } static int device_not_write_same_capable(struct dm_target *ti, struct dm_dev *dev, @@ -1909,11 +1892,11 @@ void dm_table_set_restrictions(struct dm else blk_queue_flag_clear(QUEUE_FLAG_DAX, q); - if (dm_table_any_dev_attr(t, device_dax_write_cache_enabled)) + if (dm_table_any_dev_attr(t, device_dax_write_cache_enabled, NULL)) dax_write_cache(t->md->dax_dev, true); /* Ensure that all underlying devices are non-rotational. */ - if (dm_table_any_dev_attr(t, device_is_rotational)) + if (dm_table_any_dev_attr(t, device_is_rotational, NULL)) blk_queue_flag_clear(QUEUE_FLAG_NONROT, q); else blk_queue_flag_set(QUEUE_FLAG_NONROT, q); @@ -1932,7 +1915,7 @@ void dm_table_set_restrictions(struct dm * them as well. Only targets that support iterate_devices are considered: * don't want error, zero, etc to require stable pages. */ - if (dm_table_any_dev_attr(t, device_requires_stable_pages)) + if (dm_table_any_dev_attr(t, device_requires_stable_pages, NULL)) q->backing_dev_info->capabilities |= BDI_CAP_STABLE_WRITES; else q->backing_dev_info->capabilities &= ~BDI_CAP_STABLE_WRITES; @@ -1943,7 +1926,8 @@ void dm_table_set_restrictions(struct dm * Clear QUEUE_FLAG_ADD_RANDOM if any underlying device does not * have it set. */ - if (blk_queue_add_random(q) && dm_table_any_dev_attr(t, device_is_not_random)) + if (blk_queue_add_random(q) && + dm_table_any_dev_attr(t, device_is_not_random, NULL)) blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q); /*