From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C502D54DAFB for ; Tue, 8 Sep 2026 13:42:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788874977; cv=none; b=SAaT8H02jvW0l6twQ0ibHaIlJGUJamkk0luNxpU1g53zSDo1H8nD+pw2LtM3+RcPRUSH/5g3kY27kSapXJyo3Nq26twdVJjprO0yLy3j8ezBoX13eYlfLQv0ZDYIaOv+KySsj8K8/hPouadSZ0P97iVwP3iTSdoVkJ2+IoPWVBQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788874977; c=relaxed/simple; bh=i6lOljogfuwoWbuVx+HGIhGGL/tPTgcCHoXPiJbJ8yQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hvaLbyMiPqpj9w3zfF14l7zLn8RJYCMT1HsTLnCtGqqARmorX/lyUVEWJ/TkxwwE0H/Zh0+i2M6HdSrVaxtk/dNSxLtnUueA1nEKXS8OV2822fIYgb+rWfSKLiyRzcQFzmwCuD+HtZlXToUWhHyH46dWYPP471Tv2zS5L01jMp4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 Received: by smtp.kernel.org (Postfix) with ESMTPSA id C20541F00ACA; Tue, 8 Sep 2026 13:42:40 +0000 (UTC) From: Chuck Lever To: NeilBrown , Jeff Layton , Olga Kornievskaia , Dai Ngo , Tom Talpey Cc: Subject: [PATCH v3 04/10] xdrgen: Pass the containing struct name to member codec emitters Date: Tue, 8 Sep 2026 09:42:28 -0400 Message-ID: <20260908134234.512312-5-cel@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260908134234.512312-1-cel@kernel.org> References: <20260908134234.512312-1-cel@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit A per-member code generation directive keyed on the (struct, member) pair needs the name of the containing struct, but emit_struct_member_encoder() and emit_struct_member_decoder() receive only the member declaration. Pass the containing struct's name to emit_struct_member_encoder() and emit_struct_member_decoder(), and to the matching emitters in pointer.py, as a required argument. A struct whose last field refers to its own type is an _XdrPointer rather than an _XdrStruct, so pointer.py takes the same argument. No emitter renders the new value yet, so generated output is byte-identical. A subsequent patch keys the "pragma pages" encoder on it. Signed-off-by: Chuck Lever Acked-by: Jeff Layton --- tools/net/sunrpc/xdrgen/generators/pointer.py | 12 ++++++++---- tools/net/sunrpc/xdrgen/generators/struct.py | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/net/sunrpc/xdrgen/generators/pointer.py b/tools/net/sunrpc/xdrgen/generators/pointer.py index 6dbda60ad2db..9a540e125786 100644 --- a/tools/net/sunrpc/xdrgen/generators/pointer.py +++ b/tools/net/sunrpc/xdrgen/generators/pointer.py @@ -91,7 +91,9 @@ def emit_pointer_definition(environment: Environment, node: _XdrPointer) -> None def emit_pointer_member_decoder( - environment: Environment, field: _XdrDeclaration + environment: Environment, + field: _XdrDeclaration, + struct_name: str, ) -> None: """Emit a decoder for one field in an XDR pointer""" if isinstance(field, _XdrBasic): @@ -164,14 +166,16 @@ def emit_pointer_decoder(environment: Environment, node: _XdrPointer) -> None: print(template.render(name=node.name)) for field in node.fields[0:-1]: - emit_pointer_member_decoder(environment, field) + emit_pointer_member_decoder(environment, field, node.name) template = get_jinja2_template(environment, "decoder", "close") print(template.render()) def emit_pointer_member_encoder( - environment: Environment, field: _XdrDeclaration + environment: Environment, + field: _XdrDeclaration, + struct_name: str, ) -> None: """Emit an encoder for one field in a XDR pointer""" if isinstance(field, _XdrBasic): @@ -241,7 +245,7 @@ def emit_pointer_encoder(environment: Environment, node: _XdrPointer) -> None: print(template.render(name=node.name)) for field in node.fields[0:-1]: - emit_pointer_member_encoder(environment, field) + emit_pointer_member_encoder(environment, field, node.name) template = get_jinja2_template(environment, "encoder", "close") print(template.render()) diff --git a/tools/net/sunrpc/xdrgen/generators/struct.py b/tools/net/sunrpc/xdrgen/generators/struct.py index 64911de46f62..91da3863c166 100644 --- a/tools/net/sunrpc/xdrgen/generators/struct.py +++ b/tools/net/sunrpc/xdrgen/generators/struct.py @@ -91,7 +91,9 @@ def emit_struct_definition(environment: Environment, node: _XdrStruct) -> None: def emit_struct_member_decoder( - environment: Environment, field: _XdrDeclaration + environment: Environment, + field: _XdrDeclaration, + struct_name: str, ) -> None: """Emit a decoder for one field in an XDR struct""" if isinstance(field, _XdrBasic): @@ -164,14 +166,16 @@ def emit_struct_decoder(environment: Environment, node: _XdrStruct) -> None: print(template.render(name=node.name)) for field in node.fields: - emit_struct_member_decoder(environment, field) + emit_struct_member_decoder(environment, field, node.name) template = get_jinja2_template(environment, "decoder", "close") print(template.render()) def emit_struct_member_encoder( - environment: Environment, field: _XdrDeclaration + environment: Environment, + field: _XdrDeclaration, + struct_name: str, ) -> None: """Emit an encoder for one field in an XDR struct""" if isinstance(field, _XdrBasic): @@ -241,7 +245,7 @@ def emit_struct_encoder(environment: Environment, node: _XdrStruct) -> None: print(template.render(name=node.name)) for field in node.fields: - emit_struct_member_encoder(environment, field) + emit_struct_member_encoder(environment, field, node.name) template = get_jinja2_template(environment, "encoder", "close") print(template.render()) -- 2.55.0