Received: by 2002:a89:48b:0:b0:1f5:f2ab:c469 with SMTP id a11csp1215587lqd; Thu, 25 Apr 2024 08:59:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUDBzXgvjIqL1nFq7N90lwHmQMS5xREnKmRWIa8HDN0GpNZ4WXH2BtAjDPMMiDhp0ShW1H3NuU2zSbamX6toeFKZFg1dr3C8ux/Bc3rRA== X-Google-Smtp-Source: AGHT+IFQZ5m1dlkET+2NFGyZejBhHql6DohSB2dDUq5RsHZsSeH4bE6UbTEyzYyHyFHkj/mJzuhv X-Received: by 2002:a2e:97c3:0:b0:2d8:36f9:67af with SMTP id m3-20020a2e97c3000000b002d836f967afmr5077072ljj.44.1714060744269; Thu, 25 Apr 2024 08:59:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714060744; cv=pass; d=google.com; s=arc-20160816; b=A75NVjQKd+sAu1knKr3hzN8mQjwAOMeO+EcnmAhZCi5xnQErg41VEErifDR7gXIyKD fliGkUo50gaWIwxNXfyTNXxd6upfzbqql9AkTZv3f43464AoSX/DE7UvOOnQrTMCw706 HtmoDVlhbrD6sVbRNdBIv/E8/7/nxrx65v8r4cYmbwnbkwUa5ynwf5uN81Zi0Qk90GyE akoP3lhieeNFLTw49BXDHSx5SXtI4WQkR0H9R/UFMA4kDiIgKeW34CmIq0MifKTzlDkl hVZExG1XHsXmmftZ3MUUov7HZjRLIZkVtyu9eURaWQUpbougYleZWQfhrH+itA2SJwjj Emng== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:date:message-id :dkim-signature; bh=NALKH/pyl42ME/VWnJ2K65OLIz+Fc49Laibb5CVvyBI=; fh=FNuCwIaiE+xZA3u9V/+J8Dz4a2HSlR7UkbJSAnVUqI0=; b=I0HtfhSXLSbyyDEfGC4pg7K9evKCY0nC7ILBVn0xRUyoBHEXz7ESfUYe52m3jRaHlk YScKBqNBOrRDStq1ujjdAuEtzPWS0iQ6MK1mNkUyqTOZWCkNk1KhGvYTjFjxDs3ybGDM 5bmz4pEvN5rliXQ5N2DOlmQC62XEWPbDi6Qh51+qI32udcaHo//vYh2sZZFzBg/huHgb RKoBRgC44qImvq3yW0bP/C1Xm+EBRKGHsldV/bVXmSJLZ/ahhfEudFUnkK7lCliSjqJc asf86aiHBg+8UnsjtQblN6Ent3JdDZuc7jU6hNr36pOEPm/CZ898TpU/h1lGA2ZuWHtJ SKWg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ejlIo4Yj; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-158854-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-158854-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id r21-20020a170906c29500b00a522962e041si9870450ejz.893.2024.04.25.08.59.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Apr 2024 08:59:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-158854-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ejlIo4Yj; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-158854-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-158854-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 am.mirrors.kernel.org (Postfix) with ESMTPS id A60031F221A9 for ; Thu, 25 Apr 2024 15:59:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3359114D280; Thu, 25 Apr 2024 15:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ejlIo4Yj" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 58DAA14C581; Thu, 25 Apr 2024 15:58:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714060727; cv=none; b=E6V3elegFOlK3ZXlOxLDMnwB3WYzbQAC1irxes0CFsWdXZCrOmBOTDLSu0uoKeFBRGUycRbQQaxJa41gyqeWYkgYvdRSDqmabFVSm3nHTHZTlvcZN9nZ/BYBOWwu7zUDtWGgJwQnjxw7NuSCCKRA8Q0PyZdNS6KT/CQf8WwbITc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714060727; c=relaxed/simple; bh=7DIHRS9/+j8YljOfBYLa5xBIkAhd8xyDYQAK6sxFY8s=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Z2hLRZWD5O92lJDoD9gBSOAE7cpg2qRWin7z8dv/HMg9qwnJJ/RX6w3ynH83m8axTw9wX2zP+lc9jhEGMsDdB8oi59jSYHHlAFifNTf9R7THjIRBnxf6ckhsp7G4TRsE7FtpVgn5IFK7feAsFhjogYtPIsa7qt+n4gyYX8x6fR4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ejlIo4Yj; arc=none smtp.client-ip=192.198.163.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1714060726; x=1745596726; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=7DIHRS9/+j8YljOfBYLa5xBIkAhd8xyDYQAK6sxFY8s=; b=ejlIo4Yj7vpP2rmmZt3O+dx5DtVc3NFNCJlnInMv/V6Ajuw8xReHawGV 0k8ViPM5v4hL95H4xNvFsLvI/vCJnGRxhIu1YEZ9gIPIDDDyjNQg2zPTz jt0e0EFMHEuFIh3UzwShzM104WaU3G86SklwcyyG+8/AbztO3ZO2pdDkt bVdCQap794e4M24Sl4Eyq3I8vXkmSKKXPpXTuLZsrEO6Imywjx6k5F42E GXTRLm7mWagnql580kigReH8aFIawU2vNdmOpI0PWOcs/s+Dp4vrkT+MZ 7MwyGw4o14nTovbGsmy1a3eiCbWyAyw1kyWb/FDHrWo+JsW2AdWmMvSi7 A==; X-CSE-ConnectionGUID: AV5niXCGTHmycjKeeJbxIQ== X-CSE-MsgGUID: IeCczpJxT9GGdAoebTfZ6Q== X-IronPort-AV: E=McAfee;i="6600,9927,11055"; a="9606334" X-IronPort-AV: E=Sophos;i="6.07,229,1708416000"; d="scan'208";a="9606334" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2024 08:58:44 -0700 X-CSE-ConnectionGUID: tlc3JDqvR9KvqXD9VoLr6Q== X-CSE-MsgGUID: gxjtV0M8Qcy0FU4AszxLQg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,229,1708416000"; d="scan'208";a="25112711" Received: from pdkerr-mobl2.amr.corp.intel.com (HELO [10.255.228.33]) ([10.255.228.33]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Apr 2024 08:58:43 -0700 Message-ID: <62b58fca-26ff-4c86-96a5-a1ec2b541437@intel.com> Date: Thu, 25 Apr 2024 08:58:41 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 20/71] perf/x86/intel/pt: Switch to new Intel CPU model defines To: Tony Luck , Borislav Petkov , Thomas Gleixner , Dave Hansen , x86@kernel.org Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "H. Peter Anvin" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev References: <20240424181245.41141-1-tony.luck@intel.com> <20240424181500.41538-1-tony.luck@intel.com> Content-Language: en-US From: Dave Hansen Autocrypt: addr=dave.hansen@intel.com; keydata= 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 In-Reply-To: <20240424181500.41538-1-tony.luck@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/24/24 11:15, Tony Luck wrote: > /* model-specific quirks */ > - switch (boot_cpu_data.x86_model) { > - case INTEL_FAM6_BROADWELL: > - case INTEL_FAM6_BROADWELL_D: > - case INTEL_FAM6_BROADWELL_G: > - case INTEL_FAM6_BROADWELL_X: > + switch (boot_cpu_data.x86_vfm) { > + case INTEL_BROADWELL: > + case INTEL_BROADWELL_D: > + case INTEL_BROADWELL_G: > + case INTEL_BROADWELL_X: > /* not setting BRANCH_EN will #GP, erratum BDM106 */ > pt_pmu.branch_en_always_on = true; > break; Hah, and this actually fixes a theoretical bug because there's no check for family 6 in this code.