From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 88061C27C4F for ; Tue, 18 Jun 2024 20:00:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ED86210E78C; Tue, 18 Jun 2024 20:00:04 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="M2Lsz6gm"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A1DB10E1E8 for ; Tue, 18 Jun 2024 20:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1718740803; x=1750276803; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version:content-transfer-encoding; bh=9J30UiSYeVten//br26KW8XQt3IlyeXbzEPdTakjhUk=; b=M2Lsz6gmL61Zl9bwHJbrDKcQa7IyOdkgeXx4qYWCr1dVGyEGM9XI9iYn H63WzvWPpe4jXmBwFilUzWNiyBWswsUWsj65qG9z10CiSXrYH8XeXV8mn 215B/7qAgRqM4UAcf81va+h50ffMrW2A+YXtE44DgxR/zJHBBG7hqL6cU nRsOUu+OJPYC9Q2oAJ2W4P8tUWXVerKGFOMuoYC7ceNRo/8/HsxqfblbI QNGn2RQkDV4XaDRweDrYpOsHjUjuMQnPPzQYbYy1vhoPYGe5L8z1SnhOe 03EMckqDaPCB+mpnEl+Rf7LWoNm2aO/TGZfISuVXJkdszVhBEQPfOfU7w A==; X-CSE-ConnectionGUID: 1DM5rSsjRKmNXe0VdDusrw== X-CSE-MsgGUID: RhCxC7nBQf+Z0DV3v/sj/w== X-IronPort-AV: E=McAfee;i="6700,10204,11107"; a="15767014" X-IronPort-AV: E=Sophos;i="6.08,247,1712646000"; d="scan'208";a="15767014" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2024 13:00:03 -0700 X-CSE-ConnectionGUID: ChBxQzL0Rx2xMhv+XyZe9A== X-CSE-MsgGUID: fXF6Fp6VQP+BKtV9pDwnTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,247,1712646000"; d="scan'208";a="72875155" Received: from vishrutm-mobl11.amr.corp.intel.com (HELO adixit-arch.intel.com) ([10.125.97.201]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jun 2024 13:00:01 -0700 Date: Tue, 18 Jun 2024 12:54:59 -0700 Message-ID: <87bk3yyqjw.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Rodrigo Vivi Cc: "Souza, Jose" , "Wajdeczko, Michal" , "intel-xe@lists.freedesktop.org" , "Nerlige Ramappa, Umesh" , "De Marchi, Lucas" , "thomas.hellstrom@linux.intel.com" Subject: Re: [PATCH v15 00/17] Add OA functionality to Xe In-Reply-To: References: <20240527014333.603914-1-ashutosh.dixit@intel.com> <6bee6a666dd0ab8440ca74d692a80788bfb1d748.camel@intel.com> <85v82ldew2.wl-ashutosh.dixit@intel.com> <8734pp94hx.wl-ashutosh.dixit@intel.com> <85sexfd0cy.wl-ashutosh.dixit@intel.com> <87h6drz3dy.wl-ashutosh.dixit@intel.com> <87543a50eb8056fbc1e9894d2c149bdc818d7124.camel@intel.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?ISO-8859-4?Q?Goj=F2?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" On Mon, 17 Jun 2024 14:31:25 -0700, Rodrigo Vivi wrote: > > On Mon, Jun 17, 2024 at 05:14:28PM -0400, Souza, Jose wrote: > > On Mon, 2024-06-17 at 14:05 -0700, Dixit, Ashutosh wrote: > > > On Mon, 17 Jun 2024 12:36:11 -0700, Rodrigo Vivi wrote: > > > > > > > > > > Hi Rodrigo, > > > > > > Thanks for responding :) > > > > > > > On Fri, Jun 14, 2024 at 08:12:45AM -0700, Dixit, Ashutosh wrote: > > > > > On Thu, 06 Jun 2024 13:54:18 -0700, Dixit, Ashutosh wrote: > > > > > > > > > > > > On Thu, 06 Jun 2024 12:56:13 -0700, Dixit, Ashutosh wrote: > > > > > > > > > > > > > > > > > > > Hi Lucas / Rodrigo / Thomas, > > > > > > > > > > > > > On Wed, 05 Jun 2024 07:12:54 -0700, Souza, Jose wrote: > > > > > > > > > > > > > > > > > > > > > > Hi Jose, > > > > > > > > > > > > > > > On Sun, 2024-05-26 at 18:43 -0700, Ashutosh Dixit wrote: > > > > > > > > > Please see cover letter for v7 here: > > > > > > > > > https://patchwork.freedesktop.org/series/121084/#rev7 > > > > > > > > > > > > > > > > > > For changes in later versions see changelog below. > > > > > > > > > > > > > > > > > > This series is also available at: > > > > > > > > > https://gitlab.freedesktop.org/adixit/kernel/-/tr= ee/xe-oa > > > > > > > > > > > > > > > > > > The series has been tested against this IGT series: > > > > > > > > > https://gitlab.freedesktop.org/adixit/igt-gpu-too= ls/-/tree/xe-oa > > > > > > > > > or, > > > > > > > > > https://patchwork.freedesktop.org/series/130033/ > > > > > > > > > > > > > > > > > > Opensource consumers using uapi in this series: > > > > > > > > > > > > > > > > > > gpuvis: > > > > > > > > > https://github.com/mikesart/gpuvis/pull/86 > > > > > > > > > > > > > > > > > > mesa: > > > > > > > > > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests= /29312 > > > > > > > > > > > > > > > > > > Test-with: 20240524031439.106332-1-ashutosh.dixit@intel.c= om > > > > > > > > > > > > > > > > > > > > > > > > > As first round this uAPI looks good for Mesa usage, second = round after > > > > > > > > this ones is merged will add additional features and uAPIs = need to > > > > > > > > support all Mesa needs. > > > > > > > > > > > > > > Correct. Copy/paste from another email in this thread, this i= s what we are > > > > > > > looking at for the second round: > > > > > > > > > > > > > > * hold preemption (needs some investigation as to feasibility) > > > > > > > * xe_sync for OA stream configuration and reconfiguration > > > > > > > * Equivalent of DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID. I a= m still trying > > > > > > > to figure out if this is really needed. See here: > > > > > > > https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2= 9312#note_2429650 > > > > > > > Since this seems to be using some MDAPI metrics in Mesa, I = think it > > > > > > > should be ok to do this in the second round too. > > > > > > > > > > > > > > > Acked-by: Jos=E9 Roberto de Souza > > > > > > > > > > > > > > Thanks very much for the Mesa ack. I will start asking the Xe= maintainers > > > > > > > if this (and gpuvis PR which is also merged) is sufficient to= merge this > > > > > > > series now. > > > > > > > > > > > > Mesa has now provided their ack for the Xe OA uapi. Also all Me= sa Xe OA > > > > > > patches now have R-b. The gpuvis PR mentioned above is also mer= ged. The Xe > > > > > > OA IGT series is also mentioned above. > > > > > > > > > > > > So at this point I want to check with you if these things are s= ufficient to > > > > > > merge these Xe OA patches? > > > > > > > > > > Gentle ping about this :) Can we try to get this into 6.11? > > > > > > > > Sorry for taking so long to get to this one here. > > > > > > > > Is the Mesa MR really ready to get merged right after we merge this= kernel series? > > > > Are all of the patches there really reviewed? I couldn't make a sen= se of the open > > > > MR discussions and I noticed the MR is still marked as 'Draft:'. > > > > > > +Jose: Hi Jose could you please answer Rodrigo's questions above. > > > > According to Jordan, now that Xe KMD is part of Linux stable we need to= follow the same process as i915 for uAPI additions. > > So we need to wait for uAPI changes to land to drm-next to then be able= to merge on Mesa. > > After that happens I will remove the 'draft mode' and assign to Mesa bo= t to merge it. > > > > But all patches are reviewed. > > Thanks for the confirmation. > > Ashutosh, could you please send a rebased version? > > when applying v17: > $ dim b4-shazam 171817017582.68617.16794933743922778441@a6498e030952 > [snip] > Applying: drm/xe/oa: Add OAR support > Patch failed at 0010 drm/xe/oa: Add OAR support > error: patch failed: drivers/gpu/drm/xe/xe_lrc.c:649 > > Then we wait for CI and push. > > in case someone else push that, feel free to use: > > Acked-by: Rodrigo Vivi Thanks Rodrigo. I went ahead and merged this series. Thanks all, for your inputs and support. Thanks. -- Ashutosh > > > > > > > > > > > > > > > But once we are sure that Mesa is ready and all Michal's concerns o= n the latest > > > > version of the kernel series are solved, then we can definitely mer= ge. > > > > > > I addressed Michal's concerns in v17. Except one, which you responded= to > > > right now and which we are not considering a blocker for merging the > > > series. > > > > > > > > > > > Deadline for 6.11 is Wednesday next week(Jun/26). > > > > > > > > Thanks, > > > > Rodrigo. > > > > > > Let's wait to hear from Jose and then go from there. > > > > > > Thanks. > > > -- > > > Ashutosh > > > > > > > > > > > > > > thank you > > > > > > > > > > > > > > > > > v2: Fix build > > > > > > > > > v3: Rebase, due to s/xe_engine/xe_exec_queue/ > > > > > > > > > v4: Re-run for testing > > > > > > > > > v5: Address review comments, new patches 11 through 17 > > > > > > > > > v6: New patches 18 through 21 > > > > > > > > > v7: Patches are completely redone and don't start with i9= 15 version of the uapi > > > > > > > > > v8: See https://patchwork.freedesktop.org/patch/575214/?s= eries=3D128993&rev=3D1 > > > > > > > > > v9: See https://patchwork.freedesktop.org/patch/577441/?s= eries=3D128993&rev=3D2 > > > > > > > > > v10: See https://patchwork.freedesktop.org/patch/577943/?= series=3D128993&rev=3D3 > > > > > > > > > v11: See https://patchwork.freedesktop.org/patch/581239/?= series=3D130705&rev=3D1 > > > > > > > > > v12: Add last two new patches to enable Xe2+ overrun mode > > > > > > > > > v13: Update last two patches after code review completion > > > > > > > > > v14: https://patchwork.freedesktop.org/patch/595447/?seri= es=3D134028&rev=3D1 > > > > > > > > > v15: https://patchwork.freedesktop.org/patch/595549/?seri= es=3D134056&rev=3D1 > > > > > > > > > > > > > > > > > > Ashutosh Dixit (17): > > > > > > > > > drm/xe/perf/uapi: "Perf" layer to support multiple perf= counter stream > > > > > > > > > types > > > > > > > > > drm/xe/perf/uapi: Add perf_stream_paranoid sysctl > > > > > > > > > drm/xe/oa/uapi: Add OA data formats > > > > > > > > > drm/xe/oa/uapi: Initialize OA units > > > > > > > > > drm/xe/oa/uapi: Add/remove OA config perf ops > > > > > > > > > drm/xe/oa/uapi: Define and parse OA stream properties > > > > > > > > > drm/xe/oa: OA stream initialization (OAG) > > > > > > > > > drm/xe/oa/uapi: Expose OA stream fd > > > > > > > > > drm/xe/oa/uapi: Read file_operation > > > > > > > > > drm/xe/oa: Add OAR support > > > > > > > > > drm/xe/oa: Add OAC support > > > > > > > > > drm/xe/oa/uapi: Query OA unit properties > > > > > > > > > drm/xe/oa/uapi: OA buffer mmap > > > > > > > > > drm/xe/oa: Add MMIO trigger support > > > > > > > > > drm/xe/oa: Override GuC RC with OA on PVC > > > > > > > > > drm/xe/oa: Changes to OA_TAKEN > > > > > > > > > drm/xe/oa: Enable Xe2+ overrun mode > > > > > > > > > > > > > > > > > > drivers/gpu/drm/xe/Makefile | 2 + > > > > > > > > > .../gpu/drm/xe/instructions/xe_mi_commands.h | 3 + > > > > > > > > > drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 + > > > > > > > > > drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 + > > > > > > > > > drivers/gpu/drm/xe/regs/xe_oa_regs.h | 103 + > > > > > > > > > drivers/gpu/drm/xe/xe_device.c | 19 +- > > > > > > > > > drivers/gpu/drm/xe/xe_device_types.h | 4 + > > > > > > > > > drivers/gpu/drm/xe/xe_gt_types.h | 4 + > > > > > > > > > drivers/gpu/drm/xe/xe_guc_pc.c | 57 + > > > > > > > > > drivers/gpu/drm/xe/xe_guc_pc.h | 3 + > > > > > > > > > drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 + > > > > > > > > > drivers/gpu/drm/xe/xe_lrc.c | 11 +- > > > > > > > > > drivers/gpu/drm/xe/xe_lrc.h | 1 + > > > > > > > > > drivers/gpu/drm/xe/xe_module.c | 6 + > > > > > > > > > drivers/gpu/drm/xe/xe_oa.c | 2370 +++= ++++++++++++++ > > > > > > > > > drivers/gpu/drm/xe/xe_oa.h | 27 + > > > > > > > > > drivers/gpu/drm/xe/xe_oa_types.h | 232 ++ > > > > > > > > > drivers/gpu/drm/xe/xe_perf.c | 67 + > > > > > > > > > drivers/gpu/drm/xe/xe_perf.h | 20 + > > > > > > > > > drivers/gpu/drm/xe/xe_query.c | 77 + > > > > > > > > > drivers/gpu/drm/xe/xe_reg_whitelist.c | 24 +- > > > > > > > > > include/uapi/drm/xe_drm.h | 291 ++ > > > > > > > > > 22 files changed, 3321 insertions(+), 7 deletions(-) > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/regs/xe_oa_regs.h > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/xe_oa.c > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/xe_oa.h > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/xe_oa_types.h > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/xe_perf.c > > > > > > > > > create mode 100644 drivers/gpu/drm/xe/xe_perf.h > > > > > > > > > > > > > > > > > > >