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=-3.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 3A956ECE58C for ; Tue, 8 Oct 2019 01:59:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CB0820867 for ; Tue, 8 Oct 2019 01:59:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="O64YRFK+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729491AbfJHB7n (ORCPT ); Mon, 7 Oct 2019 21:59:43 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40277 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726917AbfJHB7n (ORCPT ); Mon, 7 Oct 2019 21:59:43 -0400 Received: by mail-pg1-f195.google.com with SMTP id d26so9338257pgl.7 for ; Mon, 07 Oct 2019 18:59:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=SxiZiPgSsJ2mifRWA9TgfeZi4oLuQHvNJ4v5K9ZfYEA=; b=O64YRFK+2b/xBzxfkUVKnFYAGUgniDR5D1vYDP9EmbnfNLh9LSfe4bttoIBiB59Xir Iy0WwUpnwDDNg9E9gKFkyOc8XTVfsWG2yzCjZmujG0gQaIigA2T9+fY/BvQR1qLocSb0 vWvcNmR+CaxLTUc6XirnsGY/sDruyl65GTgFGQu/8j3vSpwlMDP0I4NJWdUcQOLsNxW5 MH8T3hwivHUfikymd6geaH3DckTEZLiQ5Sgg9cRqo+iuevwFWTszTIl79x6G757ZOK6T cb9akjcEoxJW+Ea6xFY0SncYcodpzPwmSnQYqrXvLGgK7amrtBmnqE8nEjbz4eszB9S2 1Q1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=SxiZiPgSsJ2mifRWA9TgfeZi4oLuQHvNJ4v5K9ZfYEA=; b=ZSrHy15d06cuLmQoNOfQm2Tq5Lh62JI9GLJp/q6iElWe5GGIQvJpZc6vCrZC8abVq+ n/lUHUUXOgsjRidOgu7YqwYaWcQsd8B2SINY0H9wYW8Wx/0tRgDIbhikWZkYcMITaWIy qFTmR1560vvJtn7DDJLug6wh3eRj3kF7K0JbhxDP/MuGkTSQThHkDlISfxg9S4j8tySG liqfWWp3+YJJtQa0HukuQZnhR8371yC+gRcHrCzRwIOcvckYCLDsSItzJmCpT9guDqfS vyITk7X/LggUZjRRAW4JDRrZb9xd0usfTb8Ava9MSg0RDD9nywiKxIlUEDR5DuNTo+Jx Y8lw== X-Gm-Message-State: APjAAAXHnYfpl/RZshIXQHztaStai161M9SoLBsF9I7335QkSHqIQ79l mrinx7X88JoqbuBa752og2rxww== X-Google-Smtp-Source: APXvYqymAIpCz1W6kwdBCYc8waIiyAokKTujYW8MvhAvn4ruPXB1ErEbtfVyI9RXmHce9L0M4/cukA== X-Received: by 2002:aa7:95a7:: with SMTP id a7mr36720517pfk.158.1570499982577; Mon, 07 Oct 2019 18:59:42 -0700 (PDT) Received: from cakuba.netronome.com (c-73-202-202-92.hsd1.ca.comcast.net. [73.202.202.92]) by smtp.gmail.com with ESMTPSA id b5sm16468593pfp.38.2019.10.07.18.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 18:59:42 -0700 (PDT) Date: Mon, 7 Oct 2019 18:59:32 -0700 From: Jakub Kicinski To: Andrii Nakryiko Cc: , , , , , , Subject: Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file() Message-ID: <20191007185932.24d00391@cakuba.netronome.com> In-Reply-To: <20191007225604.2006146-1-andriin@fb.com> References: <20191007225604.2006146-1-andriin@fb.com> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Mon, 7 Oct 2019 15:56:04 -0700, Andrii Nakryiko wrote: > diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c > index 43fdbbfe41bb..27da96a797ab 100644 > --- a/tools/bpf/bpftool/prog.c > +++ b/tools/bpf/bpftool/prog.c > @@ -1092,9 +1092,7 @@ static int do_run(int argc, char **argv) > static int load_with_options(int argc, char **argv, bool first_prog_only) > { > struct bpf_object_load_attr load_attr = { 0 }; > - struct bpf_object_open_attr open_attr = { > - .prog_type = BPF_PROG_TYPE_UNSPEC, > - }; > + enum bpf_prog_type common_prog_type = BPF_PROG_TYPE_UNSPEC; > enum bpf_attach_type expected_attach_type; > struct map_replace *map_replace = NULL; > struct bpf_program *prog = NULL, *pos; Please maintain reverse xmas tree..