Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1650758pxy; Mon, 2 Aug 2021 07:05:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyroORgfpx2E44d9Z1E6jLCVWKQikdSnUOk9Fg0YE8MVLJFpKTL+oWoN2eNw1kY0+sU9Kqr X-Received: by 2002:a92:d9c6:: with SMTP id n6mr454060ilq.142.1627913152531; Mon, 02 Aug 2021 07:05:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627913152; cv=none; d=google.com; s=arc-20160816; b=Ixx9/hb+g5pV12fn7WTlio8Hmd4PV/5pv9J8Em2WkSfRjgAVY+XMXZcJVw9BKEyalK 5RzJ3YFhWTVnXtC6c9kMwGGZJ6JJEb7UROX//4M1iBDkRIqVR9HWiocUzk1wEwAnczjF dHX/RdtfRDlfp8AeRT5KSODgCOA70T9uthwxDAg2Rk+Mc/xFTVW/dtvXRijJ0ZH+oV17 AssIV7IIS9SYunJzZMO5+lw+MI/yEfj4z08bc01Aa8Ufg9hJefKqqL4VpM30SGPzL1tI uDdzcNYSQLXMtF7sKKEbQkptTGoGCxt5lqf3aq+wIfa4HOTSinpeLlplzM1opnA2+6kT LNGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rQGqR6k8ybv/F9TVnM9gfmudAL8epeG6vN8HSrPHGZk=; b=FZWnk5VO2xAqpXzm0VrF0OHcHJOAILJ7rQYpdnSkN7GGQrDOM6xNxYr03OzosUMauU SeSr2vT3FSdlklDh9dCPFtcGP91XTr8t/tLOnQG5SOUNDqSkdwfr11KW1hkkjArgmZTS WrNsZGWzWwXGvkvnnsZk+ra4wmw/FRg0sTNtDLVSikj9y6w9U32fs5fhQgxmEraX3VLQ QNr1IVUAHiPi0wXk9SQpZXRiFbqjlTqwLpVY2Xl2VPd7P3TeanMQh885Ak8OkAr8PakJ prfaCAApQ2cMr3rvv82UXeZuN5q/BmJY5m7x9znRSJdmqD+aBwWawzQ2pPC1l5uP532S mxnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KCUMGnRj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c126si186568iof.49.2021.08.02.07.05.40; Mon, 02 Aug 2021 07:05:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=KCUMGnRj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236172AbhHBOEK (ORCPT + 99 others); Mon, 2 Aug 2021 10:04:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:42958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235899AbhHBN4L (ORCPT ); Mon, 2 Aug 2021 09:56:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 69C646113C; Mon, 2 Aug 2021 13:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912467; bh=ZUipM+grXA9HlVDMC3KEq/8VnFrZShP7/ttL4DzRZfM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KCUMGnRjhvxC6wLkHy/CeUUp5U4l4ffR86OGgS5ENED3OrIzyNhn6gfbMcT2xoReP 1kkv2EWOtnQkGwhd4ohXPGp+LwpM/lm1ZQWpkc6cmX8r7GjirIq8qFmmMfUrsffeeX uuGzqf8Gtgdwj0iMuntTGXrW1vTIZy0d02HroCtQ= 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 5.10 65/67] Revert "perf map: Fix dso->nsinfo refcounting" Date: Mon, 2 Aug 2021 15:45:28 +0200 Message-Id: <20210802134341.268764886@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134339.023067817@linuxfoundation.org> References: <20210802134339.023067817@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 @@ -192,8 +192,6 @@ struct map *map__new(struct machine *mac if (!(prot & PROT_EXEC)) dso__set_loaded(dso); } - - nsinfo__put(dso->nsinfo); dso->nsinfo = nsi; dso__put(dso); }