From nobody Sun May 10 15:44:52 2026 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 DEE06C433F5 for ; Fri, 29 Apr 2022 15:22:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378315AbiD2PZa (ORCPT ); Fri, 29 Apr 2022 11:25:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241558AbiD2PZ2 (ORCPT ); Fri, 29 Apr 2022 11:25:28 -0400 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6ABB5689A4; Fri, 29 Apr 2022 08:22:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1651245727; x=1682781727; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=xenmPUOXW+RZJN9qBuvo/3MkIoPU8IrRSy9rcS8hUiY=; b=UeM6p+50yGpDPgGq8Xz9wtdT2t35h45DaXetIDo5DRLpncv3FHq3tOuC CKrcDvKDOJztYFB4LgvmE7cqwmxEwsLXzR6Jc/ogGiElGounW7+BPPjX/ Ehz3EZiveGlf+R31BRHnaXwWtWVfJTFEpKJ2fV0ykUqDrkrpM2BiF6Cli VTnsHMHzPYUccOOr075dPHfxLywFL1vSU2wVbtqrkiYoSRNwT1Hk1Xog0 V5XPBFqbWXBXs3xijrDaeKX9E6KyRwqK5AJE/87AOa3/LrXUHB1jqXJVf BjYVGK+V5QtvN519jgUR0iGFxPV8Pk86e2WW24Ocrrwc5d5Bg7cHy54bP w==; From: Vincent Whitchurch To: Ulf Hansson CC: , , , Vincent Whitchurch , , Subject: [PATCH] mmc: core: support zeroout using TRIM Date: Fri, 29 Apr 2022 17:21:18 +0200 Message-ID: <20220429152118.3617303-1-vincent.whitchurch@axis.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If the device supports TRIM and indicates that it erases to zeros, we can use it to support hardware offloading of REQ_OP_WRITE_ZEROES. Signed-off-by: Vincent Whitchurch Tested-by: Jon Hunter --- Notes: https://lore.kernel.org/lkml/20160303182146.GG9772@thunk.org/ seems to = agree that BLKZEROOUT can use TRIM on eMMC. =20 BLKDISCARD uses DISCARD when available so it can't be used to send TRIM. =20 If TRIM should not be used for BLKZEROOUT for some reason I guess the o= nly way is to use MMC_IOC_MULTI_CMD like in this commit in mmc-utils but that's= a rather low-level interface: =20 https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/commit/?id=3D43= 282e80e174cc73b09b81a4d17cb3a7b4dc5cfc drivers/mmc/core/block.c | 26 ++++++++++++++++++++++---- drivers/mmc/core/queue.c | 2 ++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index 506dc900f5c7..0398b205a285 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -126,6 +126,7 @@ struct mmc_blk_data { #define MMC_BLK_DISCARD BIT(2) #define MMC_BLK_SECDISCARD BIT(3) #define MMC_BLK_CQE_RECOVERY BIT(4) +#define MMC_BLK_TRIM BIT(5) =20 /* * Only set in main mmc_blk_data associated @@ -1090,12 +1091,13 @@ static void mmc_blk_issue_drv_op(struct mmc_queue *= mq, struct request *req) blk_mq_end_request(req, ret ? BLK_STS_IOERR : BLK_STS_OK); } =20 -static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request = *req) +static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *r= eq, + int type, unsigned int erase_arg) { struct mmc_blk_data *md =3D mq->blkdata; struct mmc_card *card =3D md->queue.card; unsigned int from, nr; - int err =3D 0, type =3D MMC_BLK_DISCARD; + int err =3D 0; blk_status_t status =3D BLK_STS_OK; =20 if (!mmc_can_erase(card)) { @@ -1111,13 +1113,13 @@ static void mmc_blk_issue_discard_rq(struct mmc_que= ue *mq, struct request *req) if (card->quirks & MMC_QUIRK_INAND_CMD38) { err =3D mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, INAND_CMD38_ARG_EXT_CSD, - card->erase_arg =3D=3D MMC_TRIM_ARG ? + erase_arg =3D=3D MMC_TRIM_ARG ? INAND_CMD38_ARG_TRIM : INAND_CMD38_ARG_ERASE, card->ext_csd.generic_cmd6_time); } if (!err) - err =3D mmc_erase(card, from, nr, card->erase_arg); + err =3D mmc_erase(card, from, nr, erase_arg); } while (err =3D=3D -EIO && !mmc_blk_reset(md, card->host, type)); if (err) status =3D BLK_STS_IOERR; @@ -1127,6 +1129,19 @@ static void mmc_blk_issue_discard_rq(struct mmc_queu= e *mq, struct request *req) blk_mq_end_request(req, status); } =20 +static void mmc_blk_issue_trim_rq(struct mmc_queue *mq, struct request *re= q) +{ + mmc_blk_issue_erase_rq(mq, req, MMC_BLK_TRIM, MMC_TRIM_ARG); +} + +static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request = *req) +{ + struct mmc_blk_data *md =3D mq->blkdata; + struct mmc_card *card =3D md->queue.card; + + mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg); +} + static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, struct request *req) { @@ -2327,6 +2342,9 @@ enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue = *mq, struct request *req) case REQ_OP_SECURE_ERASE: mmc_blk_issue_secdiscard_rq(mq, req); break; + case REQ_OP_WRITE_ZEROES: + mmc_blk_issue_trim_rq(mq, req); + break; case REQ_OP_FLUSH: mmc_blk_issue_flush(mq, req); break; diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index c69b2d9df6f1..bbe2ea829ea7 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -191,6 +191,8 @@ static void mmc_queue_setup_discard(struct request_queu= e *q, q->limits.discard_granularity =3D SECTOR_SIZE; if (mmc_can_secure_erase_trim(card)) blk_queue_flag_set(QUEUE_FLAG_SECERASE, q); + if (mmc_can_trim(card) && card->erased_byte =3D=3D 0) + blk_queue_max_write_zeroes_sectors(q, max_discard); } =20 static unsigned short mmc_get_max_segments(struct mmc_host *host) --=20 2.34.1