From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 437A9C432BE for ; Thu, 26 Aug 2021 01:04:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25E9560524 for ; Thu, 26 Aug 2021 01:04:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232139AbhHZBFl (ORCPT ); Wed, 25 Aug 2021 21:05:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235677AbhHZBFl (ORCPT ); Wed, 25 Aug 2021 21:05:41 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED39AC061757 for ; Wed, 25 Aug 2021 18:04:54 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id m26so1218152pff.3 for ; Wed, 25 Aug 2021 18:04:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=c7ov6wB07MrM0gRJrpzNpSKuSouc4apAtoEUNGtyoq0=; b=V7X4HZbSNcLKfeaEgAiSHIQVXB2pFo7shclH5fRaedUqj+eEtmTpiIy3y5ieqyBjni 0BX66OLyce7432m7h1ifCUuSP5jL09aJV0oISjj1PwoS3OCbfSWM0LKYDJPbWhsSN+rr P4mDnLqSM3pUB+G76bG+F0sP114kfWlAwN2hRMjEo474wRohZHgzEMH7z6KumyQaJxOZ kyViLairZrZgdHxaJE8D2O8ozk33rFC/4XCnjLKlw0EmUZDXAxVS66Ydxz1+v3uvMdHO Bik+CtqRW+o917NfI064dfv0MCJgTEzuM8NSuQGXZkuwuFsOPM6DzMLdN1Bw9n6TJWz2 5Y8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=c7ov6wB07MrM0gRJrpzNpSKuSouc4apAtoEUNGtyoq0=; b=jODvRWA2bAKRnQZzoHeeYVb1X8SsUd2WWW+OUVo4N74tevxb3hwkPd22RlGmSYGS1b i4+MpZJGGMv7tacYbCuhJTRL/Slwfp1DE7wtqjSpbejR0kD0otZtFMqBqKIBDVrOcNFR 1EtuYBvyr692ufprBJ+MbL6EPStsMWS3FKna9duv9+Suo6e5gaDEhDSuVJNrpefGvDyf +l2boHrBsQdd185ANlG9qLcTuIYscDq9nQdy6EIFQlatz+c0ZMXPCz+lcg4MCf6KVn7C RDSvXUXFFhxqzQ853mW82MePAVqT77PrvRAfWj15VtF6cido1BKx3tEUUVBMDAKfXE94 /8YA== X-Gm-Message-State: AOAM530BPmk9giYHraIaEJhzEcmFYP3TTnpQRS6KdFWh1/xQAjU+dvns yb1+YC5gBfNTQXFx99EG6cIwWh+KvWZkv+L/+8U= X-Google-Smtp-Source: ABdhPJx2ta/f8fEt4gNA1qqg2Lkv/XZlezKh7TNhxhnQnaIJHyFJQhyy9c6HfCcrsrfaRVxYQ8MPJNUKwrPlyMgECLU= X-Received: by 2002:a05:6a00:791:b0:3e1:3316:2e8 with SMTP id g17-20020a056a00079100b003e1331602e8mr1010549pfu.10.1629939894431; Wed, 25 Aug 2021 18:04:54 -0700 (PDT) MIME-Version: 1.0 References: <20210825184745.2680830-1-fallentree@fb.com> In-Reply-To: <20210825184745.2680830-1-fallentree@fb.com> From: Alexei Starovoitov Date: Wed, 25 Aug 2021 18:04:43 -0700 Message-ID: Subject: Re: [PATCH bpf-next] selftests/bpf: reduce more flakyness in sockmap_listen To: Yucong Sun Cc: Andrii Nakryiko , sunyucong@gmail.com, bpf Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, Aug 25, 2021 at 2:07 PM Yucong Sun wrote: > > This patch adds similar retry logic to more places where read() is used, to > reduce flakyness in slow CI environment. > > Signed-off-by: Yucong Sun > --- > .../selftests/bpf/prog_tests/sockmap_listen.c | 19 ++++++++++++++++--- > 1 file changed, 16 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c > index 6a5df28f9a3d..5c5979046523 100644 > --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c > +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c > @@ -949,6 +949,7 @@ static void redir_to_connected(int family, int sotype, int sock_mapfd, > int err, n; > u32 key; > char b; > + int retries = 100; > > zero_verdict_count(verd_mapfd); > > @@ -1001,10 +1002,15 @@ static void redir_to_connected(int family, int sotype, int sock_mapfd, > goto close_peer1; > if (pass != 1) > FAIL("%s: want pass count 1, have %d", log_prefix, pass); > - > +again: > n = read(c0, &b, 1); > - if (n < 0) > + if (n < 0) { > + if (errno == EAGAIN && retries--) { TCP was fixed differently in commit 30b4cb36b111 ("selftests/bpf: Fix spurious failures in accept due to EAGAIN"). Would a similar approach work here?