From mboxrd@z Thu Jan 1 00:00:00 1970 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 0898AC7EE2E for ; Mon, 12 Jun 2023 14:56:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238235AbjFLO4h (ORCPT ); Mon, 12 Jun 2023 10:56:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238173AbjFLO4e (ORCPT ); Mon, 12 Jun 2023 10:56:34 -0400 Received: from mail-yw1-x112c.google.com (mail-yw1-x112c.google.com [IPv6:2607:f8b0:4864:20::112c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B982107 for ; Mon, 12 Jun 2023 07:56:32 -0700 (PDT) Received: by mail-yw1-x112c.google.com with SMTP id 00721157ae682-56cf00a04e5so25828187b3.0 for ; Mon, 12 Jun 2023 07:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1686581791; x=1689173791; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=h0WDTg+HDUuttQMqiXLv1SDFziFffdjMtuynIytsK/o=; b=GsRh5hpF/fBfsQGogbVYOq6koMxVFT8A97W3kqlbJhS30+dUN4Br+FfxOHRDFHpF0D WKg4xfgf0prNntOuvRJAZly0YwdCM4BTB0h2iRG/lT3Kgb4fz85XBLkdIgdq/WV0c/y/ zddq/ZEvbCz/Z0R+3DvOxDTjsJF6219k0RPFiUKGkvC2NcWgMx9LNKVsBuizGWNPaEHZ IHJ4p7cAQkG2RVhqU3itRuyjcbfotNhSuRFahtefr3sUelrrO7Ub8Cm0LHo/e29sZbYG KY93Z1hTiGL8xI6uqt2HZ/IybA8/QM6IrpNWN5C0tAmcXSMHUjmq2hNZ9WV6Sgdw1a0i /f0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686581791; x=1689173791; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=h0WDTg+HDUuttQMqiXLv1SDFziFffdjMtuynIytsK/o=; b=IRUPX+G1hzB9LTfX2EeltQu4swQ6xtfoOLH7lz3o80mWlBaVHhqQyspxvOQgDB4t8l 61TsXQz5wayWD9BkAizTUEF6ehRWnOSNmtZ8R3yN8kvxjzTvzXuZs+pGVI+dsqxaAfMR Mq8uyr6h0itKGi1kT2myqJMvc44Yjo8aopT5giP47YNZSWhl6MwdQQ+Lj1YDr61YAd76 JhQiLn6EJM5DA4Ii6pJST4W4xQeWvBSvUPcalL0VSDoPbx9uQmXDSQ8/0XfOBdFyOWs6 nubUdCNdY0vorw//xs/wTiYvknXuNMdjtOLeNmlDUkw4xUUm2cbZEgweWvZoJet9GYCy kliA== X-Gm-Message-State: AC+VfDwv2y3kXfKfbK4pK7BdRwY3TzCc7Qad4Upw6oVkIaMkn9gbZcq7 UCfv8kI1bJYPPYosdljOOqv2XQ3CWUfuvjZouFwxmmk9LZDIw+kHYCM= X-Google-Smtp-Source: ACHHUZ4fIT/hl3S/rpWMX7PcTVTNi6NOciA/zGu82vWNuauc7ajnwQjHMb066vNlUQfG5YpnEkVBAvAFIsFVlM+CmdI= X-Received: by 2002:a0d:d8d7:0:b0:56c:f0c7:90cf with SMTP id a206-20020a0dd8d7000000b0056cf0c790cfmr6007192ywe.48.1686581791125; Mon, 12 Jun 2023 07:56:31 -0700 (PDT) MIME-Version: 1.0 References: <20230329202148.71107-1-dennis@kernel.org> <2023060930-uphold-collie-3ec5@gregkh> In-Reply-To: From: Ulf Hansson Date: Mon, 12 Jun 2023 16:55:55 +0200 Message-ID: Subject: Re: [PATCH v2] mmc: inline the first mmc_scan() on mmc_start_host() To: Dennis Zhou Cc: Greg KH , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Walleij Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 9 Jun 2023 at 09:16, Dennis Zhou wrote: > > Hi Greg, > > On Fri, Jun 09, 2023 at 08:19:51AM +0200, Greg KH wrote: > > On Thu, Jun 08, 2023 at 01:49:00PM -0700, Dennis Zhou wrote: > > > On Fri, May 12, 2023 at 01:42:51PM +0200, Ulf Hansson wrote: > > > > + Linus, > > > > > > > > Hi Dennis, > > > > > > > > On Mon, 3 Apr 2023 at 11:50, Ulf Hansson wrote: > > > > > > > > > > On Fri, 31 Mar 2023 at 20:23, Dennis Zhou wrote: > > > > > > > > > > > > Hi Ulf, > > > > > > > > > > > > On Fri, Mar 31, 2023 at 02:43:10PM +0200, Ulf Hansson wrote: > > > > > > > On Thu, 30 Mar 2023 at 01:48, Dennis Zhou wrote: > > > > > > > > > > > > > > > > When using dm-verity with a data partition on an emmc device, dm-verity > > > > > > > > races with the discovery of attached emmc devices. This is because mmc's > > > > > > > > probing code sets up the host data structure then a work item is > > > > > > > > scheduled to do discovery afterwards. To prevent this race on init, > > > > > > > > let's inline the first call to detection, __mm_scan(), and let > > > > > > > > subsequent detect calls be handled via the workqueue. > > > > > > > > > > > > > > In principle, I don't mind the changes in $subject patch, as long as > > > > > > > it doesn't hurt the overall initialization/boot time. Especially, we > > > > > > > may have more than one mmc-slot being used, so this needs to be well > > > > > > > tested. > > > > > > > > > > > > > > > > > > > I unfortunately don't have a device with multiple mmcs available. Is > > > > > > this something you could help me with? > > > > > > > > > > Yes, I can help to test. Allow me a few days to see what I can do. > > > > > > > > > > Note that, just having one eMMC and one SD card should work too. It > > > > > doesn't have to be multiple eMMCs. > > > > > > > > > > > > > > > > > > Although, more importantly, I fail to understand how this is going to > > > > > > > solve the race condition. Any I/O request to an eMMC or SD requires > > > > > > > the mmc block device driver to be up and running too, which is getting > > > > > > > probed from a separate module/driver that's not part of mmc_rescan(). > > > > > > > > > > > > I believe the call chain is something like this: > > > > > > > > > > > > __mmc_rescan() > > > > > > mmc_rescan_try_freq() > > > > > > mmc_attach_mmc() > > > > > > mmc_add_card() > > > > > > device_add() > > > > > > bus_probe_device() > > > > > > mmc_blk_probe() > > > > > > > > > > > > The initial calling of this is the host probe. So effectively if there > > > > > > is a card attached, we're inlining the device_add() call for the card > > > > > > attached rather than waiting for the workqueue item to kick off. > > > > > > > > > > > > dm is a part of late_initcall() while mmc is a module_init(), when built > > > > > > in becoming a device_initcall(). So this solves a race via the initcall > > > > > > chain. In the current state, device_initcall() finishes and we move onto > > > > > > the late_initcall() phase. But now, dm is racing with the workqueue to > > > > > > init the attached emmc device. > > > > > > > > > > You certainly have a point! > > > > > > > > > > This should work when the mmc blk module is built-in. Even if that > > > > > doesn't solve the entire problem, it should be a step in the right > > > > > direction. > > > > > > > > > > I will give it some more thinking and run some tests at my side, then > > > > > I will get back to you again. > > > > > > > > > > Kind regards > > > > > Uffe > > > > > > > > > > > > > > > > > > > > > > > > > > > > Signed-off-by: Dennis Zhou > > > > > > > > --- > > > > > > > > Sigh.. fix missing static declaration. > > > > > > > > > > > > > > > > drivers/mmc/core/core.c | 15 +++++++++++---- > > > > > > > > 1 file changed, 11 insertions(+), 4 deletions(-) > > > > > > > > > > > > > > > > diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c > > > > > > > > index 368f10405e13..fda7ee57dee3 100644 > > > > > > > > --- a/drivers/mmc/core/core.c > > > > > > > > +++ b/drivers/mmc/core/core.c > > > > > > > > @@ -2185,10 +2185,8 @@ int mmc_card_alternative_gpt_sector(struct mmc_card *card, sector_t *gpt_sector) > > > > > > > > } > > > > > > > > EXPORT_SYMBOL(mmc_card_alternative_gpt_sector); > > > > > > > > > > > > > > > > -void mmc_rescan(struct work_struct *work) > > > > > > > > +static void __mmc_rescan(struct mmc_host *host) > > > > > > > > { > > > > > > > > - struct mmc_host *host = > > > > > > > > - container_of(work, struct mmc_host, detect.work); > > > > > > > > int i; > > > > > > > > > > > > > > > > if (host->rescan_disable) > > > > > > > > @@ -2249,6 +2247,14 @@ void mmc_rescan(struct work_struct *work) > > > > > > > > mmc_schedule_delayed_work(&host->detect, HZ); > > > > > > > > } > > > > > > > > > > > > > > > > +void mmc_rescan(struct work_struct *work) > > > > > > > > +{ > > > > > > > > + struct mmc_host *host = > > > > > > > > + container_of(work, struct mmc_host, detect.work); > > > > > > > > + > > > > > > > > + __mmc_rescan(host); > > > > > > > > +} > > > > > > > > + > > > > > > > > void mmc_start_host(struct mmc_host *host) > > > > > > > > { > > > > > > > > host->f_init = max(min(freqs[0], host->f_max), host->f_min); > > > > > > > > @@ -2261,7 +2267,8 @@ void mmc_start_host(struct mmc_host *host) > > > > > > > > } > > > > > > > > > > > > > > > > mmc_gpiod_request_cd_irq(host); > > > > > > > > - _mmc_detect_change(host, 0, false); > > > > > > > > + host->detect_change = 1; > > > > > > > > + __mmc_rescan(host); > > > > > > > > } > > > > > > > > > > > > > > > > void __mmc_stop_host(struct mmc_host *host) > > > > > > > > -- > > > > > > > > 2.40.0 > > > > > > > > > > > > > > > > My apologies for the long delay. I finally managed to test this. > > > > > > > > I decided to pick an old arm32 based platform. An ST-Ericsson HREF, > > > > based upon the ux500 SoC. It's quite good to use for these types of > > > > tests as it has two eMMCs soldered, an embedded SDIO (for WiFi) and an > > > > SD-card slot. So in total there are 4 devices that get probed. > > > > > > > > The SDIO card isn't detected properly, but always fails in the similar > > > > way (thus I left it out from the below data). I tested both with and > > > > without an SD card inserted during boot, to get some more data to > > > > compare. These are the summary from my tests: > > > > > > > > v6.4-rc1 without SD card: > > > > ~2.18s - MMC1 (eMMC) > > > > ~3.33s - MMC3 (eMMC) > > > > ~5.91s - kernel boot complete > > > > > > > > v6.4-rc1 with an SD card: > > > > ~2.18s - MMC1 (eMMC) > > > > ~3.45s - MMC3 (eMMC) > > > > ~3.57s - MMC2 (SD) > > > > ~5.76s - kernel boot complete > > > > > > > > v6.4-rc1 + patch without SD card: > > > > ~2.24s - MMC1 (eMMC) > > > > ~3.58s - MMC3 (eMMC) > > > > ~5.96s - kernel boot complete > > > > > > > > v6.4-rc1 + patch with an SD card: > > > > ~2.24s - MMC1 (eMMC) > > > > ~3.73s - MMC2 (SD) > > > > ~3.98s - MMC3 (eMMC) > > > > ~6.73s - kernel boot complete > > > > > > > > By looking at these results, I was kind of surprised. I was thinking > > > > that the asynchronous probe should address the parallelism problem. > > > > Then I discovered that it in fact, hasn't been enabled for the mmci > > > > driver that is being used for this platform. Huh, I was under the > > > > assumption that it has been enabled for all mmc hosts by now. :-) > > > > > > > > Okay, so I am going to run another round of tests, with async probe > > > > enabled for the mmci driver too. I will let you know the results as > > > > soon as I can. > > > > > > > > Kind regards > > > > Uffe > > > > > > Hi Uffe, > > > > > > Kindly this has been way too long for review. It's been over 3 months. > > > What's going on here? I have been busier than usual. My apologies. The main problem was also that I found a problem with the patch, as explained with the numbers above. > > > > > > I think there's a misunderstanding too. Without this fix, the machine > > > doesn't even boot. I'm not sure why perf is the blocking question here. > > > > Well you can not degrade performance of existing machines that work > > today, right? That would be a regression and it seems that you are > > doing that if I read the numbers above correctly. > > > > I agree that we shouldn't degrade performance of existing machines, but > this is a timing bug on existing platforms that have a slow enough cpu > such that emmc doesn't finish probing before dm-verity progresses to > trying to read off the device. In my opinion it's a bit unfair to trade > performance in the common case for not supporting all use cases. I'm > just trying to get my machines to boot without having to carry my own > patch here. > > As a path forward I can add a command line flag as a bool to handle this > and that should hopefully take care of the regresion aspect to this. Let's not go there. To be able to move forward with your suggested approach in $subject patch *and* without causing performance degradations, we need to enable async probe for the mmci host driver too. As I said, I was under the impression that we have already done so for all mmc host drivers by now, but apparently not. So, I have just sent a patch for that [1]. > > > > > Greg, is there another tree I can run this through? > > > > Why would you want to route around a maintainer just to get a patch that > > would have to be reverted applied? :) > > > > What's your advice here as I don't feel like I'm getting adequate > traction with Ulf. I think I've generally been quite patient here > waiting > 3 months for this patch to be reviewed. Sure, you have been patient, but in this case you needed my hands-on help too, to run specific tests. That takes time too. Anyway, unless something unexpected happens, I plan to apply the $subject patch tomorrow after running another round of tests. Kind regards Uffe [1] https://lore.kernel.org/linux-mmc/20230612143730.210390-1-ulf.hansson@linaro.org/