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 F1011C433EF for ; Wed, 20 Jul 2022 01:09:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238122AbiGTBJp (ORCPT ); Tue, 19 Jul 2022 21:09:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58840 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231806AbiGTBJk (ORCPT ); Tue, 19 Jul 2022 21:09:40 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D04794A836 for ; Tue, 19 Jul 2022 18:09:38 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id b6so9396053wmq.5 for ; Tue, 19 Jul 2022 18:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=RBVHVAW43BmInQW8xdWR/v8IxSN7KBGQTfI9TbyJA0U=; b=U1Lw/qiDoDIqyitCRCAlGJ/9641N+Vv9cSAAErraLVH325IfX1NfIerCLnJ5p1KSG2 9+8v7A86wA1VWIibPPJSu0GaH8MGvQw+psEcWyyX7b6LjuoKGg23u0+rjPWt/g0zNVWL vwc3NuwEmDFX7NCshT4Pi+okffZT95HjVdDJfGSyd6IQ3D/jln1Ok7KAKICKCc0mIoIL oxUW1WvtypqyX/sr3RU77QQeYZ0UN9RcH6K6B45KO1bj6/rUzQj7ZeSUNwyFxkFo5duU WRVsrKNp5di7h74mJBKhYj7nmTv+joLbP0MJPa3kobt+pHqs9whxO7D30KJG4sZ8aZJw EBJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=RBVHVAW43BmInQW8xdWR/v8IxSN7KBGQTfI9TbyJA0U=; b=IOiQgp9xkUW56CUqZKM26rQUNiWM7RjohD3LMui2LBibK/lXyQnKm4Zu+4N3EErSYR cJfvSO8TzCIdzdOXvnh8cfYmMW8KKJyW5IJ6Pw17EdlTlld9WDyezQj+4pePHRbCOH+L ilEGK2kFLXxRarj8y7FVW2PrcXOD6filHZWq7QpFi+3x7xn6056WzByYqmmLleq3J+Y4 Pyt3X1OV7SyDsT9ilVE8wYQGRMSI3F+lpxGiJkjNHbkVdNe6Wkl218qWIlROfHZGQB6C H6pI1a7ZH4e2OIkf1z51UG/Zv/2p1aYOi2IKkVm02BMmXPvvwbUyCO+3NLvRFYQrM5pl JQBw== X-Gm-Message-State: AJIora+XGFikKjWEN4uy6/Ykaq+KXNjEWcWYuOFCUwTAMZFn/MbFpa+u WJHXgrMoPbcSObOopiQRKp7HlpZpWHytO0kdO7MW3A== X-Google-Smtp-Source: AGRyM1txJjTrndM+sbtdvs/TWSbN+GJAz0n1EgDaOdmwLJpHQ2Foo2ces9t0uO7ZnwAko35RvufUgXmNw2ogOqlvC9k= X-Received: by 2002:a7b:ce13:0:b0:3a3:102c:23d3 with SMTP id m19-20020a7bce13000000b003a3102c23d3mr1454769wmc.67.1658279377164; Tue, 19 Jul 2022 18:09:37 -0700 (PDT) MIME-Version: 1.0 References: <20220711093218.10967-1-adrian.hunter@intel.com> <20220711093218.10967-27-adrian.hunter@intel.com> In-Reply-To: <20220711093218.10967-27-adrian.hunter@intel.com> From: Ian Rogers Date: Tue, 19 Jul 2022 18:09:24 -0700 Message-ID: Subject: Re: [PATCH 26/35] perf tools: Handle injected guest kernel mmap event To: Adrian Hunter Cc: Arnaldo Carvalho de Melo , Jiri Olsa , Namhyung Kim , Andi Kleen , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 11, 2022 at 2:33 AM Adrian Hunter wrote: > > If a kernel mmap event was recorded inside a guest and injected into a host > perf.data file, then it will match a host mmap_name not a guest mmap_name, > see machine__set_mmap_name(). So try matching a host mmap_name in that > case. > > Signed-off-by: Adrian Hunter Acked-by: Ian Rogers Thanks, Ian > --- > tools/perf/util/machine.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > index 27d1a38f44c3..8f657225fb02 100644 > --- a/tools/perf/util/machine.c > +++ b/tools/perf/util/machine.c > @@ -1742,6 +1742,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, > struct map *map; > enum dso_space_type dso_space; > bool is_kernel_mmap; > + const char *mmap_name = machine->mmap_name; > > /* If we have maps from kcore then we do not need or want any others */ > if (machine__uses_kcore(machine)) > @@ -1752,8 +1753,16 @@ static int machine__process_kernel_mmap_event(struct machine *machine, > else > dso_space = DSO_SPACE__KERNEL_GUEST; > > - is_kernel_mmap = memcmp(xm->name, machine->mmap_name, > - strlen(machine->mmap_name) - 1) == 0; > + is_kernel_mmap = memcmp(xm->name, mmap_name, strlen(mmap_name) - 1) == 0; > + if (!is_kernel_mmap && !machine__is_host(machine)) { > + /* > + * If the event was recorded inside the guest and injected into > + * the host perf.data file, then it will match a host mmap_name, > + * so try that - see machine__set_mmap_name(). > + */ > + mmap_name = "[kernel.kallsyms]"; > + is_kernel_mmap = memcmp(xm->name, mmap_name, strlen(mmap_name) - 1) == 0; > + } > if (xm->name[0] == '/' || > (!is_kernel_mmap && xm->name[0] == '[')) { > map = machine__addnew_module_map(machine, xm->start, > @@ -1767,7 +1776,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine, > dso__set_build_id(map->dso, bid); > > } else if (is_kernel_mmap) { > - const char *symbol_name = (xm->name + strlen(machine->mmap_name)); > + const char *symbol_name = xm->name + strlen(mmap_name); > /* > * Should be there already, from the build-id table in > * the header. > -- > 2.25.1 >