* [PATCH] xdrgen: handle _XdrString in union encoder/decoder
@ 2025-10-26 18:00 Khushal Chitturi
2025-10-27 13:53 ` Chuck Lever
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
0 siblings, 2 replies; 6+ messages in thread
From: Khushal Chitturi @ 2025-10-26 18:00 UTC (permalink / raw)
To: Chuck Lever, linux-nfs
Cc: Jeff Layton, Neil Brown, Olga Kornievskaia, Dai Ngo, Tom Talpey,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman, netdev, linux-kernel, Khushal Chitturi,
Khushal Chitturi
Running xdrgen on xdrgen/tests/test.x fails when
generating encoder or decoder functions for union members
of type _XdrString. It was because _XdrString
does not have a spec attribute like _XdrBasic,
leading to AttributeError.
This patch updates emit_union_case_spec_definition
and emit_union_case_spec_decoder/encoder
to handle _XdrString by assigning
type_name = "char *" and avoiding referencing to spec.
Testing: Fixed xdrgen tool was ran on originally failing
test file (tools/net/sunrpc/xdrgen/tests/test.x) and now completes without AttributeError.
Modified xdrgen tool was also run against nfs4_1.x (Documentation/sunrpc/xdr/nfs4_1.x).
The output header file matches with nfs4_1.h (include/linux/sunrpc/xdrgen/nfs4_1.h).
This validates the patch for all XDR input files currently within the kernel.
Signed-off-by: Khushal Chitturi <kc928206@gmail.com>
---
tools/net/sunrpc/xdrgen/generators/union.py | 35 ++++++++++++++-----
.../templates/C/union/encoder/string.j2 | 6 ++++
2 files changed, 32 insertions(+), 9 deletions(-)
create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
diff --git a/tools/net/sunrpc/xdrgen/generators/union.py b/tools/net/sunrpc/xdrgen/generators/union.py
index 2cca00e279cd..3118dfdddcc4 100644
--- a/tools/net/sunrpc/xdrgen/generators/union.py
+++ b/tools/net/sunrpc/xdrgen/generators/union.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#!/usr/bin/env python3
# ex: set filetype=python:
@@ -8,7 +9,7 @@ from jinja2 import Environment
from generators import SourceGenerator
from generators import create_jinja2_environment, get_jinja2_template
-from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, get_header_name
+from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, _XdrString, get_header_name
from xdr_ast import _XdrDeclaration, _XdrCaseSpec, public_apis, big_endian
@@ -40,13 +41,20 @@ def emit_union_case_spec_definition(
"""Emit a definition for an XDR union's case arm"""
if isinstance(node.arm, _XdrVoid):
return
- assert isinstance(node.arm, _XdrBasic)
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
+
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "definition", "case_spec")
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -84,6 +92,12 @@ def emit_union_case_spec_decoder(
if isinstance(node.arm, _XdrVoid):
return
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
if big_endian_discriminant:
template = get_jinja2_template(environment, "decoder", "case_spec_be")
@@ -92,13 +106,13 @@ def emit_union_case_spec_decoder(
for case in node.values:
print(template.render(case=case))
- assert isinstance(node.arm, _XdrBasic)
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "decoder", node.arm.template)
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -169,7 +183,10 @@ def emit_union_case_spec_encoder(
if isinstance(node.arm, _XdrVoid):
return
-
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ else:
+ type_name = node.arm.spec.type_name
if big_endian_discriminant:
template = get_jinja2_template(environment, "encoder", "case_spec_be")
else:
@@ -181,7 +198,7 @@ def emit_union_case_spec_encoder(
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
+ type=type_name,
)
)
diff --git a/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
new file mode 100644
index 000000000000..2f035a64f1f4
--- /dev/null
+++ b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
@@ -0,0 +1,6 @@
+{# SPDX-License-Identifier: GPL-2.0 #}
+{% if annotate %}
+ /* member {{ name }} (variable-length string) */
+{% endif %}
+ if (!xdrgen_encode_string(xdr, ptr->u.{{ name }}, {{ maxsize }}))
+ return false;
--
2.51.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] xdrgen: handle _XdrString in union encoder/decoder
2025-10-26 18:00 [PATCH] xdrgen: handle _XdrString in union encoder/decoder Khushal Chitturi
@ 2025-10-27 13:53 ` Chuck Lever
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
1 sibling, 0 replies; 6+ messages in thread
From: Chuck Lever @ 2025-10-27 13:53 UTC (permalink / raw)
To: Khushal Chitturi, linux-nfs
Cc: Jeff Layton, Neil Brown, Olga Kornievskaia, Dai Ngo, Tom Talpey,
David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simon Horman, netdev, linux-kernel, Khushal Chitturi
On 10/26/25 2:00 PM, Khushal Chitturi wrote:
> Running xdrgen on xdrgen/tests/test.x fails when
> generating encoder or decoder functions for union members
> of type _XdrString. It was because _XdrString
> does not have a spec attribute like _XdrBasic,
> leading to AttributeError.
>
> This patch updates emit_union_case_spec_definition
> and emit_union_case_spec_decoder/encoder
> to handle _XdrString by assigning
> type_name = "char *" and avoiding referencing to spec.
>
> Testing: Fixed xdrgen tool was ran on originally failing
> test file (tools/net/sunrpc/xdrgen/tests/test.x) and now completes without AttributeError.
> Modified xdrgen tool was also run against nfs4_1.x (Documentation/sunrpc/xdr/nfs4_1.x).
> The output header file matches with nfs4_1.h (include/linux/sunrpc/xdrgen/nfs4_1.h).
> This validates the patch for all XDR input files currently within the kernel.
>
> Signed-off-by: Khushal Chitturi <kc928206@gmail.com>
Hello Kushal -
Fix looks OK, but there are a couple of nits: The email address in your
Signed-off-by does not match your From: address, and I prefer if you
would keep the lines in the patch description shorter than 72
characters. Can you send a v2?
> ---
> tools/net/sunrpc/xdrgen/generators/union.py | 35 ++++++++++++++-----
> .../templates/C/union/encoder/string.j2 | 6 ++++
> 2 files changed, 32 insertions(+), 9 deletions(-)
> create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
>
> diff --git a/tools/net/sunrpc/xdrgen/generators/union.py b/tools/net/sunrpc/xdrgen/generators/union.py
> index 2cca00e279cd..3118dfdddcc4 100644
> --- a/tools/net/sunrpc/xdrgen/generators/union.py
> +++ b/tools/net/sunrpc/xdrgen/generators/union.py
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #!/usr/bin/env python3
> # ex: set filetype=python:
>
> @@ -8,7 +9,7 @@ from jinja2 import Environment
> from generators import SourceGenerator
> from generators import create_jinja2_environment, get_jinja2_template
>
> -from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, get_header_name
> +from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, _XdrString, get_header_name
> from xdr_ast import _XdrDeclaration, _XdrCaseSpec, public_apis, big_endian
>
>
> @@ -40,13 +41,20 @@ def emit_union_case_spec_definition(
> """Emit a definition for an XDR union's case arm"""
> if isinstance(node.arm, _XdrVoid):
> return
> - assert isinstance(node.arm, _XdrBasic)
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + classifier = ""
> + else:
> + type_name = node.arm.spec.type_name
> + classifier = node.arm.spec.c_classifier
> +
> + assert isinstance(node.arm, (_XdrBasic, _XdrString))
> template = get_jinja2_template(environment, "definition", "case_spec")
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> - classifier=node.arm.spec.c_classifier,
> + type=type_name,
> + classifier=classifier,
> )
> )
>
> @@ -84,6 +92,12 @@ def emit_union_case_spec_decoder(
>
> if isinstance(node.arm, _XdrVoid):
> return
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + classifier = ""
> + else:
> + type_name = node.arm.spec.type_name
> + classifier = node.arm.spec.c_classifier
>
> if big_endian_discriminant:
> template = get_jinja2_template(environment, "decoder", "case_spec_be")
> @@ -92,13 +106,13 @@ def emit_union_case_spec_decoder(
> for case in node.values:
> print(template.render(case=case))
>
> - assert isinstance(node.arm, _XdrBasic)
> + assert isinstance(node.arm, (_XdrBasic, _XdrString))
> template = get_jinja2_template(environment, "decoder", node.arm.template)
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> - classifier=node.arm.spec.c_classifier,
> + type=type_name,
> + classifier=classifier,
> )
> )
>
> @@ -169,7 +183,10 @@ def emit_union_case_spec_encoder(
>
> if isinstance(node.arm, _XdrVoid):
> return
> -
> + if isinstance(node.arm, _XdrString):
> + type_name = "char *"
> + else:
> + type_name = node.arm.spec.type_name
> if big_endian_discriminant:
> template = get_jinja2_template(environment, "encoder", "case_spec_be")
> else:
> @@ -181,7 +198,7 @@ def emit_union_case_spec_encoder(
> print(
> template.render(
> name=node.arm.name,
> - type=node.arm.spec.type_name,
> + type=type_name,
> )
> )
>
> diff --git a/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
> new file mode 100644
> index 000000000000..2f035a64f1f4
> --- /dev/null
> +++ b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
> @@ -0,0 +1,6 @@
> +{# SPDX-License-Identifier: GPL-2.0 #}
> +{% if annotate %}
> + /* member {{ name }} (variable-length string) */
> +{% endif %}
> + if (!xdrgen_encode_string(xdr, ptr->u.{{ name }}, {{ maxsize }}))
> + return false;
--
Chuck Lever
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] xdrgen: handle _XdrString in union encoder/decoder
2025-10-26 18:00 [PATCH] xdrgen: handle _XdrString in union encoder/decoder Khushal Chitturi
2025-10-27 13:53 ` Chuck Lever
@ 2025-10-28 14:53 ` Khushal Chitturi
2025-10-28 19:00 ` Chuck Lever
` (2 more replies)
1 sibling, 3 replies; 6+ messages in thread
From: Khushal Chitturi @ 2025-10-28 14:53 UTC (permalink / raw)
To: chuck.lever
Cc: linux-nfs, jlayton, neil, okorniev, Dai.Ngo, tom, davem, edumazet,
kuba, pabeni, horms, netdev, linux-kernel, Khushal Chitturi
Running xdrgen on xdrgen/tests/test.x fails when
generating encoder or decoder functions for union
members of type _XdrString. It was because _XdrString
does not have a spec attribute like _XdrBasic,
leading to AttributeError.
This patch updates emit_union_case_spec_definition
and emit_union_case_spec_decoder/encoder to handle
_XdrString by assigning type_name = "char *" and
avoiding referencing to spec.
Testing: Fixed xdrgen tool was run on originally failing
test file (tools/net/sunrpc/xdrgen/tests/test.x) and now
completes without AttributeError. Modified xdrgen tool was
also run against nfs4_1.x (Documentation/sunrpc/xdr/nfs4_1.x).
The output header file matches with nfs4_1.h
(include/linux/sunrpc/xdrgen/nfs4_1.h).
This validates the patch for all XDR input files currently
within the kernel.
Changes since v1:
- Corrected email address in Signed-off-by.
- Wrapped patch description lines to 72 characters.
Signed-off-by: Khushal Chitturi <kc9282016@gmail.com>
---
tools/net/sunrpc/xdrgen/generators/union.py | 35 ++++++++++++++-----
.../templates/C/union/encoder/string.j2 | 6 ++++
2 files changed, 32 insertions(+), 9 deletions(-)
create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
diff --git a/tools/net/sunrpc/xdrgen/generators/union.py b/tools/net/sunrpc/xdrgen/generators/union.py
index 2cca00e279cd..3118dfdddcc4 100644
--- a/tools/net/sunrpc/xdrgen/generators/union.py
+++ b/tools/net/sunrpc/xdrgen/generators/union.py
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0
#!/usr/bin/env python3
# ex: set filetype=python:
@@ -8,7 +9,7 @@ from jinja2 import Environment
from generators import SourceGenerator
from generators import create_jinja2_environment, get_jinja2_template
-from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, get_header_name
+from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, _XdrString, get_header_name
from xdr_ast import _XdrDeclaration, _XdrCaseSpec, public_apis, big_endian
@@ -40,13 +41,20 @@ def emit_union_case_spec_definition(
"""Emit a definition for an XDR union's case arm"""
if isinstance(node.arm, _XdrVoid):
return
- assert isinstance(node.arm, _XdrBasic)
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
+
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "definition", "case_spec")
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -84,6 +92,12 @@ def emit_union_case_spec_decoder(
if isinstance(node.arm, _XdrVoid):
return
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
if big_endian_discriminant:
template = get_jinja2_template(environment, "decoder", "case_spec_be")
@@ -92,13 +106,13 @@ def emit_union_case_spec_decoder(
for case in node.values:
print(template.render(case=case))
- assert isinstance(node.arm, _XdrBasic)
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "decoder", node.arm.template)
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -169,7 +183,10 @@ def emit_union_case_spec_encoder(
if isinstance(node.arm, _XdrVoid):
return
-
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ else:
+ type_name = node.arm.spec.type_name
if big_endian_discriminant:
template = get_jinja2_template(environment, "encoder", "case_spec_be")
else:
@@ -181,7 +198,7 @@ def emit_union_case_spec_encoder(
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
+ type=type_name,
)
)
diff --git a/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
new file mode 100644
index 000000000000..2f035a64f1f4
--- /dev/null
+++ b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
@@ -0,0 +1,6 @@
+{# SPDX-License-Identifier: GPL-2.0 #}
+{% if annotate %}
+ /* member {{ name }} (variable-length string) */
+{% endif %}
+ if (!xdrgen_encode_string(xdr, ptr->u.{{ name }}, {{ maxsize }}))
+ return false;
--
2.51.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] xdrgen: handle _XdrString in union encoder/decoder
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
@ 2025-10-28 19:00 ` Chuck Lever
2025-10-28 22:24 ` NeilBrown
2025-10-29 6:12 ` [PATCH v3] " Khushal Chitturi
2 siblings, 0 replies; 6+ messages in thread
From: Chuck Lever @ 2025-10-28 19:00 UTC (permalink / raw)
To: Khushal Chitturi
Cc: Chuck Lever, linux-nfs, jlayton, neil, okorniev, Dai.Ngo, tom,
davem, edumazet, kuba, pabeni, horms, netdev, linux-kernel
From: Chuck Lever <chuck.lever@oracle.com>
On Tue, 28 Oct 2025 20:23:17 +0530, Khushal Chitturi wrote:
> Running xdrgen on xdrgen/tests/test.x fails when
> generating encoder or decoder functions for union
> members of type _XdrString. It was because _XdrString
> does not have a spec attribute like _XdrBasic,
> leading to AttributeError.
>
> This patch updates emit_union_case_spec_definition
> and emit_union_case_spec_decoder/encoder to handle
> _XdrString by assigning type_name = "char *" and
> avoiding referencing to spec.
>
> [...]
Applied to nfsd-testing, thanks!
[1/1] xdrgen: handle _XdrString in union encoder/decoder
commit: 33489817c0df12155eb3bfc86edca8fc64d204f6
--
Chuck Lever
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] xdrgen: handle _XdrString in union encoder/decoder
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
2025-10-28 19:00 ` Chuck Lever
@ 2025-10-28 22:24 ` NeilBrown
2025-10-29 6:12 ` [PATCH v3] " Khushal Chitturi
2 siblings, 0 replies; 6+ messages in thread
From: NeilBrown @ 2025-10-28 22:24 UTC (permalink / raw)
To: Khushal Chitturi
Cc: chuck.lever, linux-nfs, jlayton, okorniev, Dai.Ngo, tom, davem,
edumazet, kuba, pabeni, horms, netdev, linux-kernel,
Khushal Chitturi
On Wed, 29 Oct 2025, Khushal Chitturi wrote:
> --- a/tools/net/sunrpc/xdrgen/generators/union.py
> +++ b/tools/net/sunrpc/xdrgen/generators/union.py
> @@ -1,3 +1,4 @@
> +# SPDX-License-Identifier: GPL-2.0
> #!/usr/bin/env python3
#! must be the first line to be effective.
Other .py files in the kernel have '# SPDX' on the second or third line.
NeilBrown
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] xdrgen: handle _XdrString in union encoder/decoder
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
2025-10-28 19:00 ` Chuck Lever
2025-10-28 22:24 ` NeilBrown
@ 2025-10-29 6:12 ` Khushal Chitturi
2 siblings, 0 replies; 6+ messages in thread
From: Khushal Chitturi @ 2025-10-29 6:12 UTC (permalink / raw)
To: chuck.lever
Cc: linux-nfs, jlayton, neil, okorniev, Dai.Ngo, tom, davem, edumazet,
kuba, pabeni, horms, netdev, linux-kernel, Khushal Chitturi
Running xdrgen on xdrgen/tests/test.x fails when
generating encoder or decoder functions for union
members of type _XdrString. It was because _XdrString
does not have a spec attribute like _XdrBasic,
leading to AttributeError.
This patch updates emit_union_case_spec_definition
and emit_union_case_spec_decoder/encoder to handle
_XdrString by assigning type_name = "char *" and
avoiding referencing to spec.
Testing: Fixed xdrgen tool was run on originally failing
test file (tools/net/sunrpc/xdrgen/tests/test.x) and now
completes without AttributeError. Modified xdrgen tool was
also run against nfs4_1.x (Documentation/sunrpc/xdr/nfs4_1.x).
The output header file matches with nfs4_1.h
(include/linux/sunrpc/xdrgen/nfs4_1.h).
This validates the patch for all XDR input files currently
within the kernel.
Changes since v2:
- Moved the shebang to the first line
- Removed SPDX header to match style of current xdrgen files
Changes since v1:
- Corrected email address in Signed-off-by.
- Wrapped patch description lines to 72 characters.
Signed-off-by: Khushal Chitturi <kc9282016@gmail.com>
---
tools/net/sunrpc/xdrgen/generators/union.py | 34 ++++++++++++++-----
.../templates/C/union/encoder/string.j2 | 6 ++++
2 files changed, 31 insertions(+), 9 deletions(-)
create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
diff --git a/tools/net/sunrpc/xdrgen/generators/union.py b/tools/net/sunrpc/xdrgen/generators/union.py
index 2cca00e279cd..ad1f214ef22a 100644
--- a/tools/net/sunrpc/xdrgen/generators/union.py
+++ b/tools/net/sunrpc/xdrgen/generators/union.py
@@ -8,7 +8,7 @@ from jinja2 import Environment
from generators import SourceGenerator
from generators import create_jinja2_environment, get_jinja2_template
-from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, get_header_name
+from xdr_ast import _XdrBasic, _XdrUnion, _XdrVoid, _XdrString, get_header_name
from xdr_ast import _XdrDeclaration, _XdrCaseSpec, public_apis, big_endian
@@ -40,13 +40,20 @@ def emit_union_case_spec_definition(
"""Emit a definition for an XDR union's case arm"""
if isinstance(node.arm, _XdrVoid):
return
- assert isinstance(node.arm, _XdrBasic)
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
+
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "definition", "case_spec")
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -84,6 +91,12 @@ def emit_union_case_spec_decoder(
if isinstance(node.arm, _XdrVoid):
return
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ classifier = ""
+ else:
+ type_name = node.arm.spec.type_name
+ classifier = node.arm.spec.c_classifier
if big_endian_discriminant:
template = get_jinja2_template(environment, "decoder", "case_spec_be")
@@ -92,13 +105,13 @@ def emit_union_case_spec_decoder(
for case in node.values:
print(template.render(case=case))
- assert isinstance(node.arm, _XdrBasic)
+ assert isinstance(node.arm, (_XdrBasic, _XdrString))
template = get_jinja2_template(environment, "decoder", node.arm.template)
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
- classifier=node.arm.spec.c_classifier,
+ type=type_name,
+ classifier=classifier,
)
)
@@ -169,7 +182,10 @@ def emit_union_case_spec_encoder(
if isinstance(node.arm, _XdrVoid):
return
-
+ if isinstance(node.arm, _XdrString):
+ type_name = "char *"
+ else:
+ type_name = node.arm.spec.type_name
if big_endian_discriminant:
template = get_jinja2_template(environment, "encoder", "case_spec_be")
else:
@@ -181,7 +197,7 @@ def emit_union_case_spec_encoder(
print(
template.render(
name=node.arm.name,
- type=node.arm.spec.type_name,
+ type=type_name,
)
)
diff --git a/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2 b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
new file mode 100644
index 000000000000..2f035a64f1f4
--- /dev/null
+++ b/tools/net/sunrpc/xdrgen/templates/C/union/encoder/string.j2
@@ -0,0 +1,6 @@
+{# SPDX-License-Identifier: GPL-2.0 #}
+{% if annotate %}
+ /* member {{ name }} (variable-length string) */
+{% endif %}
+ if (!xdrgen_encode_string(xdr, ptr->u.{{ name }}, {{ maxsize }}))
+ return false;
--
2.51.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-10-29 6:12 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-26 18:00 [PATCH] xdrgen: handle _XdrString in union encoder/decoder Khushal Chitturi
2025-10-27 13:53 ` Chuck Lever
2025-10-28 14:53 ` [PATCH v2] " Khushal Chitturi
2025-10-28 19:00 ` Chuck Lever
2025-10-28 22:24 ` NeilBrown
2025-10-29 6:12 ` [PATCH v3] " Khushal Chitturi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).