From mboxrd@z Thu Jan  1 00:00:00 1970
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: Re: [PATCH v2 net-next 0/7] net: speedup netns create/delete time
Date: Wed, 13 Dec 2017 14:24:49 -0800
Message-ID: <CAKdAkRSgqXA_nkiit80dDA_o1UVt6WzRd0u6POG2WCCpm=pfqw@mail.gmail.com>
References: <20170919232709.14690-1-edumazet@google.com> <8edb310a-562d-bff1-0482-64314833e722@mellanox.com>
 <CANn89i+LE6He_E3VHwUTpLAVW+uUGo+FPs_zg1bs4P3CVcCL6Q@mail.gmail.com>
 <266d30e7-5164-48e8-b802-56bb93558823@mellanox.com> <CANn89iJ4io_gX-V8A4hE04cH=czGZYs8WGBOpaiBpWMMHOgVVw@mail.gmail.com>
 <33E69A03-6594-423A-86E6-02029046BE7D@gmail.com> <CANn89iKq86_FRaL7Y3Ekhf_JD8NY2s8PWibGN+WdmJL1TsPXJA@mail.gmail.com>
 <be222d71-0b61-9256-6d39-cbb9d762cd22@mellanox.com> <CANn89iKiKvzz6_R+T4kO8ztXFC7ke299+vOsGr92q2NfGBwFjw@mail.gmail.com>
 <CAKdAkRTpnxxW0h5smyUDQKm4f94D6-i7G5UK_NnGj_i-cwj35Q@mail.gmail.com> <1513201949.25033.68.camel@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Cc: Eric Dumazet <edumazet@google.com>,
        Tariq Toukan <tariqt@mellanox.com>,
        "David S . Miller" <davem@davemloft.net>,
        netdev <netdev@vger.kernel.org>,
        "Eric W . Biederman" <ebiederm@xmission.com>,
        Majd Dibbiny <majd@mellanox.com>,
        Yonatan Cohen <yonatanc@mellanox.com>,
        Eran Ben Elisha <eranbe@mellanox.com>
To: Eric Dumazet <eric.dumazet@gmail.com>
Return-path: <netdev-owner@vger.kernel.org>
Received: from mail-vk0-f67.google.com ([209.85.213.67]:43863 "EHLO
        mail-vk0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1751088AbdLMWYv (ORCPT
        <rfc822;netdev@vger.kernel.org>); Wed, 13 Dec 2017 17:24:51 -0500
Received: by mail-vk0-f67.google.com with SMTP id u84so2407543vke.10
        for <netdev@vger.kernel.org>; Wed, 13 Dec 2017 14:24:50 -0800 (PST)
In-Reply-To: <1513201949.25033.68.camel@gmail.com>
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On Wed, Dec 13, 2017 at 1:52 PM, Eric Dumazet <eric.dumazet@gmail.com> wrote:
> On Wed, 2017-12-13 at 13:43 -0800, Dmitry Torokhov wrote:
>> Hi Eric,
>>
>> On Thu, Oct 19, 2017 at 7:11 AM, Eric Dumazet <edumazet@google.com> wrote:
>> >
>> > On Thu, Oct 19, 2017 at 4:48 AM, Tariq Toukan <tariqt@mellanox.com> wrote:
>> > >
>> > > Hi Eric,
>> > >
>> > > I just wanted to check if this is solved already, as I don't want to keep an
>> > > unnecessary revert patch in our internal branches.
>> > > According to my check bug still exists.
>> > >
>> >
>> > I will handle this today, thanks for the reminder.
>>
>> Did you have a chance to do this? It looks like the original change
>> landed on mainline and causes modules to be autoloaded on KOBJ_UNBIND
>> again.
>>
>> Thanks!
>
> I sent the following to Tariq, and he tested it successfully.
>
> I will submit this formally.
>
> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
> index c3e84edc47c965d40199b652ba78876cdaa9c70c..0795482b15d5a8f1b65b570a071aa1419cb923d8 100644
> --- a/lib/kobject_uevent.c
> +++ b/lib/kobject_uevent.c
> @@ -346,19 +346,25 @@ static int kobject_uevent_net_broadcast(struct kobject *kobj,
>  static void zap_modalias_env(struct kobj_uevent_env *env)
>  {
>         static const char modalias_prefix[] = "MODALIAS=";
> +       size_t offset = 0, len;
>         int i;
>
>         for (i = 0; i < env->envp_idx;) {
> +               len = strlen(env->envp[i]) + 1;
>                 if (strncmp(env->envp[i], modalias_prefix,
>                             sizeof(modalias_prefix) - 1)) {
>                         i++;
> +                       offset += len;
>                         continue;
>                 }
>
> -               if (i != env->envp_idx - 1)
> +               env->buflen -= len;
> +               if (i != env->envp_idx - 1) {
> +                       memmove(env->envp[i], env->envp[i + 1],
> +                               env->buflen - offset);
>                         memmove(&env->envp[i], &env->envp[i + 1],
>                                 sizeof(env->envp[i]) * env->envp_idx - 1);
> -
> +               }
>                 env->envp_idx--;
>         }
>  }
>

As I mentioned in the other thread, that works for netlink, but breaks
if you actually using env->envp pointers, as they also need to be
adjusted. I have a patch that fixes it properly.

Thanks!


-- 
Dmitry