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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 416A1C433E3 for ; Tue, 28 Jul 2020 20:54:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15236206D8 for ; Tue, 28 Jul 2020 20:54:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595969687; bh=QxYwn1VGKKYVE4wolqR/oZEUZLEvahfqhhFb7dEx8ig=; h=References:In-Reply-To:From:Date:Subject:To:Cc:List-ID:From; b=b1HbmKQ/ZmF+2z/kabkiTMQz8q4tfuhJfG1uqYh9O2b1EdpLpPONwITAzFyBa5IZC kDg8WcNJplH2GJkvYZLdsCXRhdMwJz8bfwbOKVbPZx9066uMeOfN1fOhQz4zPG+RBQ L6QalgLF2eFE/tVmqweHEYCk6970hmoCGR8ooTMo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728921AbgG1Uyo (ORCPT ); Tue, 28 Jul 2020 16:54:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:37152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728202AbgG1Uyo (ORCPT ); Tue, 28 Jul 2020 16:54:44 -0400 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BAAA420775; Tue, 28 Jul 2020 20:54:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595969684; bh=QxYwn1VGKKYVE4wolqR/oZEUZLEvahfqhhFb7dEx8ig=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=vOySFjhisZjrjcpa3h8dZhmiRAvjA3NFhmfFS7JZXK8S/tGvXyOKMFYrYlx7PH5D1 jyTYzUGhG2rDu8q/4rFJ6BRF6R0Mxsr6+7+WmueU55U6n7ppPqUezIRS4qfuQalUOD MKoUI6y3GhMnR81lA+6dxW9mjZoPYzp/EoRlX9rU= Received: by mail-lj1-f179.google.com with SMTP id b25so22687674ljp.6; Tue, 28 Jul 2020 13:54:43 -0700 (PDT) X-Gm-Message-State: AOAM530vI5V6+d70J27Jj+a4pX31kzRORROBCQOUfJlEzA1AJ63DCGzS 0Z3y5Jk+3cooPAzY9BuEujVuux6aPoBH+C/B2r0= X-Google-Smtp-Source: ABdhPJz/HC8mfYYw1GKSPbbMVpVjzr75BnuutV80ntrPCmSBUDVRRC2syeVUsksnTjoR6DbOSlm4KUI3h6YO329kpTk= X-Received: by 2002:a2e:88c6:: with SMTP id a6mr13313441ljk.27.1595969682062; Tue, 28 Jul 2020 13:54:42 -0700 (PDT) MIME-Version: 1.0 References: <20200728003139.2410375-1-andriin@fb.com> <20200728003139.2410375-2-andriin@fb.com> In-Reply-To: <20200728003139.2410375-2-andriin@fb.com> From: Song Liu Date: Tue, 28 Jul 2020 13:54:31 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 bpf 2/2] selftests/bpf: extend map-in-map selftest to detect memory leaks To: Andrii Nakryiko Cc: bpf , Networking , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Kernel Team , Song Liu , stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Jul 27, 2020 at 5:32 PM Andrii Nakryiko wrote: > > Add test validating that all inner maps are released properly after skeleton > is destroyed. To ensure determinism, trigger kernel-side synchronize_rcu() > before checking map existence by their IDs. > > Signed-off-by: Andrii Nakryiko Acked-by: Song Liu With one last nitpick... > --- > .../selftests/bpf/prog_tests/btf_map_in_map.c | 124 ++++++++++++++++-- > 1 file changed, 110 insertions(+), 14 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c b/tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c > index f7ee8fa377ad..2af1996df6f3 100644 > --- a/tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c > +++ b/tools/testing/selftests/bpf/prog_tests/btf_map_in_map.c > @@ -5,10 +5,60 @@ > > #include "test_btf_map_in_map.skel.h" > > +static int duration; > + > +__u32 bpf_map_id(struct bpf_map *map) nit: We can make this function static.