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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4632C4332F for ; Fri, 18 Feb 2022 09:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232996AbiBRJB4 (ORCPT ); Fri, 18 Feb 2022 04:01:56 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:55524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232997AbiBRJBz (ORCPT ); Fri, 18 Feb 2022 04:01:55 -0500 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04B5251333; Fri, 18 Feb 2022 01:01:38 -0800 (PST) Received: by mail-wr1-x42b.google.com with SMTP id p9so13320031wra.12; Fri, 18 Feb 2022 01:01:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=/2RVN5M9vXns43fjksLrxbLt9+niN7MDRyGnX4gqEJk=; b=Uul2xMXiAiQUcxLLlZVJWfTbrRdmG1GRcv1msFnH5DMOOHaSK1tp54asAGkAPpRgHo E5lqIz9jcJuVh/tIHOhcbduvVGBRTP9KgYyFuO7Zyicct4Nk1lknuwWRUu8SgtMrZL8e LqW+w25Wn+kUZ7WOT534Zq9Haiw1fRvdPd3ghZgswqP2MSsgVKqQ2ArovCakLUrKvB7W 1CWqmHJvGIsHe6AYrsV90XUdUimUmbjbp7T41lhVoSSPlYdkkjIvduqvdTRJkSRvp1St ezKrnRweNRQWhyNJy1hxyZJz1J5f8XPZvrW5gERur/AtFB97v370oSwL4MWlS/dFZUf/ Ovrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=/2RVN5M9vXns43fjksLrxbLt9+niN7MDRyGnX4gqEJk=; b=BJAGm010DirZnczjVWrneCB697osUkls0HpXGhQQVjBNjgu0yxWcfzU8bXeDRX+h5h lqypcNUKJwr2s92pAq2BULTJKxMuz5xlGVrtNsMmUZ5eeq9p2LJgjHoj7i67FF/HT8iH a9ZVfbu93I4qD8RDyDQ/brdk7mM/WM9zNBXy3MgrKdiwSeTYVQEVvmHKxaXf71Ovx0EO al0KjrWnYPAulIClvmUj2nu/axX/q1K8Uso+3CgYDgYx+Crh9QLrovdRbGhFOXeauAlW tJACrMCbOwG6zW0ZzvpfmAJPUHNHYxy/4jMLvRZslsY7Gt08D1eOv/5r6GFhqlBMwaLG agXA== X-Gm-Message-State: AOAM533UVXfbbELQpEQeuGK0QX1XAzTQ4PkqO1otL3WSAZnd6JxfZECQ Sgj/eQap8P3hjhPuGd5oXO4= X-Google-Smtp-Source: ABdhPJzj+BYZM338XHFtQ5TIAImmc4aJR4kwW0nrC8szNpLJcZB+7lshwPzHCdorZ9yIVprTKi8mmw== X-Received: by 2002:adf:ebd0:0:b0:1e3:f9b:7b77 with SMTP id v16-20020adfebd0000000b001e30f9b7b77mr4977912wrn.691.1645174897447; Fri, 18 Feb 2022 01:01:37 -0800 (PST) Received: from krava ([2a00:102a:5012:d617:c924:e6ed:1707:a063]) by smtp.gmail.com with ESMTPSA id q23sm3617224wmj.44.2022.02.18.01.01.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 01:01:37 -0800 (PST) Date: Fri, 18 Feb 2022 10:01:34 +0100 From: Jiri Olsa To: Andrii Nakryiko Cc: Jiri Olsa , Arnaldo Carvalho de Melo , Andrii Nakryiko , lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Ian Rogers , "linux-perf-use." , bpf Subject: Re: [PATCH 2/3] perf tools: Remove bpf_map__set_priv/bpf_map__priv usage Message-ID: References: <20220217131916.50615-1-jolsa@kernel.org> <20220217131916.50615-3-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org On Thu, Feb 17, 2022 at 01:49:39PM -0800, Andrii Nakryiko wrote: > On Thu, Feb 17, 2022 at 5:19 AM Jiri Olsa wrote: > > > > Both bpf_map__set_priv/bpf_map__priv are deprecated > > and will be eventually removed. > > > > Using hashmap to replace that functionality. > > > > Suggested-by: Andrii Nakryiko > > Signed-off-by: Jiri Olsa > > --- > > tools/perf/util/bpf-loader.c | 62 ++++++++++++++++++++++++++++++++---- > > 1 file changed, 55 insertions(+), 7 deletions(-) > > > > [...] > > > +static int map_set_priv(struct bpf_map *map, void *priv) > > +{ > > + void *old_priv; > > + > > + if (!bpf_map_hash) { > > + bpf_map_hash = hashmap__new(ptr_hash, ptr_equal, NULL); > > + if (!bpf_map_hash) > > same as in previous patch, on error this is not going to be NULL yes, will change jirka > > > + return -ENOMEM; > > + } > > + > > + old_priv = map_priv(map); > > + if (old_priv) { > > + bpf_map_priv__clear(map, old_priv); > > + return hashmap__set(bpf_map_hash, map, priv, NULL, NULL); > > + } > > + return hashmap__add(bpf_map_hash, map, priv); > > +} > > + > > [...]