From patchwork Wed Apr 22 20:32:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 185699 Delivered-To: patches@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp1229878ilf; Wed, 22 Apr 2020 13:33:03 -0700 (PDT) X-Received: by 2002:a63:b256:: with SMTP id t22mr810758pgo.92.1587587583482; Wed, 22 Apr 2020 13:33:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587587583; cv=none; d=google.com; s=arc-20160816; b=em1IzfmQKFdRfGCT0Dq4Icf1T4c64IMyqvac1OxZPzzm4SAbWlimv3f0/rgzQkUqk4 luylrHygQr1RwdrQMwi27a51uZNmCSUE46XJm4/+gPF8RNnehxlPg1s3dmgK+AbEeVsU bII7grE7ShHOsg6a0xNszjYpg6W0RvY5JRXitJlzmnLDDhPHqTHaSqfU/6sbbM0FAVh0 Bh/3QcuIaYqsGsFYY6CmPoNHWfT902RxtBnOD+FmfDC5cpslEMCQpy+cmQXYljvBAuEm eMRQzC8ICN5IblvkpiQKrpOh2SVFm3ODiKwAV5KRzXyAb1thGjSy8a2jDbK1SHLpTbef bGaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=tKbiuFbiZC2D1ImIHBQi0x36vK7Jcd27HL1H3KbbNwE=; b=lITv2zDjlQjP2ayf96/lbUxJyIKl2Z0WzhAcFg6fmM/hk/Uvd7XmSEZgRlVya0kc05 OCZpN2PvLJr/OnF/4zcLA2QWqun2kKKj2KFVFLabO9nPeAgOegGE2nk+T57eMY7/uNm4 ibHlWCZ2GFsAI1R5qSzWsA0cFABBV5GOnMgeQvqwjTyJcVcQ1Iq3x+tAVgczeSe6grZT j+digTb/E62Z4/a/EIGoMjgbFx6tIVhffI8x2YVuLoCGRouWM4zlK5r6KYHfQbLTskzG 1x/BO2EYNS960YPdwOJXntwj/IeMN+tkKhmyQJL/Sl5aviMy9IjuWC1ZO4EihXQacEQg CjoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jtXnZxTj; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u15sor665344plq.16.2020.04.22.13.33.03 for (Google Transport Security); Wed, 22 Apr 2020 13:33:03 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jtXnZxTj; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tKbiuFbiZC2D1ImIHBQi0x36vK7Jcd27HL1H3KbbNwE=; b=jtXnZxTje+esnJi9OvNJ9lL0EfuD8nLu8pEU2HsoVZcg/CcP2zGyKA3ip87zMACuqC 8IlyHWtGZ3RDEGhMv1ojVcGzgcQ2UzGav1z8V9DVG46RPsrPFRbAQJKI1wqNKsZ/VnLa g3d28TJUfTOc2mB+OAcyAD67MLfZPLhPHuZLuE4I0tNKuDK5j5se4VPIjC56kkPNukxW nKMInSzxn/+VkR9MDaoQqWec8Mas1GxhOcVr5cZg3aNUZJBGcm5thaecm/GrELurVIjW 8OlM2Vqbe0pj6/rPfZGfZSokntDvKsAiIJnmF8cDaXKsHjGu82Twh55kz59Q60VlC2ct 0XDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tKbiuFbiZC2D1ImIHBQi0x36vK7Jcd27HL1H3KbbNwE=; b=LYCOzTZ5i7hu1x1NtMZVkALv0JH+yL2Iw1vfnZHT7bJo048tq+l64LU+VqVlC2dYNe jXXAffK865MTpew0TDKTS/HW9qb+P2PpIN/EVNVzYsjGslUo/8QvuoKupaQ1o8LGYGil NWm1w7GHV1dYxla1XyGAJFXxQSaEi6RfE9op6hihD1HJtTAoBVJYXTUJ8Y6XLzeZ6ydG 2Q3JC8e1fPi9NlxAFmKVZIjo2DO3s2CbNw25hMQfoR1fJ4nL8Joh87IgeHLyppHOxbTS N5wCRz9XXTHhlM/NHPRR+BAKUIAfR8LKvJsIj346bjYOYnWnIoomwRZZmIGvDl21uMiJ 2XfA== X-Gm-Message-State: AGi0Pua/BKnHYIxob0EyZtrxV2kuPUn3O5yhSRrQa/JdRt+ybHi9RfW1 NdcjnL70AwA8Bo1IFGgT+jC7UNWV X-Google-Smtp-Source: APiQypJU20peyuHuafIh34ajjRyIE0Frxlgkvku9w3XkjEew13yPlsFgnIJ3FqXvus+Ek2lmVgQrQg== X-Received: by 2002:a17:902:9347:: with SMTP id g7mr432520plp.77.1587587583090; Wed, 22 Apr 2020 13:33:03 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id b24sm360292pfd.175.2020.04.22.13.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Apr 2020 13:33:02 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , "David S. Miller" , Alexey Kuznetsov , Hideaki YOSHIFUJI , Jakub Kicinski , Greg Kroah-Hartman , "Rafael J . Wysocki" , Rob Herring , Geert Uytterhoeven , Yoshihiro Shimoda , Robin Murphy , Andy Shevchenko , Sudeep Holla , Andy Shevchenko , Naresh Kamboju , Basil Eljuse , Ferry Toth , Arnd Bergmann , Anders Roxell , netdev , linux-pm@vger.kernel.org Subject: [PATCH v3 1/3] driver core: Revert default driver_deferred_probe_timeout value to 0 Date: Wed, 22 Apr 2020 20:32:43 +0000 Message-Id: <20200422203245.83244-2-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200422203245.83244-1-john.stultz@linaro.org> References: <20200422203245.83244-1-john.stultz@linaro.org> This patch addresses a regression in 5.7-rc1+ In commit c8c43cee29f6 ("driver core: Fix driver_deferred_probe_check_state() logic"), we both cleaned up the logic and also set the default driver_deferred_probe_timeout value to 30 seconds to allow for drivers that are missing dependencies to have some time so that the dependency may be loaded from userland after initcalls_done is set. However, Yoshihiro Shimoda reported that on his device that expects to have unmet dependencies (due to "optional links" in its devicetree), was failing to mount the NFS root. In digging further, it seemed the problem was that while the device properly probes after waiting 30 seconds for any missing modules to load, the ip_auto_config() had already failed, resulting in NFS to fail. This was due to ip_auto_config() calling wait_for_device_probe() which doesn't wait for the driver_deferred_probe_timeout to fire. Fixing that issue is possible, but could also introduce 30 second delays in bootups for users who don't have any missing dependencies, which is not ideal. So I think the best solution to avoid any regressions is to revert back to a default timeout value of zero, and allow systems that need to utilize the timeout in order for userland to load any modules that supply misisng dependencies in the dts to specify the timeout length via the exiting documented boot argument. Thanks to Geert for chasing down that ip_auto_config was why NFS was failing in this case! Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: Hideaki YOSHIFUJI Cc: Jakub Kicinski Cc: Greg Kroah-Hartman Cc: Rafael J. Wysocki Cc: Rob Herring Cc: Geert Uytterhoeven Cc: Yoshihiro Shimoda Cc: Robin Murphy Cc: Andy Shevchenko Cc: Sudeep Holla Cc: Andy Shevchenko Cc: Naresh Kamboju Cc: Basil Eljuse Cc: Ferry Toth Cc: Arnd Bergmann Cc: Anders Roxell Cc: netdev Cc: linux-pm@vger.kernel.org Reported-by: Yoshihiro Shimoda Tested-by: Yoshihiro Shimoda Fixes: c8c43cee29f6 ("driver core: Fix driver_deferred_probe_check_state() logic") Signed-off-by: John Stultz --- drivers/base/dd.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) -- 2.17.1 diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 06ec0e851fa1..908ae4d7805e 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -224,16 +224,7 @@ static int deferred_devs_show(struct seq_file *s, void *data) } DEFINE_SHOW_ATTRIBUTE(deferred_devs); -#ifdef CONFIG_MODULES -/* - * In the case of modules, set the default probe timeout to - * 30 seconds to give userland some time to load needed modules - */ -int driver_deferred_probe_timeout = 30; -#else -/* In the case of !modules, no probe timeout needed */ -int driver_deferred_probe_timeout = -1; -#endif +int driver_deferred_probe_timeout; EXPORT_SYMBOL_GPL(driver_deferred_probe_timeout); static int __init deferred_probe_timeout_setup(char *str) @@ -266,7 +257,7 @@ int driver_deferred_probe_check_state(struct device *dev) return -ENODEV; } - if (!driver_deferred_probe_timeout) { + if (!driver_deferred_probe_timeout && initcalls_done) { dev_WARN(dev, "deferred probe timeout, ignoring dependency"); return -ETIMEDOUT; }