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.8 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 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 39DA8C433ED for ; Tue, 11 May 2021 22:45:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 108896192A for ; Tue, 11 May 2021 22:45:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbhEKWqt (ORCPT ); Tue, 11 May 2021 18:46:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229637AbhEKWqs (ORCPT ); Tue, 11 May 2021 18:46:48 -0400 Received: from mail-yb1-xb35.google.com (mail-yb1-xb35.google.com [IPv6:2607:f8b0:4864:20::b35]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBE85C061574 for ; Tue, 11 May 2021 15:45:40 -0700 (PDT) Received: by mail-yb1-xb35.google.com with SMTP id m9so28454057ybm.3 for ; Tue, 11 May 2021 15:45:40 -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=1ER/hymdriwYsotFQHbExyXVOw+A2RjH7yZCn5D1jGg=; b=u4QRiwJLjlWm+a5YoilrbqFyNEPw8/TCT+IvZ8mOeAe+TycEfOPcxCgdxz/VX43Q5x CTFSZeKakP448Id2I/vnAuSMKyNoAm4juLgVD2dYMbRycZiVP8t7uAoIAfwTipWWZdC2 xpsm8VMXZBq0eX3wJLBO6R0NYxpfj7tfLD6I0ZvKKuaIxsiIYsP+BdEEM4+sLOq2eKME bhdvc6X84VtRhYzW/hSPEc0FL1yJDHJPtxB7dFW43xCFzyx/b01i0mDXyvnE7g1HR90t GTmcmiGwvT6ZNmGxw7XpyZdOKZf7yiAEjhmvJZKdBN3TGMgu/lJu+azgDpiXLjEZrOLj 4PqQ== 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=1ER/hymdriwYsotFQHbExyXVOw+A2RjH7yZCn5D1jGg=; b=UAYoX5Ct8NssO7RkXiQTvz+AuDVVx2YXdLcZSv3ENpZ6ivL6GdGPgVxpKDWHusMjcE tBT0BOIKViVYFIamVP0+TuQaXILacriPJ6IFGdECamNmtYsVyNHzYbdsMmSl/dMuGbPo 0TipLCdzm9p+pc8qLP9eGmS0wagRhxUJy7JtO91zw0tl30j/muvkA73PVFSblYjtbAj+ sk12nd81lj+xnFEzP7xTE+FLDGz7VZVQsgBGgQKMIvvHnz+DA5D1dSZw0VOqn5roQ9YF 9cn/Ufz2QPL64IO7raIp4SmB8Zrq384quqlfy8f3TwlyIjKUwhMhtfq8ozwD1iCxWB1S n3Uw== X-Gm-Message-State: AOAM531hdGkx7Yh6/SU6g/QNeL+1+dUzU0frTbmvTOHOqlg4BOP/r5vW /syxNsV6691pNBLvX1DqJcCftzswNLusq5t+bzw= X-Google-Smtp-Source: ABdhPJxpCvqvpwf4GogSqAScHfvUDpU+tcK+yNioj8T3yladYu9zld2mIDgqmgO20GNQSel8/WHIHvStIilbGflwXkQ= X-Received: by 2002:a5b:d4c:: with SMTP id f12mr19477488ybr.510.1620773140150; Tue, 11 May 2021 15:45:40 -0700 (PDT) MIME-Version: 1.0 References: <20210508034837.64585-1-alexei.starovoitov@gmail.com> <20210508034837.64585-8-alexei.starovoitov@gmail.com> In-Reply-To: <20210508034837.64585-8-alexei.starovoitov@gmail.com> From: Andrii Nakryiko Date: Tue, 11 May 2021 15:45:28 -0700 Message-ID: Subject: Re: [PATCH v4 bpf-next 07/22] selftests/bpf: Test for btf_load command. To: Alexei Starovoitov Cc: "David S. Miller" , Daniel Borkmann , Andrii Nakryiko , john fastabend , bpf , Kernel Team Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Fri, May 7, 2021 at 8:48 PM Alexei Starovoitov wrote: > > From: Alexei Starovoitov > > Improve selftest to check that btf_load is working from bpf program. > > Signed-off-by: Alexei Starovoitov > --- > tools/testing/selftests/bpf/progs/syscall.c | 48 +++++++++++++++++++++ > 1 file changed, 48 insertions(+) > [...] > SEC("syscall") > int bpf_prog(struct args *ctx) > { > @@ -33,6 +73,8 @@ int bpf_prog(struct args *ctx) > .map_type = BPF_MAP_TYPE_HASH, > .key_size = 8, > .value_size = 8, > + .btf_key_type_id = 1, > + .btf_value_type_id = 2, > }; > static union bpf_attr map_update_attr = { .map_fd = 1, }; > static __u64 key = 12; > @@ -43,7 +85,13 @@ int bpf_prog(struct args *ctx) > }; > int ret; > > + ret = btf_load(); Maybe let's move patch #11 (bpf_sys_close() helper) in front of these selftests and call bpf_sys_close() appropriately on error and (if success) after map is created? > + if (ret < 0) > + return ret; > + > map_create_attr.max_entries = ctx->max_entries; > + map_create_attr.btf_fd = ret; > + > prog_load_attr.license = (long) license; > prog_load_attr.insns = (long) insns; > prog_load_attr.log_buf = ctx->log_buf; > -- > 2.30.2 >