From patchwork Mon Aug 2 13:45:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 490782 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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 6078FC4338F for ; Mon, 2 Aug 2021 13:49:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 47ACD61101 for ; Mon, 2 Aug 2021 13:49:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234418AbhHBNuF (ORCPT ); Mon, 2 Aug 2021 09:50:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:60900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234504AbhHBNtf (ORCPT ); Mon, 2 Aug 2021 09:49:35 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C6FB661029; Mon, 2 Aug 2021 13:49:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912165; bh=g7xzlURTxicIpANFeFlnBbiOHqROcRF6ixa7g2qFe2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P2heMiiuosmOAOcl4G1Ygu/m4zkXz5FR8NEn/GoXC8F84elDLa93Sbgk0y+rKY4ya PG8o9vHN8pNMH6yxIFJ7UbP3aB11yMCTNU9vaby7fYUtKM+Lm+iQvI0v57a9Ql5ZTs FxsK4UsfEC0+ZmpnfbvfeKuUjSxSV37kIWr5Cu7o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Riccardo Mancini , Ian Rogers , Jiri Olsa , Krister Johansen , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo Subject: [PATCH 4.14 38/38] Revert "perf map: Fix dso->nsinfo refcounting" Date: Mon, 2 Aug 2021 15:45:00 +0200 Message-Id: <20210802134336.028927997@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134334.835358048@linuxfoundation.org> References: <20210802134334.835358048@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnaldo Carvalho de Melo commit 9bac1bd6e6d36459087a728a968e79e37ebcea1a upstream. This makes 'perf top' abort in some cases, and the right fix will involve surgery that is too much to do at this stage, so revert for now and fix it in the next merge window. This reverts commit 2d6b74baa7147251c30a46c4996e8cc224aa2dc5. Cc: Riccardo Mancini Cc: Ian Rogers Cc: Jiri Olsa Cc: Krister Johansen Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/perf/util/map.c | 2 -- 1 file changed, 2 deletions(-) --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -216,8 +216,6 @@ struct map *map__new(struct machine *mac if (type != MAP__FUNCTION) dso__set_loaded(dso, map->type); } - - nsinfo__put(dso->nsinfo); dso->nsinfo = nsi; dso__put(dso); }