| Message ID | 20220425142705.2099270-10-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | 9pfs: Add 9pfs support for Windows host | expand |
On Montag, 25. April 2022 16:27:05 CEST Bin Meng wrote: > From: Guohuai Shi <guohuai.shi@windriver.com> > > Some of Windows error numbers have different value from Linux ones. > For example, ENOTEMPTY is defined to 39 in Linux, but is defined to > 41 in Windows. So deleting a directory from a Linux guest on top > of QEMU from a Windows host complains: > > # rmdir tmp > rmdir: 'tmp': Unknown error 41 > > This commit provides error number traslation from Windows to Linux. > It can make Linux guest OS happy with the error number when running > on top of QEMU from a Windows host. > > This has a side effet that it requires all guest OSes' 9pfs drivers > to use the same errno. > > It looks like macOS has different errno too so using 9p in a Linux > on top of QEMU from a macOS host may also fail in the above case. > I suspect we only tested 9p from a macOS guest on top of QEMU from > a macOS host, so this issue was not exposed. > > I am not aware of Windows's native support for 9pfs so I think using > the Linux errnor as the standard is probably okay, but I am open for > suggestions. > > Signed-off-by: Guohuai Shi <guohuai.shi@windriver.com> > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- This patch collides with recent fixes for macOS hosts. Please rebase and use the already existing function errno_to_dotl(). > > hw/9pfs/9p.h | 4 ++++ > hw/9pfs/9p-util-win32.c | 38 ++++++++++++++++++++++++++++++++++++++ > hw/9pfs/9p.c | 7 +++++++ > 3 files changed, 49 insertions(+) > > diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h > index 87e8eac840..db2013d549 100644 > --- a/hw/9pfs/9p.h > +++ b/hw/9pfs/9p.h > @@ -490,6 +490,10 @@ void pdu_free(V9fsPDU *pdu); > void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr); > void v9fs_reset(V9fsState *s); > > +#ifdef CONFIG_WIN32 > +int errno_translate_win32(int errno_win32); > +#endif > + > struct V9fsTransport { > ssize_t (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, const char > *fmt, va_list ap); > diff --git a/hw/9pfs/9p-util-win32.c b/hw/9pfs/9p-util-win32.c > index d9b35e7425..c4f90c6503 100644 > --- a/hw/9pfs/9p-util-win32.c > +++ b/hw/9pfs/9p-util-win32.c > @@ -20,6 +20,11 @@ > #define V9FS_MAGIC 0x53465039 /* string "9PFS" */ > #endif > > +struct translate_map { > + int output; /* Linux error number */ > + int input; /* Windows error number */ > +}; > + No need to define a structure for this. Your motivation was to define a sparse array. That safes you only a couple bytes and comes with runtime overhead OTOH. See below. > static int build_ads_name(char *namebuf, size_t namebuflen, > const char *dirname, const char *filename, > const char *ads_name) > @@ -301,3 +306,36 @@ int qemu_statfs(const char *fs_root, struct statfs > *stbuf) > > return 0; > } > + > +int errno_translate_win32(int errno_win32) > + { > + unsigned int i; > + > + /* > + * The translation table only contains values which could be returned > + * as a result of a filesystem operation, i.e. network/socket related > + * errno values need not be considered for translation. > + */ > + static struct translate_map errno_map[] = { > + /* Linux errno Windows errno */ > + { L_EDEADLK, EDEADLK }, > + { L_ENAMETOOLONG, ENAMETOOLONG }, > + { L_ENOLCK, ENOLCK }, > + { L_ENOSYS, ENOSYS }, > + { L_ENOTEMPTY, ENOTEMPTY }, > + { L_EILSEQ, EILSEQ }, > + { L_ELOOP, ELOOP }, > + }; So far we are using if .. else if ... blocks for macOS host errno translation, because I needed quick and small patches for qemu-stable for fixing macOS host support. So it is OK to use an array solution, but simply use a dense array and use GCC designated initializers ... > + > + /* scan errno_win32 table for a matching Linux errno value */ > + > + for (i = 0; i < sizeof(errno_map) / sizeof(errno_map[0]); i++) { > + if (errno_win32 == errno_map[i].input) { > + return errno_map[i].output; > + } > + } ... then this loop will become unnecessary, and you can just make a constant time array access with prior array range check. > + > + /* no translation necessary */ > + > + return errno_win32; > + } > diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c > index a04889c1d6..0a9c0a509e 100644 > --- a/hw/9pfs/9p.c > +++ b/hw/9pfs/9p.c > @@ -1062,6 +1062,13 @@ static void coroutine_fn pdu_complete(V9fsPDU *pdu, > ssize_t len) id = P9_RERROR; > } > > +#ifdef CONFIG_WIN32 > + /* > + * Some Windows errnos have different value from Linux, > + * and they need to be translated to the Linux value. > + */ > + err = errno_translate_win32(err); > +#endif This would translate it for all 9p protocol versions. We want translation only for 9p2000.L. Current git version does this already correctly. So after having rebased you should not need to change anything here. > ret = pdu_marshal(pdu, len, "d", err); > if (ret < 0) { > goto out_notify;
diff --git a/hw/9pfs/9p.h b/hw/9pfs/9p.h index 87e8eac840..db2013d549 100644 --- a/hw/9pfs/9p.h +++ b/hw/9pfs/9p.h @@ -490,6 +490,10 @@ void pdu_free(V9fsPDU *pdu); void pdu_submit(V9fsPDU *pdu, P9MsgHeader *hdr); void v9fs_reset(V9fsState *s); +#ifdef CONFIG_WIN32 +int errno_translate_win32(int errno_win32); +#endif + struct V9fsTransport { ssize_t (*pdu_vmarshal)(V9fsPDU *pdu, size_t offset, const char *fmt, va_list ap); diff --git a/hw/9pfs/9p-util-win32.c b/hw/9pfs/9p-util-win32.c index d9b35e7425..c4f90c6503 100644 --- a/hw/9pfs/9p-util-win32.c +++ b/hw/9pfs/9p-util-win32.c @@ -20,6 +20,11 @@ #define V9FS_MAGIC 0x53465039 /* string "9PFS" */ #endif +struct translate_map { + int output; /* Linux error number */ + int input; /* Windows error number */ +}; + static int build_ads_name(char *namebuf, size_t namebuflen, const char *dirname, const char *filename, const char *ads_name) @@ -301,3 +306,36 @@ int qemu_statfs(const char *fs_root, struct statfs *stbuf) return 0; } + +int errno_translate_win32(int errno_win32) + { + unsigned int i; + + /* + * The translation table only contains values which could be returned + * as a result of a filesystem operation, i.e. network/socket related + * errno values need not be considered for translation. + */ + static struct translate_map errno_map[] = { + /* Linux errno Windows errno */ + { L_EDEADLK, EDEADLK }, + { L_ENAMETOOLONG, ENAMETOOLONG }, + { L_ENOLCK, ENOLCK }, + { L_ENOSYS, ENOSYS }, + { L_ENOTEMPTY, ENOTEMPTY }, + { L_EILSEQ, EILSEQ }, + { L_ELOOP, ELOOP }, + }; + + /* scan errno_win32 table for a matching Linux errno value */ + + for (i = 0; i < sizeof(errno_map) / sizeof(errno_map[0]); i++) { + if (errno_win32 == errno_map[i].input) { + return errno_map[i].output; + } + } + + /* no translation necessary */ + + return errno_win32; + } diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index a04889c1d6..0a9c0a509e 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1062,6 +1062,13 @@ static void coroutine_fn pdu_complete(V9fsPDU *pdu, ssize_t len) id = P9_RERROR; } +#ifdef CONFIG_WIN32 + /* + * Some Windows errnos have different value from Linux, + * and they need to be translated to the Linux value. + */ + err = errno_translate_win32(err); +#endif ret = pdu_marshal(pdu, len, "d", err); if (ret < 0) { goto out_notify;