From mboxrd@z Thu Jan 1 00:00:00 1970 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 21A00C6FD1D for ; Thu, 30 Mar 2023 10:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231324AbjC3KXy (ORCPT ); Thu, 30 Mar 2023 06:23:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230496AbjC3KXw (ORCPT ); Thu, 30 Mar 2023 06:23:52 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12B4172AE for ; Thu, 30 Mar 2023 03:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680171788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=59FDE+8LM1RTgNxCSNxSrwpKtHARF1ER91IIjRZ5nx4=; b=c/Tfi6O+Q5UPXfRx7n428Eho3OILFOGFH4Jipf7jlUg9nyijGHjAesM44GUN45lkKypUZ0 tmNP7VgAjtpkkC7TUmdbOefSkJjt0nPZRRWBmOcRhAeeG32zRp+QG12q2AsKbWjc72VXkx yOlkwoT6GnkcdK8H86zoJOC+7POqaew= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-6-PurBrOjrMeuwI1ZqyLkjaw-1; Thu, 30 Mar 2023 06:23:07 -0400 X-MC-Unique: PurBrOjrMeuwI1ZqyLkjaw-1 Received: by mail-qv1-f69.google.com with SMTP id f3-20020a0cc303000000b005c9966620daso7929382qvi.4 for ; Thu, 30 Mar 2023 03:23:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680171786; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=59FDE+8LM1RTgNxCSNxSrwpKtHARF1ER91IIjRZ5nx4=; b=jd8jNo1UnwjdpCzd7/0e0G7yA+ppyoQ+AGlVfTl+vIN5KlqVALpto2R2NXpy/g27XD 0Zlt2NdoHl+RMGCZgMW7l2ZowkBrd+lQdWBS+S1t52LpqBa7/SjO2X6gkWz1xBabodG4 fzWQyZhQUUK7t95BFDJDfFUrrQ3NoY/Oeff6LsZi+nhJ1ZhYCLZGgeJI0SaVqJzai+T9 HX7Ar2twjX9TSan4TAF2dB3f2hUCoES+twl/k8Wbsvj/f8/iz+NLgeDoemgIXQHw/E6b hyFJfUF1Xs1KNyoZ/2AZ+h0DrcGxj2c8JxFqMxi1b+jBCGdJQqwQY/LFGQbbAwFzBGCM ZDRQ== X-Gm-Message-State: AO0yUKVtRJ4g/HsZj+vqzeYJ8peIX0cD1DlKVgs1d/9BiU3SRjNNTsl4 lLRxm8QHOUR3qI45pj38EaZR8sCCKUnnWLghET6pC2HWxKbCfVNBf57Hdwkp6Q71DXPRBPxnJzt 1B/XFZYe5hmF/iAfPhn1+asMH X-Received: by 2002:a05:622a:14c7:b0:3ba:151a:d300 with SMTP id u7-20020a05622a14c700b003ba151ad300mr35694849qtx.60.1680171786535; Thu, 30 Mar 2023 03:23:06 -0700 (PDT) X-Google-Smtp-Source: AK7set9hwJzPdjL3B3XEC/SRjMmxy4i5zJ3rFc0P7bDk8NNBjognN6HOVj4HrMl2WPZD3H6XIItrvA== X-Received: by 2002:a05:622a:14c7:b0:3ba:151a:d300 with SMTP id u7-20020a05622a14c700b003ba151ad300mr35694825qtx.60.1680171786267; Thu, 30 Mar 2023 03:23:06 -0700 (PDT) Received: from debian (2a01cb058918ce003af3a313a65b3409.ipv6.abo.wanadoo.fr. [2a01:cb05:8918:ce00:3af3:a313:a65b:3409]) by smtp.gmail.com with ESMTPSA id d140-20020a376892000000b007467a4d8691sm15500145qkc.47.2023.03.30.03.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Mar 2023 03:23:05 -0700 (PDT) Date: Thu, 30 Mar 2023 12:23:02 +0200 From: Guillaume Nault To: Andrea Righi Cc: David Miller , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Shuah Khan , Wojciech Drewek , netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] l2tp: generate correct module alias strings Message-ID: References: <20230330095442.363201-1-andrea.righi@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230330095442.363201-1-andrea.righi@canonical.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 30, 2023 at 11:54:42AM +0200, Andrea Righi wrote: > 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: > > $ 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 > > Use the resolved number directly in MODULE_ALIAS_*() macros (as we > already do with SOCK_DGRAM) to fix the alias strings: > > $ 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 > > Moreover, fix the ordering of the parameters passed to > MODULE_ALIAS_NET_PF_PROTO_TYPE() by switching proto and type. Thanks! Just to be explicit to the maintainers, this patch is for the net tree (next time, you can use [PATCH net] to make that clear). > 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 > Signed-off-by: Andrea Righi > --- > net/l2tp/l2tp_ip.c | 8 ++++---- > net/l2tp/l2tp_ip6.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > 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 "); > MODULE_DESCRIPTION("L2TP over IP"); > MODULE_VERSION("1.0"); > > -/* 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 protocol, > + * 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 "); > MODULE_DESCRIPTION("L2TP IP encapsulation for IPv6"); > MODULE_VERSION("1.0"); > > -/* 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 protocol, > + * 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 >