Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Drewek, Wojciech" <wojciech.drewek@intel.com>
To:     Andrea Righi <andrea.righi@canonical.com>,
        David Miller <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>
CC:     Shuah Khan <shuah@kernel.org>,
        "netdev@vger.kernel.org" <netdev@vger.kernel.org>,
        "linux-kselftest@vger.kernel.org" <linux-kselftest@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] l2tp: generate correct module alias strings
Thread-Topic: [PATCH] l2tp: generate correct module alias strings
Thread-Index: AQHZYu25p9X/3KO1vUSWWNGmY+PWZ68TGZ1A
Date:   Thu, 30 Mar 2023 10:11:50 +0000
Message-ID: <PH0PR11MB57821BCF8B905AD3B4B06B79FD8E9@PH0PR11MB5782.namprd11.prod.outlook.com>
References: <20230330095442.363201-1-andrea.righi@canonical.com>
In-Reply-To: <20230330095442.363201-1-andrea.righi@canonical.com>
Accept-Language: pl-PL, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?2BJ+o6ey4zRHV3MiQdXgDFW5hzKmND7AsZIN5carHKvjSph5tjHo5rerG3pi?=
 =?us-ascii?Q?A01W0kdeMW1XFwrGVvj/l7VkJN8En9LM+AySQBekZNtK2UyeLdFxZyHrR9QO?=
 =?us-ascii?Q?sO+h6Hpm8RHQyNo3dRtMDRzh3QmC2vfJMkdVQwop8SIjNMDX9TDvUMjdNYYe?=
 =?us-ascii?Q?PixhxVIiNqDyfqJuU/imBUvXMnqBDfyUjR7coTyDMPxEnOqu8FSGXsqbOOu9?=
 =?us-ascii?Q?RG8lADJqroWdXzIxzM+3uwsk8Qy1pM0CQKVOOdLKyBvCGyWggXUwHxjUeskE?=
 =?us-ascii?Q?7MJZ6at+9M/xACOF+sG63ITStqOVkeaD5rXs/3y1aINZefL99Wn+nZvzypQ8?=
 =?us-ascii?Q?ileZL8XUnxBSZvK79fFwWNjlXUVshqqtvooMgHrxaVZGX7CTBfFKakLL2QaI?=
 =?us-ascii?Q?ZomaotPZN7OBjWaxGqs33BhEXKatWJVThgS5cqPAKPzFKHY1s0ltAhiDitg/?=
 =?us-ascii?Q?5Z1TIdUhFwzwGdmmENQ2+ERMnuJV4fybtdxDjDAQ3yjuBM2Nj1zJhbm8jrmt?=
 =?us-ascii?Q?DFHTidT1JY2nGU+m5uvTG9zsgORAMVOvW6RuKrZ3Kl0VbWu/DCFf7Wm5ZYQS?=
 =?us-ascii?Q?0InD7+Tsw5mWomb+ifXcjChqZYKnzVp4mrmRkBuBBM4NRFs/FVCpG4eSngf7?=
 =?us-ascii?Q?ylNmSXNIzhzVgO+l0s09pKFCTmXoaLhpKNspHlZDNL7Liw9fYI405jLRvin+?=
 =?us-ascii?Q?Z00YJ2uFk6G+RqWde+jRj2ZP5fMzMte93C9PpBrN1OCzw4/NyfGVUYZvFzDJ?=
 =?us-ascii?Q?94UVNGlxC5IzjQveoXL5WK+uwV4LTg1oW8i2wLFexT2Z8tOBmkZssmeS4bjv?=
 =?us-ascii?Q?ztSv2/5IjHoltnvCO8OrWTEeSgZzeI4BMPamebbD8D+ucWeuLDmc+MJS8VX9?=
 =?us-ascii?Q?6OjSgDQSWkLceDLO6DIo1M8PuAwD+NKnqO/m17Zna4D3fOYWwb0bmHjSeDL+?=
 =?us-ascii?Q?+P5fYvAJGtJi2HKtJHFVaLl4mnyRNZyhIRPhzCowCwdDZ7rdyflY9E4sFx7w?=
 =?us-ascii?Q?sDS1gQaQ+zkymAJb0WN0ABhOKgXqFqBie+a8Y0PSmCIx7Avkp7O29XW7vWn4?=
 =?us-ascii?Q?vFoAhKT20JKDd5owDN2/NBRzUfoGYWyPPFl417WKlCwloE8oQ7QKsGyYbQt7?=
 =?us-ascii?Q?45+Bih2JmrVVBEFZs895MbgHo8mN3u4wulW/hSzhxPgXiXD4YjlL2SB78yom?=
 =?us-ascii?Q?hfs/WemfsmoT8GJjByQBcSwwtJxjZJRNIjiF0c+/rq1dPd/vtyNU3gw5U/2a?=
 =?us-ascii?Q?o6klTZdFhIyNKPSXIQqN6/lFPeCDqSFDltmxeW3rFVmWFX3935ahnfzLN0CL?=
 =?us-ascii?Q?LwQM5qhZLXQ58cV2qrI+oBIp8DX6CfMnvYKJRqHxq7Nu9KmyoLE6Al53Ypen?=
 =?us-ascii?Q?vxJf+wFSRep7OA97gKz+RLFThr0cL4Yvxko7lDXu9kVjtUBRRXVdiwWAbY9I?=
 =?us-ascii?Q?n9cxcVsLTCqyk+bqj10/nG4olJ02kPxcexZowz4/umevOeR4TvpLxJHc0S7N?=
 =?us-ascii?Q?bYr+cuYtdTnPVHWE81oJ4iR20VvMmojmMdk7/knRzSpUYahhe0bvzRhTMThK?=
 =?us-ascii?Q?Icvs9yAQ/whipvshCD44gEOERjt0uLVb+5GmcAkX?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB5782.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e0a9d37-09a6-4301-6909-08db31072de1
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Mar 2023 10:11:50.7022
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: bFeFhXuVTcmzabGi+Gj6aKw/yiSY/ME1gVSTyze2L6jAU7+uY6AFvqy4U6gQ6z2BVfOAvakaCSJX9fnI9Phc8rpd+M+d0rdv+ciPsN0AyqI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4557
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
        SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Andrea Righi <andrea.righi@canonical.com>
> Sent: czwartek, 30 marca 2023 11:55
> To: David Miller <davem@davemloft.net>; Eric Dumazet <edumazet@google.com=
>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni
> <pabeni@redhat.com>
> Cc: Shuah Khan <shuah@kernel.org>; Drewek, Wojciech <wojciech.drewek@inte=
l.com>; netdev@vger.kernel.org; linux-
> kselftest@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] l2tp: generate correct module alias strings
>=20
> Commit 65b32f801bfb ("uapi: move IPPROTO_L2TP to in.h") moved the
> definition of IPPROTO_L2TP from a define to an enum, but since
> __stringify doesn't work properly with enums, we ended up breaking the
> modalias strings for the l2tp modules:
>=20
>  $ modinfo l2tp_ip l2tp_ip6 | grep alias
>  alias:          net-pf-2-proto-IPPROTO_L2TP
>  alias:          net-pf-2-proto-2-type-IPPROTO_L2TP
>  alias:          net-pf-10-proto-IPPROTO_L2TP
>  alias:          net-pf-10-proto-2-type-IPPROTO_L2TP
>=20
> Use the resolved number directly in MODULE_ALIAS_*() macros (as we
> already do with SOCK_DGRAM) to fix the alias strings:
>=20
> $ modinfo l2tp_ip l2tp_ip6 | grep alias
> alias:          net-pf-2-proto-115
> alias:          net-pf-2-proto-115-type-2
> alias:          net-pf-10-proto-115
> alias:          net-pf-10-proto-115-type-2
>=20
> Moreover, fix the ordering of the parameters passed to
> MODULE_ALIAS_NET_PF_PROTO_TYPE() by switching proto and type.
>=20
> Fixes: 65b32f801bfb ("uapi: move IPPROTO_L2TP to in.h")
> Link: https://lore.kernel.org/lkml/ZCQt7hmodtUaBlCP@righiandr-XPS-13-7390
> Signed-off-by: Guillaume Nault <gnault@redhat.com>
> Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Tested-by:  Wojciech Drewek <wojciech.drewek@intel.com>

> ---
>  net/l2tp/l2tp_ip.c  | 8 ++++----
>  net/l2tp/l2tp_ip6.c | 8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)
>=20
> diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
> index 4db5a554bdbd..41a74fc84ca1 100644
> --- a/net/l2tp/l2tp_ip.c
> +++ b/net/l2tp/l2tp_ip.c
> @@ -677,8 +677,8 @@ MODULE_AUTHOR("James Chapman <jchapman@katalix.com>")=
;
>  MODULE_DESCRIPTION("L2TP over IP");
>  MODULE_VERSION("1.0");
>=20
> -/* Use the value of SOCK_DGRAM (2) directory, because __stringify doesn'=
t like
> - * enums
> +/* Use the values of SOCK_DGRAM (2) as type and IPPROTO_L2TP (115) as pr=
otocol,
> + * because __stringify doesn't like enums
>   */
> -MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 2, IPPROTO_L2TP);
> -MODULE_ALIAS_NET_PF_PROTO(PF_INET, IPPROTO_L2TP);
> +MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET, 115, 2);
> +MODULE_ALIAS_NET_PF_PROTO(PF_INET, 115);
> diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
> index 2478aa60145f..5137ea1861ce 100644
> --- a/net/l2tp/l2tp_ip6.c
> +++ b/net/l2tp/l2tp_ip6.c
> @@ -806,8 +806,8 @@ MODULE_AUTHOR("Chris Elston <celston@katalix.com>");
>  MODULE_DESCRIPTION("L2TP IP encapsulation for IPv6");
>  MODULE_VERSION("1.0");
>=20
> -/* Use the value of SOCK_DGRAM (2) directory, because __stringify doesn'=
t like
> - * enums
> +/* Use the values of SOCK_DGRAM (2) as type and IPPROTO_L2TP (115) as pr=
otocol,
> + * because __stringify doesn't like enums
>   */
> -MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 2, IPPROTO_L2TP);
> -MODULE_ALIAS_NET_PF_PROTO(PF_INET6, IPPROTO_L2TP);
> +MODULE_ALIAS_NET_PF_PROTO_TYPE(PF_INET6, 115, 2);
> +MODULE_ALIAS_NET_PF_PROTO(PF_INET6, 115);
> --
> 2.39.2