From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) (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 647D62D3EE3; Tue, 23 Dec 2025 05:19:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.10 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766467147; cv=none; b=ZHeNNk2Vip16IeLsxH9DUrnLk/Aqzq1e2Yb1z630ZBjQ1Uplb0pPj6GcroEnlhOG3RWnpODnYj3ghaNlZk51yEfCur7XuTW3HhfB8EeGlI7CGBs0iir5scF9PoM7248OR3ECUK3w4TbRTkEzH4I0IOgWR+ZAmSOeoW6/p6DqK2c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766467147; c=relaxed/simple; bh=d4cadxTwko4FQPZr2JkXfI/3BEI7wU3NEIVHT3URXgQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=lovKu4QZ8qUSwEfSmwR6KscCz1bB2UcfQLM/B+TJQJn7glykrzpICHJOU0Tt46/IXe7kvP1vHoRTzCqU3tGm/mYyxhAJgjR9wW8fTIr5nRXrsY2Z3Am4TVjZ1KtoL2F2Te6K5KdAA9GqKwLjE66Ax0U9sKu73K9MoR4ezNQz4kc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=fP3xB4Q5; arc=none smtp.client-ip=198.175.65.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="fP3xB4Q5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1766467146; x=1798003146; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=d4cadxTwko4FQPZr2JkXfI/3BEI7wU3NEIVHT3URXgQ=; b=fP3xB4Q5NWVScHgZH0xZwcEmzF7UFm3wuNT7dK2bgcp6xFxd/6YRqTSn oHgwVO4XQy4g7RSCYBZ5Xp8rM3EkBmqvD7Fz20Xq6YxdXwvP0vZhYYJI1 7k5+67Pf263Uid2QTQCzBX//dPh1tVqxFKw+E1wiznDE6H0xExqLzmBtm OxpT4VLYdbdQtVWMczTzxRIlK2kMx43ldmltN6NEz4rMM0RacRIARNy9y +wFVgg283bb93gi3XMc3Utd8i8aYxAowYO6LzGGcnEGAYvyyLifYasT2e RztG5eh0QnnBEBuHbYOTbHVQDWjGmM5CNX+DyoRmAvuPhK04AsP9RZy9T g==; X-CSE-ConnectionGUID: HRcTBitZQdS3Cs6bE9aoqQ== X-CSE-MsgGUID: QgkggkmsSmC3ottNY35WFA== X-IronPort-AV: E=McAfee;i="6800,10657,11650"; a="85732214" X-IronPort-AV: E=Sophos;i="6.21,170,1763452800"; d="scan'208";a="85732214" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2025 21:19:05 -0800 X-CSE-ConnectionGUID: U4HgO9pSSImA2U6gZQWqvQ== X-CSE-MsgGUID: oXNh9DntSkSwvtHLm5NiSA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,170,1763452800"; d="scan'208";a="204647772" Received: from dapengmi-mobl1.ccr.corp.intel.com (HELO [10.124.240.14]) ([10.124.240.14]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2025 21:19:01 -0800 Message-ID: Date: Tue, 23 Dec 2025 13:18:58 +0800 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 5/7] perf/x86/intel/uncore: Support IIO free-running counters on DMR To: Zide Chen , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Ian Rogers , Adrian Hunter , Alexander Shishkin , Andi Kleen , Eranian Stephane Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Xudong Hao , Falcon Thomas References: <20251212210007.13986-1-zide.chen@intel.com> <20251212210007.13986-6-zide.chen@intel.com> Content-Language: en-US From: "Mi, Dapeng" In-Reply-To: <20251212210007.13986-6-zide.chen@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 12/13/2025 5:00 AM, Zide Chen wrote: > The free-running counters for IIO uncore blocks on Diamond Rapids are > similar to Sapphire Rapids IMC freecounters, with the following > differences: > > - The counters are MMIO based. > - Only a subset of IP blocks implement free-running counters: > HIOP0 (IP Base Addr: 2E7000h) > HIOP1 (IP Base Addr: 2EF000h) > HIOP3 (IP Base Addr: 2FF000h) > HIOP4 (IP Base Addr: 307000h) > - IMH2 (Secondary IMH) does not provide free-running counters. > > Signed-off-by: Zide Chen > --- > arch/x86/events/intel/uncore_snbep.c | 120 +++++++++++++++++++++++++-- > 1 file changed, 115 insertions(+), 5 deletions(-) > > diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c > index 56c6ac86f28e..21cca1b28075 100644 > --- a/arch/x86/events/intel/uncore_snbep.c > +++ b/arch/x86/events/intel/uncore_snbep.c > @@ -472,10 +472,14 @@ > #define SPR_C0_MSR_PMON_BOX_FILTER0 0x200e > > /* DMR */ > +#define DMR_IMH1_HIOP_MMIO_BASE 0x1ffff6ae7000 > +#define DMR_HIOP_MMIO_SIZE 0x8000 > #define DMR_CXLCM_EVENT_MASK_EXT 0xf > #define DMR_HAMVF_EVENT_MASK_EXT 0xffffffff > #define DMR_PCIE4_EVENT_MASK_EXT 0xffffff > > +#define UNCORE_DMR_ITC 0x30 > + > #define DMR_IMC_PMON_FIXED_CTR 0x18 > #define DMR_IMC_PMON_FIXED_CTL 0x10 > > @@ -6442,7 +6446,11 @@ static int uncore_type_max_boxes(struct intel_uncore_type **types, > for (node = rb_first(type->boxes); node; node = rb_next(node)) { > unit = rb_entry(node, struct intel_uncore_discovery_unit, node); > > - if (unit->id > max) > + /* > + * on DMR IMH2, the unit id starts from 0x8000, > + * and we don't need to count it. > + */ > + if ((unit->id > max) && (unit->id < 0x8000)) > max = unit->id; > } > return max + 1; > @@ -6925,6 +6933,103 @@ int dmr_uncore_units_ignore[] = { > UNCORE_IGNORE_END > }; > > +static unsigned int dmr_iio_freerunning_box_offsets[] = { > + 0x0, 0x8000, 0x18000, 0x20000 > +}; > + > +static void dmr_uncore_freerunning_init_box(struct intel_uncore_box *box) > +{ > + struct intel_uncore_type *type = box->pmu->type; > + u64 mmio_base; > + > + if (box->pmu->pmu_idx >= type->num_boxes) { > + pr_warn("perf uncore: Failed to ioremap for %s.\n", type->name); The warning message is not quite matched with the error case, please update it. Other part looks good to me. > + return; > + } > + > + mmio_base = DMR_IMH1_HIOP_MMIO_BASE; > + mmio_base += dmr_iio_freerunning_box_offsets[box->pmu->pmu_idx]; > + > + box->io_addr = ioremap(mmio_base, type->mmio_map_size); > + if (!box->io_addr) > + pr_warn("perf uncore: Failed to ioremap for %s.\n", type->name); > +} > + > +static struct intel_uncore_ops dmr_uncore_freerunning_ops = { > + .init_box = dmr_uncore_freerunning_init_box, > + .exit_box = uncore_mmio_exit_box, > + .read_counter = uncore_mmio_read_counter, > + .hw_config = uncore_freerunning_hw_config, > +}; > + > +enum perf_uncore_dmr_iio_freerunning_type_id { > + DMR_ITC_INB_DATA_BW, > + DMR_ITC_BW_IN, > + DMR_OTC_BW_OUT, > + DMR_OTC_CLOCK_TICKS, > + > + DMR_IIO_FREERUNNING_TYPE_MAX, > +}; > + > +static struct freerunning_counters dmr_iio_freerunning[] = { > + [DMR_ITC_INB_DATA_BW] = { 0x4d40, 0x8, 0, 8, 48}, > + [DMR_ITC_BW_IN] = { 0x6b00, 0x8, 0, 8, 48}, > + [DMR_OTC_BW_OUT] = { 0x6b60, 0x8, 0, 8, 48}, > + [DMR_OTC_CLOCK_TICKS] = { 0x6bb0, 0x8, 0, 1, 48}, > +}; > + > +static struct uncore_event_desc dmr_uncore_iio_freerunning_events[] = { > + /* ITC Free Running Data BW counter for inbound traffic */ > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port0, 0x10, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port1, 0x11, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port2, 0x12, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port3, 0x13, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port4, 0x14, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port5, 0x15, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port6, 0x16, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(inb_data_port7, 0x17, "3.814697266e-6"), > + > + /* ITC Free Running BW IN counters */ > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port0, 0x20, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port1, 0x21, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port2, 0x22, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port3, 0x23, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port4, 0x24, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port5, 0x25, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port6, 0x26, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_in_port7, 0x27, "3.814697266e-6"), > + > + /* ITC Free Running BW OUT counters */ > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port0, 0x30, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port1, 0x31, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port2, 0x32, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port3, 0x33, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port4, 0x34, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port5, 0x35, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port6, 0x36, "3.814697266e-6"), > + INTEL_UNCORE_FR_EVENT_DESC(bw_out_port7, 0x37, "3.814697266e-6"), > + > + /* Free Running Clock Counter */ > + INTEL_UNCORE_EVENT_DESC(clockticks, "event=0xff,umask=0x40"), > + { /* end: all zeroes */ }, > +}; > + > +static struct intel_uncore_type dmr_uncore_iio_free_running = { > + .name = "iio_free_running", > + .num_counters = 25, > + .mmio_map_size = DMR_HIOP_MMIO_SIZE, > + .num_freerunning_types = DMR_IIO_FREERUNNING_TYPE_MAX, > + .freerunning = dmr_iio_freerunning, > + .ops = &dmr_uncore_freerunning_ops, > + .event_descs = dmr_uncore_iio_freerunning_events, > + .format_group = &skx_uncore_iio_freerunning_format_group, > +}; > + > +#define UNCORE_DMR_MMIO_EXTRA_UNCORES 1 > +static struct intel_uncore_type *dmr_mmio_uncores[UNCORE_DMR_MMIO_EXTRA_UNCORES] = { > + &dmr_uncore_iio_free_running, > +}; > + > int dmr_uncore_pci_init(void) > { > uncore_pci_uncores = uncore_get_uncores(UNCORE_ACCESS_PCI, 0, NULL, > @@ -6932,11 +7037,16 @@ int dmr_uncore_pci_init(void) > dmr_uncores); > return 0; > } > + > void dmr_uncore_mmio_init(void) > { > - uncore_mmio_uncores = uncore_get_uncores(UNCORE_ACCESS_MMIO, 0, NULL, > - UNCORE_DMR_NUM_UNCORE_TYPES, > - dmr_uncores); > -} > + uncore_mmio_uncores = uncore_get_uncores(UNCORE_ACCESS_MMIO, > + UNCORE_DMR_MMIO_EXTRA_UNCORES, > + dmr_mmio_uncores, > + UNCORE_DMR_NUM_UNCORE_TYPES, > + dmr_uncores); > > + dmr_uncore_iio_free_running.num_boxes = > + uncore_type_max_boxes(uncore_mmio_uncores, UNCORE_DMR_ITC); > +} > /* end of DMR uncore support */