From patchwork Tue Apr 23 20:02:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Dasu X-Patchwork-Id: 13640616 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FBDB14198A for ; Tue, 23 Apr 2024 20:02:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713902565; cv=none; b=M4fLKOzzAYCZoLUwKcheBGy11IO1coVYL/rHvQIWyvcg1Sc3EEmDIx/HdJk1XEFTXBvZpawChglekYyra3qX+hU7EizntytkwGYug0Kp9Z7GTbiXXvrW04cwN48KnZqK8okf+WEFP4YukP8OTNY8yEO2Ulsgisik+ZLgOrOrbe8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713902565; c=relaxed/simple; bh=1jdZkbQhC4/v9Esi0hWpLiKGXFdBsI04OMiMG3Mz+Ik=; h=From:To:Cc:Subject:Date:Message-Id:Content-Type; b=TdzXVCPFE0S+VE4X+aFgQjI5QBS5u/T9QFAdrGQSGzZ38a29GO0aMvcDQt7+u5FJ6K3kkb61X9N2h5O8XdQZadBydbnkxdp08CWi/kYFtoMIcC4Hl/Dxx5LrvYTh9hSHvhuQgLtLvDOjyhPenVHklhC4zpljREMjMz/w7eR2ROI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=gzp/UIL4; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="gzp/UIL4" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3bbbc6e51d0so3077372b6e.3 for ; Tue, 23 Apr 2024 13:02:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1713902563; x=1714507363; darn=vger.kernel.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=07pU25ESlRlyhlNH3OzHCKX+S+tOmmXyQhNzps/XQcY=; b=gzp/UIL4DBb08k8HXWtAm/49gQG9QwaVsC6YmofyvnEu/aGx9HVD+R4IFReLID9Vxz 3xc8oV3Yz919l0Bwheyf7JjFWNKcXgevnunGG+7JMhs/zrE5qw0oIV3DR/K7x9yvivgg MWb8Qn+5axjqifURqNoH64c4MG/DHai1Xi8iE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713902563; x=1714507363; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=07pU25ESlRlyhlNH3OzHCKX+S+tOmmXyQhNzps/XQcY=; b=XIofA+ncA1ccuiAsVqH7umNsMtidie7KguN5whM6izvPGTX4ZwWS3jDyiqOuwDbfLs 9x2x2rd5YR3jKifg7sT0aQPvGatlfwFsYCN4hmQA5wQMlf45q5+oE9ak4xp3cezL1K+9 u2KtEDihwxD+xa2yKBqe6iEID3aE5vDMS5Y+p54nk1TqcVFi7ltpV5qy+eXZIUiaRy4i hSstXz4iQErWqFEfK+b0OuSCCkPND1Z5Q1xxigFikwoG4KmKcMKEYI+lokGdR+Fd0XHY rEIHGf2DRcuvmHL2aq/oREV51rRrLG0w/ML6LNXaTfG8d3q3q0CWPioOgJcvv6DlWXq4 SJ6Q== X-Forwarded-Encrypted: i=1; AJvYcCWo9Cssk31uUV/7b3sc+ymykbOjvu9xQxQL7ldaG2HCoR25PbZB3aYQhFgfihu60krQSpzQWLGbQeYLeF6kXH3ballv0wnfS+yY X-Gm-Message-State: AOJu0YzE1aGk0CBLp5Y2gLcfpt+GUEL+MUqdWvtGsv6sSpQioYUlJ3Mr VgKe+CVuv6eBN5MrXLhmIFOuJf19D8Vh537U/HEodFxJ5Gx+ffU3H6gB78cl8w== X-Google-Smtp-Source: AGHT+IEXahaTsfv+ACjW5Jo0pP4vpFIjBRKHYHLU0Zox+Ps2SKJcI5sW4PoaEsMwUsJ1jmxh3by/OA== X-Received: by 2002:a05:6870:a115:b0:22a:828b:57ea with SMTP id m21-20020a056870a11500b0022a828b57eamr344225oae.53.1713902563069; Tue, 23 Apr 2024 13:02:43 -0700 (PDT) Received: from mail.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id u10-20020a05620a084a00b0078a04882ac2sm5482256qku.53.2024.04.23.13.02.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Apr 2024 13:02:42 -0700 (PDT) From: Kamal Dasu To: ulf.hansson@linaro.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, ludovic.barre@st.com Cc: f.fainelli@gmail.com, bcm-kernel-feedback-list@broadcom.com, Kamal Dasu Subject: [PATCH v1] mmc: core: check R1_STATUS for erase/trim/discard Date: Tue, 23 Apr 2024 16:02:34 -0400 Message-Id: <20240423200234.21480-1-kamal.dasu@broadcom.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: When erase/trim/discard completion was converted to mmc_poll_for_busy(), optional ->card_busy() host ops support was added. sdhci card->busy() could return busy for long periods to cause mmc_do_erase() to block during discard operation as shown below during mkfs.f2fs : Info: [/dev/mmcblk1p9] Discarding device [ 39.597258] sysrq: Show Blocked State [ 39.601183] task:mkfs.f2fs state:D stack:0 pid:1561 tgid:1561 ppid:1542 flags:0x0000000d [ 39.610609] Call trace: [ 39.613098] __switch_to+0xd8/0xf4 [ 39.616582] __schedule+0x440/0x4f4 [ 39.620137] schedule+0x2c/0x48 [ 39.623341] schedule_hrtimeout_range_clock+0xe0/0x114 [ 39.628562] schedule_hrtimeout_range+0x10/0x18 [ 39.633169] usleep_range_state+0x5c/0x90 [ 39.637253] __mmc_poll_for_busy+0xec/0x128 [ 39.641514] mmc_poll_for_busy+0x48/0x70 [ 39.645511] mmc_do_erase+0x1ec/0x210 [ 39.649237] mmc_erase+0x1b4/0x1d4 [ 39.652701] mmc_blk_mq_issue_rq+0x35c/0x6ac [ 39.657037] mmc_mq_queue_rq+0x18c/0x214 [ 39.661022] blk_mq_dispatch_rq_list+0x3a8/0x528 [ 39.665722] __blk_mq_sched_dispatch_requests+0x3a0/0x4ac [ 39.671198] blk_mq_sched_dispatch_requests+0x28/0x5c [ 39.676322] blk_mq_run_hw_queue+0x11c/0x12c [ 39.680668] blk_mq_flush_plug_list+0x200/0x33c [ 39.685278] blk_add_rq_to_plug+0x68/0xd8 [ 39.689365] blk_mq_submit_bio+0x3a4/0x458 [ 39.693539] __submit_bio+0x1c/0x80 [ 39.697096] submit_bio_noacct_nocheck+0x94/0x174 [ 39.701875] submit_bio_noacct+0x1b0/0x22c [ 39.706042] submit_bio+0xac/0xe8 [ 39.709424] blk_next_bio+0x4c/0x5c [ 39.712973] blkdev_issue_secure_erase+0x118/0x170 [ 39.717835] blkdev_common_ioctl+0x374/0x728 [ 39.722175] blkdev_ioctl+0x8c/0x2b0 [ 39.725816] vfs_ioctl+0x24/0x40 [ 39.729117] __arm64_sys_ioctl+0x5c/0x8c [ 39.733114] invoke_syscall+0x68/0xec [ 39.736839] el0_svc_common.constprop.0+0x70/0xd8 [ 39.741609] do_el0_svc+0x18/0x20 [ 39.744981] el0_svc+0x68/0x94 [ 39.748107] el0t_64_sync_handler+0x88/0x124 [ 39.752455] el0t_64_sync+0x168/0x16c Fix skips the card->busy() and uses MMC_SEND_STATUS and R1_STATUS check for MMC_ERASE_BUSY busy_cmd case in the mmc_busy_cb() function. Fixes: 0d84c3e6a5b2 ("mmc: core: Convert to mmc_poll_for_busy() for erase/trim/discard") Signed-off-by: Kamal Dasu Reviewed-by: Florian Fainelli --- drivers/mmc/core/mmc_ops.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 3b3adbddf664..603fbd78c342 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -464,7 +464,8 @@ static int mmc_busy_cb(void *cb_data, bool *busy) u32 status = 0; int err; - if (data->busy_cmd != MMC_BUSY_IO && host->ops->card_busy) { + if (data->busy_cmd != MMC_BUSY_IO && + data->busy_cmd != MMC_BUSY_ERASE && host->ops->card_busy) { *busy = host->ops->card_busy(host); return 0; }