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 82428C433F5 for ; Thu, 19 May 2022 07:31:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234305AbiESHbs (ORCPT ); Thu, 19 May 2022 03:31:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234539AbiESHbn (ORCPT ); Thu, 19 May 2022 03:31:43 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC5596EC7C for ; Thu, 19 May 2022 00:31:38 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id m12so4051400plb.4 for ; Thu, 19 May 2022 00:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:to:cc:references :from:in-reply-to:content-transfer-encoding; bh=ArdF743BZoqLFAyXjQk+7RdvsBaiXgNZpZL36JdMpVg=; b=DTvtdeKgRe67G7EM5fDtunxlx5QDX6RJ0KixOqk+xQS+QKDYZYtlOhGglZAQ+r6O5j rLJcaC4kxERUnin32BPyux8DBTQfBHWXGfUU7xYSiEup5hHPuHN/txD5u5uOwBslOy4l MrfBG1ZjfcSda8Ut+o7xy/CulLZMJ9Hhx+7sgl7PxgTaa71+RO7TbuFjW2RkVFk12GD7 RFMZVxYs5XL8kq6UAgBk/GkRp5jBHj7wfTakbn1MS6ABUdMAdZMlSuUtCIgBkeh7pgWb 01G1E/JSO31wZ2QL4foYYzppRq2OdeSMMwx7laOkx6kGtzlFFr8i7X8vP3E1JCQ+P8XZ oRkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :to:cc:references:from:in-reply-to:content-transfer-encoding; bh=ArdF743BZoqLFAyXjQk+7RdvsBaiXgNZpZL36JdMpVg=; b=6GNkNmsPIrequvJyzAURrCnJAQ7zB/X499pisS65neLjRcnEBlL8JVC3eTqbp2mpdO VPLRbyr6xOvTGaTQhhH8Amj0FQNVed66/naJ4GLdGTcrRJHQcARIjEd0ATzCZ+xTVzLK YOHusQckMwi1/Xp/Wtx1Qea4olUAk3ZyN1RrzgD96tiQmvwJ1gZ8FZg35oypPJZSisO1 rDyR95SO8qBmSva14LRlaIKAASxKArXKxSb6UnmQ2dlJ5Ezaw9eNhLNGSQAau/w0tHSz hZnZBrJPIPjJduVfyV6vAK28Fp1NmW9/mRi5GapKY5DhGstXLg0YeNNJiRSidiaVm/5V UHUQ== X-Gm-Message-State: AOAM530ijOuYniYmZ2dXJ3eeydsizb21SUS8XGskc/1jBy8eDxas++BC HpalpSwZU9NQLYDxlH6I3cjQeQ== X-Google-Smtp-Source: ABdhPJzxrKB1/kR9Vev93w/bW8HjKfjBRysabAI2TMofvhcpo6g8SjVBAT+ron7MvWu5Ar6TVfIU8g== X-Received: by 2002:a17:90a:db95:b0:1df:37e7:6a28 with SMTP id h21-20020a17090adb9500b001df37e76a28mr4380345pjv.204.1652945498470; Thu, 19 May 2022 00:31:38 -0700 (PDT) Received: from [10.71.57.194] ([139.177.225.241]) by smtp.gmail.com with ESMTPSA id mq7-20020a17090b380700b001cd4989ff5esm2842065pjb.37.2022.05.19.00.31.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 May 2022 00:31:38 -0700 (PDT) Message-ID: Date: Thu, 19 May 2022 15:31:29 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.9.0 Subject: Re: [External] Re: [PATCH bpf-next] selftests/bpf: fix some bugs in map_lookup_percpu_elem testcase To: Andrii Nakryiko Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin Lau , Song Liu , Yonghong Song , john fastabend , KP Singh , Steven Rostedt , Ingo Molnar , Jiri Olsa , Dave Marchevsky , Joanne Koong , Geliang Tang , Networking , bpf , open list , duanxiongchun@bytedance.com, Muchun Song , Dongdong Wang , Cong Wang , zhouchengming@bytedance.com, Yosry Ahmed References: <20220516022453.68420-1-zhoufeng.zf@bytedance.com> <196f6ae9-f899-16c8-a5d3-a1c771fa9900@bytedance.com> From: Feng Zhou In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 在 2022/5/19 下午12:38, Andrii Nakryiko 写道: > On Wed, May 18, 2022 at 8:27 PM Feng Zhou wrote: >> 在 2022/5/19 上午8:17, Andrii Nakryiko 写道: >>> On Sun, May 15, 2022 at 7:25 PM Feng zhou wrote: >>>> From: Feng Zhou >>>> >>>> comments from Andrii Nakryiko, details in here: >>>> https://lore.kernel.org/lkml/20220511093854.411-1-zhoufeng.zf@bytedance.com/T/ >>>> >>>> use /* */ instead of // >>>> use libbpf_num_possible_cpus() instead of sysconf(_SC_NPROCESSORS_ONLN) >>>> use 8 bytes for value size >>>> fix memory leak >>>> use ASSERT_EQ instead of ASSERT_OK >>>> add bpf_loop to fetch values on each possible CPU >>>> >>>> Fixes: ed7c13776e20c74486b0939a3c1de984c5efb6aa ("selftests/bpf: add test case for bpf_map_lookup_percpu_elem") >>>> Signed-off-by: Feng Zhou >>>> --- >>>> .../bpf/prog_tests/map_lookup_percpu_elem.c | 49 +++++++++------ >>>> .../bpf/progs/test_map_lookup_percpu_elem.c | 61 ++++++++++++------- >>>> 2 files changed, 70 insertions(+), 40 deletions(-) >>>> >>>> diff --git a/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c b/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c >>>> index 58b24c2112b0..89ca170f1c25 100644 >>>> --- a/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c >>>> +++ b/tools/testing/selftests/bpf/prog_tests/map_lookup_percpu_elem.c >>>> @@ -1,30 +1,39 @@ >>>> -// SPDX-License-Identifier: GPL-2.0 >>>> -// Copyright (c) 2022 Bytedance >>>> +/* SPDX-License-Identifier: GPL-2.0 */ >>> heh, so for SPDX license comment the rule is to use // in .c files :) >>> so keep SPDX as // and all others as /* */ >> will do. Thanks. >> >>>> +/* Copyright (c) 2022 Bytedance */ >>>> >>>> #include >>>> >>>> #include "test_map_lookup_percpu_elem.skel.h" >>>> >>>> -#define TEST_VALUE 1 >>>> - >>>> void test_map_lookup_percpu_elem(void) >>>> { >>>> struct test_map_lookup_percpu_elem *skel; >>>> - int key = 0, ret; >>>> - int nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); >>>> - int *buf; >>>> + __u64 key = 0, sum; >>>> + int ret, i; >>>> + int nr_cpus = libbpf_num_possible_cpus(); >>>> + __u64 *buf; >>>> >>>> - buf = (int *)malloc(nr_cpus*sizeof(int)); >>>> + buf = (__u64 *)malloc(nr_cpus*sizeof(__u64)); >>> no need for casting >> casting means no '(__u64 *)'? >> just like this: >> 'buf = malloc(nr_cpus * sizeof(__u64));' >> > yes, in C you don't need to explicitly cast void * to other pointer types Ok, Thanks. > >>>> if (!ASSERT_OK_PTR(buf, "malloc")) >>>> return; >>>> - memset(buf, 0, nr_cpus*sizeof(int)); >>>> - buf[0] = TEST_VALUE; >>>> >>>> - skel = test_map_lookup_percpu_elem__open_and_load(); >>>> - if (!ASSERT_OK_PTR(skel, "test_map_lookup_percpu_elem__open_and_load")) >>>> - return; >>>> + for (i=0; i>> spaces between operators >> will do. Thanks. >> >>>> + buf[i] = i; >>>> + sum = (nr_cpus-1)*nr_cpus/2; >>> same, please follow kernel code style >> will do. Thanks. >> >>>> + >>>> + skel = test_map_lookup_percpu_elem__open(); >>>> + if (!ASSERT_OK_PTR(skel, "test_map_lookup_percpu_elem__open")) >>>> + goto exit; >>>> + >>> nit: keep it simple, init skel to NULL and use single cleanup goto >>> label that will destroy skel unconditionally (it deals with NULL just >>> fine) >> will do. Thanks. >> >>>> + skel->rodata->nr_cpus = nr_cpus; >>>> + >>>> + ret = test_map_lookup_percpu_elem__load(skel); >>>> + if (!ASSERT_OK(ret, "test_map_lookup_percpu_elem__load")) >>>> + goto cleanup; >>>> + >>>> ret = test_map_lookup_percpu_elem__attach(skel); >>>> - ASSERT_OK(ret, "test_map_lookup_percpu_elem__attach"); >>>> + if (!ASSERT_OK(ret, "test_map_lookup_percpu_elem__attach")) >>>> + goto cleanup; >>>> >>>> ret = bpf_map_update_elem(bpf_map__fd(skel->maps.percpu_array_map), &key, buf, 0); >>>> ASSERT_OK(ret, "percpu_array_map update"); >>> [...] >>