From nobody Wed Aug 20 22:48:38 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c6hSk4HyPz65M6K; Wed, 20 Aug 2025 22:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c6hSk3mK1z3rHJ; Wed, 20 Aug 2025 22:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8QdBn3bZE8Dflkk+f+ahuVGEf4VCK6XacpJxD7pW3KQ=; b=xzE0OzKzebew1S8OO8Pelg2YRAYItBEGBBE1HLxKNylGZ3HQ/pcLqpGWA3I+nvNwdIonMt 6U89YD7YN4ty9qseR4gKPe+C/PnHhEGujFxZDtSQ4dmSx0SjIPfrtOhtczArMI7fYa3cy4 YkpMFv6muEg/X5rC1dBVH+Hhg2aWZvYhK/1hFvu+s6WK9HaBvsxDy/8m3TiKLYCq0Kvk4B iC+TG/HBNaF0pmfeaXbbb76p9nhpz3SyULRwvIF0xwx4Ue+J2OUDxJ555yJDW64or+5Ov/ wrceoC4jHgQcIBo9Q4o5My9YkPwIzzy3Ax2hPwXcIUwXkUdjTbSHOVXD+C3EsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755730118; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8QdBn3bZE8Dflkk+f+ahuVGEf4VCK6XacpJxD7pW3KQ=; b=A1kSUPlk40NZ4Ior9epvNeS0Lm+M/bNAxw5BQO9BPvsvBNVvx2CZ8eUuI+Vkxta9JUwEMI n/gCIfPikrZOtFMdSWmF6MCgybbQL751AADTTUSx8gjBrPjG6Mk3B9F5gi5b6RXtaWn48z qYFMdw5cxsOUfiCf3whEBd9ubsfg9TPV7Ym4OEiGX6uaO7rlfquCmMIzxGYKPj2ZVZcLM+ m57Rro58lfvWDSd28Ab8C5YY0792SlbSAHYMF+T16C8w1PoMQxRYlSTy1NazEqekkkvyPm aO5i2aKh9NkWHsf5VCwGrply0D7OOuineOwRUkduiG+M2P3OLTrfr2J1Y6gRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755730118; a=rsa-sha256; cv=none; b=wsjHUcRmb6+Te1jCWie8hz5q9RQqTZdjkPPFkyibveGLtGwOV77b4mVpNJP/zxG8ykL2b3 RcYhgI0UEfbaR4mWTbiOheKrUI+ILCX3xhhLKm+k3TPKKXTC2OYO7sbAQzFpdZk9M6IQ7L XWsXcrW0FkLZicZNb4jHgNH6BOT5LBUlUzwCk9up2rQuubCZzkI/IW8w17Pkp0WEO9RA/g ukKEES+t09GLmBqvgbDR9ydpjPUGN1oixP37k+AXd63mIcAtEIccMgxuF4AbZBlu6OAjQP ybGrq4bz5iujT/TPPSbiz/H1+YIxtyKC57FeXSVeeCxNTkBoX7WxiLie9TpO1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c6hSk33BWzYpn; Wed, 20 Aug 2025 22:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57KMmckX016283; Wed, 20 Aug 2025 22:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57KMmcTO016280; Wed, 20 Aug 2025 22:48:38 GMT (envelope-from git) Date: Wed, 20 Aug 2025 22:48:38 GMT Message-Id: <202508202248.57KMmcTO016280@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: b44cc1b479fe - main - loader: do not try to open directories with TFTP List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b44cc1b479fefc8570611309c3f5a6966fb26e3b Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b44cc1b479fefc8570611309c3f5a6966fb26e3b commit b44cc1b479fefc8570611309c3f5a6966fb26e3b Author: Simon J. Gerraty AuthorDate: 2025-08-20 22:45:54 +0000 Commit: Simon J. Gerraty CommitDate: 2025-08-20 22:45:54 +0000 loader: do not try to open directories with TFTP Attempting to mount or even open / with some tftp servers causes a several minute delay in boot. Since opening a directory via TFTP does not make sense, we avoid it. We don't know if using TFTP until after net_open() has been called. Add an is_tftp() accessor to avoid everyone having to include all the net* headers. Sponsored by: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D51447 --- stand/common/dev_net.c | 9 ++++++++- stand/libsa/mount.c | 5 ++++- stand/libsa/open.c | 8 ++++++++ stand/libsa/stand.h | 3 +++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index 964fa514cac5..10389db27b99 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -182,6 +182,7 @@ net_open(struct open_file *f, ...) setenv("boot.netif.mtu", mtu, 1); } + DEBUG_PRINTF(1,("%s: netproto=%d\n", __func__, netproto)); } netdev_opens++; dev->d_opendata = &netdev_sock; @@ -193,7 +194,7 @@ net_close(struct open_file *f) { struct devdesc *dev; - DEBUG_PRINTF(1,("%s: opens=%d\n", __func__, netdev_opens)); + DEBUG_PRINTF(2,("%s: opens=%d\n", __func__, netdev_opens)); dev = f->f_devdata; dev->d_opendata = NULL; @@ -344,6 +345,12 @@ net_print(int verbose) return (ret); } +bool +is_tftp(void) +{ + return (netproto == NET_TFTP); +} + /* * Parses the rootpath if present * diff --git a/stand/libsa/mount.c b/stand/libsa/mount.c index 73bf6ab8118c..c866dc9c7055 100644 --- a/stand/libsa/mount.c +++ b/stand/libsa/mount.c @@ -107,7 +107,10 @@ mount(const char *dev, const char *path, int flags __unused, void *data) fs = file_system[i]; if (fs->fo_mount == NULL) continue; - + DEBUG_PRINTF(1,("%s: fs=%s path=%s\n", + __func__, fs->fs_name, path)); + if (is_tftp()) + break; if (fs->fo_mount(dev, path, &data) != 0) continue; diff --git a/stand/libsa/open.c b/stand/libsa/open.c index c97aa5977f9e..91848aca7dbe 100644 --- a/stand/libsa/open.c +++ b/stand/libsa/open.c @@ -138,6 +138,8 @@ open(const char *fname, int mode) struct fs_ops *fs; struct open_file *f; int fd, i, error, besterror; + bool is_dir; + size_t n; const char *file; TSENTER(); @@ -182,8 +184,14 @@ open(const char *fname, int mode) /* pass file name to the different filesystem open routines */ besterror = ENOENT; + n = strlen(file); + is_dir = (n > 0 && file[n - 1] == '/'); for (i = 0; file_system[i] != NULL; i++) { fs = file_system[i]; + if (is_dir && is_tftp()) { + error = EOPNOTSUPP; + goto err; + } error = (fs->fo_open)(file, f); if (error == 0) goto ok; diff --git a/stand/libsa/stand.h b/stand/libsa/stand.h index c6a08be2f7e3..233d11ab3ecb 100644 --- a/stand/libsa/stand.h +++ b/stand/libsa/stand.h @@ -507,6 +507,9 @@ extern void *reallocf(void *, size_t); */ caddr_t ptov(uintptr_t); +/* dev_net.c */ +bool is_tftp(void); + /* features.c */ typedef void (feature_iter_fn)(void *, const char *, const char *, bool);