From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 1/5] tftp: skip memory allocation when seeking to current position
Date: Thu, 12 Mar 2026 15:44:21 +0100 [thread overview]
Message-ID: <20260312144428.2158727-1-a.fatoum@pengutronix.de> (raw)
We currently allocate 1K of memory, only to discard it when seeking to
the same offset, we are currently at.
Restructure tftp_lseek() to use early returns for the unsupported
backward-seek and early-exit also for the no-op case of new pos being
the same as the old pos.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
fs/tftp.c | 63 +++++++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 30 deletions(-)
diff --git a/fs/tftp.c b/fs/tftp.c
index a454306b4b5a..dd4804041cde 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -902,42 +902,45 @@ static int tftp_read(struct file *f, void *buf, size_t insize)
static int tftp_lseek(struct file *f, loff_t pos)
{
- /* We cannot seek backwards without reloading or caching the file */
+ int ret = 0;
+ char *buf;
loff_t f_pos = f->f_pos;
- if (pos >= f_pos) {
- int ret = 0;
- char *buf = xmalloc(1024);
-
- while (pos > f_pos) {
- size_t len = min_t(size_t, 1024, pos - f_pos);
-
- ret = tftp_read(f, buf, len);
-
- if (!ret)
- /* EOF, so the desired pos is invalid. */
- ret = -EINVAL;
- if (ret < 0)
- goto out_free;
-
- f_pos += ret;
- }
-
-out_free:
- free(buf);
- if (ret < 0) {
- /*
- * Update f->pos even if the overall request
- * failed since we can't move backwards
- */
- f->f_pos = f_pos;
- return ret;
- }
+ /* We cannot seek backwards without reloading or caching the file */
+ if (pos < f_pos)
+ return -ENOSYS;
+ if (pos == f_pos)
return 0;
+
+ buf = xmalloc(1024);
+
+ while (pos > f_pos) {
+ size_t len = min_t(size_t, 1024, pos - f_pos);
+
+ ret = tftp_read(f, buf, len);
+
+ if (!ret)
+ /* EOF, so the desired pos is invalid. */
+ ret = -EINVAL;
+ if (ret < 0)
+ goto out_free;
+
+ f_pos += ret;
}
- return -ENOSYS;
+out_free:
+ free(buf);
+ if (ret < 0) {
+ /*
+ * Update f->pos even if the overall request
+ * failed since we can't move backwards
+ */
+ f->f_pos = f_pos;
+ return ret;
+ }
+
+ return 0;
}
static const struct inode_operations tftp_file_inode_operations;
--
2.47.3
next reply other threads:[~2026-03-12 14:45 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-12 14:44 Ahmad Fatoum [this message]
2026-03-12 14:44 ` [PATCH 2/5] tftp: warn when seek-heavy access wastes network bandwidth Ahmad Fatoum
2026-03-12 14:44 ` [PATCH 3/5] tftp: emulate backwards seek by reopening the file Ahmad Fatoum
2026-03-12 14:44 ` [PATCH 4/5] libfile: drop TFTP-specific hack in open_fdt() Ahmad Fatoum
2026-03-12 14:44 ` [PATCH 5/5] fs: fix relative path resolution when CWD is on a TFTP mount Ahmad Fatoum
2026-03-17 10:21 ` [PATCH 1/5] tftp: skip memory allocation when seeking to current position Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260312144428.2158727-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox