From patchwork Thu Nov 3 15:25:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13030394 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 590A0C43219 for ; Thu, 3 Nov 2022 15:26:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231484AbiKCP0R (ORCPT ); Thu, 3 Nov 2022 11:26:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231544AbiKCP0P (ORCPT ); Thu, 3 Nov 2022 11:26:15 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 569A222C for ; Thu, 3 Nov 2022 08:26:14 -0700 (PDT) Received: from pps.filterd (m0148460.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A3CAdCH010471 for ; Thu, 3 Nov 2022 08:26:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=VRuJvXeK/qEkN/Gz3nNXuaOmUIBiKtT2mf4BKmu/TR8=; b=ONishvUOt71bIdKPstDsIY36NzfbO1FOtWI3cBE0OsRpV6EGkjHTy71axBOYQd5OPQ41 UsE3P3HujBXqx6N//JhftFb2LKR7gV804sdTW7JXI/60FohLBwvu64obtyp3RaqIktca TMiiNpOVRy+QOVHSloLj2teBNuNfdHJeK1do1SjEtR1QXUmUhc9EZbF4hTDHGcRl/+3v ddxXnCkrS14jhg/Om6s9iFvZ7C6M6Mvdd4VB+0OMmQs2QGef/FhdHlEEG3dozHIgOgtk GngjihC6HTjHW37wQv/SOoFFM+c1EBT/o6C3hKEpZ1RizGSou4tc+zbMAlcpKtC8NLfP wA== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kmddh1kqu-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 03 Nov 2022 08:26:13 -0700 Received: from twshared6758.06.ash9.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 08:26:12 -0700 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 216FFAA9A075; Thu, 3 Nov 2022 08:26:00 -0700 (PDT) From: Keith Busch To: , , CC: , , , , Keith Busch Subject: [PATCH 1/3] block: make dma_alignment a stacking queue_limit Date: Thu, 3 Nov 2022 08:25:57 -0700 Message-ID: <20221103152559.1909328-2-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221103152559.1909328-1-kbusch@meta.com> References: <20221103152559.1909328-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: 1kMdJqFEVu7TgVM0V8LXDvKd-UOTAYms X-Proofpoint-GUID: 1kMdJqFEVu7TgVM0V8LXDvKd-UOTAYms X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-03_04,2022-11-03_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Keith Busch Device mappers had always been getting the default 511 dma mask, but the underlying device might have a larger alignment requirement. Since this value is used to determine alloweable direct-io alignment, this needs to be a stackable limit. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- block/blk-core.c | 1 - block/blk-settings.c | 8 +++++--- include/linux/blkdev.h | 15 ++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/block/blk-core.c b/block/blk-core.c index 3a2ed8dadf73..9d6a947024ea 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -418,7 +418,6 @@ struct request_queue *blk_alloc_queue(int node_id) PERCPU_REF_INIT_ATOMIC, GFP_KERNEL)) goto fail_stats; - blk_queue_dma_alignment(q, 511); blk_set_default_limits(&q->limits); q->nr_requests = BLKDEV_DEFAULT_RQ; diff --git a/block/blk-settings.c b/block/blk-settings.c index 8bb9eef5310e..4949ed3ce7c9 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -57,6 +57,7 @@ void blk_set_default_limits(struct queue_limits *lim) lim->misaligned = 0; lim->zoned = BLK_ZONED_NONE; lim->zone_write_granularity = 0; + lim->dma_alignment = 511; } EXPORT_SYMBOL(blk_set_default_limits); @@ -600,6 +601,7 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, t->io_min = max(t->io_min, b->io_min); t->io_opt = lcm_not_zero(t->io_opt, b->io_opt); + t->dma_alignment = max(t->dma_alignment, b->dma_alignment); /* Set non-power-of-2 compatible chunk_sectors boundary */ if (b->chunk_sectors) @@ -773,7 +775,7 @@ EXPORT_SYMBOL(blk_queue_virt_boundary); **/ void blk_queue_dma_alignment(struct request_queue *q, int mask) { - q->dma_alignment = mask; + q->limits.dma_alignment = mask; } EXPORT_SYMBOL(blk_queue_dma_alignment); @@ -795,8 +797,8 @@ void blk_queue_update_dma_alignment(struct request_queue *q, int mask) { BUG_ON(mask > PAGE_SIZE); - if (mask > q->dma_alignment) - q->dma_alignment = mask; + if (mask > q->limits.dma_alignment) + q->limits.dma_alignment = mask; } EXPORT_SYMBOL(blk_queue_update_dma_alignment); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 854b4745cdd1..69ee5ea29e2f 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -310,6 +310,13 @@ struct queue_limits { unsigned char discard_misaligned; unsigned char raid_partial_stripes_expensive; enum blk_zoned_model zoned; + + /* + * Drivers that set dma_alignment to less than 511 must be prepared to + * handle individual bvec's that are not a multiple of a SECTOR_SIZE + * due to possible offsets. + */ + unsigned int dma_alignment; }; typedef int (*report_zones_cb)(struct blk_zone *zone, unsigned int idx, @@ -455,12 +462,6 @@ struct request_queue { unsigned long nr_requests; /* Max # of requests */ unsigned int dma_pad_mask; - /* - * Drivers that set dma_alignment to less than 511 must be prepared to - * handle individual bvec's that are not a multiple of a SECTOR_SIZE - * due to possible offsets. - */ - unsigned int dma_alignment; #ifdef CONFIG_BLK_INLINE_ENCRYPTION struct blk_crypto_profile *crypto_profile; @@ -1318,7 +1319,7 @@ static inline sector_t bdev_zone_sectors(struct block_device *bdev) static inline int queue_dma_alignment(const struct request_queue *q) { - return q ? q->dma_alignment : 511; + return q ? q->limits.dma_alignment : 511; } static inline unsigned int bdev_dma_alignment(struct block_device *bdev) From patchwork Thu Nov 3 15:25:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13030393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AB8AC43217 for ; Thu, 3 Nov 2022 15:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231673AbiKCP0P (ORCPT ); Thu, 3 Nov 2022 11:26:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231657AbiKCP0O (ORCPT ); Thu, 3 Nov 2022 11:26:14 -0400 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 33ED81A213 for ; Thu, 3 Nov 2022 08:26:14 -0700 (PDT) Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.17.1.5/8.17.1.5) with ESMTP id 2A3Ehd6s026649 for ; Thu, 3 Nov 2022 08:26:13 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=aqbEu7FwfUoPtiNVDBTBB/4tMMl0CFp26nCKV0L1wz0=; b=XcF/B2vl8J6JDXEg6039YQL5N+u2aZfmH8NXFW4GbEKdjbdK+tPkiGwETUpFab7M8cgD ngJcQ+j8TZVLG1iDEEcS7dHZG5HT4QqySOqDiMQ/PhY1Dkw5kjaX2Vd3tkjUWU8ptNmg UD+a3F/yIXsH78HKmiTjC8tkKNxeJSKDcfN3iwjPrZ6ZtW6v7uYOImKIaVXxKax7BKO+ 1zMzBq1RvVMPDqc3w7f4I/fDS0uC4JxoWO7aZ/pArlQ+3vqhBwL+nlKW18fzgQbAk0K8 VNrqbR67zjUJTQs/0dCsj7HtuEMHbEzoa0R7btLIrMlmSapZAwPfm2g3xPdHROCOxMhZ 6w== Received: from mail.thefacebook.com ([163.114.132.120]) by m0001303.ppops.net (PPS) with ESMTPS id 3kkshd3xke-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 03 Nov 2022 08:26:13 -0700 Received: from twshared25017.14.frc2.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 08:26:11 -0700 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 6AAF0AA9A07C; Thu, 3 Nov 2022 08:26:00 -0700 (PDT) From: Keith Busch To: , , CC: , , , , Keith Busch Subject: [PATCH 2/3] dm-crypt: provide dma_alignment limit in io_hints Date: Thu, 3 Nov 2022 08:25:58 -0700 Message-ID: <20221103152559.1909328-3-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221103152559.1909328-1-kbusch@meta.com> References: <20221103152559.1909328-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: uYr3rA_vJ4HnCHBiHZJWWWvuNbu6aYfq X-Proofpoint-GUID: uYr3rA_vJ4HnCHBiHZJWWWvuNbu6aYfq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-03_04,2022-11-03_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Keith Busch This device mapper needs bio vectors to be sized and memory aligned to the logical block size. Set the minimum required queue limit accordingly. Fixes: b1a000d3b8ec5 ("block: relax direct io memory alignment") Reportred-by: Eric Biggers Reported-by: Dmitrii Tcvetkov Signed-off-by: Keith Busch --- drivers/md/dm-crypt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 159c6806c19b..2653516bcdef 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c @@ -3630,6 +3630,7 @@ static void crypt_io_hints(struct dm_target *ti, struct queue_limits *limits) limits->physical_block_size = max_t(unsigned, limits->physical_block_size, cc->sector_size); limits->io_min = max_t(unsigned, limits->io_min, cc->sector_size); + limits->dma_alignment = limits->logical_block_size - 1; } static struct target_type crypt_target = { From patchwork Thu Nov 3 15:25:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13030391 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23178C433FE for ; Thu, 3 Nov 2022 15:26:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230294AbiKCP0O (ORCPT ); Thu, 3 Nov 2022 11:26:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35914 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231404AbiKCP0N (ORCPT ); Thu, 3 Nov 2022 11:26:13 -0400 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 477EC1A234 for ; Thu, 3 Nov 2022 08:26:12 -0700 (PDT) Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2A3EpUfr014639 for ; Thu, 3 Nov 2022 08:26:11 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=B4kQCEO7e1uaX4xOqHmVbkBneaeAJi2KeOM4H2ft5PE=; b=OhYPCjP8+88uPuXH4sviHYSfMgTE1FfzVB/AwTzYt1ndtIR7yOK5HqrliXbEPYGSd37z q5+wnIFk/Mbq9mCwT7dPVvzrH4/lD0toEc5E4MhgBf6bf2+mXf28LNXFLcdL1R3R6PEL 5xlt/QvrSI8qu9sTj37gGBIEQJc7lo1Z+oG33cWDGOVuWYkKPOio504baf05vSmudbVi ojXCt+PI5/sj42jQRcLEdMA7pXzqQ1Ju5pS+XWK11I4vCNBgteiwtxP3f/Rr+oeYGQdr 3H/L0c6X2DdwW3DTPaYmjzaJRRS202o0fXKTtqA79OoJhV4G4FKnlCeI6Y/H2iE/AlcM mQ== Received: from maileast.thefacebook.com ([163.114.130.3]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3kkva1a8hy-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 03 Nov 2022 08:26:10 -0700 Received: from twshared14438.02.ash8.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::e) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 3 Nov 2022 08:26:09 -0700 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id BA164AA9A07E; Thu, 3 Nov 2022 08:26:00 -0700 (PDT) From: Keith Busch To: , , CC: , , , , Keith Busch Subject: [PATCH 3/3] block: make blk_set_default_limits() private Date: Thu, 3 Nov 2022 08:25:59 -0700 Message-ID: <20221103152559.1909328-4-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221103152559.1909328-1-kbusch@meta.com> References: <20221103152559.1909328-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: Z4luO0HVsW2z_gTgxW_f9tBsSsEmtdqM X-Proofpoint-ORIG-GUID: Z4luO0HVsW2z_gTgxW_f9tBsSsEmtdqM X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-03_04,2022-11-03_01,2022-06-22_01 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org From: Keith Busch There are no external users of this function. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- block/blk-settings.c | 1 - block/blk.h | 1 + include/linux/blkdev.h | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index 4949ed3ce7c9..8ac1038d0c79 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -59,7 +59,6 @@ void blk_set_default_limits(struct queue_limits *lim) lim->zone_write_granularity = 0; lim->dma_alignment = 511; } -EXPORT_SYMBOL(blk_set_default_limits); /** * blk_set_stacking_limits - set default limits for stacking devices diff --git a/block/blk.h b/block/blk.h index d259d1da4cb4..4849a2efa4c5 100644 --- a/block/blk.h +++ b/block/blk.h @@ -330,6 +330,7 @@ void blk_rq_set_mixed_merge(struct request *rq); bool blk_rq_merge_ok(struct request *rq, struct bio *bio); enum elv_merge blk_try_merge(struct request *rq, struct bio *bio); +void blk_set_default_limits(struct queue_limits *lim); int blk_dev_init(void); /* diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 69ee5ea29e2f..704bc175a732 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -939,7 +939,6 @@ extern void blk_queue_io_min(struct request_queue *q, unsigned int min); extern void blk_limits_io_opt(struct queue_limits *limits, unsigned int opt); extern void blk_queue_io_opt(struct request_queue *q, unsigned int opt); extern void blk_set_queue_depth(struct request_queue *q, unsigned int depth); -extern void blk_set_default_limits(struct queue_limits *lim); extern void blk_set_stacking_limits(struct queue_limits *lim); extern int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, sector_t offset);