From nobody Thu Sep 18 02:53:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6D42C4332F for ; Mon, 12 Dec 2022 11:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231785AbiLLLrV (ORCPT ); Mon, 12 Dec 2022 06:47:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231314AbiLLLrS (ORCPT ); Mon, 12 Dec 2022 06:47:18 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18B0E23D; Mon, 12 Dec 2022 03:47:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A7A7F60FD4; Mon, 12 Dec 2022 11:47:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D0E18C433EF; Mon, 12 Dec 2022 11:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670845637; bh=lWioGeYIzIqesYApk/JLuJOXnJyD7SbY2I0mQPcKIf4=; h=From:To:Cc:Subject:Date:From; b=q2dVmV6WTikcdIc/5QOlHYjekbmceuvLBIbn/4dUN2RrdzUR9NuvOsOv0wuCX7s1w d/yIWo7deyNFS6gFnNcLw2VUtIymGjxptAA2rp3KR10Qs0aAJOb7Fio46OxFaHTmJu wqh6b0toEmp8bdm0rVHZgDdRdVRjuVyfCqtLEpoov1bbjYMcWH05MXb8eWgoHnS67+ k2viP/B7jHJIBKzgNMuj58+5bCz1kM92RcH7HsCBUG+MwR206G1lMi1x7vQIF1PoGI dnqKB7pjkb+y0u5ob1RinY8P4T2H90caG1gcEPj9SK9Aaa6ZaL/qc1BBxtu/6D/hUW hi+2lwA2vH4QA== From: "Jiri Slaby (SUSE)" To: Jason@zx2c4.com Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , Martin Liska , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , wireguard@lists.zx2c4.com, netdev@vger.kernel.org Subject: [PATCH v2] wireguard (gcc13): move ULLs limits away from enum Date: Mon, 12 Dec 2022 12:47:12 +0100 Message-Id: <20221212114712.11802-1-jirislaby@kernel.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Since gcc13, each member of an enum has the same type as the enum [1]. And that is inherited from its members. Provided these two: REKEY_AFTER_MESSAGES =3D 1ULL << 60 REJECT_AFTER_MESSAGES =3D U64_MAX - COUNTER_WINDOW_SIZE - 1 the named type is unsigned long. This generates warnings with gcc-13: error: format '%d' expects argument of type 'int', but argument 6 has typ= e 'long unsigned int' Define such high values as macros instead of in the enum. Note that enums are not guaranteed to hold unsigned longs in any way. And use BIT_ULL() for REKEY_AFTER_MESSAGES. [1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=3D36113 Cc: Martin Liska Cc: "Jason A. Donenfeld" Cc: "David S. Miller" Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Cc: wireguard@lists.zx2c4.com Cc: netdev@vger.kernel.org Signed-off-by: Jiri Slaby (SUSE) --- Notes: [v2] move the constant out of enum (David) drivers/net/wireguard/messages.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireguard/messages.h b/drivers/net/wireguard/messa= ges.h index 208da72673fc..048125bdcd23 100644 --- a/drivers/net/wireguard/messages.h +++ b/drivers/net/wireguard/messages.h @@ -37,9 +37,10 @@ enum counter_values { COUNTER_WINDOW_SIZE =3D COUNTER_BITS_TOTAL - COUNTER_REDUNDANT_BITS }; =20 +#define REKEY_AFTER_MESSAGES BIT_ULL(60) +#define REJECT_AFTER_MESSAGES (U64_MAX - COUNTER_WINDOW_SIZE - 1) + enum limits { - REKEY_AFTER_MESSAGES =3D 1ULL << 60, - REJECT_AFTER_MESSAGES =3D U64_MAX - COUNTER_WINDOW_SIZE - 1, REKEY_TIMEOUT =3D 5, REKEY_TIMEOUT_JITTER_MAX_JIFFIES =3D HZ / 3, REKEY_AFTER_TIME =3D 120, --=20 2.38.1