From patchwork Sat Oct 14 21:58:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 152968 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp2672206vqb; Sat, 14 Oct 2023 14:59:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnAc8s0jyniTksAYUQR7Qy6KOI3d6h0K8groV5PpOamLMIZ4ntcky6JD7L6t34Kz8vi+J5 X-Received: by 2002:a17:902:da87:b0:1c6:2902:24f9 with SMTP id j7-20020a170902da8700b001c6290224f9mr34812330plx.1.1697320749960; Sat, 14 Oct 2023 14:59:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697320749; cv=none; d=google.com; s=arc-20160816; b=VlDXx4leyQ8iXqabQYK/NpmFzJqUsTbwnLZS7H1zCCiac0CZkvwbRA9TATO0F03rrL PBYcYs0sp8HdVyURKFNAlwF7rOdzephGY1kl6OMqnw04VTe3YmN0QZ4/BrERDE+F5LPk hYR6q5Y8DLnDwmrwxVMLEHO10KlaOko5q6SPKFg8JaStJspEbcfBKyjDUJyGsc8JGwAW FLX5HGjCGYUHD6YHIEP9mmmkBsjnwjKW+YioeKAcIFvH7Q+szMOgF2kR3n7E3aChQvzm 60SFxAy6c4+v85RuG5pXZrgbXR601yIPRQBGm0kaPJeNag1CWgkXjTiFJivcnizZa6ap UpRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:sender:dkim-signature; bh=k3rqTgJ5wiRPiIuu/wLqZjqyoaaSm39dvqVRU6EIaGo=; fh=UnF1oWgLuPmpwDVZ593QNVkqSM/EKaHxHBxBxXhVd2g=; b=Ne5fs/dRu0qm7C2l8e3ciRItSBMKFMuh9QYR97AzIS8DwRggkXCFvkfqSykIa1Uh11 lwvnmainSIhOeCa8zYSHOTfLWSpcfnJgubOQTVn7dGdLi+WluX9hZLn6skJtBnEbwu5c OtlPIpTQs2r6+mtrbF/mGeYrRJfXMoxNX8FD9DFhkr61atfN08m1WmkJ/EQ4WbiwPK0o jbDcMLw74tlbqRbKcBe5Mg412tH3357HWqBwR8RVrNFHkLuCDlG4fbLi+qtdnN89GvJD S+nxrNz5CdSO7pUFzxbFvcjXEqfH3CrnlwwGhqdshBwu2kGez1WMJW7iFu+yZdJ1SzNT Kvcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I55+kMc6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id i14-20020a170902c94e00b001c61bd7cee0si8173977pla.211.2023.10.14.14.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 14:59:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=I55+kMc6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 44DF880990E5; Sat, 14 Oct 2023 14:59:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233328AbjJNV6V (ORCPT + 19 others); Sat, 14 Oct 2023 17:58:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231987AbjJNV6U (ORCPT ); Sat, 14 Oct 2023 17:58:20 -0400 Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D1DDC9; Sat, 14 Oct 2023 14:58:19 -0700 (PDT) Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-538e8eca9c1so5568120a12.3; Sat, 14 Oct 2023 14:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697320697; x=1697925497; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:from:to:cc:subject:date:message-id:reply-to; bh=k3rqTgJ5wiRPiIuu/wLqZjqyoaaSm39dvqVRU6EIaGo=; b=I55+kMc6eieL6GYnGBKwYPFll+mRlCRApgP5/jjhBhoOG7Zg9wUfEFCKITLTtdkC0T GyoyE7jJkXxdENSqdphBPwIcuawM8OzlKnQI9C1lTYnbsqwrgqQbJrbkYCDT1rU1lX1/ NTBE54OP0eoI70JiNjYJW+ajLyRKVDgibb+IbyGNZG4tWqgVmbyhMqNWoTzVEVUzgEiF em2E9ymfy8onRQmagCHp+uMLmD2mOfIIkmuSLRH7TUoAcY7dxraNwW/7NEJQJTR+WHv7 2zU1LHvrK4m+5xs6rbbn+pWrWAzN8QuKA0Z1VWHHpAlo66h5YvPOQS64afN54JXvVji0 bKYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697320697; x=1697925497; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :sender:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k3rqTgJ5wiRPiIuu/wLqZjqyoaaSm39dvqVRU6EIaGo=; b=fm2j4AYEvGYDcnoD4ej7QS8k4UiFM5T4qxc8YhEUTxMRuyjTtjCXNhKpBluetdsbOc HXjwnhEMwDEwUAHnfsYxaFpyF/kJD0GkfLfhZ1+l/pooKic6DXfqOv8A6iqVaUmMlGrV F+5bU94iNqu/Z63vsIXaEK1/vnzbLDCoNye0L9d1GEAOpJCCwkwUTnq5GeyhZtXArC6B 0ooY4chpGmkhEFXw5i81X0kW1o+isxXfiE95S64BHIimPfi7KVthQZEp1z4BSAU3y97o iSoiz2IA+JQL+etK3UoObtilYQXCQxIrMgUq+tgVIjuR/rOc1IhvnZSi/PLGEK1HKiZ2 J2VA== X-Gm-Message-State: AOJu0Yw2zoyopLi0NgFCzNeYtvKIBi87Mp/U15zmmIbhUo/ImWdXjkF2 OcVrz8gXPJO3IizXVA5liRE= X-Received: by 2002:a17:906:4fc7:b0:9be:aebc:d480 with SMTP id i7-20020a1709064fc700b009beaebcd480mr2359055ejw.24.1697320697107; Sat, 14 Oct 2023 14:58:17 -0700 (PDT) Received: from gmail.com (1F2EF7B2.nat.pool.telekom.hu. [31.46.247.178]) by smtp.gmail.com with ESMTPSA id e8-20020a17090681c800b009be23a040cfsm1402017ejx.40.2023.10.14.14.58.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Oct 2023 14:58:14 -0700 (PDT) Sender: Ingo Molnar Date: Sat, 14 Oct 2023 23:58:11 +0200 From: Ingo Molnar To: Linus Torvalds Cc: linux-kernel@vger.kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , Alexander Shishkin , Mark Rutland , Namhyung Kim , linux-perf-users@vger.kernel.org, Borislav Petkov , Thomas Gleixner , Andrew Morton Subject: [GIT PULL] perf events fix Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sat, 14 Oct 2023 14:59:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779769802767898572 X-GMAIL-MSGID: 1779769802767898572 Linus, Please pull the latest perf/urgent git tree from: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf-urgent-2023-10-14 # HEAD: e53899771a02f798d436655efbd9d4b46c0f9265 perf/x86/lbr: Filter vsyscall addresses Fix an LBR sampling bug. Thanks, Ingo ------------------> JP Kobryn (1): perf/x86/lbr: Filter vsyscall addresses arch/x86/events/utils.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/x86/events/utils.c b/arch/x86/events/utils.c index 76b1f8bb0fd5..dab4ed199227 100644 --- a/arch/x86/events/utils.c +++ b/arch/x86/events/utils.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include +#include #include "perf_event.h" @@ -132,9 +133,9 @@ static int get_branch_type(unsigned long from, unsigned long to, int abort, * The LBR logs any address in the IP, even if the IP just * faulted. This means userspace can control the from address. * Ensure we don't blindly read any address by validating it is - * a known text address. + * a known text address and not a vsyscall address. */ - if (kernel_text_address(from)) { + if (kernel_text_address(from) && !in_gate_area_no_mm(from)) { addr = (void *)from; /* * Assume we can get the maximum possible size