Re: request_module while holding rtnl semaphore

[Patrick McHardy <kaber@xxxxxxxxx>]

David S. Miller wrote:

> Therefore I suggest we just implement the fix for this inside of
> the packet scheduler layer itself.  Simply by dropping the RTNL
> semaphore during the module request, and then regrabbing the RTNL
> semaphore and replaying the request from the beginning.
>
> The net/sched/sch_api.c version of the fix would look like the
> following.  The act_api.c case would require a bit more surgery,
> but with the right restructuring it can be done too.
>  
This patch got lost somehow. The act_api.c changes are actually
even more complicated because besides the action init path, changes
can also be made from classifiers in a deep call-chain. I hope
Thomas's recent changes make it easier to fix this, but I think
this patch should go in now anyway.

Regards
Patrick

> ===== net/sched/sch_api.c 1.41 vs edited =====
> --- 1.41/net/sched/sch_api.c    2004-11-05 16:34:45 -08:00
> +++ edited/net/sched/sch_api.c  2004-11-09 15:57:19 -08:00
> @@ -396,17 +396,30 @@
>         struct Qdisc_ops *ops;
>         int size;
>
> +       err = -EINVAL;
>         ops = qdisc_lookup_ops(kind);
> #ifdef CONFIG_KMOD
>         if (ops==NULL && tca[TCA_KIND-1] != NULL) {
>                 if (RTA_PAYLOAD(kind) <= IFNAMSIZ) {
> +                       rtnl_unlock();
>                         request_module("sch_%s", (char*)RTA_DATA(kind));
> +                       rtnl_lock();
> +
>                         ops = qdisc_lookup_ops(kind);
> +
> +                       /* We dropped the RTNL semaphore in order to
> +                        * perform the module load.  So, even if we
> +                        * succeeded in loading the module we have to
> +                        * tell the caller to replay the request.  We
> +                        * indicate this using -EAGAIN.
> +                        */
> +                       if (ops != NULL)
> +                               err = -EAGAIN;
> +                       goto err_out;
>                 }
>         }
> #endif
>
> -       err = -EINVAL;
>         if (ops == NULL)
>                 goto err_out;
>         err = -EBUSY;
> @@ -600,14 +613,19 @@
>
> static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, void *arg)
> {
> -       struct tcmsg *tcm = NLMSG_DATA(n);
> -       struct rtattr **tca = arg;
> +       struct tcmsg *tcm;
> +       struct rtattr **tca;
>         struct net_device *dev;
> -       u32 clid = tcm->tcm_parent;
> -       struct Qdisc *q = NULL;
> -       struct Qdisc *p = NULL;
> +       u32 clid;
> +       struct Qdisc *q, *p;
>         int err;
>
> +replay:
> +       tcm = NLMSG_DATA(n);
> +       tca = arg;
> +       clid = tcm->tcm_parent;
> +       q = p = NULL;
> +
>         if ((dev = __dev_get_by_index(tcm->tcm_ifindex)) == NULL)
>                 return -ENODEV;
>
> @@ -701,8 +719,14 @@
>                 q = qdisc_create(dev, tcm->tcm_parent, tca, &err);
>         else
>                 q = qdisc_create(dev, tcm->tcm_handle, tca, &err);
> -       if (q == NULL)
> +       if (q == NULL) {
> +               if (err == -EAGAIN) {
> +                       /* Replay the request. */
> +                       dev_put(dev);
> +                       goto replay;
> +               }
>                 return err;
> +       }
>
> graft:
>         if (1) {
>
>