Merge branch 'lukeshu/9p-idl-defs'

15 files changed, 1276 insertions, 748 deletions

diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index 56b39d6..309fac1 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -1,6 +1,6 @@
 /* config.h - Compile-time configuration for sbc_harness
  *
- * Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
@@ -63,6 +63,7 @@
 #define CONFIG_9P_ENABLE_9P2000_u     1 /* bool */
 #define CONFIG_9P_ENABLE_9P2000_e     0 /* bool */
 #define CONFIG_9P_ENABLE_9P2000_L     0 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_p9p   0 /* bool */
 
 /* DHCP ***********************************************************************/
 
diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index df81d25..1188c73 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -1,4 +1,4 @@
-/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
+/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
 
 #include <stdbool.h>
 #include <stddef.h>   /* for size_t */
@@ -27,6 +27,11 @@
 #else
 	#define _is_ver_9P2000_e(v) false
 #endif
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	#define _is_ver_9P2000_p9p(v) (v == LIB9P_VER_9P2000_p9p)
+#else
+	#define _is_ver_9P2000_p9p(v) false
+#endif
 #if CONFIG_9P_ENABLE_9P2000_u
 	#define _is_ver_9P2000_u(v) (v == LIB9P_VER_9P2000_u)
 #else
@@ -54,6 +59,9 @@ const char *_lib9p_table_ver_name[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000_e
 	[LIB9P_VER_9P2000_e] = "9P2000.e",
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = "9P2000.p9p",
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = "9P2000.u",
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
@@ -133,6 +141,7 @@ const char * _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
 		_MSG_NAME(Tlink),
 		_MSG_NAME(Rlink),
 		_MSG_NAME(Tmkdir),
+		_MSG_NAME(Rmkdir),
 		_MSG_NAME(Trenameat),
 		_MSG_NAME(Rrenameat),
 		_MSG_NAME(Tunlinkat),
@@ -195,6 +204,39 @@ const char * _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
 		_MSG_NAME(Rswrite),
 	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG_NAME(Topenfd),
+		_MSG_NAME(Ropenfd),
+		_MSG_NAME(Tversion),
+		_MSG_NAME(Rversion),
+		_MSG_NAME(Tauth),
+		_MSG_NAME(Rauth),
+		_MSG_NAME(Tattach),
+		_MSG_NAME(Rattach),
+		_MSG_NAME(Rerror),
+		_MSG_NAME(Tflush),
+		_MSG_NAME(Rflush),
+		_MSG_NAME(Twalk),
+		_MSG_NAME(Rwalk),
+		_MSG_NAME(Topen),
+		_MSG_NAME(Ropen),
+		_MSG_NAME(Tcreate),
+		_MSG_NAME(Rcreate),
+		_MSG_NAME(Tread),
+		_MSG_NAME(Rread),
+		_MSG_NAME(Twrite),
+		_MSG_NAME(Rwrite),
+		_MSG_NAME(Tclunk),
+		_MSG_NAME(Rclunk),
+		_MSG_NAME(Tremove),
+		_MSG_NAME(Rremove),
+		_MSG_NAME(Tstat),
+		_MSG_NAME(Rstat),
+		_MSG_NAME(Twstat),
+		_MSG_NAME(Rwstat),
+	},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = {
 		_MSG_NAME(Tversion),
@@ -230,94 +272,112 @@ const char * _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
 
 /* bitmasks *******************************************************************/
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 static const lib9p_dm_t dm_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b11101100000000000000000111111111,
+	[LIB9P_VER_9P2000]     = 0b11101100000000000000000111111111,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
 #if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000_L]   = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b11101100000000000000000111111111,
+	[LIB9P_VER_9P2000_e]   = 0b11101100000000000000000111111111,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b11101100000000000000000111111111,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b11101100101111000000000111111111,
+	[LIB9P_VER_9P2000_u]   = 0b11101100101111000000000111111111,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 static const lib9p_qt_t qt_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b11101100,
+	[LIB9P_VER_9P2000]     = 0b11101100,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
 #if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = 0b11101100,
+	[LIB9P_VER_9P2000_L]   = 0b11101100,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b11101100,
+	[LIB9P_VER_9P2000_e]   = 0b11101100,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b11101100,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b11101110,
+	[LIB9P_VER_9P2000_u]   = 0b11101110,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 static const lib9p_o_t o_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b01010011,
+	[LIB9P_VER_9P2000]     = 0b01010011,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
 #if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = 0b00000000,
+	[LIB9P_VER_9P2000_L]   = 0b00000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b01010011,
+	[LIB9P_VER_9P2000_e]   = 0b01010011,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b01010011,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b01010011,
+	[LIB9P_VER_9P2000_u]   = 0b01010011,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 static const lib9p_getattr_t getattr_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b0000000000000000000000000000000000000000000000000000000000000000,
+	[LIB9P_VER_9P2000]     = 0b0000000000000000000000000000000000000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
-	[LIB9P_VER_9P2000_L] = 0b0000000000000000000000000000000000000000000000000011111111111111,
+	[LIB9P_VER_9P2000_L]   = 0b0000000000000000000000000000000000000000000000000011111111111111,
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b0000000000000000000000000000000000000000000000000000000000000000,
+	[LIB9P_VER_9P2000_e]   = 0b0000000000000000000000000000000000000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b0000000000000000000000000000000000000000000000000000000000000000,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b0000000000000000000000000000000000000000000000000000000000000000,
+	[LIB9P_VER_9P2000_u]   = 0b0000000000000000000000000000000000000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
 static const lib9p_setattr_t setattr_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000]     = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
-	[LIB9P_VER_9P2000_L] = 0b00000000000000000000000111111111,
+	[LIB9P_VER_9P2000_L]   = 0b00000000000000000000000111111111,
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000_e]   = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b00000000000000000000000000000000,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000_u]   = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
 static const lib9p_lock_flags_t lock_flags_masks[LIB9P_VER_NUM] = {
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000]   = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000]     = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000 */
-	[LIB9P_VER_9P2000_L] = 0b00000000000000000000000000000011,
+	[LIB9P_VER_9P2000_L]   = 0b00000000000000000000000000000011,
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000_e]   = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = 0b00000000000000000000000000000000,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 0b00000000000000000000000000000000,
+	[LIB9P_VER_9P2000_u]   = 0b00000000000000000000000000000000,
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
@@ -353,12 +413,12 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
 	return false;
 }
 
-#define validate_1(ctx) _validate_size_net(ctx, 1)
-#define validate_2(ctx) _validate_size_net(ctx, 2)
-#define validate_4(ctx) _validate_size_net(ctx, 4)
-#define validate_8(ctx) _validate_size_net(ctx, 8)
+LM_ALWAYS_INLINE static bool validate_1(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 1); }
+LM_ALWAYS_INLINE static bool validate_2(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 2); }
+LM_ALWAYS_INLINE static bool validate_4(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 4); }
+LM_ALWAYS_INLINE static bool validate_8(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 8); }
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_tag(struct _validate_ctx *ctx) {
 	return validate_2(ctx);
 }
@@ -367,36 +427,17 @@ LM_ALWAYS_INLINE static bool validate_fid(struct _validate_ctx *ctx) {
 	return validate_4(ctx);
 }
 
-LM_ALWAYS_INLINE static bool validate_d(struct _validate_ctx *ctx) {
-	uint32_t base_offset = ctx->net_offset;
-	if (validate_4(ctx))
-		return true;
-	uint32_t len = uint32le_decode(&ctx->net_bytes[base_offset]);
-	return _validate_size_net(ctx, len) || _validate_size_host(ctx, len);
-}
-
-LM_ALWAYS_INLINE static bool validate_d_signed(struct _validate_ctx *ctx) {
-	uint32_t base_offset = ctx->net_offset;
-	if (validate_4(ctx))
-		return true;
-	uint32_t len = uint32le_decode(&ctx->net_bytes[base_offset]);
-	return _validate_size_net(ctx, len) || _validate_size_host(ctx, len);
-}
-
 LM_ALWAYS_INLINE static bool validate_s(struct _validate_ctx *ctx) {
-	uint32_t base_offset = ctx->net_offset;
-	if (validate_2(ctx))
-		return true;
-	uint16_t len = uint16le_decode(&ctx->net_bytes[base_offset]);
-	if (_validate_size_net(ctx, len) || _validate_size_host(ctx, ((size_t)len)))
-		return true;
-	if (!is_valid_utf8_without_nul(&ctx->net_bytes[base_offset+2], len))
-		return lib9p_error(ctx->ctx, LINUX_EBADMSG, "message contains invalid UTF-8");
-	return false;
+	uint16_t len;
+	return false
+	    || (validate_2(ctx) || ({ len = uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]); false; }))
+	    || _validate_list(ctx, len, validate_1, sizeof(uint8_t))
+	    || ({ (!is_valid_utf8_without_nul(&ctx->net_bytes[ctx->net_offset-len], len)) && lib9p_error(ctx->ctx, LINUX_EBADMSG, "message contains invalid UTF-8"); })
+	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_dm(struct _validate_ctx *ctx) {
 	 if (validate_4(ctx))
 		return true;
@@ -407,8 +448,8 @@ LM_ALWAYS_INLINE static bool validate_dm(struct _validate_ctx *ctx) {
 	return false;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_qt(struct _validate_ctx *ctx) {
 	 if (validate_1(ctx))
 		return true;
@@ -419,14 +460,14 @@ LM_ALWAYS_INLINE static bool validate_qt(struct _validate_ctx *ctx) {
 	return false;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_nuid(struct _validate_ctx *ctx) {
 	return validate_4(ctx);
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_o(struct _validate_ctx *ctx) {
 	 if (validate_1(ctx))
 		return true;
@@ -437,7 +478,7 @@ LM_ALWAYS_INLINE static bool validate_o(struct _validate_ctx *ctx) {
 	return false;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_ALWAYS_INLINE static bool validate_getattr(struct _validate_ctx *ctx) {
 	 if (validate_8(ctx))
@@ -478,7 +519,7 @@ LM_ALWAYS_INLINE static bool validate_lock_status(struct _validate_ctx *ctx) {
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Tflush(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -510,19 +551,42 @@ LM_FLATTEN static bool validate_Rflush(struct _validate_ctx *ctx) {
 	    ;
 }
 
+LM_FLATTEN static bool validate_Rread(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t count;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || _validate_list(ctx, count, validate_1, sizeof(uint8_t))
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 117; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    || ({ uint32_t max = INT32_MAX; (((uint32_t)count) > max) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "count value is too large (%"PRIu32" > %"PRIu32")", count, max); })
+	    ;
+}
+
 LM_FLATTEN static bool validate_Rwrite(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
+	uint32_t count;
 	uint32_t _size_offset;
 	return false
 	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
 	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
 	    || validate_tag(ctx)
-	    || validate_4(ctx)
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
 	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
 	    || ({ uint8_t exp = 119; (((uint8_t)typ) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    || ({ uint32_t max = INT32_MAX; (((uint32_t)count) > max) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "count value is too large (%"PRIu32" > %"PRIu32")", count, max); })
 	    ;
 }
 
@@ -556,8 +620,8 @@ LM_FLATTEN static bool validate_Rremove(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Rwstat(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -573,7 +637,7 @@ LM_FLATTEN static bool validate_Rwstat(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Rlerror(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -676,6 +740,24 @@ LM_FLATTEN static bool validate_Rxattrcreate(struct _validate_ctx *ctx) {
 	    ;
 }
 
+LM_FLATTEN static bool validate_Rreaddir(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t count;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || _validate_list(ctx, count, validate_1, sizeof(uint8_t))
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 41; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    ;
+}
+
 LM_FLATTEN static bool validate_Rfsync(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -769,6 +851,24 @@ LM_FLATTEN static bool validate_Rsession(struct _validate_ctx *ctx) {
 	    ;
 }
 
+LM_FLATTEN static bool validate_Rsread(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t count;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || _validate_list(ctx, count, validate_1, sizeof(uint8_t))
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 153; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    ;
+}
+
 LM_FLATTEN static bool validate_Rswrite(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -786,7 +886,7 @@ LM_FLATTEN static bool validate_Rswrite(struct _validate_ctx *ctx) {
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Tread(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -811,6 +911,31 @@ LM_FLATTEN static bool validate_Tread(struct _validate_ctx *ctx) {
 	    ;
 }
 
+LM_FLATTEN static bool validate_Twrite(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint64_t offset;
+	uint32_t count;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || validate_fid(ctx)
+	    || (validate_8(ctx) || ({ offset = uint64le_decode(&ctx->net_bytes[ctx->net_offset-8]); false; }))
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || _validate_list(ctx, count, validate_1, sizeof(uint8_t))
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 118; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    || ({ uint64_t max = INT64_MAX; (((uint64_t)offset) > max) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "offset value is too large (%"PRIu64" > %"PRIu64")", offset, max); })
+	    || ({ uint32_t max = INT32_MAX; (((uint32_t)count) > max) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "count value is too large (%"PRIu32" > %"PRIu32")", count, max); })
+	    ;
+}
+
 LM_FLATTEN static bool validate_Tclunk(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -843,8 +968,8 @@ LM_FLATTEN static bool validate_Tremove(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Tstat(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -861,7 +986,7 @@ LM_FLATTEN static bool validate_Tstat(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Tstatfs(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -947,79 +1072,8 @@ LM_FLATTEN static bool validate_Tfsync(struct _validate_ctx *ctx) {
 	    ;
 }
 
-LM_FLATTEN static bool validate_Rreaddir(struct _validate_ctx *ctx) {
-	uint32_t size;
-	uint8_t typ;
-	uint32_t _size_offset;
-	return false
-	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
-	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
-	    || validate_tag(ctx)
-	    || validate_d(ctx)
-	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
-	    || ({ uint8_t exp = 41; (((uint8_t)typ) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
-	    ;
-}
-
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-LM_FLATTEN static bool validate_Rsread(struct _validate_ctx *ctx) {
-	uint32_t size;
-	uint8_t typ;
-	uint32_t _size_offset;
-	return false
-	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
-	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
-	    || validate_tag(ctx)
-	    || validate_d(ctx)
-	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
-	    || ({ uint8_t exp = 153; (((uint8_t)typ) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
-	    ;
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static bool validate_Rread(struct _validate_ctx *ctx) {
-	uint32_t size;
-	uint8_t typ;
-	uint32_t _size_offset;
-	return false
-	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
-	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
-	    || validate_tag(ctx)
-	    || validate_d_signed(ctx)
-	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
-	    || ({ uint8_t exp = 117; (((uint8_t)typ) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
-	    ;
-}
-
-LM_FLATTEN static bool validate_Twrite(struct _validate_ctx *ctx) {
-	uint32_t size;
-	uint8_t typ;
-	uint64_t offset;
-	uint32_t _size_offset;
-	return false
-	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
-	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
-	    || validate_tag(ctx)
-	    || validate_fid(ctx)
-	    || (validate_8(ctx) || ({ offset = uint64le_decode(&ctx->net_bytes[ctx->net_offset-8]); false; }))
-	    || validate_d_signed(ctx)
-	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
-	    || ({ uint8_t exp = 118; (((uint8_t)typ) != exp) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
-	    || ({ uint64_t max = INT64_MAX; (((uint64_t)offset) > max) &&
-	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "offset value is too large (%"PRIu64" > %"PRIu64")", offset, max); })
-	    ;
-}
-
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Tversion(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1085,7 +1139,7 @@ LM_FLATTEN static bool validate_Twalk(struct _validate_ctx *ctx) {
 	    || validate_fid(ctx)
 	    || validate_fid(ctx)
 	    || (validate_2(ctx) || ({ nwname = uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]); false; }))
-	    || _validate_list(ctx, uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]), validate_s, sizeof(struct lib9p_s))
+	    || _validate_list(ctx, nwname, validate_s, sizeof(struct lib9p_s))
 	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
 	    || ({ uint8_t exp = 110; (((uint8_t)typ) != exp) &&
@@ -1095,7 +1149,7 @@ LM_FLATTEN static bool validate_Twalk(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Trename(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -1269,14 +1323,15 @@ LM_FLATTEN static bool validate_Tunlinkat(struct _validate_ctx *ctx) {
 LM_FLATTEN static bool validate_Tsread(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
+	uint16_t nwname;
 	uint32_t _size_offset;
 	return false
 	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
 	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
 	    || validate_tag(ctx)
 	    || validate_4(ctx)
-	    || validate_2(ctx)
-	    || _validate_list(ctx, uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]), validate_s, sizeof(struct lib9p_s))
+	    || (validate_2(ctx) || ({ nwname = uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]); false; }))
+	    || _validate_list(ctx, nwname, validate_s, sizeof(struct lib9p_s))
 	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
 	    || ({ uint8_t exp = 152; (((uint8_t)typ) != exp) &&
@@ -1287,15 +1342,18 @@ LM_FLATTEN static bool validate_Tsread(struct _validate_ctx *ctx) {
 LM_FLATTEN static bool validate_Tswrite(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
+	uint16_t nwname;
+	uint32_t count;
 	uint32_t _size_offset;
 	return false
 	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
 	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
 	    || validate_tag(ctx)
 	    || validate_4(ctx)
-	    || validate_2(ctx)
-	    || _validate_list(ctx, uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]), validate_s, sizeof(struct lib9p_s))
-	    || validate_d(ctx)
+	    || (validate_2(ctx) || ({ nwname = uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]); false; }))
+	    || _validate_list(ctx, nwname, validate_s, sizeof(struct lib9p_s))
+	    || (validate_4(ctx) || ({ count = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || _validate_list(ctx, count, validate_1, sizeof(uint8_t))
 	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
 	    || ({ uint8_t exp = 154; (((uint8_t)typ) != exp) &&
@@ -1304,7 +1362,7 @@ LM_FLATTEN static bool validate_Tswrite(struct _validate_ctx *ctx) {
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_qid(struct _validate_ctx *ctx) {
 	return false
 	    || validate_qt(ctx)
@@ -1356,7 +1414,7 @@ LM_FLATTEN static bool validate_Tattach(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Tlcreate(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -1418,8 +1476,27 @@ LM_FLATTEN static bool validate_Tmknod(struct _validate_ctx *ctx) {
 	    ;
 }
 
+LM_FLATTEN static bool validate_Tmkdir(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || validate_fid(ctx)
+	    || validate_s(ctx)
+	    || validate_4(ctx)
+	    || validate_nuid(ctx)
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 72; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    ;
+}
+
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Topen(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1456,7 +1533,26 @@ LM_FLATTEN static bool validate_Tcreate(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static bool validate_Topenfd(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || validate_fid(ctx)
+	    || validate_o(ctx)
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 98; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    ;
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Tgetattr(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -1539,7 +1635,7 @@ LM_FLATTEN static bool validate_Rlock(struct _validate_ctx *ctx) {
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool validate_stat(struct _validate_ctx *ctx) {
 	uint16_t stat_size;
 	uint32_t _kern_type_offset;
@@ -1567,8 +1663,8 @@ LM_ALWAYS_INLINE static bool validate_stat(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Rauth(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1611,7 +1707,7 @@ LM_FLATTEN static bool validate_Rwalk(struct _validate_ctx *ctx) {
 	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
 	    || validate_tag(ctx)
 	    || (validate_2(ctx) || ({ nwqid = uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]); false; }))
-	    || _validate_list(ctx, uint16le_decode(&ctx->net_bytes[ctx->net_offset-2]), validate_qid, sizeof(struct lib9p_qid))
+	    || _validate_list(ctx, nwqid, validate_qid, sizeof(struct lib9p_qid))
 	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
 	    || ({ uint8_t exp = 111; (((uint8_t)typ) != exp) &&
@@ -1621,8 +1717,8 @@ LM_FLATTEN static bool validate_Rwalk(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Ropen(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1657,7 +1753,27 @@ LM_FLATTEN static bool validate_Rcreate(struct _validate_ctx *ctx) {
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static bool validate_Ropenfd(struct _validate_ctx *ctx) {
+	uint32_t size;
+	uint8_t typ;
+	uint32_t _size_offset;
+	return false
+	    || (({ _size_offset = ctx->net_offset; validate_4(ctx); }) || ({ size = uint32le_decode(&ctx->net_bytes[ctx->net_offset-4]); false; }))
+	    || (validate_1(ctx) || ({ typ = ctx->net_bytes[ctx->net_offset-1]; false; }))
+	    || validate_tag(ctx)
+	    || validate_qid(ctx)
+	    || validate_4(ctx)
+	    || validate_4(ctx)
+	    || ({ uint32_t exp = ctx->net_offset - _size_offset; (((uint32_t)size) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "size value is wrong (actual:%"PRIu32" != correct:%"PRIu32")", (uint32_t)size, exp); })
+	    || ({ uint8_t exp = 99; (((uint8_t)typ) != exp) &&
+	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "typ value is wrong (actual:%"PRIu8" != correct:%"PRIu8")", (uint8_t)typ, exp); })
+	    ;
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool validate_Rlopen(struct _validate_ctx *ctx) {
 	uint32_t size;
@@ -1760,7 +1876,7 @@ LM_FLATTEN static bool validate_Rgetattr(struct _validate_ctx *ctx) {
 	    ;
 }
 
-LM_FLATTEN static bool validate_Tmkdir(struct _validate_ctx *ctx) {
+LM_FLATTEN static bool validate_Rmkdir(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
 	uint32_t _size_offset;
@@ -1777,7 +1893,7 @@ LM_FLATTEN static bool validate_Tmkdir(struct _validate_ctx *ctx) {
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool validate_Rstat(struct _validate_ctx *ctx) {
 	uint32_t size;
 	uint8_t typ;
@@ -1820,7 +1936,7 @@ LM_FLATTEN static bool validate_Twstat(struct _validate_ctx *ctx) {
 	          lib9p_errorf(ctx->ctx, LINUX_EBADMSG, "nstat value is wrong (actual:%"PRIu16" != correct:%"PRIu16")", (uint16_t)nstat, exp); })
 	    ;
 }
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 
 /* unmarshal_* ****************************************************************/
 
@@ -1844,7 +1960,7 @@ LM_ALWAYS_INLINE static void unmarshal_8(struct _unmarshal_ctx *ctx, uint64_t *o
 	ctx->net_offset += 8;
 }
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_tag(struct _unmarshal_ctx *ctx, lib9p_tag_t *out) {
 	unmarshal_2(ctx, (uint16_t *)out);
 }
@@ -1853,24 +1969,6 @@ LM_ALWAYS_INLINE static void unmarshal_fid(struct _unmarshal_ctx *ctx, lib9p_fid
 	unmarshal_4(ctx, (uint32_t *)out);
 }
 
-LM_ALWAYS_INLINE static void unmarshal_d(struct _unmarshal_ctx *ctx, struct lib9p_d *out) {
-	memset(out, 0, sizeof(*out));
-	unmarshal_4(ctx, &out->len);
-	out->dat = ctx->extra;
-	ctx->extra += sizeof(out->dat[0]) * out->len;
-	for (typeof(out->len) i = 0; i < out->len; i++)
-		unmarshal_1(ctx, (uint8_t *)&out->dat[i]);
-}
-
-LM_ALWAYS_INLINE static void unmarshal_d_signed(struct _unmarshal_ctx *ctx, struct lib9p_d_signed *out) {
-	memset(out, 0, sizeof(*out));
-	unmarshal_4(ctx, &out->len);
-	out->dat = ctx->extra;
-	ctx->extra += sizeof(out->dat[0]) * out->len;
-	for (typeof(out->len) i = 0; i < out->len; i++)
-		unmarshal_1(ctx, (uint8_t *)&out->dat[i]);
-}
-
 LM_ALWAYS_INLINE static void unmarshal_s(struct _unmarshal_ctx *ctx, struct lib9p_s *out) {
 	memset(out, 0, sizeof(*out));
 	unmarshal_2(ctx, &out->len);
@@ -1880,31 +1978,31 @@ LM_ALWAYS_INLINE static void unmarshal_s(struct _unmarshal_ctx *ctx, struct lib9
 		unmarshal_1(ctx, (uint8_t *)&out->utf8[i]);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_dm(struct _unmarshal_ctx *ctx, lib9p_dm_t *out) {
 	unmarshal_4(ctx, (uint32_t *)out);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_qt(struct _unmarshal_ctx *ctx, lib9p_qt_t *out) {
 	unmarshal_1(ctx, (uint8_t *)out);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_nuid(struct _unmarshal_ctx *ctx, lib9p_nuid_t *out) {
 	unmarshal_4(ctx, (uint32_t *)out);
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_o(struct _unmarshal_ctx *ctx, lib9p_o_t *out) {
 	unmarshal_1(ctx, (uint8_t *)out);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_ALWAYS_INLINE static void unmarshal_getattr(struct _unmarshal_ctx *ctx, lib9p_getattr_t *out) {
 	unmarshal_8(ctx, (uint64_t *)out);
@@ -1927,7 +2025,7 @@ LM_ALWAYS_INLINE static void unmarshal_lock_status(struct _unmarshal_ctx *ctx, l
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Tflush(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tflush *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -1943,6 +2041,18 @@ LM_FLATTEN static void unmarshal_Rflush(struct _unmarshal_ctx *ctx, struct lib9p
 	unmarshal_tag(ctx, &out->tag);
 }
 
+LM_FLATTEN static void unmarshal_Rread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rread *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_4(ctx, &out->count);
+	out->data = ctx->extra;
+	ctx->extra += sizeof(out->data[0]) * out->count;
+	for (typeof(out->count) i = 0; i < out->count; i++)
+		unmarshal_1(ctx, (uint8_t *)&out->data[i]);
+}
+
 LM_FLATTEN static void unmarshal_Rwrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwrite *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -1965,8 +2075,8 @@ LM_FLATTEN static void unmarshal_Rremove(struct _unmarshal_ctx *ctx, struct lib9
 	unmarshal_tag(ctx, &out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Rwstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rwstat *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -1974,7 +2084,7 @@ LM_FLATTEN static void unmarshal_Rwstat(struct _unmarshal_ctx *ctx, struct lib9p
 	unmarshal_tag(ctx, &out->tag);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Rlerror(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlerror *out) {
 	memset(out, 0, sizeof(*out));
@@ -2029,6 +2139,18 @@ LM_FLATTEN static void unmarshal_Rxattrcreate(struct _unmarshal_ctx *ctx, struct
 	unmarshal_tag(ctx, &out->tag);
 }
 
+LM_FLATTEN static void unmarshal_Rreaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreaddir *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_4(ctx, &out->count);
+	out->data = ctx->extra;
+	ctx->extra += sizeof(out->data[0]) * out->count;
+	for (typeof(out->count) i = 0; i < out->count; i++)
+		unmarshal_1(ctx, (uint8_t *)&out->data[i]);
+}
+
 LM_FLATTEN static void unmarshal_Rfsync(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rfsync *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2074,6 +2196,18 @@ LM_FLATTEN static void unmarshal_Rsession(struct _unmarshal_ctx *ctx, struct lib
 	unmarshal_tag(ctx, &out->tag);
 }
 
+LM_FLATTEN static void unmarshal_Rsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsread *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_4(ctx, &out->count);
+	out->data = ctx->extra;
+	ctx->extra += sizeof(out->data[0]) * out->count;
+	for (typeof(out->count) i = 0; i < out->count; i++)
+		unmarshal_1(ctx, (uint8_t *)&out->data[i]);
+}
+
 LM_FLATTEN static void unmarshal_Rswrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rswrite *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2083,7 +2217,7 @@ LM_FLATTEN static void unmarshal_Rswrite(struct _unmarshal_ctx *ctx, struct lib9
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Tread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tread *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2094,6 +2228,20 @@ LM_FLATTEN static void unmarshal_Tread(struct _unmarshal_ctx *ctx, struct lib9p_
 	unmarshal_4(ctx, &out->count);
 }
 
+LM_FLATTEN static void unmarshal_Twrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twrite *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_fid(ctx, &out->fid);
+	unmarshal_8(ctx, &out->offset);
+	unmarshal_4(ctx, &out->count);
+	out->data = ctx->extra;
+	ctx->extra += sizeof(out->data[0]) * out->count;
+	for (typeof(out->count) i = 0; i < out->count; i++)
+		unmarshal_1(ctx, (uint8_t *)&out->data[i]);
+}
+
 LM_FLATTEN static void unmarshal_Tclunk(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tclunk *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2110,8 +2258,8 @@ LM_FLATTEN static void unmarshal_Tremove(struct _unmarshal_ctx *ctx, struct lib9
 	unmarshal_fid(ctx, &out->fid);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Tstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstat *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2120,7 +2268,7 @@ LM_FLATTEN static void unmarshal_Tstat(struct _unmarshal_ctx *ctx, struct lib9p_
 	unmarshal_fid(ctx, &out->fid);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Tstatfs(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tstatfs *out) {
 	memset(out, 0, sizeof(*out));
@@ -2166,44 +2314,8 @@ LM_FLATTEN static void unmarshal_Tfsync(struct _unmarshal_ctx *ctx, struct lib9p
 	unmarshal_4(ctx, &out->datasync);
 }
 
-LM_FLATTEN static void unmarshal_Rreaddir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rreaddir *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_d(ctx, &out->data);
-}
-
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-LM_FLATTEN static void unmarshal_Rsread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rsread *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_d(ctx, &out->data);
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static void unmarshal_Rread(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rread *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_d_signed(ctx, &out->data);
-}
-
-LM_FLATTEN static void unmarshal_Twrite(struct _unmarshal_ctx *ctx, struct lib9p_msg_Twrite *out) {
-	memset(out, 0, sizeof(*out));
-	ctx->net_offset += 4;
-	ctx->net_offset += 1;
-	unmarshal_tag(ctx, &out->tag);
-	unmarshal_fid(ctx, &out->fid);
-	unmarshal_8(ctx, &out->offset);
-	unmarshal_d_signed(ctx, &out->data);
-}
-
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Tversion(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tversion *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2247,7 +2359,7 @@ LM_FLATTEN static void unmarshal_Twalk(struct _unmarshal_ctx *ctx, struct lib9p_
 		unmarshal_s(ctx, &out->wname[i]);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Trename(struct _unmarshal_ctx *ctx, struct lib9p_msg_Trename *out) {
 	memset(out, 0, sizeof(*out));
@@ -2370,11 +2482,15 @@ LM_FLATTEN static void unmarshal_Tswrite(struct _unmarshal_ctx *ctx, struct lib9
 	ctx->extra += sizeof(out->wname[0]) * out->nwname;
 	for (typeof(out->nwname) i = 0; i < out->nwname; i++)
 		unmarshal_s(ctx, &out->wname[i]);
-	unmarshal_d(ctx, &out->data);
+	unmarshal_4(ctx, &out->count);
+	out->data = ctx->extra;
+	ctx->extra += sizeof(out->data[0]) * out->count;
+	for (typeof(out->count) i = 0; i < out->count; i++)
+		unmarshal_1(ctx, (uint8_t *)&out->data[i]);
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_qid(struct _unmarshal_ctx *ctx, struct lib9p_qid *out) {
 	memset(out, 0, sizeof(*out));
 	unmarshal_qt(ctx, &out->type);
@@ -2409,7 +2525,7 @@ LM_FLATTEN static void unmarshal_Tattach(struct _unmarshal_ctx *ctx, struct lib9
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Tlcreate(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tlcreate *out) {
 	memset(out, 0, sizeof(*out));
@@ -2447,8 +2563,19 @@ LM_FLATTEN static void unmarshal_Tmknod(struct _unmarshal_ctx *ctx, struct lib9p
 	unmarshal_nuid(ctx, &out->gid);
 }
 
+LM_FLATTEN static void unmarshal_Tmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmkdir *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_fid(ctx, &out->dfid);
+	unmarshal_s(ctx, &out->name);
+	unmarshal_4(ctx, &out->mode);
+	unmarshal_nuid(ctx, &out->gid);
+}
+
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Topen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topen *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2469,7 +2596,18 @@ LM_FLATTEN static void unmarshal_Tcreate(struct _unmarshal_ctx *ctx, struct lib9
 	unmarshal_o(ctx, &out->mode);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static void unmarshal_Topenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Topenfd *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_fid(ctx, &out->fid);
+	unmarshal_o(ctx, &out->mode);
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Tgetattr(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tgetattr *out) {
 	memset(out, 0, sizeof(*out));
@@ -2520,7 +2658,7 @@ LM_FLATTEN static void unmarshal_Rlock(struct _unmarshal_ctx *ctx, struct lib9p_
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static void unmarshal_stat(struct _unmarshal_ctx *ctx, struct lib9p_stat *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 2;
@@ -2543,8 +2681,8 @@ LM_ALWAYS_INLINE static void unmarshal_stat(struct _unmarshal_ctx *ctx, struct l
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Rauth(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rauth *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2573,8 +2711,8 @@ LM_FLATTEN static void unmarshal_Rwalk(struct _unmarshal_ctx *ctx, struct lib9p_
 		unmarshal_qid(ctx, &out->wqid[i]);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Ropen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropen *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2593,7 +2731,19 @@ LM_FLATTEN static void unmarshal_Rcreate(struct _unmarshal_ctx *ctx, struct lib9
 	unmarshal_4(ctx, &out->iounit);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static void unmarshal_Ropenfd(struct _unmarshal_ctx *ctx, struct lib9p_msg_Ropenfd *out) {
+	memset(out, 0, sizeof(*out));
+	ctx->net_offset += 4;
+	ctx->net_offset += 1;
+	unmarshal_tag(ctx, &out->tag);
+	unmarshal_qid(ctx, &out->qid);
+	unmarshal_4(ctx, &out->iounit);
+	unmarshal_4(ctx, &out->unixfd);
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static void unmarshal_Rlopen(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rlopen *out) {
 	memset(out, 0, sizeof(*out));
@@ -2656,7 +2806,7 @@ LM_FLATTEN static void unmarshal_Rgetattr(struct _unmarshal_ctx *ctx, struct lib
 	unmarshal_8(ctx, &out->data_version);
 }
 
-LM_FLATTEN static void unmarshal_Tmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Tmkdir *out) {
+LM_FLATTEN static void unmarshal_Rmkdir(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rmkdir *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
 	ctx->net_offset += 1;
@@ -2665,7 +2815,7 @@ LM_FLATTEN static void unmarshal_Tmkdir(struct _unmarshal_ctx *ctx, struct lib9p
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static void unmarshal_Rstat(struct _unmarshal_ctx *ctx, struct lib9p_msg_Rstat *out) {
 	memset(out, 0, sizeof(*out));
 	ctx->net_offset += 4;
@@ -2684,7 +2834,7 @@ LM_FLATTEN static void unmarshal_Twstat(struct _unmarshal_ctx *ctx, struct lib9p
 	ctx->net_offset += 2;
 	unmarshal_stat(ctx, &out->stat);
 }
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 
 /* marshal_* ******************************************************************/
 
@@ -2728,7 +2878,7 @@ LM_ALWAYS_INLINE static bool marshal_8(struct _marshal_ctx *ctx, uint64_t *val)
 	return false;
 }
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_tag(struct _marshal_ctx *ctx, lib9p_tag_t *val) {
 	return marshal_2(ctx, (uint16_t *)val);
 }
@@ -2737,26 +2887,6 @@ LM_ALWAYS_INLINE static bool marshal_fid(struct _marshal_ctx *ctx, lib9p_fid_t *
 	return marshal_4(ctx, (uint32_t *)val);
 }
 
-LM_ALWAYS_INLINE static bool marshal_d(struct _marshal_ctx *ctx, struct lib9p_d *val) {
-	return false
-	    || marshal_4(ctx, &val->len)
-	    || ({ bool err = false;
-	          for (typeof(val->len) i = 0; i < val->len && !err; i++)
-	          	err = marshal_1(ctx, (uint8_t *)&val->dat[i]);
-	          err; })
-	    ;
-}
-
-LM_ALWAYS_INLINE static bool marshal_d_signed(struct _marshal_ctx *ctx, struct lib9p_d_signed *val) {
-	return false
-	    || marshal_4(ctx, &val->len)
-	    || ({ bool err = false;
-	          for (typeof(val->len) i = 0; i < val->len && !err; i++)
-	          	err = marshal_1(ctx, (uint8_t *)&val->dat[i]);
-	          err; })
-	    ;
-}
-
 LM_ALWAYS_INLINE static bool marshal_s(struct _marshal_ctx *ctx, struct lib9p_s *val) {
 	return false
 	    || marshal_2(ctx, &val->len)
@@ -2767,34 +2897,34 @@ LM_ALWAYS_INLINE static bool marshal_s(struct _marshal_ctx *ctx, struct lib9p_s
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_dm(struct _marshal_ctx *ctx, lib9p_dm_t *val) {
 	lib9p_dm_t masked_val = *val & dm_masks[ctx->ctx->version];
 	return marshal_4(ctx, (uint32_t *)&masked_val);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_qt(struct _marshal_ctx *ctx, lib9p_qt_t *val) {
 	lib9p_qt_t masked_val = *val & qt_masks[ctx->ctx->version];
 	return marshal_1(ctx, (uint8_t *)&masked_val);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_nuid(struct _marshal_ctx *ctx, lib9p_nuid_t *val) {
 	return marshal_4(ctx, (uint32_t *)val);
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_o(struct _marshal_ctx *ctx, lib9p_o_t *val) {
 	lib9p_o_t masked_val = *val & o_masks[ctx->ctx->version];
 	return marshal_1(ctx, (uint8_t *)&masked_val);
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_ALWAYS_INLINE static bool marshal_getattr(struct _marshal_ctx *ctx, lib9p_getattr_t *val) {
 	lib9p_getattr_t masked_val = *val & getattr_masks[ctx->ctx->version];
@@ -2820,7 +2950,7 @@ LM_ALWAYS_INLINE static bool marshal_lock_status(struct _marshal_ctx *ctx, lib9p
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Tflush(struct _marshal_ctx *ctx, struct lib9p_msg_Tflush *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -2846,6 +2976,23 @@ LM_FLATTEN static bool marshal_Rflush(struct _marshal_ctx *ctx, struct lib9p_msg
 	    ;
 }
 
+LM_FLATTEN static bool marshal_Rread(struct _marshal_ctx *ctx, struct lib9p_msg_Rread *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_4(ctx, &val->count)
+	    || ({ bool err = false;
+	          for (typeof(val->count) i = 0; i < val->count && !err; i++)
+	          	err = marshal_1(ctx, (uint8_t *)&val->data[i]);
+	          err; })
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 117; false; })
+	    ;
+}
+
 LM_FLATTEN static bool marshal_Rwrite(struct _marshal_ctx *ctx, struct lib9p_msg_Rwrite *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -2883,8 +3030,8 @@ LM_FLATTEN static bool marshal_Rremove(struct _marshal_ctx *ctx, struct lib9p_ms
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Rwstat(struct _marshal_ctx *ctx, struct lib9p_msg_Rwstat *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -2897,7 +3044,7 @@ LM_FLATTEN static bool marshal_Rwstat(struct _marshal_ctx *ctx, struct lib9p_msg
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Rlerror(struct _marshal_ctx *ctx, struct lib9p_msg_Rlerror *val) {
 	uint32_t _size_offset;
@@ -2982,6 +3129,23 @@ LM_FLATTEN static bool marshal_Rxattrcreate(struct _marshal_ctx *ctx, struct lib
 	    ;
 }
 
+LM_FLATTEN static bool marshal_Rreaddir(struct _marshal_ctx *ctx, struct lib9p_msg_Rreaddir *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_4(ctx, &val->count)
+	    || ({ bool err = false;
+	          for (typeof(val->count) i = 0; i < val->count && !err; i++)
+	          	err = marshal_1(ctx, (uint8_t *)&val->data[i]);
+	          err; })
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 41; false; })
+	    ;
+}
+
 LM_FLATTEN static bool marshal_Rfsync(struct _marshal_ctx *ctx, struct lib9p_msg_Rfsync *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3057,6 +3221,23 @@ LM_FLATTEN static bool marshal_Rsession(struct _marshal_ctx *ctx, struct lib9p_m
 	    ;
 }
 
+LM_FLATTEN static bool marshal_Rsread(struct _marshal_ctx *ctx, struct lib9p_msg_Rsread *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_4(ctx, &val->count)
+	    || ({ bool err = false;
+	          for (typeof(val->count) i = 0; i < val->count && !err; i++)
+	          	err = marshal_1(ctx, (uint8_t *)&val->data[i]);
+	          err; })
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 153; false; })
+	    ;
+}
+
 LM_FLATTEN static bool marshal_Rswrite(struct _marshal_ctx *ctx, struct lib9p_msg_Rswrite *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3071,7 +3252,7 @@ LM_FLATTEN static bool marshal_Rswrite(struct _marshal_ctx *ctx, struct lib9p_ms
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Tread(struct _marshal_ctx *ctx, struct lib9p_msg_Tread *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3087,6 +3268,25 @@ LM_FLATTEN static bool marshal_Tread(struct _marshal_ctx *ctx, struct lib9p_msg_
 	    ;
 }
 
+LM_FLATTEN static bool marshal_Twrite(struct _marshal_ctx *ctx, struct lib9p_msg_Twrite *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_fid(ctx, &val->fid)
+	    || marshal_8(ctx, &val->offset)
+	    || marshal_4(ctx, &val->count)
+	    || ({ bool err = false;
+	          for (typeof(val->count) i = 0; i < val->count && !err; i++)
+	          	err = marshal_1(ctx, (uint8_t *)&val->data[i]);
+	          err; })
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 118; false; })
+	    ;
+}
+
 LM_FLATTEN static bool marshal_Tclunk(struct _marshal_ctx *ctx, struct lib9p_msg_Tclunk *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3113,8 +3313,8 @@ LM_FLATTEN static bool marshal_Tremove(struct _marshal_ctx *ctx, struct lib9p_ms
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Tstat(struct _marshal_ctx *ctx, struct lib9p_msg_Tstat *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3128,7 +3328,7 @@ LM_FLATTEN static bool marshal_Tstat(struct _marshal_ctx *ctx, struct lib9p_msg_
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Tstatfs(struct _marshal_ctx *ctx, struct lib9p_msg_Tstatfs *val) {
 	uint32_t _size_offset;
@@ -3199,64 +3399,8 @@ LM_FLATTEN static bool marshal_Tfsync(struct _marshal_ctx *ctx, struct lib9p_msg
 	    ;
 }
 
-LM_FLATTEN static bool marshal_Rreaddir(struct _marshal_ctx *ctx, struct lib9p_msg_Rreaddir *val) {
-	uint32_t _size_offset;
-	uint32_t _typ_offset;
-	return false
-	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
-	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
-	    || marshal_tag(ctx, &val->tag)
-	    || marshal_d(ctx, &val->data)
-	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
-	    || ({ ctx->net_bytes[_typ_offset] = 41; false; })
-	    ;
-}
-
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-LM_FLATTEN static bool marshal_Rsread(struct _marshal_ctx *ctx, struct lib9p_msg_Rsread *val) {
-	uint32_t _size_offset;
-	uint32_t _typ_offset;
-	return false
-	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
-	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
-	    || marshal_tag(ctx, &val->tag)
-	    || marshal_d(ctx, &val->data)
-	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
-	    || ({ ctx->net_bytes[_typ_offset] = 153; false; })
-	    ;
-}
-
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-LM_FLATTEN static bool marshal_Rread(struct _marshal_ctx *ctx, struct lib9p_msg_Rread *val) {
-	uint32_t _size_offset;
-	uint32_t _typ_offset;
-	return false
-	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
-	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
-	    || marshal_tag(ctx, &val->tag)
-	    || marshal_d_signed(ctx, &val->data)
-	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
-	    || ({ ctx->net_bytes[_typ_offset] = 117; false; })
-	    ;
-}
-
-LM_FLATTEN static bool marshal_Twrite(struct _marshal_ctx *ctx, struct lib9p_msg_Twrite *val) {
-	uint32_t _size_offset;
-	uint32_t _typ_offset;
-	return false
-	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
-	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
-	    || marshal_tag(ctx, &val->tag)
-	    || marshal_fid(ctx, &val->fid)
-	    || marshal_8(ctx, &val->offset)
-	    || marshal_d_signed(ctx, &val->data)
-	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
-	    || ({ ctx->net_bytes[_typ_offset] = 118; false; })
-	    ;
-}
-
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Tversion(struct _marshal_ctx *ctx, struct lib9p_msg_Tversion *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3320,7 +3464,7 @@ LM_FLATTEN static bool marshal_Twalk(struct _marshal_ctx *ctx, struct lib9p_msg_
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Trename(struct _marshal_ctx *ctx, struct lib9p_msg_Trename *val) {
 	uint32_t _size_offset;
@@ -3495,14 +3639,18 @@ LM_FLATTEN static bool marshal_Tswrite(struct _marshal_ctx *ctx, struct lib9p_ms
 	          for (typeof(val->nwname) i = 0; i < val->nwname && !err; i++)
 	          	err = marshal_s(ctx, &val->wname[i]);
 	          err; })
-	    || marshal_d(ctx, &val->data)
+	    || marshal_4(ctx, &val->count)
+	    || ({ bool err = false;
+	          for (typeof(val->count) i = 0; i < val->count && !err; i++)
+	          	err = marshal_1(ctx, (uint8_t *)&val->data[i]);
+	          err; })
 	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
 	    || ({ ctx->net_bytes[_typ_offset] = 154; false; })
 	    ;
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_qid(struct _marshal_ctx *ctx, struct lib9p_qid *val) {
 	return false
 	    || marshal_qt(ctx, &val->type)
@@ -3548,7 +3696,7 @@ LM_FLATTEN static bool marshal_Tattach(struct _marshal_ctx *ctx, struct lib9p_ms
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Tlcreate(struct _marshal_ctx *ctx, struct lib9p_msg_Tlcreate *val) {
 	uint32_t _size_offset;
@@ -3601,8 +3749,24 @@ LM_FLATTEN static bool marshal_Tmknod(struct _marshal_ctx *ctx, struct lib9p_msg
 	    ;
 }
 
+LM_FLATTEN static bool marshal_Tmkdir(struct _marshal_ctx *ctx, struct lib9p_msg_Tmkdir *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_fid(ctx, &val->dfid)
+	    || marshal_s(ctx, &val->name)
+	    || marshal_4(ctx, &val->mode)
+	    || marshal_nuid(ctx, &val->gid)
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 72; false; })
+	    ;
+}
+
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Topen(struct _marshal_ctx *ctx, struct lib9p_msg_Topen *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3633,7 +3797,23 @@ LM_FLATTEN static bool marshal_Tcreate(struct _marshal_ctx *ctx, struct lib9p_ms
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static bool marshal_Topenfd(struct _marshal_ctx *ctx, struct lib9p_msg_Topenfd *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_fid(ctx, &val->fid)
+	    || marshal_o(ctx, &val->mode)
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 98; false; })
+	    ;
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Tgetattr(struct _marshal_ctx *ctx, struct lib9p_msg_Tgetattr *val) {
 	uint32_t _size_offset;
@@ -3704,7 +3884,7 @@ LM_FLATTEN static bool marshal_Rlock(struct _marshal_ctx *ctx, struct lib9p_msg_
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_ALWAYS_INLINE static bool marshal_stat(struct _marshal_ctx *ctx, struct lib9p_stat *val) {
 	uint32_t _stat_size_offset;
 	uint32_t _kern_type_offset;
@@ -3731,8 +3911,8 @@ LM_ALWAYS_INLINE static bool marshal_stat(struct _marshal_ctx *ctx, struct lib9p
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Rauth(struct _marshal_ctx *ctx, struct lib9p_msg_Rauth *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3776,8 +3956,8 @@ LM_FLATTEN static bool marshal_Rwalk(struct _marshal_ctx *ctx, struct lib9p_msg_
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Ropen(struct _marshal_ctx *ctx, struct lib9p_msg_Ropen *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3806,7 +3986,24 @@ LM_FLATTEN static bool marshal_Rcreate(struct _marshal_ctx *ctx, struct lib9p_ms
 	    ;
 }
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+LM_FLATTEN static bool marshal_Ropenfd(struct _marshal_ctx *ctx, struct lib9p_msg_Ropenfd *val) {
+	uint32_t _size_offset;
+	uint32_t _typ_offset;
+	return false
+	    || ({ _size_offset = ctx->net_offset; ({ ctx->net_offset += 4; false; }); })
+	    || ({ _typ_offset = ctx->net_offset; ({ ctx->net_offset += 1; false; }); })
+	    || marshal_tag(ctx, &val->tag)
+	    || marshal_qid(ctx, &val->qid)
+	    || marshal_4(ctx, &val->iounit)
+	    || marshal_4(ctx, &val->unixfd)
+	    || ({ uint32le_encode(&ctx->net_bytes[_size_offset], ctx->net_offset - _size_offset); false; })
+	    || ({ ctx->net_bytes[_typ_offset] = 99; false; })
+	    ;
+}
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 LM_FLATTEN static bool marshal_Rlopen(struct _marshal_ctx *ctx, struct lib9p_msg_Rlopen *val) {
 	uint32_t _size_offset;
@@ -3894,7 +4091,7 @@ LM_FLATTEN static bool marshal_Rgetattr(struct _marshal_ctx *ctx, struct lib9p_m
 	    ;
 }
 
-LM_FLATTEN static bool marshal_Tmkdir(struct _marshal_ctx *ctx, struct lib9p_msg_Tmkdir *val) {
+LM_FLATTEN static bool marshal_Rmkdir(struct _marshal_ctx *ctx, struct lib9p_msg_Rmkdir *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
 	return false
@@ -3908,7 +4105,7 @@ LM_FLATTEN static bool marshal_Tmkdir(struct _marshal_ctx *ctx, struct lib9p_msg
 }
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 LM_FLATTEN static bool marshal_Rstat(struct _marshal_ctx *ctx, struct lib9p_msg_Rstat *val) {
 	uint32_t _size_offset;
 	uint32_t _typ_offset;
@@ -3943,7 +4140,7 @@ LM_FLATTEN static bool marshal_Twstat(struct _marshal_ctx *ctx, struct lib9p_msg
 	    || ({ uint16le_encode(&ctx->net_bytes[_nstat_offset], ctx->net_offset - _stat_offset); false; })
 	    ;
 }
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 
 /* function tables ************************************************************/
 
@@ -3995,6 +4192,7 @@ const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80] = {
 		_MSG_RECV(Tlock),
 		_MSG_RECV(Tgetlock),
 		_MSG_RECV(Tlink),
+		_MSG_RECV(Tmkdir),
 		_MSG_RECV(Trenameat),
 		_MSG_RECV(Tunlinkat),
 		_MSG_RECV(Tversion),
@@ -4028,6 +4226,24 @@ const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80] = {
 		_MSG_RECV(Tswrite),
 	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG_RECV(Topenfd),
+		_MSG_RECV(Tversion),
+		_MSG_RECV(Tauth),
+		_MSG_RECV(Tattach),
+		_MSG_RECV(Tflush),
+		_MSG_RECV(Twalk),
+		_MSG_RECV(Topen),
+		_MSG_RECV(Tcreate),
+		_MSG_RECV(Tread),
+		_MSG_RECV(Twrite),
+		_MSG_RECV(Tclunk),
+		_MSG_RECV(Tremove),
+		_MSG_RECV(Tstat),
+		_MSG_RECV(Twstat),
+	},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = {
 		_MSG_RECV(Tversion),
@@ -4089,7 +4305,7 @@ const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80] = {
 		_MSG_RECV(Rlock),
 		_MSG_RECV(Rgetlock),
 		_MSG_RECV(Rlink),
-		_MSG_RECV(Tmkdir),
+		_MSG_RECV(Rmkdir),
 		_MSG_RECV(Rrenameat),
 		_MSG_RECV(Runlinkat),
 		_MSG_RECV(Rversion),
@@ -4125,6 +4341,25 @@ const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80] = {
 		_MSG_RECV(Rswrite),
 	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG_RECV(Ropenfd),
+		_MSG_RECV(Rversion),
+		_MSG_RECV(Rauth),
+		_MSG_RECV(Rattach),
+		_MSG_RECV(Rerror),
+		_MSG_RECV(Rflush),
+		_MSG_RECV(Rwalk),
+		_MSG_RECV(Ropen),
+		_MSG_RECV(Rcreate),
+		_MSG_RECV(Rread),
+		_MSG_RECV(Rwrite),
+		_MSG_RECV(Rclunk),
+		_MSG_RECV(Rremove),
+		_MSG_RECV(Rstat),
+		_MSG_RECV(Rwstat),
+	},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = {
 		_MSG_RECV(Rversion),
@@ -4184,6 +4419,7 @@ const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80] = {
 		_MSG_SEND(Tlock),
 		_MSG_SEND(Tgetlock),
 		_MSG_SEND(Tlink),
+		_MSG_SEND(Tmkdir),
 		_MSG_SEND(Trenameat),
 		_MSG_SEND(Tunlinkat),
 		_MSG_SEND(Tversion),
@@ -4217,6 +4453,24 @@ const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80] = {
 		_MSG_SEND(Tswrite),
 	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG_SEND(Topenfd),
+		_MSG_SEND(Tversion),
+		_MSG_SEND(Tauth),
+		_MSG_SEND(Tattach),
+		_MSG_SEND(Tflush),
+		_MSG_SEND(Twalk),
+		_MSG_SEND(Topen),
+		_MSG_SEND(Tcreate),
+		_MSG_SEND(Tread),
+		_MSG_SEND(Twrite),
+		_MSG_SEND(Tclunk),
+		_MSG_SEND(Tremove),
+		_MSG_SEND(Tstat),
+		_MSG_SEND(Twstat),
+	},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = {
 		_MSG_SEND(Tversion),
@@ -4278,7 +4532,7 @@ const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80] = {
 		_MSG_SEND(Rlock),
 		_MSG_SEND(Rgetlock),
 		_MSG_SEND(Rlink),
-		_MSG_SEND(Tmkdir),
+		_MSG_SEND(Rmkdir),
 		_MSG_SEND(Rrenameat),
 		_MSG_SEND(Runlinkat),
 		_MSG_SEND(Rversion),
@@ -4314,6 +4568,25 @@ const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80] = {
 		_MSG_SEND(Rswrite),
 	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG_SEND(Ropenfd),
+		_MSG_SEND(Rversion),
+		_MSG_SEND(Rauth),
+		_MSG_SEND(Rattach),
+		_MSG_SEND(Rerror),
+		_MSG_SEND(Rflush),
+		_MSG_SEND(Rwalk),
+		_MSG_SEND(Ropen),
+		_MSG_SEND(Rcreate),
+		_MSG_SEND(Rread),
+		_MSG_SEND(Rwrite),
+		_MSG_SEND(Rclunk),
+		_MSG_SEND(Rremove),
+		_MSG_SEND(Rstat),
+		_MSG_SEND(Rwstat),
+	},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	[LIB9P_VER_9P2000_u] = {
 		_MSG_SEND(Rversion),
diff --git a/lib9p/idl.gen b/lib9p/idl.gen
index b23b5b8..8782771 100755
--- a/lib9p/idl.gen
+++ b/lib9p/idl.gen
@@ -66,12 +66,10 @@ def c_ver_cond(versions: set[str]) -> str:
     return "( " + (" || ".join(c_ver_cond({v}) for v in sorted(versions))) + " )"
 
 
-def c_typename(typ: idl.Type, parent: idl.Type | None = None) -> str:
+def c_typename(typ: idl.Type, parent: idl.StructMember | None = None) -> str:
     match typ:
         case idl.Primitive():
-            if (
-                typ.value == 1 and parent and parent.name in ["d", "d_signed", "s"]
-            ):  # SPECIAL
+            if typ.value == 1 and parent and parent.cnt:  # SPECIAL (string)
                 return "[[gnu::nonstring]] char"
             return f"uint{typ.value*8}_t"
         case idl.Number():
@@ -322,13 +320,13 @@ enum {idprefix}version {{
                     continue
                 ret += "\n"
 
-                typewidth = max(len(c_typename(m.typ, typ)) for m in typ.members)
+                typewidth = max(len(c_typename(m.typ, m)) for m in typ.members)
 
                 for member in typ.members:
                     if member.val:
                         continue
                     ret += ifdef_push(2, c_ver_ifdef(member.in_versions))
-                    ret += f"\t{c_typename(member.typ, typ).ljust(typewidth)}  {'*' if member.cnt else ' '}{member.name};\n"
+                    ret += f"\t{c_typename(member.typ, member).ljust(typewidth)}  {'*' if member.cnt else ' '}{member.name};\n"
                 ret += ifdef_pop(1)
                 ret += "};\n"
     ret += ifdef_pop(0)
@@ -381,7 +379,7 @@ def gen_c(versions: set[str], typs: list[idl.Type]) -> str:
             for n in range(*rng):
                 xmsg: idl.Message | None = id2typ.get(n, None)
                 if xmsg:
-                    if ver == "unknown":  # SPECIAL
+                    if ver == "unknown":  # SPECIAL (initialization)
                         if xmsg.name not in ["Tversion", "Rversion", "Rerror"]:
                             xmsg = None
                     else:
@@ -484,10 +482,10 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
 \treturn false;
 }
 
-#define validate_1(ctx) _validate_size_net(ctx, 1)
-#define validate_2(ctx) _validate_size_net(ctx, 2)
-#define validate_4(ctx) _validate_size_net(ctx, 4)
-#define validate_8(ctx) _validate_size_net(ctx, 8)
+LM_ALWAYS_INLINE static bool validate_1(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 1); }
+LM_ALWAYS_INLINE static bool validate_2(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 2); }
+LM_ALWAYS_INLINE static bool validate_4(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 4); }
+LM_ALWAYS_INLINE static bool validate_8(struct _validate_ctx *ctx) { return _validate_size_net(ctx, 8); }
 """
     for typ in topo_sorted(typs):
         inline = "LM_FLATTEN" if isinstance(typ, idl.Message) else "LM_ALWAYS_INLINE"
@@ -496,31 +494,6 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
         ret += ifdef_push(1, c_ver_ifdef(typ.in_versions))
         ret += f"{inline} static bool validate_{typ.name}(struct _validate_ctx *{argfn('ctx')}) {{\n"
 
-        if typ.name == "d" or typ.name == "d_signed":  # SPECIAL
-            # Optimize... maybe the compiler could figure out to do
-            # this, but let's make it obvious.
-            ret += "\tuint32_t base_offset = ctx->net_offset;\n"
-            ret += "\tif (validate_4(ctx))\n"
-            ret += "\t\treturn true;\n"
-            ret += "\tuint32_t len = uint32le_decode(&ctx->net_bytes[base_offset]);\n"
-            ret += "\treturn _validate_size_net(ctx, len) || _validate_size_host(ctx, len);\n"
-            ret += "}\n"
-            continue
-        if typ.name == "s":  # SPECIAL
-            # Add an extra nul-byte on the host, and validate UTF-8
-            # (also, similar optimization to "d").
-            ret += "\tuint32_t base_offset = ctx->net_offset;\n"
-            ret += "\tif (validate_2(ctx))\n"
-            ret += "\t\treturn true;\n"
-            ret += "\tuint16_t len = uint16le_decode(&ctx->net_bytes[base_offset]);\n"
-            ret += "\tif (_validate_size_net(ctx, len) || _validate_size_host(ctx, ((size_t)len)))\n"
-            ret += "\t\treturn true;\n"
-            ret += "\tif (!is_valid_utf8_without_nul(&ctx->net_bytes[base_offset+2], len))\n"
-            ret += '\t\treturn lib9p_error(ctx->ctx, LINUX_EBADMSG, "message contains invalid UTF-8");\n'
-            ret += "\treturn false;\n"
-            ret += "}\n"
-            continue
-
         match typ:
             case idl.Number():
                 ret += f"\treturn validate_{typ.prim.name}(ctx);\n"
@@ -543,9 +516,18 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
                     ret += "}\n"
                     continue
 
+                def should_save_value(member: idl.StructMember) -> bool:
+                    nonlocal typ
+                    assert isinstance(typ, idl.Struct)
+                    return bool(
+                        member.max
+                        or member.val
+                        or any(m.cnt == member for m in typ.members)
+                    )
+
                 # Pass 1 - declare value variables
                 for member in typ.members:
-                    if member.max or member.val:
+                    if should_save_value(member):
                         ret += ifdef_push(2, c_ver_ifdef(member.in_versions))
                         ret += f"\t{c_typename(member.typ)} {member.name};\n"
                 ret += ifdef_pop(1)
@@ -561,27 +543,24 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
 
                 # Pass 3 - main pass
                 ret += "\treturn false\n"
-                prev_size: int | None = None
                 for member in typ.members:
                     ret += ifdef_push(2, c_ver_ifdef(member.in_versions))
                     ret += f"\t    || "
                     if member.in_versions != typ.in_versions:
                         ret += "( " + c_ver_cond(member.in_versions) + " && "
                     if member.cnt is not None:
-                        assert prev_size
-                        if prev_size == 1:
-                            ret += f"_validate_list(ctx, ctx->net_bytes[ctx->net_offset-1], validate_{member.typ.name}, sizeof({c_typename(member.typ)}))"
-                        else:
-                            ret += f"_validate_list(ctx, uint{prev_size*8}le_decode(&ctx->net_bytes[ctx->net_offset-{prev_size}]), validate_{member.typ.name}, sizeof({c_typename(member.typ)}))"
+                        ret += f"_validate_list(ctx, {member.cnt.name}, validate_{member.typ.name}, sizeof({c_typename(member.typ)}))"
+                        if typ.name == "s":  # SPECIAL (string)
+                            ret += f'\n\t    || ({{ (!is_valid_utf8_without_nul(&ctx->net_bytes[ctx->net_offset-len], len)) && lib9p_error(ctx->ctx, LINUX_EBADMSG, "message contains invalid UTF-8"); }})'
                     else:
-                        if member.max or member.val:
+                        if should_save_value(member):
                             ret += "("
                         if member.name in mark_offset:
                             ret += f"({{ _{member.name}_offset = ctx->net_offset; "
                         ret += f"validate_{member.typ.name}(ctx)"
                         if member.name in mark_offset:
                             ret += "; })"
-                        if member.max or member.val:
+                        if should_save_value(member):
                             nbytes = member.static_size
                             assert nbytes
                             if nbytes == 1:
@@ -591,7 +570,6 @@ LM_ALWAYS_INLINE static bool _validate_list(struct _validate_ctx *ctx,
                     if member.in_versions != typ.in_versions:
                         ret += " )"
                     ret += "\n"
-                    prev_size = member.static_size
 
                 # Pass 4 - validate ,max= and ,val= constraints
                 for member in typ.members:
@@ -669,7 +647,7 @@ LM_ALWAYS_INLINE static void unmarshal_8(struct _unmarshal_ctx *ctx, uint64_t *o
                         ret += f"out->{member.name} = ctx->extra;\n"
                         ret += f"{prefix}ctx->extra += sizeof(out->{member.name}[0]) * out->{member.cnt.name};\n"
                         ret += f"{prefix}for (typeof(out->{member.cnt.name}) i = 0; i < out->{member.cnt.name}; i++)\n"
-                        if typ.name in ["d", "d_signed", "s"]:  # SPECIAL
+                        if member.typ.static_size == 1:  # SPECIAL (string)
                             # Special-case is that we cast from `char` to `uint8_t`.
                             ret += f"{prefix}\tunmarshal_{member.typ.name}(ctx, (uint8_t *)&out->{member.name}[i]);\n"
                         else:
@@ -772,7 +750,7 @@ LM_ALWAYS_INLINE static bool marshal_8(struct _marshal_ctx *ctx, uint64_t *val)
                         ret += "({ bool err = false;\n"
                         ret += f"\t          for (typeof(val->{member.cnt.name}) i = 0; i < val->{member.cnt.name} && !err; i++)\n"
                         ret += "\t          \terr = "
-                        if typ.name in ["d", "d_signed", "s"]:  # SPECIAL
+                        if member.typ.static_size == 1:  # SPECIAL (string)
                             # Special-case is that we cast from `char` to `uint8_t`.
                             ret += f"marshal_{member.typ.name}(ctx, (uint8_t *)&val->{member.name}[i]);\n"
                         else:
@@ -855,11 +833,34 @@ LM_FLATTEN bool _{idprefix}stat_marshal(struct _marshal_ctx *ctx, struct lib9p_s
 if __name__ == "__main__":
     import sys
 
+    if typing.TYPE_CHECKING:
+
+        class ANSIColors:
+            MAGENTA = "\x1b[35m"
+            RED = "\x1b[31m"
+            RESET = "\x1b[0m"
+
+    else:
+        from _colorize import ANSIColors  # Present in Python 3.13+
+
     if len(sys.argv) < 2:
         raise ValueError("requires at least 1 .9p filename")
     parser = idl.Parser()
     for txtname in sys.argv[1:]:
-        parser.parse_file(txtname)
+        try:
+            parser.parse_file(txtname)
+        except SyntaxError as e:
+            print(
+                f"{ANSIColors.RED}{e.filename}{ANSIColors.RESET}:{ANSIColors.MAGENTA}{e.lineno}{ANSIColors.RESET}: {e.msg}",
+                file=sys.stderr,
+            )
+            assert e.text
+            print(f"\t{e.text}", file=sys.stderr)
+            print(
+                f"\t{ANSIColors.RED}{'~'*len(e.text)}{ANSIColors.RESET}",
+                file=sys.stderr,
+            )
+            sys.exit(2)
     versions, typs = parser.all()
     outdir = os.path.normpath(os.path.join(sys.argv[0], ".."))
     with open(os.path.join(outdir, "include/lib9p/9p.generated.h"), "w") as fh:
diff --git a/lib9p/idl/0000-TODO.md b/lib9p/idl/0000-TODO.md
new file mode 100644
index 0000000..1cb02db
--- /dev/null
+++ b/lib9p/idl/0000-TODO.md
@@ -0,0 +1,5 @@
+- Decide how to handle duplicate type names from different versions
+- Decide how to handle duplicate `enum lib9p_msg_type` names and
+  values
+- Clean up the iterate-over-all-msgids-in-a-version code
+- Allow for const `.cnt` instead of only having previous-member `.cnt`
diff --git a/lib9p/idl/1992-9P0.9p.wip b/lib9p/idl/1992-9P0.9p.wip
index 15997d9..086e8e4 100644
--- a/lib9p/idl/1992-9P0.9p.wip
+++ b/lib9p/idl/1992-9P0.9p.wip
@@ -3,7 +3,20 @@
 # Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-# https://man.cat-v.org/plan_9_1st_ed/5/
+# The original 9P protocol ("9P0"), from Plan 9 1st edition.
+#
+# Documentation:
+# - https://github.com/plan9foundation/plan9/tree/1e-1993-01-03/sys/man/5
+# - https://github.com/plan9foundation/plan9/tree/1e-1993-01-03/sys/man/6/auth
+# - https://man.cat-v.org/plan_9_1st_ed/5/
+# - https://man.cat-v.org/plan_9_1st_ed/6/auth
+#
+# Implementation references:
+# - https://github.com/plan9foundation/plan9/blob/1e-1993-01-03/sys/include/fcall.h (MAXFDATA)
+# - https://github.com/plan9foundation/plan9/blob/1e-1993-01-03/sys/include/libc.h (`ch` bits)
+# - https://github.com/plan9foundation/plan9/blob/1e-1993-01-03/sys/src/fs/port/fcall.c (`stat`)
+# - https://github.com/plan9foundation/plan9/blob/1e-1993-01-03/sys/src/fs/port/fs.c (`offset:max`)
+# - https://github.com/plan9foundation/plan9/blob/1e-1993-01-03/sys/src/fs/port/portdata.h (MAXDAT)
 version "9P0"
 
 # tag - identify a request/response pair
@@ -15,8 +28,77 @@ num fid = 2
 # uni"Q"ue "ID"entification
 struct qid = "path[4] version[4]"
 
-# a nul-padded string
-struct name = 28*(txt[1])
+# a nul-terminated+padded string
+struct name = "28*(txt[1])"
+
+# a nul-terminated+padded string
+struct errstr = "64*(txt[1])"
+
+# "O"pen flags (flags to pass to Topen and Tcreate)
+# Unused bits are *ignored*.
+bitfield o = 1
+	"0=mode_0" # low bit of the 2-bit READ/WRITE/RDWR/EXEC enum
+	"1=mode_1" # high bit of the 2-bit READ/WRITE/RDWR/EXEC enum
+	#"2=unused"
+	#"3=unused"
+	"4=TRUNC"
+	#"5=_reserved_CEXEC" # close-on-exec
+	"6=RCLOSE" # remove-on-close
+	#"7=unused"
+
+	"READ  = 0" # make available for this FID: Tread()
+	"WRITE = 1" # make available for this FID: Twrite()
+	"RDWR  = 2" # make available for this FID: Tread() and Twrite()
+	"EXEC  = 3" # make available for this FID: Tread()
+
+	"MODE_MASK = 0b00000011"
+	"FLAG_MASK = 0b11111100"
+
+# "C"??? "H"??? - file permissions and attributes
+bitfield ch = 4
+	"31=DIR"
+	"30=APPEND"
+	"29=EXCL"
+	#...
+	"8=OWNER_R"
+	"7=OWNER_W"
+	"6=OWNER_X"
+	"5=GROUP_R"
+	"4=GROUP_W"
+	"3=GROUP_X"
+	"2=OTHER_R"
+	"1=OTHER_W"
+	"0=OTHER_X"
+
+	"PERM_MASK=0777" # {OWNER,GROUP,OTHER}_{R,W,X}
+
+struct stat = "file_name[name]"
+              "file_owner[name]"
+              "file_group[name]"
+              "file_qid[qid]"
+              "file_mode[ch]"
+              "file_atime[4]"
+              "file_mtime[4]"
+              "file_size[8]"
+              "kern_type[2]"
+              "kern_dev[2]"
+
+# Authentication uses symetric-key encryption, using a per-client
+# secret-key.  The encryption scheme is beyond the scope of this
+# document.
+struct auth_ticket = "15*(dat[1])"
+struct encrypted_auth_challenge = "36*(ciphertext[1])"
+struct cleartext_auth_challenge = "magic[1,val=1] 7*(client_challenge[1]) server[name]"
+struct encrypted_auth_response = "30*(ciphertext[1])"
+struct cleartext_auth_response = "magic[1,val=4] 7*(client_challenge[1]) ticket[auth_ticket]"
+
+# A 9P0 session goes:
+#
+#    [nop()]
+#    session()
+#    [auth_tok=auth()]
+#    attach([auth_tok])
+#    ...
 
 msg Tmux      = "typ[1,val=48] mux[2]" # Undocumented, but implemented by mux(3) / libmux.a
 #msg Rmux      = "typ[1,val=49] illegal"
@@ -25,32 +107,35 @@ msg Rnop      = "typ[1,val=51] tag[tag,val=0xFFFF]"
 msg Tsession  = "typ[1,val=52] tag[tag,val=0xFFFF]"
 msg Rsession  = "typ[1,val=53] tag[tag,val=0xFFFF]"
 #msg Terror    = "typ[1,val=54] illegal"
-msg Rerror    = "typ[1,val=55] tag[tag] ename[64]"
+msg Rerror    = "typ[1,val=55] tag[tag] ename[errstr]"
 msg Tflush    = "typ[1,val=56] tag[tag] oldtag[tag]"
 msg Rflush    = "typ[1,val=57] tag[tag]"
-msg Tattach   = "typ[1,val=58] tag[tag] fid[fid] uid[28] aname[28] auth[28]"
-msg Rattach   = "typ[1,val=59] tag[tag] fid[fid] qid[8]"
+msg Tattach   = "typ[1,val=58] tag[tag] fid[fid] uid[name] aname[name] auth[auth_ticket] 13*(pad[1])" # Pad to allow auth_tickets up to 28 bytes.
+msg Rattach   = "typ[1,val=59] tag[tag] fid[fid] qid[qid]"
 msg Tclone    = "typ[1,val=60] tag[tag] fid[fid] newfid[fid]"
 msg Rclone    = "typ[1,val=61] tag[tag] fid[fid]"
-msg Twalk     = "typ[1,val=62] tag[tag] fid[fid] name[28]"
-msg Rwalk     = "typ[1,val=63] tag[tag] fid[fid] qid[8]"
-msg Topen     = "typ[1,val=64] tag[tag] fid[fid] mode[1]"
-msg Ropen     = "typ[1,val=65] tag[tag] fid[fid] qid[8]"
-msg Tcreate   = "typ[1,val=66] tag[tag] fid[fid] name[28] perm[4] mode[1]"
-msg Rcreate   = "typ[1,val=67] tag[tag] fid[fid] qid[8]"
-msg Tread     = "typ[1,val=68] tag[tag] fid[fid] offset[8] count[2,max=8192]"
+msg Twalk     = "typ[1,val=62] tag[tag] fid[fid] name[name]"
+msg Rwalk     = "typ[1,val=63] tag[tag] fid[fid] qid[qid]"
+msg Topen     = "typ[1,val=64] tag[tag] fid[fid] mode[o]"
+msg Ropen     = "typ[1,val=65] tag[tag] fid[fid] qid[qid]"
+msg Tcreate   = "typ[1,val=66] tag[tag] fid[fid] name[name] perm[ch] mode[o]"
+msg Rcreate   = "typ[1,val=67] tag[tag] fid[fid] qid[qid]"
+# For `count:max`, see 1e/2e/3e `sys/include/fcall.h:MAXFDATA` or 1e/2e `sys/src/fs/port/portdata.h:MAXDAT`.
+# For read `offset:max`, see 1e/2e/3e `sys/src/fs/port/fs.c:f_read()` or 3e `sys/src/lib9p/srv.c:srv():case Tread`.
+# For write `offset:max`, see 1e/2e/3e `sys/src/fs/port/fs.c:f_write()`.
+msg Tread     = "typ[1,val=68] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192]"
 msg Rread     = "typ[1,val=69] tag[tag] fid[fid] count[2,max=8192] pad[1] count*(data[1])"
-msg Twrite    = "typ[1,val=70] tag[tag] fid[fid] offset[8] count[2,max=8192] pad[1] count*(data[1])"
+msg Twrite    = "typ[1,val=70] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192] pad[1] count*(data[1])"
 msg Rwrite    = "typ[1,val=71] tag[tag] fid[fid] count[2,max=8192]"
 msg Tclunk    = "typ[1,val=72] tag[tag] fid[fid]"
 msg Rclunk    = "typ[1,val=73] tag[tag] fid[fid]"
 msg Tremove   = "typ[1,val=74] tag[tag] fid[fid]"
 msg Rremove   = "typ[1,val=75] tag[tag] fid[fid]"
 msg Tstat     = "typ[1,val=76] tag[tag] fid[fid]"
-msg Rstat     = "typ[1,val=77] tag[tag] fid[fid] stat[116]"
-msg Twstat    = "typ[1,val=78] tag[tag] fid[fid] stat[116]"
+msg Rstat     = "typ[1,val=77] tag[tag] fid[fid] stat[stat]"
+msg Twstat    = "typ[1,val=78] tag[tag] fid[fid] stat[stat]"
 msg Rwstat    = "typ[1,val=79] tag[tag] fid[fid]"
-msg Tclwalk   = "typ[1,val=80] tag[tag] fid[fid] newfid[fid] name[28]"
-msg Rclwalk   = "typ[1,val=81] tag[tag] fid[fid] qid[8]"
-msg Tauth     = "typ[1,val=82] tag[tag] fid[fid] uid[28] chal[36]"
-msg Rauth     = "typ[1,val=83] tag[tag] fid[fid] chal[30]"
+msg Tclwalk   = "typ[1,val=80] tag[tag] fid[fid] newfid[fid] name[name]"
+msg Rclwalk   = "typ[1,val=81] tag[tag] fid[fid] qid[qid]"
+msg Tauth     = "typ[1,val=82] tag[tag] fid[fid] uid[name] chal[encrypted_auth_challenge]" # chal is an encrypted
+msg Rauth     = "typ[1,val=83] tag[tag] fid[fid] chal[encrypted_auth_response]"
diff --git a/lib9p/idl/1995-9P1.9p.wip b/lib9p/idl/1995-9P1.9p.wip
index 2812cda..2caf39d 100644
--- a/lib9p/idl/1995-9P1.9p.wip
+++ b/lib9p/idl/1995-9P1.9p.wip
@@ -3,57 +3,105 @@
 # Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
-# https://man.cat-v.org/plan_9_2nd_ed/5/
-# https://man.cat-v.org/plan_9_3rd_ed/5/
+# Plan 9 2nd and 3rd edition used a version of 9P lightly revised from
+# the 1st edition version, re-thinking authentication.
+#
+# 2nd edition documentation:
+# - https://github.com/plan9foundation/plan9/tree/2e-1995-04-05/sys/man/5
+# - https://github.com/plan9foundation/plan9/tree/2e-1995-04-05/sys/man/6/auth
+# - https://man.cat-v.org/plan_9_2nd_ed/5/
+# - https://man.cat-v.org/plan_9_2nd_ed/6/auth
+#
+# 2nd edition implementation references:
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/include/fcall.h (MAXFDATA)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/include/libc.h (`ch` bits)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/include/auth.h (auth matic)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/src/fs/port/fcall.c (`stat`)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/src/fs/port/fs.c (`offset:max`)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/src/fs/port/portdata.h (`MAXDAT`)
+# - https://github.com/plan9foundation/plan9/blob/2e-1995-04-05/sys/src/libauth/convM2T.c (`auth_ticket`)
+#
+# 3rd edition documentation:
+# - https://github.com/plan9foundation/plan9/tree/3e-2001-03-28/sys/man/5
+# - https://github.com/plan9foundation/plan9/tree/3e-2001-03-28/sys/man/6/auth
+# - https://man.cat-v.org/plan_9_3rd_ed/5/
+# - https://man.cat-v.org/plan_9_3rd_ed/6/auth
+#
+# 3rd edition implementation references:
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/include/fcall.h (MAXFDATA)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/include/libc.h (`ch` bits)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/include/auth.h (auth magic)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/src/fs/port/fcall.c (`stat`)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/src/fs/port/fs.c (`offset:max`)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/src/lib9p/srv.c (read `offset:max`)
+# - https://github.com/plan9foundation/plan9/blob/3e-2001-03-28/sys/src/libauth/convM2T.c (`auth_ticket`)
 version "9P1"
 
-# tag - identify a request/response pair
-num tag = 2
+from ./1992-9P0.9p import tag, fid, qid, name, errstr, o, ch, stat
 
-# file identifier - like a UNIX file-descriptor
-num fid = 2
+# CHMOUNT is undocumented (and is explicitly excluded from the 9P2000
+# draft RFC).  As I understand it, CHMOUNT indicates that the file is
+# mounted by the kernel as a 9P transport; that the kernel has a lock
+# on doing I/O on it, so userspace can't do I/O on it.
+bitfield ch += "28=MOUNT"
 
-# uni"Q"ue "ID"entification
-struct qid = "path[4] version[4]"
+# Authentication uses DES encryption.  The client obtains a ticket and
+# a nonce-key from a separate auth-server; how it does this is beyond
+# the scope of this document.
+struct random = "8*(dat[1])"
+struct domain_name = "48*(txt[1])"
+struct des_key = "7*(dat[1])"
+struct encrypted_ticket = "72*(ciphertext[1])" # encrypted by auth-server with server-key
+struct cleartext_ticket = "magic[1,val=64] server_chal[random] client_uid[name] server_uid[name] nonce_key[des_key]"
+struct encrypted_authenticator_challenge = "13*(ciphertext[1])" # encrypted by client with nonce-key obtained from auth-server
+struct cleartext_authenticator_challenge = "magic[1,val=66] server_chal[random] replay_count[4]"
+struct encrypted_authenticator_response = "13*(ciphertext[1])" # encrypted by server with nonce-key obtained from ticket
+struct cleartext_authenticator_response = "magic[1,val=67] client_chal[random] replay_count[4]"
 
-# a nul-padded string
-struct name = 28*(txt[1])
+# A 9P0 session goes:
+#
+#    [nop()]
+#    auth_tok=[session()]
+#    attach(auth_tok)
+#    ...
 
-msg Tnop      = "typ[1,val=50] tag[tag,val=0xFFFF]"
-msg Rnop      = "typ[1,val=51] tag[tag,val=0xFFFF]"
-#msg Tosession = "typ[1,val=52] illegal"
-#msg Rosession = "typ[1,val=53] illegal"
-#msg Terror    = "typ[1,val=54] illegal"
-msg Rerror    = "typ[1,val=55] tag[tag] ename[64]"
-msg Tflush    = "typ[1,val=56] tag[tag] oldtag[tag]"
-msg Rflush    = "typ[1,val=57] tag[tag]"
-#msg Toattach  = "typ[1,val=58] illegal"
-#msg Roattach  = "typ[1,val=59] illegal"
-msg Tclone    = "typ[1,val=60] tag[tag] fid[fid] newfid[fid]"
-msg Rclone    = "typ[1,val=61] tag[tag] fid[fid]"
-msg Twalk     = "typ[1,val=62] tag[tag] fid[fid] name[28]"
-msg Rwalk     = "typ[1,val=63] tag[tag] fid[fid] qid[8]"
-msg Topen     = "typ[1,val=64] tag[tag] fid[fid] mode[1]"
-msg Ropen     = "typ[1,val=65] tag[tag] fid[fid] qid[8]"
-msg Tcreate   = "typ[1,val=66] tag[tag] fid[fid] name[28] perm[4] mode[1]"
-msg Rcreate   = "typ[1,val=67] tag[tag] fid[fid] qid[8]"
-msg Tread     = "typ[1,val=68] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192]"
-msg Rread     = "typ[1,val=69] tag[tag] fid[fid] count[2,max=8192] pad[1] count*(data[1])"
-msg Twrite    = "typ[1,val=70] tag[tag] fid[fid] offset[8] count[2,max=8192] pad[1] count*(data[1])"
-msg Rwrite    = "typ[1,val=71] tag[tag] fid[fid] count[2,max=8192]"
-msg Tclunk    = "typ[1,val=72] tag[tag] fid[fid]"
-msg Rclunk    = "typ[1,val=73] tag[tag] fid[fid]"
-msg Tremove   = "typ[1,val=74] tag[tag] fid[fid]"
-msg Rremove   = "typ[1,val=75] tag[tag] fid[fid]"
-msg Tstat     = "typ[1,val=76] tag[tag] fid[fid]"
-msg Rstat     = "typ[1,val=77] tag[tag] fid[fid] stat[116]"
-msg Twstat    = "typ[1,val=78] tag[tag] fid[fid] stat[116]"
-msg Rwstat    = "typ[1,val=79] tag[tag] fid[fid]"
-msg Tclwalk   = "typ[1,val=80] tag[tag] fid[fid] newfid[fid] name[28]"
-msg Rclwalk   = "typ[1,val=81] tag[tag] fid[fid] qid[8]"
-#msg Toauth    = typ[1,val=82] illegal"
-#msg Roauth    = typ[1,val=83] illegal"
-msg Tsession  = "typ[1,val=84] tag[tag,val=0xFFFF] chal[8]"
-msg Rsession  = "typ[1,val=85] tag[tag,val=0xFFFF] chal[8] authid[28] authdom[48]"
-msg Tattach   = "typ[1,val=86] tag[tag] fid[fid] uid[28] aname[28] ticket[72] auth[13]"
-msg Rattach   = "typ[1,val=87] tag[tag] fid[fid] qid[8] rauth[13]"
+#from ./1992-9P0.9p import Tmux     # typ=48 ; removed
+#from ./1992-9P0.9p import Rmux     # typ=49 ; removed
+from ./1992-9P0.9p import Tnop     # typ=50
+from ./1992-9P0.9p import Rnop     # typ=51
+#from ./1992-9P0.9p import Tsession # typ=52 ; revised, now has typ=84
+#from ./1992-9P0.9p import Rsession # typ=53 ; revised, now has typ=85
+#from ./1992-9P0.9p import Terror   # typ=54 ; never existed
+from ./1992-9P0.9p import Rerror   # typ=55
+from ./1992-9P0.9p import Tflush   # typ=56
+from ./1992-9P0.9p import Rflush   # typ=57
+#from ./1992-9P0.9p import Tattach  # typ=58 ; revised, now has typ=86
+#from ./1992-9P0.9p import Rattach  # typ=59 ; revised, now has typ=87
+from ./1992-9P0.9p import Tclone   # typ=60
+from ./1992-9P0.9p import Rclone   # typ=61
+from ./1992-9P0.9p import Twalk    # typ=62
+from ./1992-9P0.9p import Rwalk    # typ=63
+from ./1992-9P0.9p import Topen    # typ=64
+from ./1992-9P0.9p import Ropen    # typ=65
+from ./1992-9P0.9p import Tcreate  # typ=66
+from ./1992-9P0.9p import Rcreate  # typ=67
+from ./1992-9P0.9p import Tread    # typ=68
+from ./1992-9P0.9p import Rread    # typ=69
+from ./1992-9P0.9p import Twrite   # typ=70
+from ./1992-9P0.9p import Rwrite   # typ=71
+from ./1992-9P0.9p import Tclunk   # typ=72
+from ./1992-9P0.9p import Rclunk   # typ=73
+from ./1992-9P0.9p import Tremove  # typ=74
+from ./1992-9P0.9p import Rremove  # typ=75
+from ./1992-9P0.9p import Tstat    # typ=76
+from ./1992-9P0.9p import Rstat    # typ=77
+from ./1992-9P0.9p import Twstat   # typ=78
+from ./1992-9P0.9p import Rwstat   # typ=79
+from ./1992-9P0.9p import Tclwalk  # typ=80
+from ./1992-9P0.9p import Rclwalk  # typ=81
+#from ./1992-9P0.9p import Tauth    # typ=82 ; merged into Tsession
+#from ./1992-9P0.9p import Rauth    # typ=83 ; merged into Rsession
+msg Tsession  = "typ[1,val=84] tag[tag,val=0xFFFF] chal[random]"
+msg Rsession  = "typ[1,val=85] tag[tag,val=0xFFFF] chal[random] server_name[name] server_domain[domain_name]"
+msg Tattach   = "typ[1,val=86] tag[tag] fid[fid] uid[name] aname[name] ticket[encrypted_ticket] auth[encrypted_authenticator_challenge]"
+msg Rattach   = "typ[1,val=87] tag[tag] fid[fid] qid[qid] rauth[encrypted_authenticator_response]"
diff --git a/lib9p/idl/1996-Styx.9p.wip b/lib9p/idl/1996-Styx.9p.wip
index d9d3399..6ba4509 100644
--- a/lib9p/idl/1996-Styx.9p.wip
+++ b/lib9p/idl/1996-Styx.9p.wip
@@ -1,15 +1,59 @@
 # lib9p/idl/1996-Styx.9p - Definitions of Styx messages
 #
-# Copyright (C) 2024  Luke T. Shumaker <lukeshu@lukeshu.com>
+# Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 # Styx was a variant of the 9P protocol used by the Inferno operating
-# system.  Message framing looks like 9P1 (1995), but semantics look
-# more like 9P2000 (2002).  I am not sure whether there are Styx
-# protocol differences between Inferno 1e, 2e, or 3e (4e adopted
-# 9P2000).
-#
-# - 1996 beta
-# - 1997 1.0
-# - 1999 2nd ed
-# - 2001 3rd ed
+# system (before it switched to 9P2000 in 4th edition).  It looks
+# exactly like 9P1 but with different message-type numbers and without
+# `clwalk` or `session`, and no authentication in `attach`.
+#
+# There do not appear to be Styx protocol differences between Inferno
+# 1e, 2e, or 3e.
+#
+# - 1996 beta https://github.com/inferno-os/inferno-1e0/blob/main/ see `man/html/proto*.htm`, `include/styx.h`, and `Linux/386/include/lib9.h`
+# - 1997 1e   https://github.com/inferno-os/inferno-1e1/blob/master/ see `man/html/mpgs{113..124}.htm`, `include/styx.h`, `os/port/lib.h`, and `os/fs/fs.c`
+# - 1999 2e   https://github.com/inferno-os/inferno-2e/blob/master/ see `include/styx.h`, `os/port/lib.h`, and `os/kfs/fs.c` (no public manpages)
+# - 2001 3e   https://github.com/inferno-os/inferno-3e/blob/master/ see `include/man/5/`, `include/styx.h`, `os/port/lib.h`, and `os/kfs/fs.c`
+version "Styx"
+
+from ./1992-9P1.9p import tag, fid, qid, name, errstr, o, ch, stat
+
+# A Styx session goes:
+#
+#    [nop()]
+#    attach()
+#    ...
+
+msg Tnop     = "typ[1,val=0] tag[tag,val=0xFFFF]"
+msg Rnop     = "typ[1,val=1] tag[tag,val=0xFFFF]"
+#msg Terror   = "typ[1,val=2] illegal"
+msg Rerror   = "typ[1,val=3] tag[tag] ename[errstr]"
+msg Tflush   = "typ[1,val=4] tag[tag] oldtag[tag]"
+msg Rflush   = "typ[1,val=5] tag[tag]"
+msg Tclone   = "typ[1,val=6] tag[tag] fid[fid] newfid[fid]"
+msg Rclone   = "typ[1,val=7] tag[tag] fid[fid]"
+msg Twalk    = "typ[1,val=8] tag[tag] fid[fid] name[name]"
+msg Rwalk    = "typ[1,val=9] tag[tag] fid[fid] qid[qid]"
+msg Topen    = "typ[1,val=10] tag[tag] fid[fid] mode[o]"
+msg Ropen    = "typ[1,val=11] tag[tag] fid[fid] qid[qid]"
+msg Tcreate  = "typ[1,val=12] tag[tag] fid[fid] name[name] perm[ch] mode[o]"
+msg Rcreate  = "typ[1,val=13] tag[tag] fid[fid] qid[qid]"
+# For `offset:max`, see `fs.c` `f_read()` and `f_write()`.
+# For `count:max`, see `styx.h:MAXFDATA'.
+msg Tread    = "typ[1,val=14] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192]"
+msg Rread    = "typ[1,val=15] tag[tag] fid[fid] count[2,max=8192] pad[1] count*(data[1])"
+msg Twrite   = "typ[1,val=16] tag[tag] fid[fid] offset[8,max=s64_max] count[2,max=8192] pad[1] count*(data[1])"
+msg Rwrite   = "typ[1,val=17] tag[tag] fid[fid] count[2,max=8192]"
+msg Tclunk   = "typ[1,val=18] tag[tag] fid[fid]"
+msg Rclunk   = "typ[1,val=19] tag[tag] fid[fid]"
+msg Tremove  = "typ[1,val=20] tag[tag] fid[fid]"
+msg Rremove  = "typ[1,val=21] tag[tag] fid[fid]"
+msg Tstat    = "typ[1,val=22] tag[tag] fid[fid]"
+msg Rstat    = "typ[1,val=23] tag[tag] fid[fid] stat[stat]"
+msg Twstat   = "typ[1,val=24] tag[tag] fid[fid] stat[stat]"
+msg Rwstat   = "typ[1,val=25] tag[tag] fid[fid]"
+#msg Tsession = "typ[1,val=26]" # The 1e kernel used Tsession in structs internally, but never transmitted it.
+#msg Rsession = "typ[1,val=27]" # Implied by Tsession.
+msg Tattach  = "typ[1,val=28] tag[tag] fid[fid] uid[name] aname[name]"
+msg Rattach  = "typ[1,val=29] tag[tag] fid[fid] qid[qid]"
diff --git a/lib9p/idl/2002-9P2000.9p b/lib9p/idl/2002-9P2000.9p
index f0df7d1..438e02f 100644
--- a/lib9p/idl/2002-9P2000.9p
+++ b/lib9p/idl/2002-9P2000.9p
@@ -16,6 +16,7 @@
 # https://github.com/plan9foundation/plan9/tree/main/sys/man/5
 # https://man.cat-v.org/plan_9/5/
 # https://github.com/plan9foundation/plan9/blob/main/sys/include/fcall.h
+# https://github.com/plan9foundation/plan9/blob/main/sys/include/libc.h
 # https://github.com/plan9foundation/plan9/blob/main/sys/src/lib9p/srv.c
 version "9P2000"
 
@@ -27,26 +28,20 @@ num tag = 2
 num fid = 4
     "NOFID = ~0"
 
-# data - u32le `n`, then `n` bytes of data
-struct d = "len[4] len*(dat[1])"
-
-# data - s32le `n`, then `n` bytes of data
-struct d_signed = "len[4,max=s32_max] len*(dat[1])"
-
 # string - u16le `n`, then `n` bytes of UTF-8, without any nul-bytes
 struct s = "len[2] len*(utf8[1])"
 
-# "d"? mode - file permissions and attributes
+# "D"ir-entry "M"ode - file permissions and attributes
 bitfield dm = 4
 	"31=DIR"
 	"30=APPEND"
 	"29=EXCL"
-	# DMMOUNT has been around in Plan 9 forever, but is
-	# undocumented, and is explicitly excluded from the 9P2000
-	# draft RFC.  As I understand it, DMMOUNT indicates that the
-	# file is mounted by the kernel as a 9P transport; that the
-	# kernel has a lock on doing I/O on it, so userspace can't do
-	# I/O on it.
+	# DMMOUNT has been around in Plan 9 forever (CHMOUNT in <4e),
+	# but is undocumented, and is explicitly excluded from the
+	# 9P2000 draft RFC.  As I understand it, DMMOUNT indicates
+	# that the file is mounted by the kernel as a 9P transport;
+	# that the kernel has a lock on doing I/O on it, so userspace
+	# can't do I/O on it.
 	"28=_PLAN9_MOUNT"
 	"27=AUTH"
 	"26=TMP"
@@ -68,7 +63,7 @@ bitfield qt = 1
 	"7=DIR"
 	"6=APPEND"
 	"5=EXCL"
-	"4=_PLAN9_MOUNT" # see "MOUNT" in "dm" above
+	"4=_PLAN9_MOUNT" # See "_PLAN9_MOUNT" in "dm" above.
 	"3=AUTH"
 	# Fun historical fact: QTTMP was a relatively late addition to
 	# Plan 9, in 2003-12.
@@ -110,13 +105,14 @@ struct stat = "stat_size[2,val=end-&kern_type]"
               "file_last_modified_uid[s]"
 
 # "O"pen flags (flags to pass to Topen and Tcreate)
+# Unused bits *must* be 0.
 bitfield o = 1
 	"0=mode_0" # low bit of the 2-bit READ/WRITE/RDWR/EXEC enum
 	"1=mode_1" # high bit of the 2-bit READ/WRITE/RDWR/EXEC enum
 	#"2=unused"
 	#"3=unused"
 	"4=TRUNC"
-	#"5=unused"
+	#"5=_reserved_CEXEC" # close-on-exec
 	"6=RCLOSE" # remove-on-close
 	#"7=unused"
 
@@ -128,6 +124,13 @@ bitfield o = 1
 	"MODE_MASK = 0b00000011"
 	"FLAG_MASK = 0b11111100"
 
+# A 9P2000 session goes:
+#
+#    version()
+#    [auth_fid=auth]
+#    attach([auth_fid])
+#    ...
+
 msg Tversion = "size[4,val=end-&size] typ[1,val=100] tag[tag] max_msg_size[4] version[s]"
 msg Rversion = "size[4,val=end-&size] typ[1,val=101] tag[tag] max_msg_size[4] version[s]"
 msg Tauth    = "size[4,val=end-&size] typ[1,val=102] tag[tag] afid[fid] uname[s] aname[s]"
@@ -144,10 +147,10 @@ msg Topen    = "size[4,val=end-&size] typ[1,val=112] tag[tag] fid[fid] mode[o]"
 msg Ropen    = "size[4,val=end-&size] typ[1,val=113] tag[tag] qid[qid] iounit[4]"
 msg Tcreate  = "size[4,val=end-&size] typ[1,val=114] tag[tag] fid[fid] name[s] perm[dm] mode[o]"
 msg Rcreate  = "size[4,val=end-&size] typ[1,val=115] tag[tag] qid[qid] iounit[4]"
-msg Tread    = "size[4,val=end-&size] typ[1,val=116] tag[tag] fid[fid] offset[8,max=s64_max] count[4,max=s32_max]"
-msg Rread    = "size[4,val=end-&size] typ[1,val=117] tag[tag] data[d_signed]" # for directories `data` is the sequence "cnt*(entries[stat])"
-msg Twrite   = "size[4,val=end-&size] typ[1,val=118] tag[tag] fid[fid] offset[8,max=s64_max] data[d_signed]"
-msg Rwrite   = "size[4,val=end-&size] typ[1,val=119] tag[tag] count[4]"
+msg Tread    = "size[4,val=end-&size] typ[1,val=116] tag[tag] fid[fid] offset[8,max=s64_max] count[4,max=s32_max]" # See 4e `sys/src/lib9p/srv.c:sread()` for `offset:max` and `count:max`.
+msg Rread    = "size[4,val=end-&size] typ[1,val=117] tag[tag] count[4,max=s32_max] count*(data[1])" # `max` is inherited from Tread, for directories `data` is the sequence "cnt*(entries[stat])".
+msg Twrite   = "size[4,val=end-&size] typ[1,val=118] tag[tag] fid[fid] offset[8,max=s64_max] count[4,max=s32_max] count*(data[1])" # See 4e `sys/src/lib9p/srv.c:swrite()` for `offset:max` and `count:max`.
+msg Rwrite   = "size[4,val=end-&size] typ[1,val=119] tag[tag] count[4,max=s32_max]" # `max` is inherited from Twrite.
 msg Tclunk   = "size[4,val=end-&size] typ[1,val=120] tag[tag] fid[fid]"
 msg Rclunk   = "size[4,val=end-&size] typ[1,val=121] tag[tag]"
 msg Tremove  = "size[4,val=end-&size] typ[1,val=122] tag[tag] fid[fid]"
diff --git a/lib9p/idl/2003-9P2000.p9p.9p.wip b/lib9p/idl/2003-9P2000.p9p.9p
index c42584f..3f6a524 100644
--- a/lib9p/idl/2003-9P2000.p9p.9p.wip
+++ b/lib9p/idl/2003-9P2000.p9p.9p
@@ -14,6 +14,7 @@
 
 # BUG: There is no version-string for this extension; plan9port still
 # calls it vanilla "9P2000".
+version "9P2000.p9p"
 
 from ./2002-9P2000.9p import *
 
@@ -41,7 +42,7 @@ from ./2002-9P2000.9p import *
 # but also an out-of-band control-message with a socketpair() file
 # descriptor.  A successful call results in the FID being clunked.
 msg Topenfd = "size[4,val=end-&size] typ[1,val=98] tag[tag] fid[fid] mode[o]"
-msg Ropenfd = "size[4,val=end-&size] typ[1,val=98] tag[tag] qid[qid] iounit[4] unixfd[4]"
+msg Ropenfd = "size[4,val=end-&size] typ[1,val=99] tag[tag] qid[qid] iounit[4] unixfd[4]"
 # BUG: The "unixfd" field nominally indicates the the file descriptor
 # of the pipe, but really 9pserve doesn't know which FD it will end up
 # on the client process, and lib9pclient ignores the value here and
diff --git a/lib9p/idl/2010-9P2000.L.9p b/lib9p/idl/2010-9P2000.L.9p
index 3e5db69..e21d411 100644
--- a/lib9p/idl/2010-9P2000.L.9p
+++ b/lib9p/idl/2010-9P2000.L.9p
@@ -7,7 +7,7 @@
 # https://github.com/chaos/diod/blob/master/protocol.md
 version "9P2000.L"
 
-from ./2002-9P2000.9p import tag, fid, s, d, d_signed, qt, qid
+from ./2002-9P2000.9p import tag, fid, s, qt, qid
 from ./2002-9P2000.9p import Rerror
 from ./2002-9P2000.9p import Tversion, Rversion, Tflush, Rflush, Twalk, Rwalk, Tread, Rread, Twrite, Rwrite, Tclunk, Rclunk, Tremove, Rremove
 from ./2005-9P2000.u.9p import nuid, Tauth, Rauth, Tattach, Rattach
@@ -89,7 +89,7 @@ msg Txattrcreate = "size[4,val=end-&size] typ[1,val=32] tag[tag] fid[fid] name[s
 msg Rxattrcreate = "size[4,val=end-&size] typ[1,val=33] tag[tag]"
 #...
 msg Treaddir     = "size[4,val=end-&size] typ[1,val=40] tag[tag] fid[fid] offset[8] count[4]"
-msg Rreaddir     = "size[4,val=end-&size] typ[1,val=41] tag[tag] data[d]" # data is "qid[qid] offset[8] type[1] name[s]"
+msg Rreaddir     = "size[4,val=end-&size] typ[1,val=41] tag[tag] count[4] count*(data[1])" # data is "qid[qid] offset[8] type[1] name[s]"
 #...
 msg Tfsync       = "size[4,val=end-&size] typ[1,val=50] tag[tag] fid[fid] datasync[4]"
 msg Rfsync       = "size[4,val=end-&size] typ[1,val=51] tag[tag]"
@@ -101,7 +101,7 @@ msg Rgetlock     = "size[4,val=end-&size] typ[1,val=55] tag[tag] type[1] start[8
 msg Tlink        = "size[4,val=end-&size] typ[1,val=70] tag[tag] dfid[fid] fid[fid] name[s]"
 msg Rlink        = "size[4,val=end-&size] typ[1,val=71] tag[tag]"
 msg Tmkdir       = "size[4,val=end-&size] typ[1,val=72] tag[tag] dfid[fid] name[s] mode[4] gid[nuid]"
-msg Tmkdir       = "size[4,val=end-&size] typ[1,val=73] tag[tag] qid[qid]"
+msg Rmkdir       = "size[4,val=end-&size] typ[1,val=73] tag[tag] qid[qid]"
 msg Trenameat    = "size[4,val=end-&size] typ[1,val=74] tag[tag] olddirfid[fid] oldname[s] newdirfid[fid] newname[s]"
 msg Rrenameat    = "size[4,val=end-&size] typ[1,val=75] tag[tag]"
 msg Tunlinkat    = "size[4,val=end-&size] typ[1,val=76] tag[tag] dirfd[fid] name[s] flags[4]"
diff --git a/lib9p/idl/2012-9P2000.e.9p b/lib9p/idl/2012-9P2000.e.9p
index ef80796..dde9d96 100644
--- a/lib9p/idl/2012-9P2000.e.9p
+++ b/lib9p/idl/2012-9P2000.e.9p
@@ -13,6 +13,6 @@ from ./2002-9P2000.9p import *
 msg Tsession = "size[4,val=end-&size] typ[1,val=150] tag[tag] key[8]"
 msg Rsession = "size[4,val=end-&size] typ[1,val=151] tag[tag]"
 msg Tsread   = "size[4,val=end-&size] typ[1,val=152] tag[tag] fid[4] nwname[2] nwname*(wname[s])"
-msg Rsread   = "size[4,val=end-&size] typ[1,val=153] tag[tag] data[d]"
-msg Tswrite  = "size[4,val=end-&size] typ[1,val=154] tag[tag] fid[4] nwname[2] nwname*(wname[s]) data[d]"
+msg Rsread   = "size[4,val=end-&size] typ[1,val=153] tag[tag] count[4] count*(data[1])"
+msg Tswrite  = "size[4,val=end-&size] typ[1,val=154] tag[tag] fid[4] nwname[2] nwname*(wname[s]) count[4] count*(data[1])"
 msg Rswrite  = "size[4,val=end-&size] typ[1,val=155] tag[tag] count[4]"
diff --git a/lib9p/idl/__init__.py b/lib9p/idl/__init__.py
index 41664f1..a01c38f 100644
--- a/lib9p/idl/__init__.py
+++ b/lib9p/idl/__init__.py
@@ -433,121 +433,144 @@ def parse_file(
 
     with open(filename, "r") as fh:
         prev: Type | None = None
-        for line in fh:
-            line = line.split("#", 1)[0].rstrip()
-            if not line:
-                continue
-            if m := re.fullmatch(re_line_version, line):
-                if version:
+        for lineno, line in enumerate(fh):
+            try:
+                line = line.split("#", 1)[0].rstrip()
+                if not line:
+                    continue
+                if m := re.fullmatch(re_line_version, line):
+                    if version:
+                        raise SyntaxError("must have exactly 1 version line")
+                    version = m.group("version")
+                    continue
+                if not version:
                     raise SyntaxError("must have exactly 1 version line")
-                version = m.group("version")
-                continue
-            if not version:
-                raise SyntaxError("must have exactly 1 version line")
-
-            if m := re.fullmatch(re_line_import, line):
-                other_version, other_typs = get_include(m.group("file"))
-                for symname in m.group("syms").split(sep=","):
-                    symname = symname.strip()
-                    found = False
-                    for typ in other_typs:
-                        if typ.name == symname or symname == "*":
-                            found = True
-                            match typ:
-                                case Primitive():
-                                    pass
-                                case Number():
-                                    typ.in_versions.add(version)
-                                case Bitfield():
-                                    typ.in_versions.add(version)
-                                    for val in typ.names.values():
-                                        if other_version in val.in_versions:
-                                            val.in_versions.add(version)
-                                case Struct():  # and Message()
-                                    typ.in_versions.add(version)
-                                    for member in typ.members:
-                                        if other_version in member.in_versions:
-                                            member.in_versions.add(version)
-                            env[typ.name] = typ
-                    if symname != "*" and not found:
-                        raise ValueError(
-                            f"import: {m.group('file')}: no symbol {repr(symname)}"
-                        )
-            elif m := re.fullmatch(re_line_num, line):
-                num = Number()
-                num.name = m.group("name")
-                num.in_versions.add(version)
-
-                prim = env[m.group("prim")]
-                assert isinstance(prim, Primitive)
-                num.prim = prim
-
-                env[num.name] = num
-                prev = num
-            elif m := re.fullmatch(re_line_bitfield, line):
-                bf = Bitfield()
-                bf.name = m.group("name")
-                bf.in_versions.add(version)
-
-                prim = env[m.group("prim")]
-                assert isinstance(prim, Primitive)
-                bf.prim = prim
-
-                bf.bits = (prim.static_size * 8) * [""]
-
-                env[bf.name] = bf
-                prev = bf
-            elif m := re.fullmatch(re_line_bitfield_, line):
-                bf = get_type(m.group("name"), Bitfield)
-                parse_bitspec(version, bf, m.group("member"))
-
-                prev = bf
-            elif m := re.fullmatch(re_line_struct, line):
-                match m.group("op"):
-                    case "=":
-                        struct = Struct()
-                        struct.name = m.group("name")
-                        struct.in_versions.add(version)
-                        struct.members = []
-                        parse_members(version, env, struct, m.group("members"))
-
-                        env[struct.name] = struct
-                        prev = struct
-                    case "+=":
-                        struct = get_type(m.group("name"), Struct)
-                        parse_members(version, env, struct, m.group("members"))
-
-                        prev = struct
-            elif m := re.fullmatch(re_line_msg, line):
-                match m.group("op"):
-                    case "=":
-                        msg = Message()
-                        msg.name = m.group("name")
-                        msg.in_versions.add(version)
-                        msg.members = []
-                        parse_members(version, env, msg, m.group("members"))
-
-                        env[msg.name] = msg
-                        prev = msg
-                    case "+=":
-                        msg = get_type(m.group("name"), Message)
-                        parse_members(version, env, msg, m.group("members"))
-
-                        prev = msg
-            elif m := re.fullmatch(re_line_cont, line):
-                match prev:
-                    case Bitfield():
-                        parse_bitspec(version, prev, m.group("specs"))
-                    case Number():
-                        parse_numspec(version, prev, m.group("specs"))
-                    case Struct():  # and Message()
-                        parse_members(version, env, prev, m.group("specs"))
-                    case _:
-                        raise SyntaxError(
-                            "continuation line must come after a bitfield, struct, or msg line"
-                        )
-            else:
-                raise SyntaxError(f"invalid line {repr(line)}")
+
+                if m := re.fullmatch(re_line_import, line):
+                    other_version, other_typs = get_include(m.group("file"))
+                    for symname in m.group("syms").split(sep=","):
+                        symname = symname.strip()
+                        found = False
+                        for typ in other_typs:
+                            if typ.name == symname or symname == "*":
+                                found = True
+                                match typ:
+                                    case Primitive():
+                                        pass
+                                    case Number():
+                                        typ.in_versions.add(version)
+                                    case Bitfield():
+                                        typ.in_versions.add(version)
+                                        for val in typ.names.values():
+                                            if other_version in val.in_versions:
+                                                val.in_versions.add(version)
+                                    case Struct():  # and Message()
+                                        typ.in_versions.add(version)
+                                        for member in typ.members:
+                                            if other_version in member.in_versions:
+                                                member.in_versions.add(version)
+                                if typ.name in env and env[typ.name] != typ:
+                                    raise ValueError(
+                                        f"duplicate type name {repr(typ.name)}"
+                                    )
+                                env[typ.name] = typ
+                        if symname != "*" and not found:
+                            raise ValueError(
+                                f"import: {m.group('file')}: no symbol {repr(symname)}"
+                            )
+                elif m := re.fullmatch(re_line_num, line):
+                    num = Number()
+                    num.name = m.group("name")
+                    num.in_versions.add(version)
+
+                    prim = env[m.group("prim")]
+                    assert isinstance(prim, Primitive)
+                    num.prim = prim
+
+                    if num.name in env:
+                        raise ValueError(f"duplicate type name {repr(num.name)}")
+                    env[num.name] = num
+                    prev = num
+                elif m := re.fullmatch(re_line_bitfield, line):
+                    bf = Bitfield()
+                    bf.name = m.group("name")
+                    bf.in_versions.add(version)
+
+                    prim = env[m.group("prim")]
+                    assert isinstance(prim, Primitive)
+                    bf.prim = prim
+
+                    bf.bits = (prim.static_size * 8) * [""]
+
+                    if bf.name in env:
+                        raise ValueError(f"duplicate type name {repr(bf.name)}")
+                    env[bf.name] = bf
+                    prev = bf
+                elif m := re.fullmatch(re_line_bitfield_, line):
+                    bf = get_type(m.group("name"), Bitfield)
+                    parse_bitspec(version, bf, m.group("member"))
+
+                    prev = bf
+                elif m := re.fullmatch(re_line_struct, line):
+                    match m.group("op"):
+                        case "=":
+                            struct = Struct()
+                            struct.name = m.group("name")
+                            struct.in_versions.add(version)
+                            struct.members = []
+                            parse_members(version, env, struct, m.group("members"))
+
+                            if struct.name in env:
+                                raise ValueError(
+                                    f"duplicate type name {repr(struct.name)}"
+                                )
+                            env[struct.name] = struct
+                            prev = struct
+                        case "+=":
+                            struct = get_type(m.group("name"), Struct)
+                            parse_members(version, env, struct, m.group("members"))
+
+                            prev = struct
+                elif m := re.fullmatch(re_line_msg, line):
+                    match m.group("op"):
+                        case "=":
+                            msg = Message()
+                            msg.name = m.group("name")
+                            msg.in_versions.add(version)
+                            msg.members = []
+                            parse_members(version, env, msg, m.group("members"))
+
+                            if msg.name in env:
+                                raise ValueError(
+                                    f"duplicate type name {repr(msg.name)}"
+                                )
+                            env[msg.name] = msg
+                            prev = msg
+                        case "+=":
+                            msg = get_type(m.group("name"), Message)
+                            parse_members(version, env, msg, m.group("members"))
+
+                            prev = msg
+                elif m := re.fullmatch(re_line_cont, line):
+                    match prev:
+                        case Bitfield():
+                            parse_bitspec(version, prev, m.group("specs"))
+                        case Number():
+                            parse_numspec(version, prev, m.group("specs"))
+                        case Struct():  # and Message()
+                            parse_members(version, env, prev, m.group("specs"))
+                        case _:
+                            raise SyntaxError(
+                                "continuation line must come after a bitfield, struct, or msg line"
+                            )
+                else:
+                    raise SyntaxError("invalid line")
+            except (SyntaxError, NameError, ValueError) as e:
+                e2 = SyntaxError(str(e))
+                e2.filename = filename
+                e2.lineno = lineno + 1
+                e2.text = line
+                raise e2 from e
     if not version:
         raise SyntaxError("must have exactly 1 version line")
 
@@ -601,4 +624,10 @@ class Parser:
                         raise ValueError(f"duplicate type name {repr(typ.name)}")
                 else:
                     ret_typs[typ.name] = typ
+        msgids: set[int] = set()
+        for typ in ret_typs.values():
+            if isinstance(typ, Message):
+                if typ.msgid in msgids:
+                    raise ValueError(f"duplicate msgid {repr(typ.msgid)}")
+                msgids.add(typ.msgid)
         return ret_versions, list(ret_typs.values())
diff --git a/lib9p/include/lib9p/9p.generated.h b/lib9p/include/lib9p/9p.generated.h
index 99bc4ce..a5b719e 100644
--- a/lib9p/include/lib9p/9p.generated.h
+++ b/lib9p/include/lib9p/9p.generated.h
@@ -1,4 +1,4 @@
-/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
+/* Generated by `lib9p/idl.gen lib9p/idl/2002-9P2000.9p lib9p/idl/2003-9P2000.p9p.9p lib9p/idl/2005-9P2000.u.9p lib9p/idl/2010-9P2000.L.9p lib9p/idl/2012-9P2000.e.9p`.  DO NOT EDIT!  */
 
 #ifndef _LIB9P_9P_H_
 	#error Do not include <lib9p/9p.generated.h> directly; include <lib9p/9p.h> instead
@@ -22,6 +22,10 @@
 	#error config.h must define CONFIG_9P_ENABLE_9P2000_e
 #endif
 
+#ifndef CONFIG_9P_ENABLE_9P2000_p9p
+	#error config.h must define CONFIG_9P_ENABLE_9P2000_p9p
+#endif
+
 #ifndef CONFIG_9P_ENABLE_9P2000_u
 	#error config.h must define CONFIG_9P_ENABLE_9P2000_u
 #endif
@@ -39,6 +43,9 @@ enum lib9p_version {
 #if CONFIG_9P_ENABLE_9P2000_e
 	LIB9P_VER_9P2000_e,    /* "9P2000.e" */
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	LIB9P_VER_9P2000_p9p,  /* "9P2000.p9p" */
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_VER_9P2000_u,    /* "9P2000.u" */
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
@@ -82,13 +89,18 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Rgetlock     = 55,
 	LIB9P_TYP_Tlink        = 70,
 	LIB9P_TYP_Rlink        = 71,
-	LIB9P_TYP_Tmkdir       = 73,
+	LIB9P_TYP_Tmkdir       = 72,
+	LIB9P_TYP_Rmkdir       = 73,
 	LIB9P_TYP_Trenameat    = 74,
 	LIB9P_TYP_Rrenameat    = 75,
 	LIB9P_TYP_Tunlinkat    = 76,
 	LIB9P_TYP_Runlinkat    = 77,
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	LIB9P_TYP_Topenfd      = 98,
+	LIB9P_TYP_Ropenfd      = 99,
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Tversion     = 100,
 	LIB9P_TYP_Rversion     = 101,
 	LIB9P_TYP_Tauth        = 102,
@@ -100,14 +112,14 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Rflush       = 109,
 	LIB9P_TYP_Twalk        = 110,
 	LIB9P_TYP_Rwalk        = 111,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Topen        = 112,
 	LIB9P_TYP_Ropen        = 113,
 	LIB9P_TYP_Tcreate      = 114,
 	LIB9P_TYP_Rcreate      = 115,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Tread        = 116,
 	LIB9P_TYP_Rread        = 117,
 	LIB9P_TYP_Twrite       = 118,
@@ -116,13 +128,13 @@ enum lib9p_msg_type { /* uint8_t */
 	LIB9P_TYP_Rclunk       = 121,
 	LIB9P_TYP_Tremove      = 122,
 	LIB9P_TYP_Rremove      = 123,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 	LIB9P_TYP_Tstat        = 124,
 	LIB9P_TYP_Rstat        = 125,
 	LIB9P_TYP_Twstat       = 126,
 	LIB9P_TYP_Rwstat       = 127,
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_e
 	LIB9P_TYP_Tsession     = 150,
 	LIB9P_TYP_Rsession     = 151,
@@ -135,7 +147,7 @@ enum lib9p_msg_type { /* uint8_t */
 
 /* payload types **************************************************************/
 
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 2 */
 typedef uint16_t lib9p_tag_t;
 #define LIB9P_TAG_NOTAG ((lib9p_tag_t)UINT16_C(~0))
@@ -144,26 +156,14 @@ typedef uint16_t lib9p_tag_t;
 typedef uint32_t lib9p_fid_t;
 #define LIB9P_FID_NOFID ((lib9p_fid_t)UINT32_C(~0))
 
-/* min_size = 4 ; max_size = 4,294,967,299 (warning: >UINT32_MAX) */
-struct lib9p_d {
-	uint32_t                  len;
-	[[gnu::nonstring]] char  *dat;
-};
-
-/* min_size = 4 ; max_size = 2,147,483,651 */
-struct lib9p_d_signed {
-	uint32_t                  len;
-	[[gnu::nonstring]] char  *dat;
-};
-
 /* min_size = 2 ; max_size = 65,537 */
 struct lib9p_s {
 	uint16_t                  len;
 	[[gnu::nonstring]] char  *utf8;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 4 */
 typedef uint32_t lib9p_dm_t;
 
@@ -206,8 +206,8 @@ typedef uint32_t lib9p_dm_t;
 
 #define   LIB9P_DM_PERM_MASK     ((lib9p_dm_t)(0777))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 1 */
 typedef uint8_t lib9p_qt_t;
 
@@ -224,14 +224,14 @@ typedef uint8_t lib9p_qt_t;
 
 #define   LIB9P_QT_FILE          ((lib9p_qt_t)(0))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u
 /* size = 4 */
 typedef uint32_t lib9p_nuid_t;
 #define LIB9P_NUID_NONUID ((lib9p_nuid_t)UINT32_C(~0))
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 1 */
 typedef uint8_t lib9p_o_t;
 
@@ -251,7 +251,7 @@ typedef uint8_t lib9p_o_t;
 #define   LIB9P_O_MODE_MASK  ((lib9p_o_t)(0b00000011))
 #define   LIB9P_O_FLAG_MASK  ((lib9p_o_t)(0b11111100))
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* size = 8 */
 typedef uint64_t lib9p_getattr_t;
@@ -410,7 +410,7 @@ typedef uint8_t lib9p_lock_status_t;
 #define LIB9P_LOCK_STATUS_GRACE   ((lib9p_lock_status_t)UINT8_C(3))
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 9 */
 struct lib9p_msg_Tflush {
 	lib9p_tag_t   tag;
@@ -422,6 +422,13 @@ struct lib9p_msg_Rflush {
 	lib9p_tag_t   tag;
 };
 
+/* min_size = 11 ; max_size = 2,147,483,658 */
+struct lib9p_msg_Rread {
+	lib9p_tag_t               tag;
+	uint32_t                  count;
+	[[gnu::nonstring]] char  *data;
+};
+
 /* size = 11 */
 struct lib9p_msg_Rwrite {
 	lib9p_tag_t   tag;
@@ -438,14 +445,14 @@ struct lib9p_msg_Rremove {
 	lib9p_tag_t   tag;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 7 */
 struct lib9p_msg_Rwstat {
 	lib9p_tag_t   tag;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* size = 11 */
 struct lib9p_msg_Rlerror {
@@ -488,6 +495,13 @@ struct lib9p_msg_Rxattrcreate {
 	lib9p_tag_t   tag;
 };
 
+/* min_size = 11 ; max_size = 4,294,967,306 (warning: >UINT32_MAX) */
+struct lib9p_msg_Rreaddir {
+	lib9p_tag_t               tag;
+	uint32_t                  count;
+	[[gnu::nonstring]] char  *data;
+};
+
 /* size = 7 */
 struct lib9p_msg_Rfsync {
 	lib9p_tag_t   tag;
@@ -521,6 +535,13 @@ struct lib9p_msg_Rsession {
 	lib9p_tag_t   tag;
 };
 
+/* min_size = 11 ; max_size = 4,294,967,306 (warning: >UINT32_MAX) */
+struct lib9p_msg_Rsread {
+	lib9p_tag_t               tag;
+	uint32_t                  count;
+	[[gnu::nonstring]] char  *data;
+};
+
 /* size = 11 */
 struct lib9p_msg_Rswrite {
 	lib9p_tag_t   tag;
@@ -528,7 +549,7 @@ struct lib9p_msg_Rswrite {
 };
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 23 */
 struct lib9p_msg_Tread {
 	lib9p_tag_t   tag;
@@ -537,6 +558,15 @@ struct lib9p_msg_Tread {
 	uint32_t      count;
 };
 
+/* min_size = 23 ; max_size = 2,147,483,670 */
+struct lib9p_msg_Twrite {
+	lib9p_tag_t               tag;
+	lib9p_fid_t               fid;
+	uint64_t                  offset;
+	uint32_t                  count;
+	[[gnu::nonstring]] char  *data;
+};
+
 /* size = 11 */
 struct lib9p_msg_Tclunk {
 	lib9p_tag_t   tag;
@@ -549,15 +579,15 @@ struct lib9p_msg_Tremove {
 	lib9p_fid_t   fid;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 11 */
 struct lib9p_msg_Tstat {
 	lib9p_tag_t   tag;
 	lib9p_fid_t   fid;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* size = 11 */
 struct lib9p_msg_Tstatfs {
@@ -593,36 +623,8 @@ struct lib9p_msg_Tfsync {
 	uint32_t      datasync;
 };
 
-/* min_size = 11 ; max_size = 4,294,967,306 (warning: >UINT32_MAX) */
-struct lib9p_msg_Rreaddir {
-	lib9p_tag_t      tag;
-	struct lib9p_d   data;
-};
-
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-/* min_size = 11 ; max_size = 4,294,967,306 (warning: >UINT32_MAX) */
-struct lib9p_msg_Rsread {
-	lib9p_tag_t      tag;
-	struct lib9p_d   data;
-};
-
-#endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-/* min_size = 11 ; max_size = 2,147,483,658 */
-struct lib9p_msg_Rread {
-	lib9p_tag_t             tag;
-	struct lib9p_d_signed   data;
-};
-
-/* min_size = 23 ; max_size = 2,147,483,670 */
-struct lib9p_msg_Twrite {
-	lib9p_tag_t             tag;
-	lib9p_fid_t             fid;
-	uint64_t                offset;
-	struct lib9p_d_signed   data;
-};
-
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* min_size = 13 ; max_size = 65,548 */
 struct lib9p_msg_Tversion {
 	lib9p_tag_t      tag;
@@ -637,10 +639,11 @@ struct lib9p_msg_Rversion {
 	struct lib9p_s   version;
 };
 
-/* LIB9P_VER_9P2000  : min_size = 9 ; max_size = 65,544 */
-/* LIB9P_VER_9P2000_L: min_size = 9 ; max_size = 65,544 */
-/* LIB9P_VER_9P2000_e: min_size = 9 ; max_size = 65,544 */
-/* LIB9P_VER_9P2000_u: min_size = 13 ; max_size = 65,548 */
+/* LIB9P_VER_9P2000    : min_size = 9 ; max_size = 65,544 */
+/* LIB9P_VER_9P2000_L  : min_size = 9 ; max_size = 65,544 */
+/* LIB9P_VER_9P2000_e  : min_size = 9 ; max_size = 65,544 */
+/* LIB9P_VER_9P2000_p9p: min_size = 9 ; max_size = 65,544 */
+/* LIB9P_VER_9P2000_u  : min_size = 13 ; max_size = 65,548 */
 struct lib9p_msg_Rerror {
 	lib9p_tag_t      tag;
 	struct lib9p_s   ename;
@@ -658,7 +661,7 @@ struct lib9p_msg_Twalk {
 	struct lib9p_s  *wname;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* min_size = 17 ; max_size = 65,552 */
 struct lib9p_msg_Trename {
@@ -749,15 +752,16 @@ struct lib9p_msg_Tsread {
 
 /* min_size = 17 ; max_size = 8,589,934,607 (warning: >UINT32_MAX) */
 struct lib9p_msg_Tswrite {
-	lib9p_tag_t      tag;
-	uint32_t         fid;
-	uint16_t         nwname;
-	struct lib9p_s  *wname;
-	struct lib9p_d   data;
+	lib9p_tag_t               tag;
+	uint32_t                  fid;
+	uint16_t                  nwname;
+	struct lib9p_s           *wname;
+	uint32_t                  count;
+	[[gnu::nonstring]] char  *data;
 };
 
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 13 */
 struct lib9p_qid {
 	lib9p_qt_t   type;
@@ -765,10 +769,11 @@ struct lib9p_qid {
 	uint64_t     path;
 };
 
-/* LIB9P_VER_9P2000  : min_size = 15 ; max_size = 131,085 */
-/* LIB9P_VER_9P2000_L: min_size = 19 ; max_size = 131,089 */
-/* LIB9P_VER_9P2000_e: min_size = 15 ; max_size = 131,085 */
-/* LIB9P_VER_9P2000_u: min_size = 19 ; max_size = 131,089 */
+/* LIB9P_VER_9P2000    : min_size = 15 ; max_size = 131,085 */
+/* LIB9P_VER_9P2000_L  : min_size = 19 ; max_size = 131,089 */
+/* LIB9P_VER_9P2000_e  : min_size = 15 ; max_size = 131,085 */
+/* LIB9P_VER_9P2000_p9p: min_size = 15 ; max_size = 131,085 */
+/* LIB9P_VER_9P2000_u  : min_size = 19 ; max_size = 131,089 */
 struct lib9p_msg_Tauth {
 	lib9p_tag_t      tag;
 	lib9p_fid_t      afid;
@@ -779,10 +784,11 @@ struct lib9p_msg_Tauth {
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 };
 
-/* LIB9P_VER_9P2000  : min_size = 19 ; max_size = 131,089 */
-/* LIB9P_VER_9P2000_L: min_size = 23 ; max_size = 131,093 */
-/* LIB9P_VER_9P2000_e: min_size = 19 ; max_size = 131,089 */
-/* LIB9P_VER_9P2000_u: min_size = 23 ; max_size = 131,093 */
+/* LIB9P_VER_9P2000    : min_size = 19 ; max_size = 131,089 */
+/* LIB9P_VER_9P2000_L  : min_size = 23 ; max_size = 131,093 */
+/* LIB9P_VER_9P2000_e  : min_size = 19 ; max_size = 131,089 */
+/* LIB9P_VER_9P2000_p9p: min_size = 19 ; max_size = 131,089 */
+/* LIB9P_VER_9P2000_u  : min_size = 23 ; max_size = 131,093 */
 struct lib9p_msg_Tattach {
 	lib9p_tag_t      tag;
 	lib9p_fid_t      fid;
@@ -794,7 +800,7 @@ struct lib9p_msg_Tattach {
 #endif /* CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* min_size = 25 ; max_size = 65,560 */
 struct lib9p_msg_Tlcreate {
@@ -826,8 +832,17 @@ struct lib9p_msg_Tmknod {
 	lib9p_nuid_t     gid;
 };
 
+/* min_size = 21 ; max_size = 65,556 */
+struct lib9p_msg_Tmkdir {
+	lib9p_tag_t      tag;
+	lib9p_fid_t      dfid;
+	struct lib9p_s   name;
+	uint32_t         mode;
+	lib9p_nuid_t     gid;
+};
+
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 12 */
 struct lib9p_msg_Topen {
 	lib9p_tag_t   tag;
@@ -844,7 +859,16 @@ struct lib9p_msg_Tcreate {
 	lib9p_o_t        mode;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+/* size = 12 */
+struct lib9p_msg_Topenfd {
+	lib9p_tag_t   tag;
+	lib9p_fid_t   fid;
+	lib9p_o_t     mode;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* size = 19 */
 struct lib9p_msg_Tgetattr {
@@ -887,10 +911,11 @@ struct lib9p_msg_Rlock {
 };
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-/* LIB9P_VER_9P2000  : min_size = 49 ; max_size = 262,189 */
-/* LIB9P_VER_9P2000_e: min_size = 49 ; max_size = 262,189 */
-/* LIB9P_VER_9P2000_u: min_size = 63 ; max_size = 327,738 */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+/* LIB9P_VER_9P2000    : min_size = 49 ; max_size = 262,189 */
+/* LIB9P_VER_9P2000_e  : min_size = 49 ; max_size = 262,189 */
+/* LIB9P_VER_9P2000_p9p: min_size = 49 ; max_size = 262,189 */
+/* LIB9P_VER_9P2000_u  : min_size = 63 ; max_size = 327,738 */
 struct lib9p_stat {
 	uint16_t           kern_type;
 	uint32_t           kern_dev;
@@ -911,8 +936,8 @@ struct lib9p_stat {
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 20 */
 struct lib9p_msg_Rauth {
 	lib9p_tag_t        tag;
@@ -932,8 +957,8 @@ struct lib9p_msg_Rwalk {
 	struct lib9p_qid  *wqid;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_L || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
 /* size = 24 */
 struct lib9p_msg_Ropen {
 	lib9p_tag_t        tag;
@@ -948,7 +973,17 @@ struct lib9p_msg_Rcreate {
 	uint32_t           iounit;
 };
 
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+/* size = 28 */
+struct lib9p_msg_Ropenfd {
+	lib9p_tag_t        tag;
+	struct lib9p_qid   qid;
+	uint32_t           iounit;
+	uint32_t           unixfd;
+};
+
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_L
 /* size = 24 */
 struct lib9p_msg_Rlopen {
@@ -1002,27 +1037,29 @@ struct lib9p_msg_Rgetattr {
 };
 
 /* size = 20 */
-struct lib9p_msg_Tmkdir {
+struct lib9p_msg_Rmkdir {
 	lib9p_tag_t        tag;
 	struct lib9p_qid   qid;
 };
 
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u
-/* LIB9P_VER_9P2000  : min_size = 58 ; max_size = 262,198 */
-/* LIB9P_VER_9P2000_e: min_size = 58 ; max_size = 262,198 */
-/* LIB9P_VER_9P2000_u: min_size = 72 ; max_size = 327,747 */
+#if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
+/* LIB9P_VER_9P2000    : min_size = 58 ; max_size = 262,198 */
+/* LIB9P_VER_9P2000_e  : min_size = 58 ; max_size = 262,198 */
+/* LIB9P_VER_9P2000_p9p: min_size = 58 ; max_size = 262,198 */
+/* LIB9P_VER_9P2000_u  : min_size = 72 ; max_size = 327,747 */
 struct lib9p_msg_Rstat {
 	lib9p_tag_t         tag;
 	struct lib9p_stat   stat;
 };
 
-/* LIB9P_VER_9P2000  : min_size = 62 ; max_size = 262,202 */
-/* LIB9P_VER_9P2000_e: min_size = 62 ; max_size = 262,202 */
-/* LIB9P_VER_9P2000_u: min_size = 76 ; max_size = 327,751 */
+/* LIB9P_VER_9P2000    : min_size = 62 ; max_size = 262,202 */
+/* LIB9P_VER_9P2000_e  : min_size = 62 ; max_size = 262,202 */
+/* LIB9P_VER_9P2000_p9p: min_size = 62 ; max_size = 262,202 */
+/* LIB9P_VER_9P2000_u  : min_size = 76 ; max_size = 327,751 */
 struct lib9p_msg_Twstat {
 	lib9p_tag_t         tag;
 	lib9p_fid_t         fid;
 	struct lib9p_stat   stat;
 };
-#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_u */
+#endif /* CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u */
diff --git a/lib9p/srv.c b/lib9p/srv.c
index f2d1315..7e6402e 100644
--- a/lib9p/srv.c
+++ b/lib9p/srv.c
@@ -53,13 +53,13 @@ struct _srv_fidinfo {
 };
 
 #define NAME  fidmap
-#define KEY_T uint32_t
+#define KEY_T lib9p_fid_t
 #define VAL_T struct _srv_fidinfo
 #define CAP   CONFIG_9P_MAX_FIDS
 #include "map.h"
 
 #define NAME  reqmap
-#define KEY_T uint32_t
+#define KEY_T lib9p_tag_t
 #define VAL_T struct _lib9p_srv_req *
 #define CAP   CONFIG_9P_MAX_REQS
 #include "map.h"
@@ -818,7 +818,7 @@ static void handle_Tread(struct _lib9p_srv_req *ctx,
 
 	/* Variables.  */
 	implements_lib9p_srv_file *file = fidinfo->file;
-	resp->data.dat = (char *)(&resp[1]);
+	resp->data = (char *)(&resp[1]);
 
 	/* Do it.  */
 	if (fidinfo->flags & FIDFLAG_ISDIR) {
@@ -835,20 +835,20 @@ static void handle_Tread(struct _lib9p_srv_req *ctx,
 			return;
 		}
 		/* Do it.  */
-		size_t num = VCALL(file, dread, &ctx->ctx, (uint8_t *)resp->data.dat, req->count, idx);
+		size_t num = VCALL(file, dread, &ctx->ctx, (uint8_t *)resp->data, req->count, idx);
 		/* Translate object-count back to byte-count.  */
 		uint32_t len = 0;
 		for (size_t i = 0; i < num; i++) {
 			uint32_t i_len;
-			lib9p_stat_validate(&ctx->ctx.basectx, req->count, &((uint8_t *)resp->data.dat)[len], &i_len, NULL);
+			lib9p_stat_validate(&ctx->ctx.basectx, req->count, &((uint8_t *)resp->data)[len], &i_len, NULL);
 			len += i_len;
 		}
-		resp->data.len = len;
+		resp->count = len;
 		/* Remember.  */
 		fidinfo->dir_idx = idx+num;
 		fidinfo->dir_off = req->offset + len;
 	} else
-		resp->data.len = VCALL(file, pread, &ctx->ctx, resp->data.dat, req->count, req->offset);
+		resp->count = VCALL(file, pread, &ctx->ctx, resp->data, req->count, req->offset);
 }
 
 static void handle_Twrite(struct _lib9p_srv_req *ctx,
@@ -873,7 +873,7 @@ static void handle_Twrite(struct _lib9p_srv_req *ctx,
 	implements_lib9p_srv_file *file = fidinfo->file;
 
 	/* Do it.  */
-	resp->count = VCALL(file, pwrite, &ctx->ctx, req->data.dat, req->data.len, req->offset);
+	resp->count = VCALL(file, pwrite, &ctx->ctx, req->data, req->count, req->offset);
 }
 
 static void handle_Tclunk(struct _lib9p_srv_req *ctx,
diff --git a/lib9p/tests/test_server/config/config.h b/lib9p/tests/test_server/config/config.h
index 971dda2..e4036d6 100644
--- a/lib9p/tests/test_server/config/config.h
+++ b/lib9p/tests/test_server/config/config.h
@@ -43,6 +43,7 @@
 #define CONFIG_9P_ENABLE_9P2000_u     1 /* bool */
 #define CONFIG_9P_ENABLE_9P2000_e     0 /* bool */
 #define CONFIG_9P_ENABLE_9P2000_L     0 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_p9p   0 /* bool */
 
 /* COROUTINE ******************************************************************/