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 D7D13FF8868 for ; Mon, 27 Apr 2026 20:30:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9870E10E913; Mon, 27 Apr 2026 20:30:50 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="WkIOhA4t"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id D8D8810E913 for ; Mon, 27 Apr 2026 20:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1777321850; x=1808857850; h=date:message-id:from:to:cc:subject:in-reply-to: references:mime-version:content-transfer-encoding; bh=/jnMsP3/7O7ppesv7qgfe8KGmAZfCceWxaq+zuNy+zs=; b=WkIOhA4tPr82FNTBd2H8I7xAoWo3YAgj/1Ofj4CqpChal99M00BHTkAe 14zSM5+wIHr7Bxb8fr++2lEprWorALbwlcog56qHDXv+v1AyLRj9H6Oic T71Vc5YWrOnkTae/dOYb79voUqPbWXAR4k+to3qpfc1IhtHkMjYtnen4a gMFuhbidW2sUhTrNlUy16/qDj0PwJWlIXrUTqHGL1VwA7sYO430oMY5ha Cv8UUxWspYAEzlyXrINSn3lHL3JmMupy7DjGF9+CVtdmoiia4L6beCoyv OYOPV8Vqd0NhyzeRGgk3oXzWLYi2CLNQa9rIcl74rDATjIeg6/5k0Enh3 Q==; X-CSE-ConnectionGUID: n+zmiFU8SDuQGClfxhW2Yw== X-CSE-MsgGUID: Kp3T0HzaRniZcZpgwrtT1Q== X-IronPort-AV: E=McAfee;i="6800,10657,11769"; a="77385530" X-IronPort-AV: E=Sophos;i="6.23,202,1770624000"; d="scan'208";a="77385530" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2026 13:30:39 -0700 X-CSE-ConnectionGUID: uu3RXfmTRnClBattjn+vPw== X-CSE-MsgGUID: JCzl3CrHRkivz3zv5Ti6qw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,202,1770624000"; d="scan'208";a="233607766" Received: from unknown (HELO adixit-MOBL3.intel.com) ([10.125.136.209]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2026 13:30:38 -0700 Date: Mon, 27 Apr 2026 13:30:38 -0700 Message-ID: <87lde8jgcx.wl-ashutosh.dixit@intel.com> From: "Dixit, Ashutosh" To: Umesh Nerlige Ramappa Cc: Subject: Re: [PATCH 1/3] drm/xe/oa: Use xe_map layer In-Reply-To: References: <20260427190223.2487665-1-ashutosh.dixit@intel.com> <20260427190223.2487665-2-ashutosh.dixit@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/30.2 (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=UTF-8 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, 27 Apr 2026 12:34:24 -0700, Umesh Nerlige Ramappa wrote: > > On Mon, Apr 27, 2026 at 12:02:21PM -0700, Ashutosh Dixit wrote: > > OA code should have used xe_map layer to begin with. In CRI, the OA buf= fer > > can be located both in system and device memory. For these reasons, mov= e OA > > code to use the xe_map layer when accessing the OA buffer. > > > > v2: Use xe_map layer and put_user in xe_oa_copy_to_user (Umesh) > > v3: To avoid performance impact in v2, revert to v1 but move > > xe_map_copy_to_user() to xe_map.h > > v4: Use bounce buffer and copy_to_user in xe_oa_copy_to_user > > v5: Fix offsets in oa_timestamp() and oa_timestamp_clear() (Umesh) > > v6: Rename head/tail in helper args to report_offset (Umesh) > > Thanks for renaming. My comments are in the v5 version of the series. > > With an assert/check in the xe_oa_copy_to_user(), this should be Add in v7. The only remaining comment is the one about the test, will make a note of it. > > Reviewed-by: Umesh Nerlige Ramappa Thanks. -- Ashutosh > > > > > Signed-off-by: Ashutosh Dixit > > --- > > drivers/gpu/drm/xe/xe_oa.c | 95 +++++++++++++++++++------------- > > drivers/gpu/drm/xe/xe_oa_types.h | 4 +- > > 2 files changed, 58 insertions(+), 41 deletions(-) > > > > diff --git a/drivers/gpu/drm/xe/xe_oa.c b/drivers/gpu/drm/xe/xe_oa.c > > index 6337e671c97ae..1fff0e8e9e78e 100644 > > --- a/drivers/gpu/drm/xe/xe_oa.c > > +++ b/drivers/gpu/drm/xe/xe_oa.c > > @@ -213,32 +213,40 @@ static u32 xe_oa_hw_tail_read(struct xe_oa_stream= *stream) > > #define oa_report_header_64bit(__s) \ > > ((__s)->oa_buffer.format->header =3D=3D HDR_64_BIT) > > > > -static u64 oa_report_id(struct xe_oa_stream *stream, void *report) > > +static u64 oa_report_id(struct xe_oa_stream *stream, u32 report_offset) > > { > > - return oa_report_header_64bit(stream) ? *(u64 *)report : *(u32 *)repo= rt; > > + struct iosys_map *map =3D &stream->oa_buffer.bo->vmap; > > + > > + return oa_report_header_64bit(stream) ? > > + xe_map_rd(stream->oa->xe, map, report_offset, u64) : > > + xe_map_rd(stream->oa->xe, map, report_offset, u32); > > } > > > > -static void oa_report_id_clear(struct xe_oa_stream *stream, u32 *repor= t) > > +static void oa_report_id_clear(struct xe_oa_stream *stream, u32 report= _offset) > > { > > - if (oa_report_header_64bit(stream)) > > - *(u64 *)report =3D 0; > > - else > > - *report =3D 0; > > + struct iosys_map *map =3D &stream->oa_buffer.bo->vmap; > > + > > + oa_report_header_64bit(stream) ? > > + xe_map_wr(stream->oa->xe, map, report_offset, u64, 0) : > > + xe_map_wr(stream->oa->xe, map, report_offset, u32, 0); > > } > > > > -static u64 oa_timestamp(struct xe_oa_stream *stream, void *report) > > +static u64 oa_timestamp(struct xe_oa_stream *stream, u32 report_offset) > > { > > + struct iosys_map *map =3D &stream->oa_buffer.bo->vmap; > > + > > return oa_report_header_64bit(stream) ? > > - *((u64 *)report + 1) : > > - *((u32 *)report + 1); > > + xe_map_rd(stream->oa->xe, map, report_offset + 8, u64) : > > + xe_map_rd(stream->oa->xe, map, report_offset + 4, u32); > > } > > > > -static void oa_timestamp_clear(struct xe_oa_stream *stream, u32 *repor= t) > > +static void oa_timestamp_clear(struct xe_oa_stream *stream, u32 report= _offset) > > { > > - if (oa_report_header_64bit(stream)) > > - *(u64 *)&report[2] =3D 0; > > - else > > - report[1] =3D 0; > > + struct iosys_map *map =3D &stream->oa_buffer.bo->vmap; > > + > > + oa_report_header_64bit(stream) ? > > + xe_map_wr(stream->oa->xe, map, report_offset + 8, u64, 0) : > > + xe_map_wr(stream->oa->xe, map, report_offset + 4, u32, 0); > > } > > > > static bool xe_oa_buffer_check_unlocked(struct xe_oa_stream *stream) > > @@ -275,9 +283,7 @@ static bool xe_oa_buffer_check_unlocked(struct xe_o= a_stream *stream) > > * they were written. If not : (=E2=95=AF=C2=B0=E2=96=A1=C2=B0=EF=BC= =89=E2=95=AF=EF=B8=B5 =E2=94=BB=E2=94=81=E2=94=BB > > */ > > while (xe_oa_circ_diff(stream, tail, stream->oa_buffer.tail) >=3D repor= t_size) { > > - void *report =3D stream->oa_buffer.vaddr + tail; > > - > > - if (oa_report_id(stream, report) || oa_timestamp(stream, report)) > > + if (oa_report_id(stream, tail) || oa_timestamp(stream, tail)) > > break; > > > > tail =3D xe_oa_circ_diff(stream, tail, report_size); > > @@ -311,30 +317,35 @@ static enum hrtimer_restart xe_oa_poll_check_time= r_cb(struct hrtimer *hrtimer) > > return HRTIMER_RESTART; > > } > > > > +static unsigned long > > +xe_oa_copy_to_user(struct xe_oa_stream *stream, void __user *dst, u32 = report_offset, u32 len) > > +{ > > + xe_map_memcpy_from(stream->oa->xe, stream->oa_buffer.bounce, > > + &stream->oa_buffer.bo->vmap, report_offset, len); > > + return copy_to_user(dst, stream->oa_buffer.bounce, len); > > +} > > + > > static int xe_oa_append_report(struct xe_oa_stream *stream, char __user= *buf, > > - size_t count, size_t *offset, const u8 *report) > > + size_t count, size_t *offset, u32 report_offset) > > { > > int report_size =3D stream->oa_buffer.format->size; > > int report_size_partial; > > - u8 *oa_buf_end; > > > > if ((count - *offset) < report_size) > > return -ENOSPC; > > > > buf +=3D *offset; > > > > - oa_buf_end =3D stream->oa_buffer.vaddr + stream->oa_buffer.circ_size; > > - report_size_partial =3D oa_buf_end - report; > > + report_size_partial =3D stream->oa_buffer.circ_size - report_offset; > > > > if (report_size_partial < report_size) { > > - if (copy_to_user(buf, report, report_size_partial)) > > + if (xe_oa_copy_to_user(stream, buf, report_offset, report_size_parti= al)) > > return -EFAULT; > > buf +=3D report_size_partial; > > > > - if (copy_to_user(buf, stream->oa_buffer.vaddr, > > - report_size - report_size_partial)) > > + if (xe_oa_copy_to_user(stream, buf, 0, report_size - report_size_par= tial)) > > return -EFAULT; > > - } else if (copy_to_user(buf, report, report_size)) { > > + } else if (xe_oa_copy_to_user(stream, buf, report_offset, report_size= )) { > > return -EFAULT; > > } > > > > @@ -347,7 +358,6 @@ static int xe_oa_append_reports(struct xe_oa_stream= *stream, char __user *buf, > > size_t count, size_t *offset) > > { > > int report_size =3D stream->oa_buffer.format->size; > > - u8 *oa_buf_base =3D stream->oa_buffer.vaddr; > > u32 gtt_offset =3D xe_bo_ggtt_addr(stream->oa_buffer.bo); > > size_t start_offset =3D *offset; > > unsigned long flags; > > @@ -364,26 +374,24 @@ static int xe_oa_append_reports(struct xe_oa_stre= am *stream, char __user *buf, > > > > for (; xe_oa_circ_diff(stream, tail, head); > > head =3D xe_oa_circ_incr(stream, head, report_size)) { > > - u8 *report =3D oa_buf_base + head; > > - > > - ret =3D xe_oa_append_report(stream, buf, count, offset, report); > > + ret =3D xe_oa_append_report(stream, buf, count, offset, head); > > if (ret) > > break; > > > > if (!(stream->oa_buffer.circ_size % report_size)) { > > /* Clear out report id and timestamp to detect unlanded reports */ > > - oa_report_id_clear(stream, (void *)report); > > - oa_timestamp_clear(stream, (void *)report); > > + oa_report_id_clear(stream, head); > > + oa_timestamp_clear(stream, head); > > } else { > > - u8 *oa_buf_end =3D stream->oa_buffer.vaddr + stream->oa_buffer.circ= _size; > > - u32 part =3D oa_buf_end - report; > > + struct iosys_map *map =3D &stream->oa_buffer.bo->vmap; > > + u32 part =3D stream->oa_buffer.circ_size - head; > > > > /* Zero out the entire report */ > > if (report_size <=3D part) { > > - memset(report, 0, report_size); > > + xe_map_memset(stream->oa->xe, map, head, 0, report_size); > > } else { > > - memset(report, 0, part); > > - memset(oa_buf_base, 0, report_size - part); > > + xe_map_memset(stream->oa->xe, map, head, 0, part); > > + xe_map_memset(stream->oa->xe, map, 0, 0, report_size - part); > > } > > } > > } > > @@ -436,7 +444,8 @@ static void xe_oa_init_oa_buffer(struct xe_oa_strea= m *stream) > > spin_unlock_irqrestore(&stream->oa_buffer.ptr_lock, flags); > > > > /* Zero out the OA buffer since we rely on zero report id and timestamp= fields */ > > - memset(stream->oa_buffer.vaddr, 0, xe_bo_size(stream->oa_buffer.bo)); > > + xe_map_memset(stream->oa->xe, &stream->oa_buffer.bo->vmap, 0, 0, > > + xe_bo_size(stream->oa_buffer.bo)); > > } > > > > static u32 __format_to_oactrl(const struct xe_oa_format *format, int co= unter_sel_mask) > > @@ -699,6 +708,7 @@ static int num_lri_dwords(int num_regs) > > static void xe_oa_free_oa_buffer(struct xe_oa_stream *stream) > > { > > xe_bo_unpin_map_no_vm(stream->oa_buffer.bo); > > + kfree(stream->oa_buffer.bounce); > > } > > > > static void xe_oa_free_configs(struct xe_oa_stream *stream) > > @@ -889,9 +899,16 @@ static int xe_oa_alloc_oa_buffer(struct xe_oa_stre= am *stream, size_t size) > > return PTR_ERR(bo); > > > > stream->oa_buffer.bo =3D bo; > > + > > /* mmap implementation requires OA buffer to be in system memory */ > > xe_assert(stream->oa->xe, bo->vmap.is_iomem =3D=3D 0); > > - stream->oa_buffer.vaddr =3D bo->vmap.vaddr; > > + > > + stream->oa_buffer.bounce =3D kmalloc(stream->oa_buffer.format->size, = GFP_KERNEL); > > + if (!stream->oa_buffer.bounce) { > > + xe_bo_unpin_map_no_vm(stream->oa_buffer.bo); > > + return -ENOMEM; > > + } > > + > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/xe/xe_oa_types.h b/drivers/gpu/drm/xe/xe_o= a_types.h > > index 8906c3084b5f8..3d9ec8490899c 100644 > > --- a/drivers/gpu/drm/xe/xe_oa_types.h > > +++ b/drivers/gpu/drm/xe/xe_oa_types.h > > @@ -164,8 +164,8 @@ struct xe_oa_buffer { > > /** @bo: xe_bo backing the OA buffer */ > > struct xe_bo *bo; > > > > - /** @vaddr: mapped vaddr of the OA buffer */ > > - u8 *vaddr; > > + /** @bounce: bounce buffer used with xe_map layer */ > > + void *bounce; > > > > /** @ptr_lock: Lock protecting reads/writes to head/tail pointers */ > > spinlock_t ptr_lock; > > -- > > 2.54.0 > >