On Fri, 22 Jan 2021, Matthieu Baerts wrote:

> Hi Florian,
>
> On 20/01/2021 18:15, Matthieu Baerts wrote:
>> On 20/01/2021 16:43, Florian Westphal wrote:
>>
>>  > diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h
>>  > index 3674a451a18c..4983ced8e1f8 100644
>>  > --- a/include/uapi/linux/mptcp.h
>>  > +++ b/include/uapi/linux/mptcp.h
>>  > @@ -36,6 +36,7 @@ enum {
>>  >   /* netlink interface */
>>  >   #define MPTCP_PM_NAME        "mptcp_pm"
>>  >   #define MPTCP_PM_CMD_GRP_NAME    "mptcp_pm_cmds"
>>  > +#define MPTCP_PM_EV_GRP_NAME    "mptcp_events"
>> 
>> We will check if it is OK for Ossama :)
>
> Just to be sure it is clear for everyone, it was decided yesterday at the 
> weekly meeting to switch to "mptcp_pm_events".
>
>>> diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
>>> index e2f40985b450..c2939362f47a 100644
>>> --- a/net/mptcp/pm_netlink.c
>>> +++ b/net/mptcp/pm_netlink.c
>> 
>> (...)
>> 
>>> +static int mptcp_event_put_token_and_ssk(struct sk_buff *skb,
>>> +                     const struct mptcp_sock *msk,
>>> +                     const struct sock *ssk)
>>> +{
>>> +    const struct sock *sk = (const struct sock *)msk;
>>> +    const struct mptcp_subflow_context *sf;
>>> +    u8 sk_err;
>>> +
>>> +    if (nla_put_u32(skb, MPTCP_ATTR_TOKEN, msk->token))
>>> +        return -EMSGSIZE;
>>> +
>>> +    if (mptcp_event_add_subflow(skb, ssk))
>>> +        return -EMSGSIZE;
>>> +
>>> +    sf = mptcp_subflow_ctx(ssk);
>>> +    if (WARN_ON_ONCE(!sf))
>>> +        return -EINVAL;
>>> +
>>> +    if (nla_put_u8(skb, MPTCP_ATTR_BACKUP, sf->backup))
>>> +        return -EMSGSIZE;
>>> +
>>> +    if (ssk->sk_bound_dev_if &&
>>> +        nla_put_s32(skb, MPTCP_ATTR_IF_IDX, ssk->sk_bound_dev_if))
>>> +        return -EMSGSIZE;
>>> +
>>> +    sk_err = ssk->sk_err;
>> 
>> Could we have an error set on the msk? (sk->sk_err)
>
> And here, as discussed yesterday, we would keep "ssk->sk_err" and not use the 
> one from the msk.
>
> I guess Mat and Ossama prefer to quickly validate it before applying these 
> patches, I can wait before applying them. Or maybe I misunderstood and I can 
> apply it sooner.
> (And if we only need to change the group name, I can fix that when applying 
> it without having to submit a new version ;-) )
>

Hi Matthieu -

Go ahead and apply the series to the export branch with the group name 
fix, if other fixes are needed after testing we can squash those.

Thanks,

--
Mat Martineau
Intel