From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (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 8EAAC3AE6FC for ; Fri, 8 May 2026 23:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778282038; cv=none; b=YvK1N0TXOPLm3+0QDIakqScYg5s2NXNtzu1okb0A2BeZbFF9UvK8vVsEY7g4hd/54mX8hMMeOw9ThIi/8PfBtLSD2I4YzpU/uwnNjn+bU0/RJ9pWb2zV/yzKtABAi259qQL2Ibep43o9xYBQlyXz6j5Xsh4TuSfzDzrKogWRuZc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778282038; c=relaxed/simple; bh=yx/8znDbwZackXRIS3uVWDYIbK9dKkMXLjcg4TqN5Us=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Tb+5nhNCZ36LfWwn+G7gnQ5s1KNozlmxRO3WX8jgDHnJOhbcLExhq0ihsa2JZ9wAHY3oSN3lPW/RnwyYvkqyCuyImv52MbRf7U6f2IDl+WnW70gHG5CiOQEyQIkkcgJ6pzOBJp9HB/fb1n9I8FT58pOwAXl2qKGuZFZj1vP4PJc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Pzh2WYPB; arc=none smtp.client-ip=209.85.216.74 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--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pzh2WYPB" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-3662668b825so4043819a91.3 for ; Fri, 08 May 2026 16:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1778282037; x=1778886837; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=+D5quk3d/QgNQ3+BOhnf9E+QRhuhNCjSe9w0CI0JGNM=; b=Pzh2WYPBvEmk9SbutkfErFW52bj9Qstoqx8RBAekfuaODEXCYLQlEPxAYM6d0wrSk6 lCmv0fFQ/XLJJX8H3Gf0D42oKh4wht84k7hv0XCsn04G4bK2nPoZJlku/eGnwvpMSZdK nI25FUL3vCONkiFdAe5hfRRqFgYcZ93u3QX41x66q35qV1vkfXkMKMpSAVumn106hMov W/eB5zTredZaduIILTd8t1th/8LqjeCDxAFDidiIpvX43gdZmBImjPseLgEiy2VZyWRF 11dAdR1kMIJLiwK8AeN3hRytX2oW2aJpO+kapJK9YrK5rHUyGAUYzeX0uBdOCw6NRhKn Rhrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778282037; x=1778886837; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+D5quk3d/QgNQ3+BOhnf9E+QRhuhNCjSe9w0CI0JGNM=; b=RpIQLcCRmcVeyx1cy0qWigFItBXTJ8Q4oqZZOpI4kQ8PTJI5t0gyqgWE4ruA4JUJly 56yn0ekFKpBOv1ZwBbF0dOCHZKU3r88CDcALnY5azcMJLcQCg0s3+qTXyWk9/gK0KeqY AVrNJIyFEX3cx5ze/rj0pJpGPyIPd90MBQwzfSlF3aLR1uJMDs/bJxhL6YEVZY5Sbubo Y6+B9IYw7BBvqiUXylauN2/Za4C7QxfE3PBdrzpidzAO5FgeCdrUnSqS0dOn7VfYB552 6kx4Rev+1N3C6JNx90BJ6pHnjxNGjV3rysypy77ig6LcU1GvHPxO5SXtfTJEI6gcTZre DgJw== X-Forwarded-Encrypted: i=1; AFNElJ/SuOP5gXutQdMfMopSeyChAQTrjdQwwQnRgPvwhC5kyD2rMIM3YGTxoWMr7u457RMWGMmOw/ZvaRNGbDY=@vger.kernel.org X-Gm-Message-State: AOJu0Yz2qLi0VPXV3eJBfqm6DQ8ut0xj5+TYgIx0TdczVxGccDToEH+E OEJ5v3gvbiZKk6FRSRD/ZqgU9I/ZG3BJR2S7xxXbb5ZbyCI+dQMLuDRTgJEoOU79cmTbA+XiHDK h7/QXZA== X-Received: from pfbgg21.prod.google.com ([2002:a05:6a00:6315:b0:838:27b2:c6d]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a20:4324:b0:398:4a1f:8a54 with SMTP id adf61e73a8af0-3aa5a8308ccmr16370081637.2.1778282036646; Fri, 08 May 2026 16:13:56 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 8 May 2026 16:13:45 -0700 In-Reply-To: <20260508231353.406465-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260508231353.406465-1-seanjc@google.com> X-Mailer: git-send-email 2.54.0.563.g4f69b47b94-goog Message-ID: <20260508231353.406465-2-seanjc@google.com> Subject: [PATCH v3 1/9] perf/x86/intel: Ensure guest PEBS path doesn't set unwanted PERF_GLOBAL_CTRL bits From: Sean Christopherson To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Sean Christopherson , Paolo Bonzini Cc: Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Jim Mattson , Mingwei Zhang , Stephane Eranian , Dapeng Mi Content-Type: text/plain; charset="UTF-8" When reinstating PEBS counters into PERF_GLOBAL_CTRL for a KVM guest, mask the value with perf's desired/original PERF_GLOBAL_CTRL value to ensure KVM doesn't unintentionally enable counters. This _should_ be a nop, as arr[pebs_enable].guest is derived from cpuc->pebs_enabled, which should be a subset of x86_pmu.intel_ctrl, but paranoia is cheap in this case. Signed-off-by: Sean Christopherson --- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index d9488ade0f8e..b70dc35fcceb 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -5066,7 +5066,7 @@ static struct perf_guest_switch_msr *intel_guest_get_msrs(int *nr, void *data) arr[pebs_enable].guest &= ~kvm_pmu->host_cross_mapped_mask; arr[global_ctrl].guest &= ~kvm_pmu->host_cross_mapped_mask; /* Set hw GLOBAL_CTRL bits for PEBS counter when it runs for guest */ - arr[global_ctrl].guest |= arr[pebs_enable].guest; + arr[global_ctrl].guest |= intel_ctrl & arr[pebs_enable].guest; } return arr; -- 2.54.0.563.g4f69b47b94-goog