Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3;
From:   Gary Guo <gary@garyguo.net>
To:     Miguel Ojeda <ojeda@kernel.org>,
        Alex Gaynor <alex.gaynor@gmail.com>,
        Wedson Almeida Filho <wedsonaf@gmail.com>,
        Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>,
        =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= <bjorn3_gh@protonmail.com>,
        Benno Lossin <benno.lossin@proton.me>,
        Andreas Hindborg <a.hindborg@samsung.com>,
        Alice Ryhl <aliceryhl@google.com>,
        Martin Rodriguez Reboredo <yakoyoku@gmail.com>,
        Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
Cc:     Wedson Almeida Filho <walmeida@microsoft.com>,
        Vlastimil Babka <vbabka@suse.cz>,
        rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] rust: bindings: rename const binding using sed
Date:   Sat,  4 Nov 2023 14:56:56 +0000
Message-Id: <20231104145700.2495176-1-gary@garyguo.net>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?smzAKmZDZuMXtlbVo+BkWAXH2MNQAtZ5M0Q9+ChGjdUrpli+DUtL0KLq1F2w?=
 =?us-ascii?Q?WjXksFdqxmFHx7sD7GyRadzUNl9dl0qZZOBDgrDyolZb/o+awzjja0xjUZLB?=
 =?us-ascii?Q?fbWb/XM2bZDtEp86NFYMcDqfL/xyXSGp3IkA+I02y1eGZoL747hOuTGnAHvC?=
 =?us-ascii?Q?MTUq5ifeS95Cr1s0bDb5Ef1ZK8RKYgVjA7us7xs8fpvXIa/v2v5TTrHt79nw?=
 =?us-ascii?Q?hiw7dxuEzlQMbuebj/HEf9tubnwhTX74QZ8W91EY35e8YgrF53KDcczR2kJX?=
 =?us-ascii?Q?YjROAvf3sbgUzFrjfA8B30CzPggKVYQHcOtK285y68F6CuU0O9NJcdh9NUbG?=
 =?us-ascii?Q?+aW2gmBA/RjF4nJeg3q4/VwWz1sC5yfZ0zEiy9WqfrIQZR7zJCs5jE8ErTRk?=
 =?us-ascii?Q?W9tfJH1lk4Hha3vOsvbWPn9VqIktXg4K3Tgg0z0wS7kxfKOvgetlHATkgSwM?=
 =?us-ascii?Q?xLxLoymLKKPC8+Sh6ZWPTP9jkG+IojqKgaPLzY7nw+H5WbPE68mFupWNx2Ia?=
 =?us-ascii?Q?z1OF9QanuftqDyEQm/OyzsGjeUzLAlPrHrLz5xd/LbvYJndHW9lpZvK9tvUy?=
 =?us-ascii?Q?HfpWkK+0GPsSI9X4a7M/Vry7YBbkD3RADC+IbaDp9qk8wHqNJcMVjOSyL4AU?=
 =?us-ascii?Q?g3Jr0+uI1uibLyVU4zZTvr3PeFIg1yPtg139KM/EGZ7tc44X1hSsxORaUjvZ?=
 =?us-ascii?Q?wfT3wdHioOWc0jQcVcnj8PnXawHtqm9BGTBfRKHmlFkynGCyajcrxsaBl7j6?=
 =?us-ascii?Q?UkPERIgW93KFT75zQ7ofqalFJxXcCcbjZhgYrD6TEveM5hmIejBhVHunVc0/?=
 =?us-ascii?Q?ne7CK21AV+zLa+qvBM2Spuahq3mGkOnkXkIQh5Jz8o96pW73CqcdIFuMwKO1?=
 =?us-ascii?Q?7VVXZFbhSJ5CexGdx2VSHFyYcwGY1x9JTtLkVwSERe1Ze4Kf65iWHvPV+7I3?=
 =?us-ascii?Q?vCncKRssB8WgZbPjXhDiP32OIAHnni5gy17VzGMTLlP9b/w6MSy5++pPFRn3?=
 =?us-ascii?Q?V6jwzvy6FSZRSNL8gyNkggUVV5komvA7A7FZIhONa8o8IYDd95u4RPudgCSn?=
 =?us-ascii?Q?1Ki4dPTnJ7JPD0jNNZ7+6vyDA7GPxDrQpXlCy5GHPf/EeVlTEiqyOyH5BfMp?=
 =?us-ascii?Q?/vMkj5SDAoBltmIz4yVHphGTFO8IC2EnSUThYo73BKpB1GEgYoIfzpR1Qwgb?=
 =?us-ascii?Q?r8iH+x6tS28L6tF5ncpblAlHM3XQ8g/I3IgTaWLv3dA+bkrX4pRDCNelro1a?=
 =?us-ascii?Q?v0D/lUiv8T8PUI811A8gLyUoTERD3uuEzvVzSQ8+KQiCim1SNz9ear7Yyf7w?=
 =?us-ascii?Q?+bcGx8poinARHAR682065zqgdg8OQPVzunEEvIm3YOdu17Nj2wscmGWDVyAa?=
 =?us-ascii?Q?J+MrQsEjy14YvXhZ94IfTNrtahzHnJ3/Jv2lfO5EALaBgkMPGN7NRFEL4yQH?=
 =?us-ascii?Q?WVuvcajv7HRjZ+BMZ21qcGUK4NCVNYwZr24P5OFZ9/YnaQ/BLwghqqCoa7JU?=
 =?us-ascii?Q?fePWiLOoTuS/qUWJcqDfZZ5qltsMSp6wqkVdnru7KLC3mfw97PoGGr2AITpf?=
 =?us-ascii?Q?PBUFciTcFLbnq7jGgoXRUW4p1TWSa7Ij4nq2sRTTTInQjOY3e/igazfBVayw?=
 =?us-ascii?Q?+abibzft5jA0QptUoadtE13oerqnZLxdzlWg54pWI2Cx?=
X-OriginatorOrg: garyguo.net
X-MS-Exchange-CrossTenant-Network-Message-Id: fbbd5a5f-3b1a-44ac-ea67-08dbdd467212
X-MS-Exchange-CrossTenant-AuthSource: LO2P265MB5183.GBRP265.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2023 14:58:03.5933
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: pnitynQhL1+ioTFC3ONuUbg3n0odMSWN7/VXlDVyascEDL+KZUHMM7pCHt9gD0PaeJWGulIO88mKfTK14WmY1Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LO4P265MB6012
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
	autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Sat, 04 Nov 2023 07:58:19 -0700 (PDT)

Current for consts that bindgen don't recognise, we define a helper
constant with

    const <TYPE> BINDINGS_<NAME> = <NAME>;

in `bindings_helper.h` and then we put

    pub const <NAME>: <TYPE> = BINDINGS_<NAME>;

in `bindings/lib.rs`. This is fine that we currently only have 3
constants that are defined this way, but is going to be more annoying
when more constants are added since every new constant needs to be
defined in two places.

This patch changes the way we define constant helpers to

    const <TYPE> RUST_CONST_HELPER_<NAME> = <NAME>;

and then use `sed` to postprocess Rust code by generated by bindgen to
remove the distinct prefix, so user of the binding crate can refer to
the name directly.

Reviewed-by: Benno Lossin <benno.lossin@proton.me>
Reviewed-by: Andreas Hindborg <a.hindborg@samsung.com>
Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
Signed-off-by: Gary Guo <gary@garyguo.net>
---
v1 -> v2:
- Changed `RUST_BINDING_` to `RUST_CONST_HELPER_`.

 rust/Makefile                   | 2 ++
 rust/bindings/bindings_helper.h | 6 +++---
 rust/bindings/lib.rs            | 3 ---
 rust/kernel/allocator.rs        | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/rust/Makefile b/rust/Makefile
index a27f35f924ec..57f7f5e5a95d 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -337,6 +337,8 @@ quiet_cmd_bindgen = BINDGEN $@
 
 $(obj)/bindings/bindings_generated.rs: private bindgen_target_flags = \
     $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)
+$(obj)/bindings/bindings_generated.rs: private bindgen_target_extra = ; \
+    sed -Ei 's/pub const RUST_CONST_HELPER_([a-zA-Z0-9_]*)/pub const \1/g' $@
 $(obj)/bindings/bindings_generated.rs: $(src)/bindings/bindings_helper.h \
     $(src)/bindgen_parameters FORCE
 	$(call if_changed_dep,bindgen)
diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
index c91a3c24f607..bfa0fa794dae 100644
--- a/rust/bindings/bindings_helper.h
+++ b/rust/bindings/bindings_helper.h
@@ -14,6 +14,6 @@
 #include <linux/sched.h>
 
 /* `bindgen` gets confused at certain things. */
-const size_t BINDINGS_ARCH_SLAB_MINALIGN = ARCH_SLAB_MINALIGN;
-const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL;
-const gfp_t BINDINGS___GFP_ZERO = __GFP_ZERO;
+const size_t RUST_CONST_HELPER_ARCH_SLAB_MINALIGN = ARCH_SLAB_MINALIGN;
+const gfp_t RUST_CONST_HELPER_GFP_KERNEL = GFP_KERNEL;
+const gfp_t RUST_CONST_HELPER___GFP_ZERO = __GFP_ZERO;
diff --git a/rust/bindings/lib.rs b/rust/bindings/lib.rs
index 9bcbea04dac3..40ddaee50d8b 100644
--- a/rust/bindings/lib.rs
+++ b/rust/bindings/lib.rs
@@ -48,6 +48,3 @@ mod bindings_helper {
 }
 
 pub use bindings_raw::*;
-
-pub const GFP_KERNEL: gfp_t = BINDINGS_GFP_KERNEL;
-pub const __GFP_ZERO: gfp_t = BINDINGS___GFP_ZERO;
diff --git a/rust/kernel/allocator.rs b/rust/kernel/allocator.rs
index a8f3d5be1af1..4b057e837358 100644
--- a/rust/kernel/allocator.rs
+++ b/rust/kernel/allocator.rs
@@ -21,7 +21,7 @@ unsafe fn krealloc_aligned(ptr: *mut u8, new_layout: Layout, flags: bindings::gf
 
     let mut size = layout.size();
 
-    if layout.align() > bindings::BINDINGS_ARCH_SLAB_MINALIGN {
+    if layout.align() > bindings::ARCH_SLAB_MINALIGN {
         // The alignment requirement exceeds the slab guarantee, thus try to enlarge the size
         // to use the "power-of-two" size/alignment guarantee (see comments in `kmalloc()` for
         // more information).

base-commit: 3857af38e57a80b15b994e19d1f4301cac796481
-- 
2.40.1