Merge branch 'lukeshu/9p-misc'

16 files changed, 600 insertions, 591 deletions

diff --git a/cmd/sbc_harness/config/config.h b/cmd/sbc_harness/config/config.h
index fd089b1..da3edad 100644
--- a/cmd/sbc_harness/config/config.h
+++ b/cmd/sbc_harness/config/config.h
@@ -32,6 +32,8 @@
 
 /* 9P *************************************************************************/
 
+#define CONFIG_9P_MAX_ERR_SIZE          128 /* 128 is what Plan 9 4e uses */
+
 /**
  * This max-msg-size is sized so that a Twrite message can return
  * 8KiB of data.
@@ -49,22 +51,22 @@
  * negotiated.  In Plan 9 1e it was (8*1024)+128, and was bumped to
  * (8*1024)+160 in 2e and 3e.
  */
-#define CONFIG_9P_MAX_MSG_SIZE        ((4*1024)+24)
+#define CONFIG_9P_SRV_MAX_MSG_SIZE      ((4*1024)+24)
 /**
  * Maximum host-data-structure size.  A message may be larger in
  * unmarshaled-host-structures than marshaled-net-bytes due to (1)
- * struct padding, (2) nul-terminator byes for strings.
+ * struct padding, (2) array pointers.
  */
-#define CONFIG_9P_MAX_HOSTMSG_SIZE    CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_ERR_SIZE        128 /* 128 is what Plan 9 4e uses */
-#define CONFIG_9P_SRV_MAX_FIDS        16
-#define CONFIG_9P_SRV_MAX_REQS        2
-#define CONFIG_9P_SRV_MAX_DEPTH       3
-#define CONFIG_9P_ENABLE_9P2000       1 /* bool */
-#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 */
+#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE  CONFIG_9P_SRV_MAX_MSG_SIZE+16
+#define CONFIG_9P_SRV_MAX_FIDS          16
+#define CONFIG_9P_SRV_MAX_REQS          2
+#define CONFIG_9P_SRV_MAX_DEPTH         3
+
+#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
+#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.c b/lib9p/9p.c
index c11bcd6..e90ef30 100644
--- a/lib9p/9p.c
+++ b/lib9p/9p.c
@@ -9,32 +9,10 @@
 #include <stdio.h>    /* for vsnprintf() */
 #include <string.h>   /* for strncpy() */
 
-#define LOG_NAME 9P
-#include <libmisc/log.h> /* for const_byte_str() */
-
 #include <lib9p/9p.h>
 
-#include "internal.h"
-
 /* strings ********************************************************************/
 
-const char *lib9p_version_str(enum lib9p_version ver) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
-	assert(0 <= ver && ver < LIB9P_VER_NUM);
-#pragma GCC diagnostic pop
-	return _lib9p_table_ver_name[ver];
-}
-
-const char *lib9p_msgtype_str(enum lib9p_version ver, enum lib9p_msg_type typ) {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
-	assert(0 <= ver && ver < LIB9P_VER_NUM);
-	assert(0 <= typ && typ <= 0xFF);
-#pragma GCC diagnostic pop
-	return _lib9p_table_msg_name[ver][typ] ?: const_byte_str(typ);
-}
-
 struct lib9p_s lib9p_str(char *s) {
 	if (!s)
 		return (struct lib9p_s){0};
@@ -114,131 +92,3 @@ int lib9p_errorf(struct lib9p_ctx *ctx, lib9p_errno_t linux_errno, char const *f
 
 	return -1;
 }
-
-/* main message functions *****************************************************/
-
-static
-ssize_t _lib9p_validate(uint8_t                          xxx_low_typ_bit,
-                        const char                      *xxx_errmsg,
-                        const struct _lib9p_recv_tentry  xxx_table[LIB9P_VER_NUM][0x80],
-                        struct lib9p_ctx *ctx, uint8_t *net_bytes) {
-	/* Inspect the first 5 bytes ourselves.  */
-	uint32_t net_size = uint32le_decode(net_bytes);
-	if (net_size < 5)
-		return lib9p_error(ctx, LINUX_EBADMSG, "message is impossibly short");
-	uint8_t typ = net_bytes[4];
-	if (typ % 2 != xxx_low_typ_bit)
-		return lib9p_errorf(ctx, LINUX_EOPNOTSUPP, "%s: message_type=%s", xxx_errmsg,
-		                    lib9p_msgtype_str(ctx->version, typ));
-	struct _lib9p_recv_tentry tentry = xxx_table[ctx->version][typ/2];
-	if (!tentry.validate)
-		return lib9p_errorf(ctx, LINUX_EOPNOTSUPP, "unknown message type: %s (protocol_version=%s)",
-		                    lib9p_msgtype_str(ctx->version, typ), lib9p_version_str(ctx->version));
-
-	/* Now use the message-type-specific tentry to process the whole thing.  */
-	return tentry.validate(ctx, net_size, net_bytes);
-}
-
-ssize_t lib9p_Tmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes) {
-	return _lib9p_validate(0, "expected a T-message but got an R-message", _lib9p_table_Tmsg_recv,
-	                       ctx, net_bytes);
-}
-
-ssize_t lib9p_Rmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes) {
-	return _lib9p_validate(1, "expected an R-message but got a T-message", _lib9p_table_Rmsg_recv,
-	                       ctx, net_bytes);
-}
-
-static
-void _lib9p_unmarshal(const struct _lib9p_recv_tentry xxx_table[LIB9P_VER_NUM][0x80],
-                      struct lib9p_ctx *ctx, uint8_t *net_bytes,
-                      enum lib9p_msg_type *ret_typ, void *ret_body) {
-	enum lib9p_msg_type typ = net_bytes[4];
-	*ret_typ = typ;
-	struct _lib9p_recv_tentry tentry = xxx_table[ctx->version][typ/2];
-
-	tentry.unmarshal(ctx, net_bytes, ret_body);
-}
-
-void lib9p_Tmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
-                          enum lib9p_msg_type *ret_typ, void *ret_body) {
-	_lib9p_unmarshal(_lib9p_table_Tmsg_recv,
-	                 ctx, net_bytes, ret_typ, ret_body);
-}
-
-void lib9p_Rmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
-                          enum lib9p_msg_type *ret_typ, void *ret_body) {
-	_lib9p_unmarshal(_lib9p_table_Rmsg_recv,
-	                 ctx, net_bytes, ret_typ, ret_body);
-}
-
-static
-bool _lib9p_marshal(const struct _lib9p_send_tentry xxx_table[LIB9P_VER_NUM][0x80],
-                    struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
-                    size_t *ret_iov_cnt, struct iovec *ret_iov, uint8_t *ret_copied) {
-	struct _marshal_ret ret = {
-		.net_iov_cnt     = 1,
-		.net_iov         = ret_iov,
-		.net_copied_size = 0,
-		.net_copied      = ret_copied,
-	};
-
-	struct _lib9p_send_tentry tentry = xxx_table[ctx->version][typ/2];
-	bool ret_erred = tentry.marshal(ctx, body, &ret);
-	if (ret_iov[ret.net_iov_cnt-1].iov_len == 0)
-		ret.net_iov_cnt--;
-	*ret_iov_cnt = ret.net_iov_cnt;
-	return ret_erred;
-}
-
-bool lib9p_Tmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
-                        struct lib9p_Tmsg_send_buf *ret) {
-	assert(typ % 2 == 0);
-	memset(ret, 0, sizeof(*ret));
-	return _lib9p_marshal(_lib9p_table_Tmsg_send,
-	                      ctx, typ, body,
-	                      &ret->iov_cnt, ret->iov, ret->copied);
-}
-
-bool lib9p_Rmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
-                        struct lib9p_Rmsg_send_buf *ret) {
-	assert(typ % 2 == 1);
-	memset(ret, 0, sizeof(*ret));
-	return _lib9p_marshal(_lib9p_table_Rmsg_send,
-	                      ctx, typ, body,
-	                      &ret->iov_cnt, ret->iov, ret->copied);
-}
-
-/* `struct lib9p_stat` helpers ************************************************/
-
-bool lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes,
-                         uint32_t *ret_net_size, ssize_t *ret_host_size) {
-	ssize_t host_size = _lib9p_stat_validate(ctx, net_size, net_bytes, ret_net_size);
-	if (host_size < 0)
-		return true;
-	if (ret_host_size)
-		*ret_host_size = host_size;
-	return false;
-}
-
-void lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
-                          struct lib9p_stat *ret) {
-	_lib9p_stat_unmarshal(ctx, net_bytes, ret);
-}
-
-uint32_t lib9p_stat_marshal(struct lib9p_ctx *ctx, uint32_t max_net_size, struct lib9p_stat *obj,
-                            uint8_t *ret_bytes) {
-	struct lib9p_ctx _ctx = *ctx;
-	_ctx.max_msg_size = max_net_size;
-
-	struct iovec iov = {0};
-	struct _marshal_ret ret = {
-		.net_iov_cnt     = 1,
-		.net_iov         = &iov,
-		.net_copied_size = 0,
-		.net_copied      = ret_bytes,
-	};
-	if (_lib9p_stat_marshal(&_ctx, obj, &ret))
-		return 0;
-	return ret.net_iov[0].iov_len;
-}
diff --git a/lib9p/9p.generated.c b/lib9p/9p.generated.c
index 8819458..49bab14 100644
--- a/lib9p/9p.generated.c
+++ b/lib9p/9p.generated.c
@@ -6,10 +6,12 @@
 #include <string.h>   /* for memset() */
 
 #include <libmisc/assert.h>
+#include <libmisc/endian.h>
 
 #include <lib9p/9p.h>
 
-#include "internal.h"
+#include "tables.h"
+#include "utf8.h"
 
 /* utilities ******************************************************************/
 #if CONFIG_9P_ENABLE_9P2000
@@ -46,230 +48,6 @@
  */
 #define is_ver(ctx, ver) _is_ver_##ver((ctx)->version)
 
-/* strings ********************************************************************/
-
-const char *const _lib9p_table_ver_name[LIB9P_VER_NUM] = {
-	[LIB9P_VER_unknown] = "unknown",
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = "9P2000",
-#endif /* CONFIG_9P_ENABLE_9P2000 */
-#if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = "9P2000.L",
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#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 */
-};
-
-#define _MSG_NAME(typ) [LIB9P_TYP_##typ] = #typ
-const char *const _lib9p_table_msg_name[LIB9P_VER_NUM][0x100] = {
-	[LIB9P_VER_unknown] = {
-		_MSG_NAME(Tversion),
-		_MSG_NAME(Rversion),
-		_MSG_NAME(Rerror),
-	},
-#if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = {
-		_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 */
-#if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = {
-		_MSG_NAME(Rlerror),
-		_MSG_NAME(Tstatfs),
-		_MSG_NAME(Rstatfs),
-		_MSG_NAME(Tlopen),
-		_MSG_NAME(Rlopen),
-		_MSG_NAME(Tlcreate),
-		_MSG_NAME(Rlcreate),
-		_MSG_NAME(Tsymlink),
-		_MSG_NAME(Rsymlink),
-		_MSG_NAME(Tmknod),
-		_MSG_NAME(Rmknod),
-		_MSG_NAME(Trename),
-		_MSG_NAME(Rrename),
-		_MSG_NAME(Treadlink),
-		_MSG_NAME(Rreadlink),
-		_MSG_NAME(Tgetattr),
-		_MSG_NAME(Rgetattr),
-		_MSG_NAME(Tsetattr),
-		_MSG_NAME(Rsetattr),
-		_MSG_NAME(Txattrwalk),
-		_MSG_NAME(Rxattrwalk),
-		_MSG_NAME(Txattrcreate),
-		_MSG_NAME(Rxattrcreate),
-		_MSG_NAME(Treaddir),
-		_MSG_NAME(Rreaddir),
-		_MSG_NAME(Tfsync),
-		_MSG_NAME(Rfsync),
-		_MSG_NAME(Tlock),
-		_MSG_NAME(Rlock),
-		_MSG_NAME(Tgetlock),
-		_MSG_NAME(Rgetlock),
-		_MSG_NAME(Tlink),
-		_MSG_NAME(Rlink),
-		_MSG_NAME(Tmkdir),
-		_MSG_NAME(Rmkdir),
-		_MSG_NAME(Trenameat),
-		_MSG_NAME(Rrenameat),
-		_MSG_NAME(Tunlinkat),
-		_MSG_NAME(Runlinkat),
-		_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(Tread),
-		_MSG_NAME(Rread),
-		_MSG_NAME(Twrite),
-		_MSG_NAME(Rwrite),
-		_MSG_NAME(Tclunk),
-		_MSG_NAME(Rclunk),
-		_MSG_NAME(Tremove),
-		_MSG_NAME(Rremove),
-	},
-#endif /* CONFIG_9P_ENABLE_9P2000_L */
-#if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = {
-		_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),
-		_MSG_NAME(Tsession),
-		_MSG_NAME(Rsession),
-		_MSG_NAME(Tsread),
-		_MSG_NAME(Rsread),
-		_MSG_NAME(Tswrite),
-		_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),
-		_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_u */
-};
-
 /* bitmasks *******************************************************************/
 
 #if CONFIG_9P_ENABLE_9P2000 || CONFIG_9P_ENABLE_9P2000_e || CONFIG_9P_ENABLE_9P2000_p9p || CONFIG_9P_ENABLE_9P2000_u
@@ -4743,29 +4521,231 @@ static bool marshal_Rswrite(struct lib9p_ctx *ctx, struct lib9p_msg_Rswrite *val
 }
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
 
-/* function tables ************************************************************/
+/* tables.h *******************************************************************/
+
+const struct _lib9p_ver_tentry _lib9p_table_ver[LIB9P_VER_NUM] = {
+	[LIB9P_VER_unknown] = {.name="unknown", .min_msg_size=9},
+#if CONFIG_9P_ENABLE_9P2000
+	[LIB9P_VER_9P2000] = {.name="9P2000", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000 */
+#if CONFIG_9P_ENABLE_9P2000_L
+	[LIB9P_VER_9P2000_L] = {.name="9P2000.L", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_L */
+#if CONFIG_9P_ENABLE_9P2000_e
+	[LIB9P_VER_9P2000_e] = {.name="9P2000.e", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_e */
+#if CONFIG_9P_ENABLE_9P2000_p9p
+	[LIB9P_VER_9P2000_p9p] = {.name="9P2000.p9p", .min_msg_size=9},
+#endif /* CONFIG_9P_ENABLE_9P2000_p9p */
+#if CONFIG_9P_ENABLE_9P2000_u
+	[LIB9P_VER_9P2000_u] = {.name="9P2000.u", .min_msg_size=13},
+#endif /* CONFIG_9P_ENABLE_9P2000_u */
+};
 
-const uint32_t _lib9p_table_msg_min_size[LIB9P_VER_NUM] = {
-	[LIB9P_VER_unknown] = 9,
+#define _MSG(typ) [LIB9P_TYP_##typ] = {.name=#typ}
+const struct _lib9p_msg_tentry _lib9p_table_msg[LIB9P_VER_NUM][0x100] = {
+	[LIB9P_VER_unknown] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Rerror),
+	},
 #if CONFIG_9P_ENABLE_9P2000
-	[LIB9P_VER_9P2000] = 9,
+	[LIB9P_VER_9P2000] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000 */
 #if CONFIG_9P_ENABLE_9P2000_L
-	[LIB9P_VER_9P2000_L] = 9,
+	[LIB9P_VER_9P2000_L] = {
+		_MSG(Rlerror),
+		_MSG(Tstatfs),
+		_MSG(Rstatfs),
+		_MSG(Tlopen),
+		_MSG(Rlopen),
+		_MSG(Tlcreate),
+		_MSG(Rlcreate),
+		_MSG(Tsymlink),
+		_MSG(Rsymlink),
+		_MSG(Tmknod),
+		_MSG(Rmknod),
+		_MSG(Trename),
+		_MSG(Rrename),
+		_MSG(Treadlink),
+		_MSG(Rreadlink),
+		_MSG(Tgetattr),
+		_MSG(Rgetattr),
+		_MSG(Tsetattr),
+		_MSG(Rsetattr),
+		_MSG(Txattrwalk),
+		_MSG(Rxattrwalk),
+		_MSG(Txattrcreate),
+		_MSG(Rxattrcreate),
+		_MSG(Treaddir),
+		_MSG(Rreaddir),
+		_MSG(Tfsync),
+		_MSG(Rfsync),
+		_MSG(Tlock),
+		_MSG(Rlock),
+		_MSG(Tgetlock),
+		_MSG(Rgetlock),
+		_MSG(Tlink),
+		_MSG(Rlink),
+		_MSG(Tmkdir),
+		_MSG(Rmkdir),
+		_MSG(Trenameat),
+		_MSG(Rrenameat),
+		_MSG(Tunlinkat),
+		_MSG(Runlinkat),
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_L */
 #if CONFIG_9P_ENABLE_9P2000_e
-	[LIB9P_VER_9P2000_e] = 9,
+	[LIB9P_VER_9P2000_e] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+		_MSG(Tsession),
+		_MSG(Rsession),
+		_MSG(Tsread),
+		_MSG(Rsread),
+		_MSG(Tswrite),
+		_MSG(Rswrite),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_e */
 #if CONFIG_9P_ENABLE_9P2000_p9p
-	[LIB9P_VER_9P2000_p9p] = 9,
+	[LIB9P_VER_9P2000_p9p] = {
+		_MSG(Topenfd),
+		_MSG(Ropenfd),
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_p9p */
 #if CONFIG_9P_ENABLE_9P2000_u
-	[LIB9P_VER_9P2000_u] = 13,
+	[LIB9P_VER_9P2000_u] = {
+		_MSG(Tversion),
+		_MSG(Rversion),
+		_MSG(Tauth),
+		_MSG(Rauth),
+		_MSG(Tattach),
+		_MSG(Rattach),
+		_MSG(Rerror),
+		_MSG(Tflush),
+		_MSG(Rflush),
+		_MSG(Twalk),
+		_MSG(Rwalk),
+		_MSG(Topen),
+		_MSG(Ropen),
+		_MSG(Tcreate),
+		_MSG(Rcreate),
+		_MSG(Tread),
+		_MSG(Rread),
+		_MSG(Twrite),
+		_MSG(Rwrite),
+		_MSG(Tclunk),
+		_MSG(Rclunk),
+		_MSG(Tremove),
+		_MSG(Rremove),
+		_MSG(Tstat),
+		_MSG(Rstat),
+		_MSG(Twstat),
+		_MSG(Rwstat),
+	},
 #endif /* CONFIG_9P_ENABLE_9P2000_u */
 };
 
 #define _MSG_RECV(typ) [LIB9P_TYP_##typ/2] = {                 \
-		.basesize  = sizeof(struct lib9p_msg_##typ),   \
 		.validate  = validate_##typ,                   \
 		.unmarshal = (_unmarshal_fn_t)unmarshal_##typ, \
 	}
diff --git a/lib9p/CMakeLists.txt b/lib9p/CMakeLists.txt
index 707308e..9240aa3 100644
--- a/lib9p/CMakeLists.txt
+++ b/lib9p/CMakeLists.txt
@@ -8,6 +8,7 @@ target_include_directories(lib9p SYSTEM INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/in
 target_sources(lib9p INTERFACE
 	9p.generated.c
 	9p.c
+	tables.c
 	srv.c
 )
 target_link_libraries(lib9p INTERFACE
diff --git a/lib9p/idl/2002-9P2000.9p b/lib9p/idl/2002-9P2000.9p
index 36a2427..2b51612 100644
--- a/lib9p/idl/2002-9P2000.9p
+++ b/lib9p/idl/2002-9P2000.9p
@@ -79,7 +79,7 @@ bitfield qt = 1
 #
 #  - "path" is a unique uint64_t that does most of the work in the
 #    above statement about files being the same if their QIDs are the
-#    same; " If a file is deleted and recreated with the same name in
+#    same; "If a file is deleted and recreated with the same name in
 #    the same directory, the old and new path components of the qids
 #    should be different"
 #
diff --git a/lib9p/include/lib9p/9p.h b/lib9p/include/lib9p/9p.h
index ffac453..4cdb997 100644
--- a/lib9p/include/lib9p/9p.h
+++ b/lib9p/include/lib9p/9p.h
@@ -18,6 +18,7 @@
 #ifndef CONFIG_9P_MAX_ERR_SIZE
 	#error config.h must define CONFIG_9P_MAX_ERR_SIZE
 #endif
+static_assert(CONFIG_9P_MAX_ERR_SIZE <= UINT16_MAX);
 
 /* constants ******************************************************************/
 
@@ -60,6 +61,10 @@ int lib9p_error(struct lib9p_ctx *ctx, lib9p_errno_t linux_errno, char const *ms
 /** Write a printf-style error into ctx, return -1.  */
 int lib9p_errorf(struct lib9p_ctx *ctx, lib9p_errno_t linux_errno, char const *fmt, ...) [[gnu::format(printf, 3, 4)]];
 
+/* misc utilities *************************************************************/
+
+uint32_t lib9p_version_min_msg_size(enum lib9p_version);
+
 /* main T-message functions ***************************************************/
 
 /**
diff --git a/lib9p/internal.h b/lib9p/internal.h
deleted file mode 100644
index 92340a5..0000000
--- a/lib9p/internal.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* lib9p/internal.h - Internal machinery shared between parts of lib9p
- *
- * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-#ifndef _LIB9P_INTERNAL_H_
-#define _LIB9P_INTERNAL_H_
-
-#include <stddef.h> /* for size_t */
-#include <limits.h> /* for SSIZE_MAX, not set by newlib */
-#ifndef SSIZE_MAX
-#define SSIZE_MAX (SIZE_MAX >> 1)
-#endif
-
-#include <libmisc/endian.h>
-#include <libmisc/macro.h>
-
-#include <lib9p/9p.h>
-
-/* configuration **************************************************************/
-
-#include "config.h"
-
-#ifndef CONFIG_9P_MAX_MSG_SIZE
-	#error config.h must define CONFIG_9P_MAX_MSG_SIZE
-#endif
-#ifndef CONFIG_9P_MAX_HOSTMSG_SIZE
-	#error config.h must define CONFIG_9P_MAX_HOSTMSG_SIZE
-#endif
-#ifndef CONFIG_9P_MAX_ERR_SIZE
-	#error config.h must define CONFIG_9P_MAX_ERR_SIZE
-#endif
-
-static_assert(CONFIG_9P_MAX_ERR_SIZE <= UINT16_MAX);
-static_assert(CONFIG_9P_MAX_MSG_SIZE <= CONFIG_9P_MAX_HOSTMSG_SIZE);
-static_assert(CONFIG_9P_MAX_HOSTMSG_SIZE <= SSIZE_MAX);
-
-/* tables / exports ***********************************************************/
-
-typedef ssize_t (*_validate_fn_t)(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes);
-typedef void (*_unmarshal_fn_t)(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
-
-struct _marshal_ret {
-	size_t                   net_iov_cnt;
-	struct iovec            *net_iov;
-	size_t                   net_copied_size;
-	uint8_t                 *net_copied;
-};
-typedef bool (*_marshal_fn_t)(struct lib9p_ctx *ctx, void *host_val, struct _marshal_ret *ret);
-
-struct _lib9p_recv_tentry {
-	size_t                  basesize;
-	_validate_fn_t          validate;
-	_unmarshal_fn_t         unmarshal;
-};
-
-struct _lib9p_send_tentry {
-	_marshal_fn_t           marshal;
-};
-
-extern const char *const _lib9p_table_ver_name[LIB9P_VER_NUM];
-extern const char *const _lib9p_table_msg_name[LIB9P_VER_NUM][0x100];
-extern const uint32_t _lib9p_table_msg_min_size[LIB9P_VER_NUM];
-extern const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80];
-extern const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80];
-extern const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80];
-extern const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80];
-
-ssize_t _lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size);
-void _lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
-bool _lib9p_stat_marshal(struct lib9p_ctx *ctx, struct lib9p_stat *val, struct _marshal_ret *ret);
-
-/* unmarshal utilities ********************************************************/
-
-static inline bool _is_valid_utf8(uint8_t *str, size_t len, bool forbid_nul) {
-	uint32_t ch;
-	uint8_t chlen;
-	assert(str);
-	for (size_t pos = 0; pos < len;) {
-		if      ((str[pos] & 0b10000000) == 0b00000000) { ch = str[pos] & 0b01111111; chlen = 1; }
-		else if ((str[pos] & 0b11100000) == 0b11000000) { ch = str[pos] & 0b00011111; chlen = 2; }
-		else if ((str[pos] & 0b11110000) == 0b11100000) { ch = str[pos] & 0b00001111; chlen = 3; }
-		else if ((str[pos] & 0b11111000) == 0b11110000) { ch = str[pos] & 0b00000111; chlen = 4; }
-		else return false;
-		if ((ch == 0 && (chlen != 1 || forbid_nul)) || pos + chlen > len) return false;
-		for (uint8_t i = 1; i < chlen; i++) {
-			if ((str[pos+i] & 0b11000000) != 0b10000000) return false;
-			ch = (ch << 6) | (str[pos+i] & 0b00111111);
-		}
-		if (ch > 0x10FFFF) return false;
-		pos += chlen;
-	}
-	return true;
-}
-
-#define is_valid_utf8(str, len)                 _is_valid_utf8(str, len, false)
-#define is_valid_utf8_without_nul(str, len)     _is_valid_utf8(str, len, true)
-
-#endif /* _LIB9P_INTERNAL_H_ */
diff --git a/lib9p/map.h b/lib9p/map.h
index ab9564f..c5eab0f 100644
--- a/lib9p/map.h
+++ b/lib9p/map.h
@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-#include "internal.h"
-
 /**
  * `#define` `NAME`, `KEY_T`, `VAL_T`, and `CAP`; then `#include
  * "map.h".
diff --git a/lib9p/protogen/c.py b/lib9p/protogen/c.py
index cc1daea..b36e817 100644
--- a/lib9p/protogen/c.py
+++ b/lib9p/protogen/c.py
@@ -29,10 +29,12 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
 #include <string.h>   /* for memset() */
 
 #include <libmisc/assert.h>
+#include <libmisc/endian.h>
 
 #include <lib9p/9p.h>
 
-#include "internal.h"
+#include "tables.h"
+#include "utf8.h"
 """
 
     # utilities ################################################################
@@ -44,28 +46,6 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
     for msg in [msg for msg in typs if isinstance(msg, idl.Message)]:
         id2typ[msg.msgid] = msg
 
-    def msg_table(grp: str, meth: str, tentry: str, rng: tuple[int, int, int]) -> str:
-        ret = f"const {tentry} {c9util.ident(f'_table_{grp}_{meth}')}[{c9util.ver_enum('NUM')}][{hex(len(range(*rng)))}] = {{\n"
-        for ver in ["unknown", *sorted(versions)]:
-            if ver != "unknown":
-                ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-            ret += f"\t[{c9util.ver_enum(ver)}] = {{\n"
-            for n in range(*rng):
-                xmsg: idl.Message | None = id2typ.get(n, None)
-                if xmsg:
-                    if ver == "unknown":  # SPECIAL (initialization)
-                        if xmsg.typname not in ["Tversion", "Rversion", "Rerror"]:
-                            xmsg = None
-                    else:
-                        if ver not in xmsg.in_versions:
-                            xmsg = None
-                if xmsg:
-                    ret += f"\t\t_MSG_{meth.upper()}({xmsg.typname}),\n"
-            ret += "\t},\n"
-        ret += cutil.ifdef_pop(0)
-        ret += "};\n"
-        return ret
-
     for v in sorted(versions):
         ret += f"#if CONFIG_9P_ENABLE_{v.replace('.', '_')}\n"
         ret += (
@@ -83,23 +63,6 @@ def gen_c(versions: set[str], typs: list[idl.UserType]) -> str:
     ret += " */\n"
     ret += "#define is_ver(ctx, ver) _is_ver_##ver((ctx)->version)\n"
 
-    # strings ##################################################################
-    ret += f"""
-/* strings ********************************************************************/
-
-const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] = {{
-"""
-    for ver in ["unknown", *sorted(versions)]:
-        if ver in versions:
-            ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-        ret += f'\t[{c9util.ver_enum(ver)}] = "{ver}",\n'
-    ret += cutil.ifdef_pop(0)
-    ret += "};\n"
-
-    ret += "\n"
-    ret += f"#define _MSG_NAME(typ) [{c9util.Ident('TYP_')}##typ] = #typ\n"
-    ret += msg_table("msg", "name", "char *const", (0, 0x100, 1))
-
     # bitmasks #################################################################
     ret += """
 /* bitmasks *******************************************************************/
@@ -139,25 +102,55 @@ const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] =
     # marshal_* ################################################################
     ret += c_marshal.gen_c_marshal(versions, typs)
 
-    # function tables ##########################################################
+    # tables.h #################################################################
     ret += """
-/* function tables ************************************************************/
+/* tables.h *******************************************************************/
 """
 
     ret += "\n"
-    ret += f"const uint32_t {c9util.ident('_table_msg_min_size')}[{c9util.ver_enum('NUM')}] = {{\n"
+    ret += f"const struct {c9util.ident('_ver_tentry')} {c9util.ident('_table_ver')}[{c9util.ver_enum('NUM')}] = {{\n"
     rerror = next(typ for typ in typs if typ.typname == "Rerror")
-    ret += f"\t[{c9util.ver_enum('unknown')}] = {rerror.min_size('9P2000')},\n"  # SPECIAL (initialization)
-    for ver in sorted(versions):
-        ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
-        ret += f"\t[{c9util.ver_enum(ver)}] = {rerror.min_size(ver)},\n"
+    for ver in ["unknown", *sorted(versions)]:
+        if ver == "unknown":
+            min_msg_size = rerror.min_size("9P2000")  # SPECIAL (initialization)
+        else:
+            ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
+            min_msg_size = rerror.min_size(ver)
+        ret += f'\t[{c9util.ver_enum(ver)}] = {{.name="{ver}", .min_msg_size={min_msg_size}}},\n'
     ret += cutil.ifdef_pop(0)
     ret += "};\n"
 
+    def msg_table(
+        cstruct: str, cname: str, each: str, _range: tuple[int, int, int]
+    ) -> str:
+        ret = f"const struct {c9util.ident(cstruct)} {c9util.ident(cname)}[{c9util.ver_enum('NUM')}][{hex(len(range(*_range)))}] = {{\n"
+        for ver in ["unknown", *sorted(versions)]:
+            if ver != "unknown":
+                ret += cutil.ifdef_push(1, c9util.ver_ifdef({ver}))
+            ret += f"\t[{c9util.ver_enum(ver)}] = {{\n"
+            for n in range(*_range):
+                xmsg: idl.Message | None = id2typ.get(n, None)
+                if xmsg:
+                    if ver == "unknown":  # SPECIAL (initialization)
+                        if xmsg.typname not in ["Tversion", "Rversion", "Rerror"]:
+                            xmsg = None
+                    else:
+                        if ver not in xmsg.in_versions:
+                            xmsg = None
+                if xmsg:
+                    ret += f"\t\t{each}({xmsg.typname}),\n"
+            ret += "\t},\n"
+        ret += cutil.ifdef_pop(0)
+        ret += "};\n"
+        return ret
+
+    ret += "\n"
+    ret += f"#define _MSG(typ) [{c9util.Ident('TYP_')}##typ] = {{.name=#typ}}\n"
+    ret += msg_table("_msg_tentry", "_table_msg", "_MSG", (0, 0x100, 1))
+
     ret += "\n"
     ret += cutil.macro(
         f"#define _MSG_RECV(typ) [{c9util.Ident('TYP_')}##typ/2] = {{\n"
-        f"\t\t.basesize  = sizeof(struct {c9util.ident('msg_')}##typ),\n"
         f"\t\t.validate  = validate_##typ,\n"
         f"\t\t.unmarshal = (_unmarshal_fn_t)unmarshal_##typ,\n"
         f"\t}}\n"
@@ -168,21 +161,13 @@ const char *const {c9util.ident('_table_ver_name')}[{c9util.ver_enum('NUM')}] =
         f"\t}}\n"
     )
     ret += "\n"
-    ret += msg_table(
-        "Tmsg", "recv", f"struct {c9util.ident('_recv_tentry')}", (0, 0x100, 2)
-    )
+    ret += msg_table("_recv_tentry", "_table_Tmsg_recv", "_MSG_RECV", (0, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Rmsg", "recv", f"struct {c9util.ident('_recv_tentry')}", (1, 0x100, 2)
-    )
+    ret += msg_table("_recv_tentry", "_table_Rmsg_recv", "_MSG_RECV", (1, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Tmsg", "send", f"struct {c9util.ident('_send_tentry')}", (0, 0x100, 2)
-    )
+    ret += msg_table("_send_tentry", "_table_Tmsg_send", "_MSG_SEND", (0, 0x100, 2))
     ret += "\n"
-    ret += msg_table(
-        "Rmsg", "send", f"struct {c9util.ident('_send_tentry')}", (1, 0x100, 2)
-    )
+    ret += msg_table("_send_tentry", "_table_Rmsg_send", "_MSG_SEND", (1, 0x100, 2))
 
     ret += f"""
 LM_FLATTEN ssize_t {c9util.ident('_stat_validate')}(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size) {{
diff --git a/lib9p/srv.c b/lib9p/srv.c
index a29a4cb..2723207 100644
--- a/lib9p/srv.c
+++ b/lib9p/srv.c
@@ -6,12 +6,18 @@
 
 #include <alloca.h>
 #include <inttypes.h> /* for PRI* */
+#include <stddef.h>   /* for size_t */
+#include <limits.h>   /* for SSIZE_MAX, not set by newlib */
+#ifndef SSIZE_MAX
+#define SSIZE_MAX (SIZE_MAX >> 1)
+#endif
 
 #include <libcr/coroutine.h>
 #include <libcr_ipc/chan.h>
 #include <libcr_ipc/mutex.h>
 #include <libcr_ipc/select.h>
 #include <libmisc/assert.h>
+#include <libmisc/endian.h>
 #include <libhw/generic/net.h>
 
 #define LOG_NAME 9P_SRV
@@ -20,7 +26,9 @@
 #define IMPLEMENTATION_FOR_LIB9P_SRV_H YES
 #include <lib9p/srv.h>
 
-#include "internal.h"
+/* config *********************************************************************/
+
+#include "config.h"
 
 #ifndef CONFIG_9P_SRV_MAX_FIDS
 	#error config.h must define CONFIG_9P_SRV_MAX_FIDS
@@ -32,6 +40,14 @@
 	/* 1=just the root dir, 2=just files in the root dir, 3=1 subdir, ... */
 	#error config.h must define CONFIG_9P_SRV_MAX_DEPTH
 #endif
+#ifndef CONFIG_9P_SRV_MAX_MSG_SIZE
+	#error config.h must define CONFIG_9P_SRV_MAX_MSG_SIZE
+#endif
+#ifndef CONFIG_9P_SRV_MAX_HOSTMSG_SIZE
+	#error config.h must define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE
+#endif
+static_assert(CONFIG_9P_SRV_MAX_MSG_SIZE <= CONFIG_9P_SRV_MAX_HOSTMSG_SIZE);
+static_assert(CONFIG_9P_SRV_MAX_HOSTMSG_SIZE <= SSIZE_MAX);
 
 /* context ********************************************************************/
 
@@ -218,7 +234,7 @@ static void handle_message(struct _lib9p_srv_req *ctx);
 
 	srv->readers++;
 
-	uint32_t initial_rerror_overhead = _lib9p_table_msg_min_size[LIB9P_VER_unknown];
+	uint32_t initial_rerror_overhead = lib9p_version_min_msg_size(LIB9P_VER_unknown);
 
 	for (;;) {
 		struct _srv_conn conn = {
@@ -238,7 +254,7 @@ static void handle_message(struct _lib9p_srv_req *ctx);
 		struct _srv_sess sess = {
 			.parent_conn     = &conn,
 			.version         = LIB9P_VER_unknown,
-			.max_msg_size    = CONFIG_9P_MAX_MSG_SIZE,
+			.max_msg_size    = CONFIG_9P_SRV_MAX_MSG_SIZE,
 			.rerror_overhead = initial_rerror_overhead,
 			.initialized     = false,
 		};
@@ -397,7 +413,7 @@ static tmessage_handler tmessage_handlers[0x100] = {
 
 static void handle_message(struct _lib9p_srv_req *ctx) {
 	uint8_t *host_req = NULL;
-	uint8_t host_resp[CONFIG_9P_MAX_HOSTMSG_SIZE];
+	uint8_t host_resp[CONFIG_9P_SRV_MAX_HOSTMSG_SIZE];
 
 	/* Unmarshal it.  */
 	ssize_t host_size = lib9p_Tmsg_validate(&ctx->ctx.basectx, ctx->net_bytes);
@@ -573,7 +589,7 @@ static void handle_Tversion(struct _lib9p_srv_req *ctx,
 #endif
 	}
 
-	uint32_t min_msg_size = _lib9p_table_msg_min_size[version];
+	uint32_t min_msg_size = lib9p_version_min_msg_size(version);
 	if (req->max_msg_size < min_msg_size) {
 		lib9p_errorf(&ctx->ctx.basectx,
 		             LINUX_EDOM, "requested max_msg_size is less than minimum for %s (%"PRIu32" < %"PRIu32")",
@@ -582,8 +598,8 @@ static void handle_Tversion(struct _lib9p_srv_req *ctx,
 	}
 
 	resp->version = lib9p_str((char *)lib9p_version_str(version)); /* cast to discard "const" qualifier */
-	resp->max_msg_size = (CONFIG_9P_MAX_MSG_SIZE < req->max_msg_size)
-		? CONFIG_9P_MAX_MSG_SIZE
+	resp->max_msg_size = (CONFIG_9P_SRV_MAX_MSG_SIZE < req->max_msg_size)
+		? CONFIG_9P_SRV_MAX_MSG_SIZE
 		: req->max_msg_size;
 
 	/* Close the old session.  */
diff --git a/lib9p/tables.c b/lib9p/tables.c
new file mode 100644
index 0000000..36fe3b3
--- /dev/null
+++ b/lib9p/tables.c
@@ -0,0 +1,178 @@
+/* lib9p/tables.c - Access tables of version and message information
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#include <string.h>
+
+#include <libmisc/endian.h>
+#include <libmisc/log.h> /* for const_byte_str() */
+
+#include "tables.h"
+
+/* bounds checks **************************************************************/
+
+static inline void assert_ver(enum lib9p_version ver) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
+	assert(0 <= ver && ver < LIB9P_VER_NUM);
+#pragma GCC diagnostic pop
+}
+
+static inline void assert_typ(enum lib9p_msg_type typ) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
+	assert(0 <= typ && typ < 0xFF);
+#pragma GCC diagnostic pop
+}
+
+/* simple lookups *************************************************************/
+
+const char *lib9p_version_str(enum lib9p_version ver) {
+	assert_ver(ver);
+	return _lib9p_table_ver[ver].name;
+}
+
+uint32_t lib9p_version_min_msg_size(enum lib9p_version ver) {
+	assert_ver(ver);
+	return _lib9p_table_ver[ver].min_msg_size;
+}
+
+const char *lib9p_msgtype_str(enum lib9p_version ver, enum lib9p_msg_type typ) {
+	assert_ver(ver);
+	assert_typ(typ);
+	return _lib9p_table_msg[ver][typ].name ?: const_byte_str(typ);
+}
+
+/* main message functions *****************************************************/
+
+static
+ssize_t _lib9p_validate(uint8_t                          xxx_low_typ_bit,
+                        const char                      *xxx_errmsg,
+                        const struct _lib9p_recv_tentry  xxx_table[LIB9P_VER_NUM][0x80],
+                        struct lib9p_ctx *ctx, uint8_t *net_bytes) {
+	assert_ver(ctx->version);
+	/* Inspect the first 5 bytes ourselves.  */
+	uint32_t net_size = uint32le_decode(net_bytes);
+	if (net_size < 5)
+		return lib9p_error(ctx, LINUX_EBADMSG, "message is impossibly short");
+	uint8_t typ = net_bytes[4];
+	if (typ % 2 != xxx_low_typ_bit)
+		return lib9p_errorf(ctx, LINUX_EOPNOTSUPP, "%s: message_type=%s", xxx_errmsg,
+		                    lib9p_msgtype_str(ctx->version, typ));
+	struct _lib9p_recv_tentry tentry = xxx_table[ctx->version][typ/2];
+	if (!tentry.validate)
+		return lib9p_errorf(ctx, LINUX_EOPNOTSUPP, "unknown message type: %s (protocol_version=%s)",
+		                    lib9p_msgtype_str(ctx->version, typ), lib9p_version_str(ctx->version));
+
+	/* Now use the message-type-specific tentry to process the whole thing.  */
+	return tentry.validate(ctx, net_size, net_bytes);
+}
+
+ssize_t lib9p_Tmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes) {
+	return _lib9p_validate(0, "expected a T-message but got an R-message", _lib9p_table_Tmsg_recv,
+	                       ctx, net_bytes);
+}
+
+ssize_t lib9p_Rmsg_validate(struct lib9p_ctx *ctx, uint8_t *net_bytes) {
+	return _lib9p_validate(1, "expected an R-message but got a T-message", _lib9p_table_Rmsg_recv,
+	                       ctx, net_bytes);
+}
+
+static
+void _lib9p_unmarshal(const struct _lib9p_recv_tentry xxx_table[LIB9P_VER_NUM][0x80],
+                      struct lib9p_ctx *ctx, uint8_t *net_bytes,
+                      enum lib9p_msg_type *ret_typ, void *ret_body) {
+	assert_ver(ctx->version);
+	enum lib9p_msg_type typ = net_bytes[4];
+	*ret_typ = typ;
+	struct _lib9p_recv_tentry tentry = xxx_table[ctx->version][typ/2];
+
+	tentry.unmarshal(ctx, net_bytes, ret_body);
+}
+
+void lib9p_Tmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
+                          enum lib9p_msg_type *ret_typ, void *ret_body) {
+	_lib9p_unmarshal(_lib9p_table_Tmsg_recv,
+	                 ctx, net_bytes, ret_typ, ret_body);
+}
+
+void lib9p_Rmsg_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
+                          enum lib9p_msg_type *ret_typ, void *ret_body) {
+	_lib9p_unmarshal(_lib9p_table_Rmsg_recv,
+	                 ctx, net_bytes, ret_typ, ret_body);
+}
+
+static
+bool _lib9p_marshal(const struct _lib9p_send_tentry xxx_table[LIB9P_VER_NUM][0x80],
+                    struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
+                    size_t *ret_iov_cnt, struct iovec *ret_iov, uint8_t *ret_copied) {
+	assert_ver(ctx->version);
+	assert_typ(typ);
+	struct _marshal_ret ret = {
+		.net_iov_cnt     = 1,
+		.net_iov         = ret_iov,
+		.net_copied_size = 0,
+		.net_copied      = ret_copied,
+	};
+
+	struct _lib9p_send_tentry tentry = xxx_table[ctx->version][typ/2];
+	bool ret_erred = tentry.marshal(ctx, body, &ret);
+	if (ret_iov[ret.net_iov_cnt-1].iov_len == 0)
+		ret.net_iov_cnt--;
+	*ret_iov_cnt = ret.net_iov_cnt;
+	return ret_erred;
+}
+
+bool lib9p_Tmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
+                        struct lib9p_Tmsg_send_buf *ret) {
+	assert(typ % 2 == 0);
+	memset(ret, 0, sizeof(*ret));
+	return _lib9p_marshal(_lib9p_table_Tmsg_send,
+	                      ctx, typ, body,
+	                      &ret->iov_cnt, ret->iov, ret->copied);
+}
+
+bool lib9p_Rmsg_marshal(struct lib9p_ctx *ctx, enum lib9p_msg_type typ, void *body,
+                        struct lib9p_Rmsg_send_buf *ret) {
+	assert(typ % 2 == 1);
+	memset(ret, 0, sizeof(*ret));
+	return _lib9p_marshal(_lib9p_table_Rmsg_send,
+	                      ctx, typ, body,
+	                      &ret->iov_cnt, ret->iov, ret->copied);
+}
+
+/* `struct lib9p_stat` helpers ************************************************/
+
+bool lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes,
+                         uint32_t *ret_net_size, ssize_t *ret_host_size) {
+	ssize_t host_size = _lib9p_stat_validate(ctx, net_size, net_bytes, ret_net_size);
+	if (host_size < 0)
+		return true;
+	if (ret_host_size)
+		*ret_host_size = host_size;
+	return false;
+}
+
+void lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes,
+                          struct lib9p_stat *ret) {
+	_lib9p_stat_unmarshal(ctx, net_bytes, ret);
+}
+
+uint32_t lib9p_stat_marshal(struct lib9p_ctx *ctx, uint32_t max_net_size, struct lib9p_stat *obj,
+                            uint8_t *ret_bytes) {
+	struct lib9p_ctx _ctx = *ctx;
+	_ctx.max_msg_size = max_net_size;
+
+	struct iovec iov = {0};
+	struct _marshal_ret ret = {
+		.net_iov_cnt     = 1,
+		.net_iov         = &iov,
+		.net_copied_size = 0,
+		.net_copied      = ret_bytes,
+	};
+	if (_lib9p_stat_marshal(&_ctx, obj, &ret))
+		return 0;
+	return ret.net_iov[0].iov_len;
+}
diff --git a/lib9p/tables.h b/lib9p/tables.h
new file mode 100644
index 0000000..0b642eb
--- /dev/null
+++ b/lib9p/tables.h
@@ -0,0 +1,57 @@
+/* lib9p/tables.h - Declare tables of version and message information
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#ifndef _LIB9P_TABLES_H_
+#define _LIB9P_TABLES_H_
+
+#include <lib9p/9p.h>
+
+/* version ********************************************************************/
+
+struct _lib9p_ver_tentry {
+	const char      *name;
+	uint32_t         min_msg_size;
+};
+
+extern const struct _lib9p_ver_tentry _lib9p_table_ver[LIB9P_VER_NUM];
+
+/* message ********************************************************************/
+
+struct _lib9p_msg_tentry {
+	const char      *name;
+};
+
+typedef ssize_t (*_validate_fn_t)(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes);
+typedef void (*_unmarshal_fn_t)(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
+struct _lib9p_recv_tentry {
+	_validate_fn_t           validate;
+	_unmarshal_fn_t          unmarshal;
+};
+
+struct _marshal_ret {
+	size_t                   net_iov_cnt;
+	struct iovec            *net_iov;
+	size_t                   net_copied_size;
+	uint8_t                 *net_copied;
+};
+typedef bool (*_marshal_fn_t)(struct lib9p_ctx *ctx, void *host_val, struct _marshal_ret *ret);
+struct _lib9p_send_tentry {
+	_marshal_fn_t            marshal;
+};
+
+extern const struct _lib9p_msg_tentry  _lib9p_table_msg[LIB9P_VER_NUM][0x100];
+extern const struct _lib9p_recv_tentry _lib9p_table_Tmsg_recv[LIB9P_VER_NUM][0x80];
+extern const struct _lib9p_recv_tentry _lib9p_table_Rmsg_recv[LIB9P_VER_NUM][0x80];
+extern const struct _lib9p_send_tentry _lib9p_table_Tmsg_send[LIB9P_VER_NUM][0x80];
+extern const struct _lib9p_send_tentry _lib9p_table_Rmsg_send[LIB9P_VER_NUM][0x80];
+
+/* stat ***********************************************************************/
+
+ssize_t _lib9p_stat_validate(struct lib9p_ctx *ctx, uint32_t net_size, uint8_t *net_bytes, uint32_t *ret_net_size);
+void _lib9p_stat_unmarshal(struct lib9p_ctx *ctx, uint8_t *net_bytes, void *out);
+bool _lib9p_stat_marshal(struct lib9p_ctx *ctx, struct lib9p_stat *val, struct _marshal_ret *ret);
+
+#endif /* _LIB9P_TABLES_H_ */
diff --git a/lib9p/tests/test_compile_config/config.h b/lib9p/tests/test_compile_config/config.h
index 38ab0c0..cc8eec1 100644
--- a/lib9p/tests/test_compile_config/config.h
+++ b/lib9p/tests/test_compile_config/config.h
@@ -9,20 +9,20 @@
 
 /* 9P *************************************************************************/
 
-#define CONFIG_9P_MAX_MSG_SIZE        ((4*1024)+24)
-#define CONFIG_9P_MAX_HOSTMSG_SIZE    CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_ERR_SIZE        128
-#define CONFIG_9P_MAX_9P2000_e_WELEM  16
-
-#define CONFIG_9P_SRV_MAX_FIDS        16
-#define CONFIG_9P_SRV_MAX_REQS        2
-#define CONFIG_9P_SRV_MAX_DEPTH       3
-
-#define CONFIG_9P_ENABLE_9P2000       1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_u     1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_e     1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_L     1 /* bool */
-#define CONFIG_9P_ENABLE_9P2000_p9p   1 /* bool */
+#define CONFIG_9P_MAX_ERR_SIZE          128
+#define CONFIG_9P_MAX_9P2000_e_WELEM    16
+
+#define CONFIG_9P_SRV_MAX_MSG_SIZE      ((4*1024)+24)
+#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE  CONFIG_9P_SRV_MAX_MSG_SIZE+16
+#define CONFIG_9P_SRV_MAX_FIDS          16
+#define CONFIG_9P_SRV_MAX_REQS          2
+#define CONFIG_9P_SRV_MAX_DEPTH         3
+
+#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_u       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_e       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_L       1 /* bool */
+#define CONFIG_9P_ENABLE_9P2000_p9p     1 /* bool */
 
 /* COROUTINE ******************************************************************/
 
diff --git a/lib9p/tests/test_server/config/config.h b/lib9p/tests/test_server/config/config.h
index afe6dc0..03143e1 100644
--- a/lib9p/tests/test_server/config/config.h
+++ b/lib9p/tests/test_server/config/config.h
@@ -12,6 +12,8 @@
 
 /* 9P *************************************************************************/
 
+#define CONFIG_9P_MAX_ERR_SIZE          128 /* 128 is what Plan 9 4e uses */
+
 /**
  * This max-msg-size is sized so that a Twrite message can return
  * 8KiB of data.
@@ -29,22 +31,22 @@
  * negotiated.  In Plan 9 1e it was (8*1024)+128, and was bumped to
  * (8*1024)+160 in 2e and 3e.
  */
-#define CONFIG_9P_MAX_MSG_SIZE        ((4*1024)+24)
+#define CONFIG_9P_SRV_MAX_MSG_SIZE      ((4*1024)+24)
 /**
  * Maximum host-data-structure size.  A message may be larger in
  * unmarshaled-host-structures than marshaled-net-bytes due to (1)
  * struct padding, (2) array pointers.
  */
-#define CONFIG_9P_MAX_HOSTMSG_SIZE    CONFIG_9P_MAX_MSG_SIZE+16
-#define CONFIG_9P_MAX_ERR_SIZE        128 /* 128 is what Plan 9 4e uses */
-#define CONFIG_9P_SRV_MAX_FIDS        16
-#define CONFIG_9P_SRV_MAX_REQS        2
-#define CONFIG_9P_SRV_MAX_DEPTH       3
-#define CONFIG_9P_ENABLE_9P2000       1 /* bool */
-#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 */
+#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE  CONFIG_9P_SRV_MAX_MSG_SIZE+16
+#define CONFIG_9P_SRV_MAX_FIDS          16
+#define CONFIG_9P_SRV_MAX_REQS          2
+#define CONFIG_9P_SRV_MAX_DEPTH         3
+
+#define CONFIG_9P_ENABLE_9P2000         1 /* bool */
+#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 ******************************************************************/
 
diff --git a/lib9p/utf8.h b/lib9p/utf8.h
new file mode 100644
index 0000000..5ffd674
--- /dev/null
+++ b/lib9p/utf8.h
@@ -0,0 +1,34 @@
+/* lib9p/utf8.h - Internal UTF-8 validation
+ *
+ * Copyright (C) 2024-2025  Luke T. Shumaker <lukeshu@lukeshu.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+#ifndef _LIB9P_UTF8_H_
+#define _LIB9P_UTF8_H_
+
+static inline bool _is_valid_utf8(uint8_t *str, size_t len, bool forbid_nul) {
+	uint32_t ch;
+	uint8_t chlen;
+	assert(str);
+	for (size_t pos = 0; pos < len;) {
+		if      ((str[pos] & 0b10000000) == 0b00000000) { ch = str[pos] & 0b01111111; chlen = 1; }
+		else if ((str[pos] & 0b11100000) == 0b11000000) { ch = str[pos] & 0b00011111; chlen = 2; }
+		else if ((str[pos] & 0b11110000) == 0b11100000) { ch = str[pos] & 0b00001111; chlen = 3; }
+		else if ((str[pos] & 0b11111000) == 0b11110000) { ch = str[pos] & 0b00000111; chlen = 4; }
+		else return false;
+		if ((ch == 0 && (chlen != 1 || forbid_nul)) || pos + chlen > len) return false;
+		for (uint8_t i = 1; i < chlen; i++) {
+			if ((str[pos+i] & 0b11000000) != 0b10000000) return false;
+			ch = (ch << 6) | (str[pos+i] & 0b00111111);
+		}
+		if (ch > 0x10FFFF) return false;
+		pos += chlen;
+	}
+	return true;
+}
+
+#define is_valid_utf8(str, len)                 _is_valid_utf8(str, len, false)
+#define is_valid_utf8_without_nul(str, len)     _is_valid_utf8(str, len, true)
+
+#endif /* _LIB9P_UTF8_H_ */
diff --git a/libmisc/include/libmisc/endian.h b/libmisc/include/libmisc/endian.h
index 665a8c8..75240fe 100644
--- a/libmisc/include/libmisc/endian.h
+++ b/libmisc/include/libmisc/endian.h
@@ -7,6 +7,7 @@
 #ifndef _LIBMISC_ENDIAN_H_
 #define _LIBMISC_ENDIAN_H_
 
+#include <stddef.h> /* for size_t */
 #include <stdint.h> /* for uint{n}_t */
 
 #include <libmisc/assert.h>