Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Song Liu <songliubraving@fb.com>
To:     Nicolas Rybowski <nicolas.rybowski@tessares.net>
CC:     Song Liu <song@kernel.org>, Shuah Khan <shuah@kernel.org>,
        "Alexei Starovoitov" <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        "Martin Lau" <kafai@fb.com>, Yonghong Song <yhs@fb.com>,
        Andrii Nakryiko <andriin@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@chromium.org>,
        Matthieu Baerts <matthieu.baerts@tessares.net>,
        "open list" <linux-kernel@vger.kernel.org>,
        "linux-kselftest@vger.kernel.org" <linux-kselftest@vger.kernel.org>,
        Networking <netdev@vger.kernel.org>, bpf <bpf@vger.kernel.org>
Subject: Re: [PATCH bpf-next v2 4/5] bpf: selftests: add MPTCP test base
Thread-Topic: [PATCH bpf-next v2 4/5] bpf: selftests: add MPTCP test base
Thread-Index: AQHWiEg5lAOuSkQSgUOwFXGkhtXnPqloc0EAgAF4xICAAAv+gA==
Date:   Tue, 15 Sep 2020 17:18:56 +0000
Message-ID: <6BCFCB44-3CF4-47B0-BD59-720F32581E31@fb.com>
References: <20200911143022.414783-1-nicolas.rybowski@tessares.net>
 <20200911143022.414783-4-nicolas.rybowski@tessares.net>
 <CAPhsuW5Gbx2pWgM1XcSYqVsN6L=q+0u3QFNxG7A+Qez=Tziu2A@mail.gmail.com>
 <CACXrtpRzZuCyZnduYcV+1d2Z3qTK2b7Mcj2gQvcRbnv7+k0VRw@mail.gmail.com>
In-Reply-To: <CACXrtpRzZuCyZnduYcV+1d2Z3qTK2b7Mcj2gQvcRbnv7+k0VRw@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <3BE0F881EB00B04C84DF90A443A9D9E0@namprd15.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: b2c42a33-d544-457c-8042-08d8599b6daf
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Sep 2020 17:18:56.6337
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: oda95L09On1+cpkYGHa0laGQU4tS4KmfU+EicbXiP6JPjfgz9wEF5wvCBfXEIiJwGOiRFqhIIHbfgG9LeD7t7A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR15MB2197
X-OriginatorOrg: fb.com
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235,18.0.687
 definitions=2020-09-15_12:2020-09-15,2020-09-15 signatures=0
X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 phishscore=0
 clxscore=1011 priorityscore=1501 mlxscore=0 lowpriorityscore=0 bulkscore=0
 malwarescore=0 suspectscore=0 mlxlogscore=999 adultscore=0 spamscore=0
 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2006250000 definitions=main-2009150138
X-FB-Internal: deliver
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Sep 15, 2020, at 9:35 AM, Nicolas Rybowski <nicolas.rybowski@tessares.=
net> wrote:
>=20
> Hi Song,
>=20
> Thanks for the feedback !
>=20
> On Mon, Sep 14, 2020 at 8:07 PM Song Liu <song@kernel.org> wrote:
>>=20
>> On Fri, Sep 11, 2020 at 8:02 AM Nicolas Rybowski
>> <nicolas.rybowski@tessares.net> wrote:
>>>=20
>>> This patch adds a base for MPTCP specific tests.
>>>=20
>>> It is currently limited to the is_mptcp field in case of plain TCP
>>> connection because for the moment there is no easy way to get the subfl=
ow
>>> sk from a msk in userspace. This implies that we cannot lookup the
>>> sk_storage attached to the subflow sk in the sockops program.
>>>=20
>>> Acked-by: Matthieu Baerts <matthieu.baerts@tessares.net>
>>> Signed-off-by: Nicolas Rybowski <nicolas.rybowski@tessares.net>
>>=20
>> Acked-by: Song Liu <songliubraving@fb.com>
>>=20
>> With some nitpicks below.
>>=20
>>> ---
>>>=20
>>> Notes:
>>>    v1 -> v2:
>>>    - new patch: mandatory selftests (Alexei)
>>>=20
>> [...]
>>>                     int timeout_ms);
>>> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/tes=
ting/selftests/bpf/prog_tests/mptcp.c
>>> new file mode 100644
>>> index 000000000000..0e65d64868e9
>>> --- /dev/null
>>> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
>>> @@ -0,0 +1,119 @@
>>> +// SPDX-License-Identifier: GPL-2.0
>>> +#include <test_progs.h>
>>> +#include "cgroup_helpers.h"
>>> +#include "network_helpers.h"
>>> +
>>> +struct mptcp_storage {
>>> +       __u32 invoked;
>>> +       __u32 is_mptcp;
>>> +};
>>> +
>>> +static int verify_sk(int map_fd, int client_fd, const char *msg, __u32=
 is_mptcp)
>>> +{
>>> +       int err =3D 0, cfd =3D client_fd;
>>> +       struct mptcp_storage val;
>>> +
>>> +       /* Currently there is no easy way to get back the subflow sk fr=
om the MPTCP
>>> +        * sk, thus we cannot access here the sk_storage associated to =
the subflow
>>> +        * sk. Also, there is no sk_storage associated with the MPTCP s=
k since it
>>> +        * does not trigger sockops events.
>>> +        * We silently pass this situation at the moment.
>>> +        */
>>> +       if (is_mptcp =3D=3D 1)
>>> +               return 0;
>>> +
>>> +       if (CHECK_FAIL(bpf_map_lookup_elem(map_fd, &cfd, &val) < 0)) {
>>> +               perror("Failed to read socket storage");
>>=20
>> Maybe simplify this with CHECK(), which contains a customized error mess=
age?
>> Same for some other calls.
>>=20
>=20
> The whole logic here is strongly inspired from prog_tests/tcp_rtt.c
> where CHECK_FAIL is used.
> Also the CHECK macro will print a PASS message on successful map
> lookup, which is not expected at this point of the tests.
> I think it would be more interesting to leave it as it is to keep a
> cohesion between TCP and MPTCP selftests. What do you think?

I guess CHECK_FAIL makes sense when we don't need the PASS message.=20
Let's keep this part as-is then.=20

Thanks,
Song