From: Chuck Lever <chuck.lever@oracle.com>
Date: Thu, 3 Oct 2024 18:54:36 +0000 (-0400)
Subject: xdrgen: XDR width for variable-length opaque
X-Git-Tag: v6.13-rc1~76^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0b85ef754740102cd659aea10aa516fe27f6b36;p=thirdparty%2Fkernel%2Flinux.git

xdrgen: XDR width for variable-length opaque

The byte size of a variable-length opaque is conveyed in an unsigned
integer. If there is a specified maximum size, that is included in
the type's widths list.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---

diff --git a/tools/net/sunrpc/xdrgen/xdr_ast.py b/tools/net/sunrpc/xdrgen/xdr_ast.py
index 9fe7fa688caaf..94cdcfb36e775 100644
--- a/tools/net/sunrpc/xdrgen/xdr_ast.py
+++ b/tools/net/sunrpc/xdrgen/xdr_ast.py
@@ -148,6 +148,21 @@ class _XdrVariableLengthOpaque(_XdrDeclaration):
     maxsize: str
     template: str = "variable_length_opaque"
 
+    def max_width(self) -> int:
+        """Return width of type in XDR_UNITS"""
+        return 1 + xdr_quadlen(self.maxsize)
+
+    def symbolic_width(self) -> List:
+        """Return list containing XDR width of type's components"""
+        widths = ["XDR_unsigned_int"]
+        if self.maxsize != "0":
+            widths.append("XDR_QUADLEN(" + self.maxsize + ")")
+        return widths
+
+    def __post_init__(self):
+        max_widths[self.name] = self.max_width()
+        symbolic_widths[self.name] = self.symbolic_width()
+
 
 @dataclass
 class _XdrString(_XdrDeclaration):