From patchwork Mon Sep 7 16:36:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Monnet X-Patchwork-Id: 1359081 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=isovalent.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=isovalent-com.20150623.gappssmtp.com header.i=@isovalent-com.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=WuomelGJ; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BlYpK43vcz9sTX for ; Tue, 8 Sep 2020 02:36:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730917AbgIGQg4 (ORCPT ); Mon, 7 Sep 2020 12:36:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730902AbgIGQgm (ORCPT ); Mon, 7 Sep 2020 12:36:42 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7293EC061574 for ; Mon, 7 Sep 2020 09:36:42 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id j2so16415826wrx.7 for ; Mon, 07 Sep 2020 09:36:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QWC8ABqOj9tnGBywTcIQeelbRdA8/0ZzqwQDNhLengM=; b=WuomelGJnWurYaBUF2nmtrnHY+KjbPYEBfz8tqpfeXDstSfVNlxEc5pAGGDjiEx4p8 rwuIr/MS02JMRmUkl4w5HgrXGYTQoeyGlD4Yw7ipAtlTsE9vyiZ42bfQYdrbaC3NR1Xx pAS+fsQVBsrk0OkitURXQt2DlKp0z/P19z3OcLPh24lqpXmavlp6SnLpJBRrlUIxKfcY eOrPdEKgrPROdEz5mcoTcmUWRV56iAWx1o62pKATZsbqYEugPH0DWnZZRAVAkoYSsyTU ao5vMa7Fz4B/VggMIK3+pOvcNC/bWqmYCRyJzyWsaCbBeyLVsmJIX3nM9pVLtGfFLlG/ MVVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=QWC8ABqOj9tnGBywTcIQeelbRdA8/0ZzqwQDNhLengM=; b=nmlmIlg5BlZAxwf4h4WjJNZ7h64P7zvlmaiNuDh2fx7hl+aLoeSHR5clkhp2yFyqWT dj36D0TnCNmozRu3oOuiWKKkoghUnDcc9T2qIIxeEkLLC+w+oo7JCFCxvROAGnWip7Mj FQi9JiPDxHtxUd7YKwrv9WND2gA83L5fakfo/aFjwi7RQqYhTFwMgC4hEfXKXVKMiHtz c+FOdQXagawOHXcETp74BA64xW5c+z8uo/MpleD5SCyBYJGOpTnirpy081bctXlPgCGe CpPgK9weMIA1IEhOl1R4WDMDzlv0QVpcy9RkpyY8pR2jc+cQX/xEfM02JhpC/TvUVCtE pOFA== X-Gm-Message-State: AOAM531Ag+9lku4qaa1WXGvAlsoj/vBIua1DKRXorjoi+4YKzLSDIgm4 mD17jPvl3MO0h/Q17qdlgK07kg== X-Google-Smtp-Source: ABdhPJx7ybduonsODy8DQshJzntV5ZBDwmr061Tj42v2kmVoMKExLWWqKRntYKJq9qFKJwAKVTJyGQ== X-Received: by 2002:a5d:60cc:: with SMTP id x12mr21913343wrt.84.1599496600562; Mon, 07 Sep 2020 09:36:40 -0700 (PDT) Received: from localhost.localdomain ([194.35.119.17]) by smtp.gmail.com with ESMTPSA id p11sm26443677wma.11.2020.09.07.09.36.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 09:36:40 -0700 (PDT) From: Quentin Monnet To: Alexei Starovoitov , Daniel Borkmann Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, Andrii Nakryiko , Quentin Monnet Subject: [PATCH bpf-next v2 0/2] tools: bpftool: support creating outer maps Date: Mon, 7 Sep 2020 17:36:32 +0100 Message-Id: <20200907163634.27469-1-quentin@isovalent.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This series makes bpftool able to create outer maps (maps of types array-of-maps and hash-of-maps). This is done by passing the relevant inner_map_fd, which we do through a new command-line keyword. A first patch also cleans up the function related to dumping map elements. v2: - v1 was wrongly expected to allow bpftool to dump the content of outer maps (already supported). v2 skipped that patch, and instead replaced it with a clean-up for the dump_map_elem() function. Quentin Monnet (2): tools: bpftool: clean up function to dump map entry tools: bpftool: add "inner_map" to "bpftool map create" outer maps .../bpf/bpftool/Documentation/bpftool-map.rst | 10 +- tools/bpf/bpftool/bash-completion/bpftool | 22 ++- tools/bpf/bpftool/map.c | 149 ++++++++++-------- 3 files changed, 114 insertions(+), 67 deletions(-)