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>,
        Guillaume Nault <gnault@redhat.com>
CC:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, 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: selftests: net: l2tp.sh regression starting with 6.1-rc1
Thread-Topic: selftests: net: l2tp.sh regression starting with 6.1-rc1
Thread-Index: AQHZYjl1GRPOFSRp8EO/z00nY9tXgq8RxqfwgAAajwCAAAHa8IAAFiQAgADot4CAACws0A==
Date:   Thu, 30 Mar 2023 09:26:06 +0000
Message-ID: <PH0PR11MB57829AF31406D3EA4B1D9112FD8E9@PH0PR11MB5782.namprd11.prod.outlook.com>
References: <ZCQt7hmodtUaBlCP@righiandr-XPS-13-7390>
 <MW4PR11MB57763144FE1BE9756FD3176BFD899@MW4PR11MB5776.namprd11.prod.outlook.com>
 <ZCRYpDehyDxsrnfi@debian>
 <MW4PR11MB5776F1B04976CB59D9FE41BFFD899@MW4PR11MB5776.namprd11.prod.outlook.com>
 <ZCRsxERSZiGf5H5e@debian> <ZCUv+8tbH3H5tZKe@righiandr-XPS-13-7390>
In-Reply-To: <ZCUv+8tbH3H5tZKe@righiandr-XPS-13-7390>
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?F29D9MF63ybnaMtqkuDbk+D/g6ysaTq2RpSed5SiQTvoLgiPzuh6gYIdS82k?=
 =?us-ascii?Q?8tiOipTucLOPUWqnz+7DdPcyfJYW2b6rGO2OVFokXd6Vh+ea7M5zrC+m5tCh?=
 =?us-ascii?Q?ghykOwql/yg/hJqGcGneE+yB309rJFI0jWDmtFV8ugR53f2DH+cOrXcdvBii?=
 =?us-ascii?Q?DLVl9YZGg8WwaBtnE/f+YpWjZRoqgfPuXVpkZpwNSZxU4Nq7rB6S9fqLiZ+n?=
 =?us-ascii?Q?5B54mmnFC50hkAOfe3QSQTGy8Pkfx0a5csmYSzzDXIw3an2i8T1L6NRHd5yS?=
 =?us-ascii?Q?Q6RMrSiOln1UMukrv4Vped4j13nsPm8zZeD8HXAeTdRUyRHu2cnSAXHK0LBj?=
 =?us-ascii?Q?MMaOBdZBGf1QKvsC5Ove+aTsc/3JuC9X4nSFi32YNX8fh4/ymfMVIEPsRXjw?=
 =?us-ascii?Q?a7rTZuiltXGryFdbrt128tTFvA/0IutfDK7562IHKbmk50YnVqqilah72+b6?=
 =?us-ascii?Q?Ve80VaNVRs+axXKIs09CYA3tDr2JjHgo4A6RB4P/AKmFdohQjDprB3lZCycM?=
 =?us-ascii?Q?+C9rRjpJc4ivn5hR32XUdZTGe2T0yDUblE/uIijiRHgTK/8HJTAc5prvZZa9?=
 =?us-ascii?Q?5n+cx31CbTS8+/Svlb0Q9MFdgCmf7Lpd39QSXmRp8M3lB2QA1KKljXgxeb6I?=
 =?us-ascii?Q?RW+zudnkwvulGELToGFDw/2KKKN6ih3Oj70NCCBcusU3WVdu2dzzXmviKJS9?=
 =?us-ascii?Q?tIDLRUgMJNm1l2dSCjt8Ss/5Be1BKgrCW4JmHY9P+J/sY7qSxnNpbWGZl0gD?=
 =?us-ascii?Q?+Oo+0HzmDmgzhn6iYXfFhqm9xXrLdzAEnSizF+f17XbjxYEpjhvngZm9XpBJ?=
 =?us-ascii?Q?iMIfBM6tRD2Vr88zns1zW/BgzM/r8MVIG+SPOcxOefbIMVujsGzp01MZRkJa?=
 =?us-ascii?Q?CrRLUDbTR3JaEyYwrjlYYp7qyooGhtnUSbwh6+qjm5zmWSHONYuPvixObOFR?=
 =?us-ascii?Q?G0b8odOMuIiAl6dJ4hB3TeJmXruma1WcSZYuFo/ta1IwbpqVxUV1rshVXeDY?=
 =?us-ascii?Q?rHQ8N+PxmR8rAQUIlcgYyMexqLkVUi0t7NvmJsBnyenRpwFoNBY+5WbosvYQ?=
 =?us-ascii?Q?V9SQd+Sk8aooUNm+Iy3Wf/WHbMuK67Q1xIU90057lgnzZYSeMouvXo2n3fZH?=
 =?us-ascii?Q?4MnpfDZb4JwFQy3Gil/GSR1B64j0qWwAf3FpCGw0TQKmR0LdQIawN8jStFOL?=
 =?us-ascii?Q?Ds/zIWR0M0VtbCczc19lTiCN55cHh00E4vcfg9YFna4HIo8gQfjpmKzj00hq?=
 =?us-ascii?Q?FoSHQfM5KRSif48YwKzsHYXageyrDD73+gMJl6A5Y81b1j7u/nq/UVVPtxPu?=
 =?us-ascii?Q?kAMHZC81ws7J+tgE7cMdNOtAohR33kzL/I5pZ/u2hN2QFh4I+m9Ye6XfY10O?=
 =?us-ascii?Q?/Ksbn8KEEJn6ihjxCmgKKRHvhdugWT6Nq8zN5Ob2ex9DLWZ56JvAzxmkEmPQ?=
 =?us-ascii?Q?eJBQBYmTehZm2yZYfhpAUIqtUOi6cCDSbAaidzgP4jhdggiLITmfHVCBq+Lw?=
 =?us-ascii?Q?P4Pwxv9nFcvdevoDsvEu4c6qWsvx92sMGZEFhVznwFWUCj5Dc5X3JzJs0zEu?=
 =?us-ascii?Q?xM7/0rvpdz8tYsxRpsYXhArX9U0mpWAdLXcRCM8P?=
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: dbcd12b2-9fdd-4db0-ef26-08db3100ca63
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Mar 2023 09:26:06.7766
 (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: bD6IhsTAnIu8diFYvSmQ5UIoTU/eM612nTt/znaO3KCBRCp6flQhxDvnkTPvBwsaxWEbe49+Backf7Nfn2J377qwfWXjv/9oDZjjsGvXNpA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR11MB6464
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 08:45
> To: Guillaume Nault <gnault@redhat.com>
> Cc: Drewek, Wojciech <wojciech.drewek@intel.com>; David S. Miller <davem@=
davemloft.net>; Eric Dumazet
> <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pab=
eni@redhat.com>; Shuah Khan <shuah@kernel.org>;
> netdev@vger.kernel.org; linux-kselftest@vger.kernel.org; linux-kernel@vge=
r.kernel.org
> Subject: Re: selftests: net: l2tp.sh regression starting with 6.1-rc1
>=20
> On Wed, Mar 29, 2023 at 06:52:20PM +0200, Guillaume Nault wrote:
> > On Wed, Mar 29, 2023 at 03:39:13PM +0000, Drewek, Wojciech wrote:
> > >
> > >
> > > > -----Original Message-----
> > > > -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, 2, 115 /* IPPROTO_L2TP */=
);
> > > > +MODULE_ALIAS_NET_PF_PROTO(PF_INET6, 115 /* IPPROTO_L2TP */);
> > >
> > > Btw, am I blind or the alias with type was wrong the whole time?
> > > pf goes first, then proto and type at the end according to the defini=
tion of MODULE_ALIAS_NET_PF_PROTO_TYPE
> > > and here type (2) is 2nd and proto (115) is 3rd
> >
> > You're not blind :). The MODULE_ALIAS_NET_PF_PROTO_TYPE(...) is indeed
> > wrong. Auto-loading the l2tp_ip and l2tp_ip6 modules only worked
> > because of the extra MODULE_ALIAS_NET_PF_PROTO() declaration (as
> > inet_create() and inet6_create() fallback to "net-pf-%d-proto-%d" if
> > "net-pf-%d-proto-%d-type-%d" fails).
>=20
> At this point I think using 115 directly is probably the best solution,
> that is also what we do already with SOCK_DGRAM, but I would just update
> the comment up above, instead of adding the inline comments.

Agree,

I verified the fix on my machine,=20
Do you want me to send the patch or you'll just send below one?

>=20
> Something like this maybe:
>=20
> ---
>=20
> From: Andrea Righi <andrea.righi@canonical.com>
> 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")
> Signed-off-by: Guillaume Nault <gnault@redhat.com>
> Signed-off-by: Andrea Righi <andrea.righi@canonical.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