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, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED 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 8992CECE58C for ; Tue, 8 Oct 2019 02:38:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59A2720867 for ; Tue, 8 Oct 2019 02:38:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oGeXTShE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729465AbfJHCia (ORCPT ); Mon, 7 Oct 2019 22:38:30 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:38592 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729285AbfJHCia (ORCPT ); Mon, 7 Oct 2019 22:38:30 -0400 Received: by mail-lj1-f193.google.com with SMTP id b20so15813997ljj.5; Mon, 07 Oct 2019 19:38:27 -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=VgTBznajx1HX4zvBYEm6aNoSOsgFu/JG0aP5omKI1e4=; b=oGeXTShEmm2cSJ51fJfrZphg72LwXwFJ+3IaVGqV7EH6f+sjBz0H9di4yYbkgUbTyC UTnKYUhCNb+dMsUQ/5QUK3UvUGuNW8tg+GbrI4mi6FGIGr5MKLUptQqt4k4nKFU0yom9 Z/8TPKtDlywwOcZPOUkBs2Sbcla56/Sf2N8UqCVjLxmklvE1R3BGfb2NgNvN07zREAB2 m0G2p/ANunKHuY9GCLCqs24vAjIZ7bXI5/NEuF6WKdpNhk0ez2Jx/Fty1e5fQBH/gr9z //rGaBlnDrmlXmgYhauNlbm0gP/s0W1UZW7mo621iX0JxMRjnydHTEWZyOXNtFdjE8MC eROA== 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=VgTBznajx1HX4zvBYEm6aNoSOsgFu/JG0aP5omKI1e4=; b=rH/E3GSinHla2Z9VKZdWsOXPGm5KIdznrqJUjvi9Hh169G1rZnkWHmx36w6WddgdW6 2Lxef5a8H5Z4hxWAxuxRrk9RiyKL/XTc6Ryu7voVN00N2C39gh9YzfUGshWq3pKFlHON XW6KlFFRLZRq8XIdStgaf+UjsdF9qb4RzLLauqikWhErOwHXw8e12upyWYK0B5kz1UJ/ Qc+WyqU0kX3M0QsNKTME3gz8EuNvo5YH+I3J5k0/rEv1gHR5lFvsnRg01v6Ska4mQKd7 fNqaM/3A1Ug/xzGigLo4h6Syo21DdcVZaWA3txPE5wLwr4+yR533KnjnR1TMqQnBj3za YGmw== X-Gm-Message-State: APjAAAWWbbtGQmMGtrjMgIG4ZyuH/pLPOJBXZ/6GYvkgCTx21yI+irKZ m+VDPs2jnpuMsV3oooklg0dxaCg2vhXgf2YSfrk= X-Google-Smtp-Source: APXvYqw6An+Q/HIBj8ODgIQwgciSeNV7wWH0gdJWPJeccHQAzVmwT94heE8lPQsyfd+6fxgT436rCwU1xpIONV+kz8A= X-Received: by 2002:a2e:29dc:: with SMTP id p89mr20843740ljp.228.1570502306891; Mon, 07 Oct 2019 19:38:26 -0700 (PDT) MIME-Version: 1.0 References: <20191007225604.2006146-1-andriin@fb.com> <20191007185932.24d00391@cakuba.netronome.com> <20191007192328.2d89f63e@cakuba.netronome.com> In-Reply-To: <20191007192328.2d89f63e@cakuba.netronome.com> From: Alexei Starovoitov Date: Mon, 7 Oct 2019 19:38:15 -0700 Message-ID: Subject: Re: [PATCH v2 bpf-next] bpftool: fix bpftool build by switching to bpf_object__open_file() To: Jakub Kicinski Cc: Andrii Nakryiko , bpf , Network Development , Alexei Starovoitov , Daniel Borkmann , Stanislav Fomichev , Andrii Nakryiko , Kernel Team Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Mon, Oct 7, 2019 at 7:23 PM Jakub Kicinski wrote: > > On Mon, 7 Oct 2019 19:16:45 -0700, Alexei Starovoitov wrote: > > On Mon, Oct 7, 2019 at 7:00 PM Jakub Kicinski wrote: > > > 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.. > > > > There are exceptions. I don't think it's worth doing everywhere. > > Rule #0 stick to the existing code style. > > "Previous line of code declaring this variable in a different way was > in this place" is a really weak argument and the only one which can be > made here... do you seriously think that arguing about xmas tree is a good spend of yours and my time?!