From: Qu Wenruo <wqu@suse.com>
To: u-boot@lists.denx.de
Cc: marek.behun@nic.cz, linux-btrfs@vger.kernel.org,
jnhuang95@gmail.com, linux-erofs@lists.ozlabs.org,
trini@konsulko.com, joaomarcos.costa@bootlin.com,
thomas.petazzoni@bootlin.com, miquel.raynal@bootlin.com,
Simon Glass <sjg@chromium.org>
Subject: [PATCH RFC 6/8] fs: sandboxfs: add sandbox_fs_get_blocksize()
Date: Tue, 28 Jun 2022 15:28:06 +0800 [thread overview]
Message-ID: <9f4b43b84a688b0367a87da2d4e0eb303a36bf32.1656401086.git.wqu@suse.com> (raw)
In-Reply-To: <cover.1656401086.git.wqu@suse.com>
This is to make sandboxfs to report blocksize it supports for
_fs_read() to handle unaligned read.
Unlike all other fses, sandboxfs can handle unaligned read/write without
any problem since it's calling read()/write(), which doesn't bother the
blocksize at all.
This change is mostly to make testing of _fs_read() much easier.
Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
arch/sandbox/cpu/os.c | 11 +++++++++++
fs/fs.c | 2 +-
fs/sandbox/sandboxfs.c | 14 ++++++++++++++
include/os.h | 8 ++++++++
include/sandboxfs.h | 1 +
5 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c
index 5ea54179176c..6c29f29bdd9b 100644
--- a/arch/sandbox/cpu/os.c
+++ b/arch/sandbox/cpu/os.c
@@ -46,6 +46,17 @@ ssize_t os_read(int fd, void *buf, size_t count)
return read(fd, buf, count);
}
+ssize_t os_get_blocksize(int fd)
+{
+ struct stat stat = {0};
+ int ret;
+
+ ret = fstat(fd, &stat);
+ if (ret < 0)
+ return -errno;
+ return stat.st_blksize;
+}
+
ssize_t os_write(int fd, const void *buf, size_t count)
{
return write(fd, buf, count);
diff --git a/fs/fs.c b/fs/fs.c
index 7e4ead9b790b..337d5711c28c 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -261,7 +261,7 @@ static struct fstype_info fstypes[] = {
.exists = sandbox_fs_exists,
.size = sandbox_fs_size,
.read = fs_read_sandbox,
- .get_blocksize = fs_get_blocksize_unsupported,
+ .get_blocksize = sandbox_fs_get_blocksize,
.write = fs_write_sandbox,
.uuid = fs_uuid_unsupported,
.opendir = fs_opendir_unsupported,
diff --git a/fs/sandbox/sandboxfs.c b/fs/sandbox/sandboxfs.c
index 4ae41d5b4db1..130fee088621 100644
--- a/fs/sandbox/sandboxfs.c
+++ b/fs/sandbox/sandboxfs.c
@@ -55,6 +55,20 @@ int sandbox_fs_read_at(const char *filename, loff_t pos, void *buffer,
return ret;
}
+int sandbox_fs_get_blocksize(const char *filename)
+{
+ int fd;
+ int ret;
+
+ fd = os_open(filename, OS_O_RDONLY);
+ if (fd < 0)
+ return fd;
+
+ ret = os_get_blocksize(fd);
+ os_close(fd);
+ return ret;
+}
+
int sandbox_fs_write_at(const char *filename, loff_t pos, void *buffer,
loff_t towrite, loff_t *actwrite)
{
diff --git a/include/os.h b/include/os.h
index 10e198cf503e..a864d9ca39b2 100644
--- a/include/os.h
+++ b/include/os.h
@@ -26,6 +26,14 @@ struct sandbox_state;
*/
ssize_t os_read(int fd, void *buf, size_t count);
+/**
+ * Get the optimial blocksize through stat() call.
+ *
+ * @fd: File descriptor as returned by os_open()
+ * Return: >=0 for the blocksize. <0 for error.
+ */
+ssize_t os_get_blocksize(int fd);
+
/**
* Access to the OS write() system call
*
diff --git a/include/sandboxfs.h b/include/sandboxfs.h
index 783dd5c88a73..6937068f7b82 100644
--- a/include/sandboxfs.h
+++ b/include/sandboxfs.h
@@ -32,6 +32,7 @@ void sandbox_fs_close(void);
int sandbox_fs_ls(const char *dirname);
int sandbox_fs_exists(const char *filename);
int sandbox_fs_size(const char *filename, loff_t *size);
+int sandbox_fs_get_blocksize(const char *filename);
int fs_read_sandbox(const char *filename, void *buf, loff_t offset, loff_t len,
loff_t *actread);
int fs_write_sandbox(const char *filename, void *buf, loff_t offset,
--
2.36.1
next prev parent reply other threads:[~2022-06-28 7:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-28 7:28 [PATCH 0/8] u-boot: fs: add generic unaligned read handling Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 1/8] fs: fat: unexport file_fat_read_at() Qu Wenruo
2022-06-30 10:06 ` Simon Glass
2022-06-28 7:28 ` [PATCH RFC 2/8] fs: always get the file size in _fs_read() Qu Wenruo
2022-06-28 12:36 ` Huang Jianan
2022-06-28 12:43 ` Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 3/8] fs: btrfs: move the unaligned read code to _fs_read() for btrfs Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 4/8] fs: ext4: rely on _fs_read() to pass block aligned range into ext4fs_read_file() Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 5/8] fs: fat: rely on higher layer to get block aligned read range Qu Wenruo
2022-06-28 7:28 ` Qu Wenruo [this message]
2022-06-30 10:06 ` [PATCH RFC 6/8] fs: sandboxfs: add sandbox_fs_get_blocksize() Simon Glass
2022-06-30 10:12 ` Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 7/8] fs: ubifs: rely on higher layer to do unaligned read Qu Wenruo
2022-06-28 7:28 ` [PATCH RFC 8/8] fs: erofs: add unaligned read range handling Qu Wenruo
2022-06-28 13:37 ` [PATCH 0/8] u-boot: fs: add generic unaligned read handling Sean Anderson
2022-06-28 14:17 ` Tom Rini
2022-06-29 1:40 ` Qu Wenruo
2022-06-29 12:53 ` Tom Rini
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=9f4b43b84a688b0367a87da2d4e0eb303a36bf32.1656401086.git.wqu@suse.com \
--to=wqu@suse.com \
--cc=jnhuang95@gmail.com \
--cc=joaomarcos.costa@bootlin.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-erofs@lists.ozlabs.org \
--cc=marek.behun@nic.cz \
--cc=miquel.raynal@bootlin.com \
--cc=sjg@chromium.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/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;
as well as URLs for NNTP newsgroup(s).