Re: [PATCH bpf-next] bpf: Add BPF_MAP_TYPE_QUEUE and BPF_MAP_TYPE_QUEUE to bpftool-map

On 11/23/2018 06:48 PM, David Calavera wrote:

Hi,

Sorry for the mistake, I'll send a new patch. Before doing that, I've
noticed that the array of map names in tools/bpf/bpftool/map.c is very
inconsistent in formatting, some lines use tabs to align the names, others
use spaces, and other are not aligned at all. Is there any formatting
convention for this? I can fix those lines if you have a preferred method
now that I'm adding new elements to that array.

I've fixed the typo from the subject and applied your patch. If you want to
send a patch with white-space cleanup for all the entries that would be fine
with me, sure. You could align all the '=' with tabs to the one from
percpu_cgroup_storage.

Thanks,
Daniel

On Fri, Nov 23, 2018 at 2:56 AM Edward Cree [off-list ref] wrote:

quoted

On 22/11/18 20:59, David Calavera wrote:

quoted

I noticed that these two new BPF Maps are not defined in bpftool.
This patch defines those two maps and adds their names to the
bpftool-map documentation.

Signed-off-by: David Calavera <redacted>
---

Subject line says 'QUEUE' twice, should one of those be 'STACK'?

quoted

 tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 ++-
 tools/bpf/bpftool/map.c                         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/bpf/bpftool/Documentation/bpftool-map.rst

b/tools/bpf/bpftool/Documentation/bpftool-map.rst

quoted

index f55a2daed59b..9e827e342d9e 100644

--- a/tools/bpf/bpftool/Documentation/bpftool-map.rst
+++ b/tools/bpf/bpftool/Documentation/bpftool-map.rst

@@ -42,7 +42,8 @@ MAP COMMANDS
 |            | **percpu_array** | **stack_trace** | **cgroup_array** |

**lru_hash**

quoted

 |            | **lru_percpu_hash** | **lpm_trie** | **array_of_maps** |

**hash_of_maps**

quoted

 |            | **devmap** | **sockmap** | **cpumap** | **xskmap** |

**sockhash**

quoted

-|            | **cgroup_storage** | **reuseport_sockarray** |

**percpu_cgroup_storage** }

quoted

+|            | **cgroup_storage** | **reuseport_sockarray** |

**percpu_cgroup_storage**

quoted

+|            | **queue** | **stack** }

 DESCRIPTION
 ===========

diff --git a/tools/bpf/bpftool/map.c b/tools/bpf/bpftool/map.c
index 7bf38f0e152e..68b656b6edcc 100644
--- a/tools/bpf/bpftool/map.c
+++ b/tools/bpf/bpftool/map.c

@@ -74,6 +74,8 @@ static const char * const map_type_name[] = {
      [BPF_MAP_TYPE_CGROUP_STORAGE]   = "cgroup_storage",
      [BPF_MAP_TYPE_REUSEPORT_SOCKARRAY] = "reuseport_sockarray",
      [BPF_MAP_TYPE_PERCPU_CGROUP_STORAGE]    = "percpu_cgroup_storage",
+     [BPF_MAP_TYPE_QUEUE] = "queue",
+     [BPF_MAP_TYPE_STACK] = "stack",
 };

 static bool map_is_per_cpu(__u32 type)