VirtFS update
The following changes since commit 30eaca3acdf17d7bcbd1213eb149c02037edfb0b:
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140902-1' into staging (2014-09-02 10:26:10 +0100)
are available in the git repository at:
https://github.com/kvaneesh/qemu.git for-upstream
for you to fetch changes up to 840a1bf2832f5783d1070547fcb460216fc219e5:
hw/9pfs: Don't return type from host in readdir on local 9p filesystem (2014-09-04 10:51:13 -0500)
----------------------------------------------------------------
Aneesh Kumar K.V (1):
hw/9pfs: Use little-endian format for xattr values
Bastian Blank (1):
hw/9pfs: Don't return type from host in readdir on local 9p filesystem
hw/9pfs/virtio-9p-local.c | 49 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-)
Signature · 1 line
1.9.1
PATCH 1/2 hw/9pfs: Use little-endian format for xattr values
With security_model=mapped-xattr, we encode the uid,gid and other file attributes as extended attributes of the file. We save them under user.virtfs.* namespace.
Use little-endian encoding for on-disk values. This enables us to export the same directory from both little-endian and big-endian hosts.
NOTE: This will break big-endian host that have virtFS exports using security model mapped-xattr. They will have to use external tools to convert the xattr to little-endian format.
--- hw/9pfs/virtio-9p-local.c | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-)
hw/9pfs/virtio-9p-local.c +20 -24
@@ -135,17 +135,17 @@ static int local_lstat(FsContext *fs_ctx, V9fsPath *fs_path, struct stat *stbuf)mode_t tmp_mode;dev_t tmp_dev;if (getxattr (buffer,"user.virtfs.uid" , &tmp_uid,sizeof (uid_t)) >0 ) { - stbuf->st_uid = tmp_uid; + stbuf->st_uid =le32_to_cpu (tmp_uid); }if (getxattr (buffer,"user.virtfs.gid" , &tmp_gid,sizeof (gid_t)) >0 ) { - stbuf->st_gid = tmp_gid; + stbuf->st_gid =le32_to_cpu (tmp_gid); }if (getxattr (buffer,"user.virtfs.mode" , &tmp_mode,sizeof (mode_t)) >0 ) { - stbuf->st_mode = tmp_mode; + stbuf->st_mode =le32_to_cpu (tmp_mode); }if (getxattr (buffer,"user.virtfs.rdev" , &tmp_dev,sizeof (dev_t)) >0 ) { - stbuf->st_rdev = tmp_dev; + stbuf->st_rdev =le64_to_cpu (tmp_dev); } }else if (fs_ctx->export_flags &V9FS_SM_MAPPED_FILE ) {local_mapped_file_attr (fs_ctx, path, stbuf);
@@ -255,29 +255,29 @@ static int local_set_xattr(const char *path, FsCred *credp)int err;if (credp->fc_uid !=-1 ) { - err =setxattr (path,"user.virtfs.uid" , &credp->fc_uid,sizeof (uid_t), -0 ); +uint32_t tmp_uid =cpu_to_le32 (credp->fc_uid); + err =setxattr (path,"user.virtfs.uid" , &tmp_uid,sizeof (uid_t),0 );if (err) {return err; } }if (credp->fc_gid !=-1 ) { - err =setxattr (path,"user.virtfs.gid" , &credp->fc_gid,sizeof (gid_t), -0 ); +uint32_t tmp_gid =cpu_to_le32 (credp->fc_gid); + err =setxattr (path,"user.virtfs.gid" , &tmp_gid,sizeof (gid_t),0 );if (err) {return err; } }if (credp->fc_mode !=-1 ) { - err =setxattr (path,"user.virtfs.mode" , &credp->fc_mode, -sizeof (mode_t),0 ); +uint32_t tmp_mode =cpu_to_le32 (credp->fc_mode); + err =setxattr (path,"user.virtfs.mode" , &tmp_mode,sizeof (mode_t),0 );if (err) {return err; } }if (credp->fc_rdev !=-1 ) { - err =setxattr (path,"user.virtfs.rdev" , &credp->fc_rdev, -sizeof (dev_t),0 ); +uint64_t tmp_rdev =cpu_to_le64 (credp->fc_rdev); + err =setxattr (path,"user.virtfs.rdev" , &tmp_rdev,sizeof (dev_t),0 );if (err) {return err; }
@@ -630,21 +630,17 @@ static int local_fstat(FsContext *fs_ctx, int fid_type,mode_t tmp_mode;dev_t tmp_dev; -if (fgetxattr (fd,"user.virtfs.uid" , - &tmp_uid,sizeof (uid_t)) >0 ) { - stbuf->st_uid = tmp_uid; +if (fgetxattr (fd,"user.virtfs.uid" , &tmp_uid,sizeof (uid_t)) >0 ) { + stbuf->st_uid =le32_to_cpu (tmp_uid); } -if (fgetxattr (fd,"user.virtfs.gid" , - &tmp_gid,sizeof (gid_t)) >0 ) { - stbuf->st_gid = tmp_gid; +if (fgetxattr (fd,"user.virtfs.gid" , &tmp_gid,sizeof (gid_t)) >0 ) { + stbuf->st_gid =le32_to_cpu (tmp_gid); } -if (fgetxattr (fd,"user.virtfs.mode" , - &tmp_mode,sizeof (mode_t)) >0 ) { - stbuf->st_mode = tmp_mode; +if (fgetxattr (fd,"user.virtfs.mode" , &tmp_mode,sizeof (mode_t)) >0 ) { + stbuf->st_mode =le32_to_cpu (tmp_mode); } -if (fgetxattr (fd,"user.virtfs.rdev" , - &tmp_dev,sizeof (dev_t)) >0 ) { - stbuf->st_rdev = tmp_dev; +if (fgetxattr (fd,"user.virtfs.rdev" , &tmp_dev,sizeof (dev_t)) >0 ) { + stbuf->st_rdev =le64_to_cpu (tmp_dev); } }else if (fs_ctx->export_flags &V9FS_SM_MAPPED_FILE ) { errno =EOPNOTSUPP ;
Signature · 1 line
1.9.1
PATCH 2/2 hw/9pfs: Don't return type from host in readdir on local 9p filesystem
In reply to Aneesh Kumar K.VFrom: Bastian Blank <[email protected]>
When using mapped mode in 9pfs, readdir implementation should not return file type in d_type from the host readdir, instead, it should use the type stored in the extended attributes. Since d_type is optional and reading ext attrs for every readdir is expensive, it should be sufficient to just set d_type to DT_UNKNOWN, so guest will know to look it up separately.
This is a -stable material.
--- hw/9pfs/virtio-9p-local.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
hw/9pfs/virtio-9p-local.c +4 -1
@@ -397,12 +397,15 @@ static int local_readdir_r(FsContext *ctx, V9fsFidOpenState *fs, again: ret =readdir_r (fs->dir, entry, result); -if (ctx->export_flags &V9FS_SM_MAPPED_FILE ) { +if (ctx->export_flags &V9FS_SM_MAPPED ) { + entry->d_type =DT_UNKNOWN ; + }else if (ctx->export_flags &V9FS_SM_MAPPED_FILE ) {if (!ret && *result !=NULL && !strcmp (entry->d_name,VIRTFS_META_DIR )) {/* skp the meta data directory */ goto again; } + entry->d_type =DT_UNKNOWN ; }return ret; }
Signature · 1 line
1.9.1
Peter Maydell
AppliedQuoted 17 lines · Aneesh Kumar K.V
The following changes since commit
30eaca3acdf17d7bcbd1213eb149c02037edfb0b:Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140902-1' into staging (2014-09-02 10:26:10 +0100)
are available in the git repository at:
https://github.com/kvaneesh/qemu.git for-upstream
for you to fetch changes up to
840a1bf2832f5783d1070547fcb460216fc219e5:hw/9pfs: Don't return type from host in readdir on local 9p filesystem (2014-09-04 10:51:13 -0500)
----------------------------------------------------------------
Aneesh Kumar K.V (1):
hw/9pfs: Use little-endian format for xattr values
Quoted 8 lines
Bastian Blank (1):
hw/9pfs: Don't return type from host in readdir on local 9p filesystemhw/9pfs/virtio-9p-local.c | 49 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 25 deletions(-)--
1.9.1
Applied, thanks.
-- PMM