Message ID | 20230124004542.29659-1-ville.syrjala@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1900679wrn; Mon, 23 Jan 2023 17:06:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXta8UuzIUmZdkY5taruRM/tuC7FQR+5HfTc5Zm0gzqHkL3EycN8d2E8SeZpv9iT7aw3qSgy X-Received: by 2002:a05:6a20:8e18:b0:ad:97cc:e957 with SMTP id y24-20020a056a208e1800b000ad97cce957mr65691891pzj.39.1674522395591; Mon, 23 Jan 2023 17:06:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674522395; cv=none; d=google.com; s=arc-20160816; b=ayeY3t1XUhBIFPH1o+0DBjhLmpMkAK0X1AK9wHefkuwxH6EWcTuKfTMGkZQ8JLUuw5 Tdc3Qg0Rb6ggRDRZYeLBvkUQpzz/nqZvhSzBJsmDtdyrOml8ZkXZ4+HyPYIkNwiR0kYh dyrOj/SmScoct1T344YD4AQ+wmc5Foxia9p2SAt69K71kXUPSpubiuFxPm9Za0kEzsza ElIavjCYb7B4m/Yvi/M7DGFd5RxCH+6v6ZU9++E00qmJGVwshbpCKzvJrbigV72P0vR+ U/6DHrbvwoEonFX69r3MF3++tJ1SW9S2N68Hbap+PAghxicnkhTrN2qTAcSWuAKjpN5+ KMpQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=npwpQy/HVI20kutjln5Lf2b88ckv+Ow8Vy3KUkf6Gug=; b=ACm+Lazegdax/cJWlc8K03AXtH1ToB/R3OgF2T+JJ0hEefLdLiAoyw9xQvmlncCUiS NTwKqntbFE+BT2boGv3SFsJH00CQXCIGI8CLH4bs+JrKq4MZwsMxR9sLs2bVYInYW3fm OWfQSm0myuGvdta//yi8VjXQmANN94nSCnC5U35oxZhqPeLaSCVATRntKAhEZWQEBTrD OYGU1ojiZkfUSqzPSGl9XB94XiBztJLDfU2XaedbDAgQYY/5XTibaXR08hV1LLEVmSUq 1+7ECyIIlWJJRAfUUmvtfIbKHIPgJ7LDUEySg0bY2/1vDz2a69GdKHEjkun2e9v0T1Xa Q2PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=g62PvPkE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w64-20020a628243000000b0058db16d611csi666198pfd.21.2023.01.23.17.06.14; Mon, 23 Jan 2023 17:06:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=g62PvPkE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231840AbjAXApw (ORCPT <rfc822;rust.linux@gmail.com> + 99 others); Mon, 23 Jan 2023 19:45:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229589AbjAXApv (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 23 Jan 2023 19:45:51 -0500 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E90ED2ED4C for <linux-kernel@vger.kernel.org>; Mon, 23 Jan 2023 16:45:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1674521151; x=1706057151; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=/wzLkEnAqdDrA9q6+UgWLb7nmAJz6Hrh36W9SoY5p20=; b=g62PvPkEEFqssFoe3caq/VT/BFaQnWKOAXKLHYQANXOEwc22WudQ4DMh 1jagOcI8zJRD6ir+agT7+878N2agyx2Wf20IW8a6q6QLiofqbJJ1KpQYx rZlZ0zRto6QR15NHxq5vUfM4JpuDvuu2XHu+xYi8ovecisk4laEurncsK zbznZpODGgwbMKE5fQ6iSABuGi7fMLi64Py1Ofppzh7yg/Auf861h9jR+ JwOmrRTDiLfOqPyUtlzU0/TpKIsECBmkj2L+7E9kcXtFp5SWG8iP+MMhS L4GFriPXhJU9Qqw1uSrRkr9m9gF8Bhwx/a+evDkx/dJDFQ+VqqmG0KCG2 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="314101089" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="314101089" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jan 2023 16:45:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10599"; a="611855604" X-IronPort-AV: E=Sophos;i="5.97,240,1669104000"; d="scan'208";a="611855604" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.55]) by orsmga003.jf.intel.com with SMTP; 23 Jan 2023 16:45:43 -0800 Received: by stinkbox (sSMTP sendmail emulation); Tue, 24 Jan 2023 02:45:42 +0200 From: Ville Syrjala <ville.syrjala@linux.intel.com> To: linux-kernel@vger.kernel.org Cc: linux-nvme@lists.infradead.org, Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@kernel.org>, Chaitanya Kulkarni <kch@nvidia.com>, Gerd Bayer <gbayer@linux.ibm.com>, Sagi Grimberg <sagi@grimberg.me>, Jens Axboe <axboe@fb.com>, =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com> Subject: [PATCH] nvme-pci: Switch back to sync probe to fix rootfs mount regression Date: Tue, 24 Jan 2023 02:45:42 +0200 Message-Id: <20230124004542.29659-1-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755863995442470166?= X-GMAIL-MSGID: =?utf-8?q?1755863995442470166?= |
Series |
nvme-pci: Switch back to sync probe to fix rootfs mount regression
|
|
Commit Message
Ville Syrjälä
Jan. 24, 2023, 12:45 a.m. UTC
From: Ville Syrjälä <ville.syrjala@linux.intel.com> Async probe caused a regression where we fail to find the rootfs in time, leading an unbootable machine. rootdelay=1 can be used as a workaround but that needlessly slows down the boot by a whole extra second. To get the best of both worlds perhaps there should be some kind of async probe flush/sync just before attempting to mount the rootfs? In the meantime just switch back to a sync probe to fix the regression. Cc: linux-nvme@lists.infradead.org Cc: Christoph Hellwig <hch@lst.de> Cc: Keith Busch <kbusch@kernel.org> Cc: Chaitanya Kulkarni <kch@nvidia.com> Cc: Gerd Bayer <gbayer@linux.ibm.com> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Jens Axboe <axboe@fb.com> Fixes: eac3ef262941 ("nvme-pci: split the initial probe from the rest path") Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> --- drivers/nvme/host/pci.c | 1 - 1 file changed, 1 deletion(-)
Comments
Err, no. We're not going to randomly revert things. If you want to be productive check the one liner Keith reported in reply to the last report.
On Tue, Jan 24, 2023 at 07:21:40AM +0100, Christoph Hellwig wrote: > Err, no. We're not going to randomly revert things. If you want > to be productive check the one liner Keith reported in reply to the > last report. No idea what that previous report is. Care to share a link?
On Tue, Jan 24, 2023 at 10:47:59AM +0200, Ville Syrjälä wrote: > On Tue, Jan 24, 2023 at 07:21:40AM +0100, Christoph Hellwig wrote: > > Err, no. We're not going to randomly revert things. If you want > > to be productive check the one liner Keith reported in reply to the > > last report. > > No idea what that previous report is. Care to share a link? https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#m759092f541ea29fcb41911890307e70868636a45 Patch to test: https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#md13c22b29cd81bd0ce9167c271c582005ba30550
On Tue, Jan 24, 2023 at 02:41:34PM +0100, Christoph Hellwig wrote: > On Tue, Jan 24, 2023 at 10:47:59AM +0200, Ville Syrjälä wrote: > > On Tue, Jan 24, 2023 at 07:21:40AM +0100, Christoph Hellwig wrote: > > > Err, no. We're not going to randomly revert things. If you want > > > to be productive check the one liner Keith reported in reply to the > > > last report. > > > > No idea what that previous report is. Care to share a link? > > https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#m759092f541ea29fcb41911890307e70868636a45 > > Patch to test: > > https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#md13c22b29cd81bd0ce9167c271c582005ba30550 I'll post the official patch if someone can let me know if it's successful. Or I can potentially setup a VM to verify myself, but I probably won't be able to get to that till next week.
On Tue, Jan 24, 2023 at 08:56:30AM -0700, Keith Busch wrote: > On Tue, Jan 24, 2023 at 02:41:34PM +0100, Christoph Hellwig wrote: > > On Tue, Jan 24, 2023 at 10:47:59AM +0200, Ville Syrjälä wrote: > > > On Tue, Jan 24, 2023 at 07:21:40AM +0100, Christoph Hellwig wrote: > > > > Err, no. We're not going to randomly revert things. If you want > > > > to be productive check the one liner Keith reported in reply to the > > > > last report. > > > > > > No idea what that previous report is. Care to share a link? > > > > https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#m759092f541ea29fcb41911890307e70868636a45 > > > > Patch to test: > > > > https://lore.kernel.org/linux-nvme/849c43bc-7488-72a6-f6fc-8700639b0c79@leemhuis.info/T/#md13c22b29cd81bd0ce9167c271c582005ba30550 > > I'll post the official patch if someone can let me know if it's > successful. Or I can potentially setup a VM to verify myself, but I > probably won't be able to get to that till next week. Appears to work here. I threw a tested-by to the original thread.
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 1ff8843bc4b3..d0f5e93d977e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3514,7 +3514,6 @@ static struct pci_driver nvme_driver = { .remove = nvme_remove, .shutdown = nvme_shutdown, .driver = { - .probe_type = PROBE_PREFER_ASYNCHRONOUS, #ifdef CONFIG_PM_SLEEP .pm = &nvme_dev_pm_ops, #endif