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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham 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 86363C352A5 for ; Mon, 10 Feb 2020 14:32:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5F90F2080C for ; Mon, 10 Feb 2020 14:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581345155; bh=OTTgq0jJHUhKyl/oM3betpSgEVHJn1bgKWksYT9OfT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UCpw/i/2EcAm/hayEukHCI8J5IjiwxrkFlV9+LZFeVWX9MgEymqXbliXAQKAtmJG1 1NMbLx1oPKsfiSUWlxaKlA2QrguhQxs4YewXls+zD1SqjRvfZxmLzGBx4jDyvcj8a2 p3tznu9IKflaqA7qv5NiZgxj3uo9xo4AInQnD534= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728861AbgBJOce convert rfc822-to-8bit (ORCPT ); Mon, 10 Feb 2020 09:32:34 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:34155 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727120AbgBJOcb (ORCPT ); Mon, 10 Feb 2020 09:32:31 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-112-kTq16wSVObqdK8oP9EPmoQ-1; Mon, 10 Feb 2020 09:32:27 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C210F477; Mon, 10 Feb 2020 14:32:25 +0000 (UTC) Received: from krava.redhat.com (unknown [10.43.17.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0B1060BF1; Mon, 10 Feb 2020 14:32:23 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Ravi Bangoria , lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Michael Petlan Subject: [PATCH 2/4] perf tools: Mark ksymbol dsos with kernel type Date: Mon, 10 Feb 2020 15:32:16 +0100 Message-Id: <20200210143218.24948-3-jolsa@kernel.org> In-Reply-To: <20200210143218.24948-1-jolsa@kernel.org> References: <20200210143218.24948-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: kTq16wSVObqdK8oP9EPmoQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We add ksymbol map into machine->kmaps, so it needs to be created as 'struct kmap', which is dependent on its dso having kernel type. Reported-by: Ravi Bangoria Tested-by: Ravi Bangoria Signed-off-by: Jiri Olsa --- tools/perf/util/machine.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index e3e5490f6de5..0a43dc83d7b2 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -727,8 +727,14 @@ static int machine__process_ksymbol_register(struct machine *machine, struct map *map = maps__find(&machine->kmaps, event->ksymbol.addr); if (!map) { - map = dso__new_map(event->ksymbol.name); - if (!map) + struct dso *dso = dso__new(event->ksymbol.name); + + if (dso) { + dso->kernel = DSO_TYPE_KERNEL; + map = map__new2(0, dso); + } + + if (!dso || !map) return -ENOMEM; map->start = event->ksymbol.addr; -- 2.24.1