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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 5BA73C74A52 for ; Thu, 11 Jul 2019 12:07:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 35CE320665 for ; Thu, 11 Jul 2019 12:07:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kinvolk.io header.i=@kinvolk.io header.b="ektyVvNo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728601AbfGKMHi (ORCPT ); Thu, 11 Jul 2019 08:07:38 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:45664 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728531AbfGKMHh (ORCPT ); Thu, 11 Jul 2019 08:07:37 -0400 Received: by mail-lj1-f193.google.com with SMTP id m23so5479224lje.12 for ; Thu, 11 Jul 2019 05:07:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kinvolk.io; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=/GkyJO/XzCdLnefrckS27eNcOWh/ymnRvDaUSAxjqU8=; b=ektyVvNoHno+vGzdhSyNvexrE2XG1HdIQjty5SZHH7PS1BFMLEd9bZ81vw7XjKeA4d UapLshT+pX16Xoyw5FdEWffeXedaspH6Q5KXdfoJfSBzRQQbVXsHKOs/NrzEDeCvzSIy YQdagHOcmHKLQ2NAJx6GwCW8s9RwY9K0qshog= 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:content-transfer-encoding; bh=/GkyJO/XzCdLnefrckS27eNcOWh/ymnRvDaUSAxjqU8=; b=hF/CIedoN6UYAM6dqID2KCfXfD6YoNX3rhrLqTQeH3q+znhUcvJfXzCthqS/vO1dXR 3HlcGk1IC0zeoY88fNGZT92f8iTWC4d33tAp4oOhTpohBvypuv8p4tViFqySugw4VWF2 YjDV56BhD3mKi9q+zNTehirvZ69+4QFzwCVlzmGW+HA7X8c9AELGSrNyMFHVnBWfCNar qhhoqaIgcnRoLtyBaWFNkvierXmZarzqHWAXyHlPhEDsYHdKcIdxSuuQjVi38FAzyDYw 3LGt6J+WOStbayB00lI4fOmI/YFtqTH8qowy7KUWMnDBjLabioZS+6mdJt81zR4qpYhn g8iA== X-Gm-Message-State: APjAAAXTvYrWmEI56ml94zMNDIszpu9Ur2Gp7HtAYp3nhUAKO0VO3MaW AE1fhTwbzSJkW6b7qv68ErKYSyt27vK9ZeLJVDpY/w== X-Google-Smtp-Source: APXvYqzP22RRcZcUhDujyqUU5IP2zXoX9fJ3k2M6/GT1tQ3bZzzFR2TqUW6TndXcmnVlqSvHUPDoPdHjVwPeutIGhko= X-Received: by 2002:a2e:9754:: with SMTP id f20mr2293534ljj.151.1562846855331; Thu, 11 Jul 2019 05:07:35 -0700 (PDT) MIME-Version: 1.0 References: <20190708163121.18477-1-krzesimir@kinvolk.io> <20190708163121.18477-5-krzesimir@kinvolk.io> In-Reply-To: From: Krzesimir Nowak Date: Thu, 11 Jul 2019 14:07:24 +0200 Message-ID: Subject: Re: [bpf-next v3 04/12] selftests/bpf: Use bpf_prog_test_run_xattr To: Andrii Nakryiko Cc: open list , Alban Crequy , =?UTF-8?Q?Iago_L=C3=B3pez_Galeiras?= , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Networking , bpf , xdp-newbies@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 11, 2019 at 2:03 AM Andrii Nakryiko wrote: > > On Mon, Jul 8, 2019 at 3:43 PM Krzesimir Nowak wro= te: > > > > The bpf_prog_test_run_xattr function gives more options to set up a > > test run of a BPF program than the bpf_prog_test_run function. > > > > We will need this extra flexibility to pass ctx data later. > > > > Signed-off-by: Krzesimir Nowak > > --- > > lgtm, with some nits below > > Acked-by: Andrii Nakryiko > > > tools/testing/selftests/bpf/test_verifier.c | 16 +++++++++++----- > > 1 file changed, 11 insertions(+), 5 deletions(-) > > > > diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testin= g/selftests/bpf/test_verifier.c > > index c7541f572932..1640ba9f12c1 100644 > > --- a/tools/testing/selftests/bpf/test_verifier.c > > +++ b/tools/testing/selftests/bpf/test_verifier.c > > @@ -822,14 +822,20 @@ static int do_prog_test_run(int fd_prog, bool unp= riv, uint32_t expected_val, > > { > > __u8 tmp[TEST_DATA_LEN << 2]; > > __u32 size_tmp =3D sizeof(tmp); > > nit: this is now is not needed as a separate local variable, inline? I think I'm using this variable in a followup commit, but I'll look closely= . > > > - uint32_t retval; > > int saved_errno; > > int err; > > + struct bpf_prog_test_run_attr attr =3D { > > + .prog_fd =3D fd_prog, > > + .repeat =3D 1, > > + .data_in =3D data, > > + .data_size_in =3D size_data, > > + .data_out =3D tmp, > > + .data_size_out =3D size_tmp, > > + }; > > > > if (unpriv) > > set_admin(true); > > - err =3D bpf_prog_test_run(fd_prog, 1, data, size_data, > > - tmp, &size_tmp, &retval, NULL); > > + err =3D bpf_prog_test_run_xattr(&attr); > > saved_errno =3D errno; > > if (unpriv) > > set_admin(false); > > @@ -846,9 +852,9 @@ static int do_prog_test_run(int fd_prog, bool unpri= v, uint32_t expected_val, > > return err; > > } > > } > > - if (retval !=3D expected_val && > > + if (attr.retval !=3D expected_val && > > expected_val !=3D POINTER_VALUE) { > > this if condition now fits one line, can you please combine? thanks! Sure. > > > - printf("FAIL retval %d !=3D %d ", retval, expected_val)= ; > > + printf("FAIL retval %d !=3D %d ", attr.retval, expected= _val); > > return 1; > > } > > > > -- > > 2.20.1 > > --=20 Kinvolk GmbH | Adalbertstr.6a, 10999 Berlin | tel: +491755589364 Gesch=C3=A4ftsf=C3=BChrer/Directors: Alban Crequy, Chris K=C3=BChl, Iago L= =C3=B3pez Galeiras Registergericht/Court of registration: Amtsgericht Charlottenburg Registernummer/Registration number: HRB 171414 B Ust-ID-Nummer/VAT ID number: DE302207000