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=-2.5 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS, USER_AGENT_MUTT 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 A1B84C43387 for ; Wed, 16 Jan 2019 16:45:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E9A6205C9 for ; Wed, 16 Jan 2019 16:45:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=fomichev-me.20150623.gappssmtp.com header.i=@fomichev-me.20150623.gappssmtp.com header.b="ojVjVH54" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393803AbfAPQpe (ORCPT ); Wed, 16 Jan 2019 11:45:34 -0500 Received: from mail-pg1-f169.google.com ([209.85.215.169]:45044 "EHLO mail-pg1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725994AbfAPQpe (ORCPT ); Wed, 16 Jan 2019 11:45:34 -0500 Received: by mail-pg1-f169.google.com with SMTP id t13so3048448pgr.11 for ; Wed, 16 Jan 2019 08:45:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fomichev-me.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=cjjoRcio+Cjzu0DtVY8B1v7ZX5IElyvit51KJoH+AeY=; b=ojVjVH54nXsi+XzRvE5GPC8tRqq5h1mKSO94ekdkmR0t444LJmPFcyXHxXhAxLR/9c 5cgOsae8Q7WV3rT21HtbvnOvlUoSIAuG3AxvY4vXAnB51PnKe4vvLqVbcTiLhMlv3WZY UY0ba+hmBMXnmtWlNUyaVUIlFddkoJymuhMiYT1HRU0kVEUB3gNAO0w1GElIcu1CJkWi 5FAL469OEKjUe1ZVPL5WXIg8gMxHrV6VtzUcojuVdR51Xt1Hl1FgymMu6W5cOrJwDlBJ JfNf843bx2AI0Ak4L1SMOOgtDXW0MuotZoXaJOTKQWwFpEhtaaRZo7YjVFXEvKC0UsGy Jp/Q== 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:references :mime-version:content-disposition:in-reply-to:user-agent; bh=cjjoRcio+Cjzu0DtVY8B1v7ZX5IElyvit51KJoH+AeY=; b=ZPrnTp1+3FDgE1BTGXxXU8QShdjLqoUGe/GKzMpsC1xAhFQIb/VrDyHA4DcXxOjF4N etlgfkX81uDR6ZG02V2ZRh4oluP9Rlq4K6Ps3pg0OVHBfL4zcJwhDcYMUJHfsGEpIU3K bfJeQ6oFsMbZxiRX9TCxMQ0T4rErjudzg+ngyB609S+EVeBC80O/4wry5TI4pfVYlcay LHgO8WDhcHCrvMSTfVl/si7c7C5FphgYqA5MT4xJx1jvTMxmLyjBIpomF97Qbt4dM9SY Z8A8JTtMib+ybMYn4Umvk2CBFRFdk6rJohSwOM5RhVBRDPuGpzuB6gvr58y25OzTSu+j JJFA== X-Gm-Message-State: AJcUukfWBU+V9EWMe/TFyPzOl6A0Ja8ornKSgMCjloOLhQIe2vaAeIIs D3E5H5TFsxc2THPfcga0OM/ULg== X-Google-Smtp-Source: ALg8bN4o1oV7zDz6LTdkYbYGGBOEnq05WAwVGHn3Kd42BvVy+ASmK9RfsZwvhsCRNqG5c990sDNzBA== X-Received: by 2002:a63:9a09:: with SMTP id o9mr9336876pge.94.1547657133002; Wed, 16 Jan 2019 08:45:33 -0800 (PST) Received: from localhost ([2601:646:8f00:18d9:d0fa:7a4b:764f:de48]) by smtp.gmail.com with ESMTPSA id q5sm10637772pfi.165.2019.01.16.08.45.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Jan 2019 08:45:32 -0800 (PST) Date: Wed, 16 Jan 2019 08:45:31 -0800 From: Stanislav Fomichev To: Jakub Kicinski Cc: Stanislav Fomichev , netdev@vger.kernel.org, davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, quentin.monnet@netronome.com Subject: Re: [PATCH bpf-next 6/6] bpftool: add pop and dequeue commands Message-ID: <20190116164531.GC726@mini-arch> References: <20190115232252.5736-1-sdf@google.com> <20190115232252.5736-7-sdf@google.com> <20190115174618.0bd5e56b@cakuba.netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190115174618.0bd5e56b@cakuba.netronome.com> User-Agent: Mutt/1.11.2 (2019-01-07) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 01/15, Jakub Kicinski wrote: > On Tue, 15 Jan 2019 15:22:52 -0800, Stanislav Fomichev wrote: > > +static int do_pop_dequeue(int argc, char **argv) > > +{ > > + struct bpf_map_info info = {}; > > + __u32 len = sizeof(info); > > + void *key, *value; > > + int err; > > + int fd; > > + > > + if (argc < 2) > > + usage(); > > + > > + fd = map_parse_fd_and_info(&argc, &argv, &info, &len); > > + if (fd < 0) > > + return -1; > > + > > + err = alloc_key_value(&info, &key, &value); > > + if (err) > > + goto exit_free; > > + > > + err = bpf_map_lookup_and_delete_elem(fd, key, value); > > + if (err) { > > + if (errno == ENOENT) { > > + if (json_output) > > + jsonw_null(json_wtr); > > + else > > + printf("Error: empty map\n"); > > + } else { > > + p_err("pop failed: %s", strerror(errno)); > > + } > > + > > + goto exit_free; > > + } > > + > > + print_key_value(&info, key, value); > > + > > +exit_free: > > + free(key); > > + free(value); > > + close(fd); > > + > > + if (!err && json_output) > > + jsonw_null(json_wtr); > > These two lines look out of place? Ah, indeed, sorry about that. Will remove in v2. > > > + return err; > > +}