From patchwork Fri Mar 1 07:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 208682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2097:b0:108:e6aa:91d0 with SMTP id gs23csp922845dyb; Thu, 29 Feb 2024 23:56:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX0I6qJDEJKpDap6KlC6kyppGt0e46Odjn1r44hoNZrGl+piUcGhMera1CNizoVuwErp1vXws49A+U9/ZlGGuoizilzUQ== X-Google-Smtp-Source: AGHT+IHKj9kkl719+ujJEYqcd86cpgs2PlOVExycw34QhXobtReWX9TU9p5JAOfwcjUssVwEHFds X-Received: by 2002:a05:6808:1411:b0:3c1:b3b1:2776 with SMTP id w17-20020a056808141100b003c1b3b12776mr1221262oiv.38.1709279788352; Thu, 29 Feb 2024 23:56:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709279788; cv=pass; d=google.com; s=arc-20160816; b=hio3lFghAiWa6FLN0x446KzVF4iNcgB+x9CczYsgWpMD6U9wCCeUWPCgKwBY5VF4Jh hCsLYwQbx+i18ACucaEkxTmQAwRQI7bpX8IYi/aURL4g4jvBQs16UID8k6V08Yeci7Fz ly4UaK3BR3syZKcptfhEyWsI/iE2uks+nZ/pPvlTtDszkoaBRP/gqyvifV7hafLzSE3x FG25TUDDSjrpdiKxZzM+BJR4CK4nAFvFi1qwcTeOzAg9asFnTZQXJE7pfwHI24s5rjxG mRDdTPssbYueqDr18r4tzKjfSRiXXW8bLYbPRXwaWKk1IHwy6E4RFMtSLK7CtK3pACNS oAXg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=to:from:subject:mime-version:list-unsubscribe:list-subscribe :list-id:precedence:message-id:date:dkim-signature; bh=2vDtF8jsZ47KJFPdTHlyCCCvC1lX3V2rNBLzzEwdQPY=; fh=VnSkHUMhBNoahwow96DScfIaccDcqOPv8XRcKseGH2s=; b=lspML2xDAPriqqaQQeOMMe2sMWMYYrlb6YXM3zagVdlehZFm93q0u/w4wc7T8KnlVo ZQMCBkQ8jnai08birI+p90ASW6dz/VvJlDt0KdgQ9KNj5+xiBHk0ZiHLxJTEkk/b06bg nWJIb54Gp/fx7SoMheOLdMSKLZC1JRut77AA/Dxg8C8HF+JJMkHDw93vsw2/ewaknHfF kHtsdwLD4xOtcqYXaH9OuE+u3Hl8Lj4NIlH9mx7qAsYGBzSmOQd1Qk6F1Wl7LmLT4RWt lGKYRAsB83jpL8WepXXwIeAK9bXHcEAE2ViyBWtQ1pyY4cJqxQZW0YTrISfQ7wWanYjy naqw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=X5CuGzuE; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-88022-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id b11-20020a056a000ccb00b006e5c6f03fa7si417159pfv.3.2024.02.29.23.56.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Feb 2024 23:56:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-88022-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=X5CuGzuE; arc=pass (i=1 spf=pass spfdomain=flex--irogers.bounces.google.com dkim=pass dkdomain=google.com dmarc=pass fromdomain=google.com); spf=pass (google.com: domain of linux-kernel+bounces-88022-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-88022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id F170D28BD76 for ; Fri, 1 Mar 2024 07:47:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AE64F69D20; Fri, 1 Mar 2024 07:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="X5CuGzuE" Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B2CC69964 for ; Fri, 1 Mar 2024 07:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709279223; cv=none; b=FpHZ+BAvw1FDJujgzkb6gUACUpSr7g+xVY/mLvzrFHsFEnmEVBO/1/uIxMdr5RtxNwKfY3k6mtncUcf6l4aQVC+nEoL6LpGBnRAuAgzgddaF/Swk5S7uqxcWMPWrUngkr0txRCnyUUVLWYgZvJiZkZ5b4Za/nRyPvG9/l2Khl9k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709279223; c=relaxed/simple; bh=/sx6SEtFquJtDyl4dFJaKZNITaLfCxUGF+8rTsmsL5I=; h=Date:Message-Id:Mime-Version:Subject:From:To:Content-Type; b=ljC8C0hDMH7qS+04AwGWcnHRR8RwfthSriNqZU9dOC1CpLo1pIT8spwU7wM72d0HaI4PEScZtLgwB0SROAEfj87cQevehBYmAGRlfAiUNhKj4bkHxBJgN1SKbOg9ry4bQmjsq7LyuorMKaCVR55KZy3dgk6YSpYul7Wg7ZhXkO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=X5CuGzuE; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcd1779adbeso3403162276.3 for ; Thu, 29 Feb 2024 23:47:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1709279221; x=1709884021; darn=vger.kernel.org; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=2vDtF8jsZ47KJFPdTHlyCCCvC1lX3V2rNBLzzEwdQPY=; b=X5CuGzuEbpnd08seUNciEd2ZFar+I8pfG77yKvaboqu0k1oqz2VsNIAGgeHsJtXoVc Djc/WfsRTbCtqb9JEQO1R7EwaBXSYTMCRaM7GSHBjGoS6tFDvhaK7FvAcnsoQEmS3Iiu L/C5d98BhT42uyeHopNw5oXln845w5RwNqhhPypS2E0rvwymrcYExdx+Q6xH++Y+JBC6 KQ1L7nrIUCMsPzi3nxupvoP9zFNCrlJ4tuXia3/pqna0ndAfYXv9RS7hdxmxTAM2VZoh JjB1eIlDSBVvDN4wWys8X+9kRBGr5KRau0lFnb4NUi2LXPM5lM80KNmqshwhU+2SECWF cVww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709279221; x=1709884021; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=2vDtF8jsZ47KJFPdTHlyCCCvC1lX3V2rNBLzzEwdQPY=; b=VgNFofExQWN9hTeIRQdA+OIgr4pd+fI2sZaKQ9edtA5A1APMX6AS62X8WBKltaOCJ6 vhMFysEV//JwOM+1U1KLi3pU3wNJKRmPXWS93vAOVxOJ/buZKLAT1PLAL+NzLfrJwq74 imTrYtLG+NZoUUxeAmiytZHXQjZmKWBwezcQvRTTHvsyV/CiQrxnYiHTU/2tr7O3IzFJ zyo3umabBaVBI1QFhhjb+cgmF9p/ORlJnZlr7ljqE17DL+CcgC8ZzNJNhxIj8npqQj3c ZkO126eqTK/074cKgP6HVBkD3g2rw03/p1cIXhPUPsjaF0fiP4rtGj748SCLXAHNvGzj Yzwg== X-Forwarded-Encrypted: i=1; AJvYcCXgf5j22lB/PQ6YAj4gNoB4W1BBJYfSk65iLmq4GLhoR3faxsBmQDXNUJdW7C3eLW9aa4+emif/1MWMdEczqEsvaKSdI74uVuByR3Ai X-Gm-Message-State: AOJu0YzMZpL3jvE3swdHhB8OFIuIdbd+5kZ+UgFey8dLCY+P+YwgCduQ pG5pDZEaFN2tx242J0666lgZW5LGrVSOGa0m5psCZjm6W2t74FTc5KIaV+t8IV3gF+eXX4xIVQI C0r518w== X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:af4b:7fc1:b7be:fcb7]) (user=irogers job=sendgmr) by 2002:a5b:f05:0:b0:dca:33b8:38d7 with SMTP id x5-20020a5b0f05000000b00dca33b838d7mr193989ybr.11.1709279221335; Thu, 29 Feb 2024 23:47:01 -0800 (PST) Date: Thu, 29 Feb 2024 23:46:36 -0800 Message-Id: <20240301074639.2260708-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog Subject: [PATCH v1 1/4] perf record: Delete session after stopping sideband thread From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Christian Brauner , James Clark , Kan Liang , Tim Chen , Athira Rajeev , Yicong Yang , Kajol Jain , Disha Goel , K Prateek Nayak , Song Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792309442178589748 X-GMAIL-MSGID: 1792309763240266013 The session has a header in it which contains a perf env with bpf_progs. The bpf_progs are accessed by the sideband thread and so the sideband thread must be stopped before the session is deleted, to avoid a use after free. This error was detected by AddressSanitizer in the following: ``` ==2054673==ERROR: AddressSanitizer: heap-use-after-free on address 0x61d000161e00 at pc 0x55769289de54 bp 0x7f9df36d4ab0 sp 0x7f9df36d4aa8 READ of size 8 at 0x61d000161e00 thread T1 #0 0x55769289de53 in __perf_env__insert_bpf_prog_info util/env.c:42 #1 0x55769289dbb1 in perf_env__insert_bpf_prog_info util/env.c:29 #2 0x557692bbae29 in perf_env__add_bpf_info util/bpf-event.c:483 #3 0x557692bbb01a in bpf_event__sb_cb util/bpf-event.c:512 #4 0x5576928b75f4 in perf_evlist__poll_thread util/sideband_evlist.c:68 #5 0x7f9df96a63eb in start_thread nptl/pthread_create.c:444 #6 0x7f9df9726a4b in clone3 ../sysdeps/unix/sysv/linux/x86_64/clone3.S:81 0x61d000161e00 is located 384 bytes inside of 2136-byte region [0x61d000161c80,0x61d0001624d8) freed by thread T0 here: #0 0x7f9dfa6d7288 in __interceptor_free libsanitizer/asan/asan_malloc_linux.cpp:52 #1 0x557692978d50 in perf_session__delete util/session.c:319 #2 0x557692673959 in __cmd_record tools/perf/builtin-record.c:2884 #3 0x55769267a9f0 in cmd_record tools/perf/builtin-record.c:4259 #4 0x55769286710c in run_builtin tools/perf/perf.c:349 #5 0x557692867678 in handle_internal_command tools/perf/perf.c:402 #6 0x557692867a40 in run_argv tools/perf/perf.c:446 #7 0x557692867fae in main tools/perf/perf.c:562 #8 0x7f9df96456c9 in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58 ``` Fixes: 657ee5531903 ("perf evlist: Introduce side band thread") Signed-off-by: Ian Rogers --- tools/perf/builtin-record.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 92ccca9574ca..32df34dda9cd 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -2881,10 +2881,10 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } #endif zstd_fini(&session->zstd_data); - perf_session__delete(session); - if (!opts->no_bpf_event) evlist__stop_sb_thread(rec->sb_evlist); + + perf_session__delete(session); return status; }