From: Thomas Zimmermann <tzimmermann@suse.de> To: Lucas De Marchi <lucas.demarchi@intel.com>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Matthew Brost" <matthew.brost@intel.com>, "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Daniele Ceraolo Spurio" <daniele.ceraolospurio@intel.com>, "Christian König" <christian.koenig@amd.com>, "John Harrison" <John.C.Harrison@Intel.com> Subject: Re: [PATCH 09/19] drm/i915/guc: Convert engine record to iosys_map Date: Fri, 4 Feb 2022 20:23:00 +0100 [thread overview] Message-ID: <1f665285-fcaf-1990-2204-16a46c699f43@suse.de> (raw) In-Reply-To: <20220204174436.830121-10-lucas.demarchi@intel.com> [-- Attachment #1.1: Type: text/plain, Size: 5341 bytes --] Hi Am 04.02.22 um 18:44 schrieb Lucas De Marchi: > Use iosys_map to read fields from the dma_blob so access to IO and > system memory is abstracted away. > > Cc: Matt Roper <matthew.d.roper@intel.com> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: John Harrison <John.C.Harrison@Intel.com> > Cc: Matthew Brost <matthew.brost@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 14 ++++++-------- > drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 3 ++- > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 17 ++++++++++------- > 3 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > index 6311b9da87e4..1d21a2d457e0 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > @@ -698,18 +698,16 @@ void intel_guc_ads_reset(struct intel_guc *guc) > > u32 intel_guc_engine_usage_offset(struct intel_guc *guc) > { > - struct __guc_ads_blob *blob = guc->ads_blob; > - u32 base = intel_guc_ggtt_offset(guc, guc->ads_vma); > - u32 offset = base + ptr_offset(blob, engine_usage); > - > - return offset; > + return intel_guc_ggtt_offset(guc, guc->ads_vma) + > + offsetof(struct __guc_ads_blob, engine_usage); > } > > -struct guc_engine_usage_record *intel_guc_engine_usage(struct intel_engine_cs *engine) > +struct iosys_map intel_guc_engine_usage_record_map(struct intel_engine_cs *engine) > { > struct intel_guc *guc = &engine->gt->uc.guc; > - struct __guc_ads_blob *blob = guc->ads_blob; > u8 guc_class = engine_class_to_guc_class(engine->class); > + size_t offset = offsetof(struct __guc_ads_blob, > + engine_usage.engines[guc_class][ilog2(engine->logical_mask)]); > > - return &blob->engine_usage.engines[guc_class][ilog2(engine->logical_mask)]; > + return IOSYS_MAP_INIT_OFFSET(&guc->ads_map, offset); Here's one of the few cases where you can legitimately make a copy of an iosys_map buffer and call iosys_map_incr() on it. Saves you the IOSYS_MAP_INIT_OFFSET(). Best regards Thomas > } > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > index e74c110facff..1c64f4d6ea21 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > @@ -7,6 +7,7 @@ > #define _INTEL_GUC_ADS_H_ > > #include <linux/types.h> > +#include <linux/iosys-map.h> > > struct intel_guc; > struct drm_printer; > @@ -18,7 +19,7 @@ void intel_guc_ads_init_late(struct intel_guc *guc); > void intel_guc_ads_reset(struct intel_guc *guc); > void intel_guc_ads_print_policy_info(struct intel_guc *guc, > struct drm_printer *p); > -struct guc_engine_usage_record *intel_guc_engine_usage(struct intel_engine_cs *engine); > +struct iosys_map intel_guc_engine_usage_record_map(struct intel_engine_cs *engine); > u32 intel_guc_engine_usage_offset(struct intel_guc *guc); > > #endif > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index b3a429a92c0d..6d34842f68b4 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -1139,6 +1139,9 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) > *prev_start = ((u64)gt_stamp_hi << 32) | new_start; > } > > +#define record_read(map_, field_) \ > + iosys_map_rd_field(map_, struct guc_engine_usage_record, field_) > + > /* > * GuC updates shared memory and KMD reads it. Since this is not synchronized, > * we run into a race where the value read is inconsistent. Sometimes the > @@ -1153,17 +1156,17 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) > static void __get_engine_usage_record(struct intel_engine_cs *engine, > u32 *last_in, u32 *id, u32 *total) > { > - struct guc_engine_usage_record *rec = intel_guc_engine_usage(engine); > + struct iosys_map rec_map = intel_guc_engine_usage_record_map(engine); > int i = 0; > > do { > - *last_in = READ_ONCE(rec->last_switch_in_stamp); > - *id = READ_ONCE(rec->current_context_index); > - *total = READ_ONCE(rec->total_runtime); > + *last_in = record_read(&rec_map, last_switch_in_stamp); > + *id = record_read(&rec_map, current_context_index); > + *total = record_read(&rec_map, total_runtime); > > - if (READ_ONCE(rec->last_switch_in_stamp) == *last_in && > - READ_ONCE(rec->current_context_index) == *id && > - READ_ONCE(rec->total_runtime) == *total) > + if (record_read(&rec_map, last_switch_in_stamp) == *last_in && > + record_read(&rec_map, current_context_index) == *id && > + record_read(&rec_map, total_runtime) == *total) > break; > } while (++i < 6); > } -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 840 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Thomas Zimmermann <tzimmermann@suse.de> To: Lucas De Marchi <lucas.demarchi@intel.com>, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Christian König" <christian.koenig@amd.com> Subject: Re: [Intel-gfx] [PATCH 09/19] drm/i915/guc: Convert engine record to iosys_map Date: Fri, 4 Feb 2022 20:23:00 +0100 [thread overview] Message-ID: <1f665285-fcaf-1990-2204-16a46c699f43@suse.de> (raw) In-Reply-To: <20220204174436.830121-10-lucas.demarchi@intel.com> [-- Attachment #1.1: Type: text/plain, Size: 5341 bytes --] Hi Am 04.02.22 um 18:44 schrieb Lucas De Marchi: > Use iosys_map to read fields from the dma_blob so access to IO and > system memory is abstracted away. > > Cc: Matt Roper <matthew.d.roper@intel.com> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: John Harrison <John.C.Harrison@Intel.com> > Cc: Matthew Brost <matthew.brost@intel.com> > Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> > --- > drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 14 ++++++-------- > drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h | 3 ++- > .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 17 ++++++++++------- > 3 files changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > index 6311b9da87e4..1d21a2d457e0 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c > @@ -698,18 +698,16 @@ void intel_guc_ads_reset(struct intel_guc *guc) > > u32 intel_guc_engine_usage_offset(struct intel_guc *guc) > { > - struct __guc_ads_blob *blob = guc->ads_blob; > - u32 base = intel_guc_ggtt_offset(guc, guc->ads_vma); > - u32 offset = base + ptr_offset(blob, engine_usage); > - > - return offset; > + return intel_guc_ggtt_offset(guc, guc->ads_vma) + > + offsetof(struct __guc_ads_blob, engine_usage); > } > > -struct guc_engine_usage_record *intel_guc_engine_usage(struct intel_engine_cs *engine) > +struct iosys_map intel_guc_engine_usage_record_map(struct intel_engine_cs *engine) > { > struct intel_guc *guc = &engine->gt->uc.guc; > - struct __guc_ads_blob *blob = guc->ads_blob; > u8 guc_class = engine_class_to_guc_class(engine->class); > + size_t offset = offsetof(struct __guc_ads_blob, > + engine_usage.engines[guc_class][ilog2(engine->logical_mask)]); > > - return &blob->engine_usage.engines[guc_class][ilog2(engine->logical_mask)]; > + return IOSYS_MAP_INIT_OFFSET(&guc->ads_map, offset); Here's one of the few cases where you can legitimately make a copy of an iosys_map buffer and call iosys_map_incr() on it. Saves you the IOSYS_MAP_INIT_OFFSET(). Best regards Thomas > } > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > index e74c110facff..1c64f4d6ea21 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.h > @@ -7,6 +7,7 @@ > #define _INTEL_GUC_ADS_H_ > > #include <linux/types.h> > +#include <linux/iosys-map.h> > > struct intel_guc; > struct drm_printer; > @@ -18,7 +19,7 @@ void intel_guc_ads_init_late(struct intel_guc *guc); > void intel_guc_ads_reset(struct intel_guc *guc); > void intel_guc_ads_print_policy_info(struct intel_guc *guc, > struct drm_printer *p); > -struct guc_engine_usage_record *intel_guc_engine_usage(struct intel_engine_cs *engine); > +struct iosys_map intel_guc_engine_usage_record_map(struct intel_engine_cs *engine); > u32 intel_guc_engine_usage_offset(struct intel_guc *guc); > > #endif > diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > index b3a429a92c0d..6d34842f68b4 100644 > --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c > @@ -1139,6 +1139,9 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) > *prev_start = ((u64)gt_stamp_hi << 32) | new_start; > } > > +#define record_read(map_, field_) \ > + iosys_map_rd_field(map_, struct guc_engine_usage_record, field_) > + > /* > * GuC updates shared memory and KMD reads it. Since this is not synchronized, > * we run into a race where the value read is inconsistent. Sometimes the > @@ -1153,17 +1156,17 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) > static void __get_engine_usage_record(struct intel_engine_cs *engine, > u32 *last_in, u32 *id, u32 *total) > { > - struct guc_engine_usage_record *rec = intel_guc_engine_usage(engine); > + struct iosys_map rec_map = intel_guc_engine_usage_record_map(engine); > int i = 0; > > do { > - *last_in = READ_ONCE(rec->last_switch_in_stamp); > - *id = READ_ONCE(rec->current_context_index); > - *total = READ_ONCE(rec->total_runtime); > + *last_in = record_read(&rec_map, last_switch_in_stamp); > + *id = record_read(&rec_map, current_context_index); > + *total = record_read(&rec_map, total_runtime); > > - if (READ_ONCE(rec->last_switch_in_stamp) == *last_in && > - READ_ONCE(rec->current_context_index) == *id && > - READ_ONCE(rec->total_runtime) == *total) > + if (record_read(&rec_map, last_switch_in_stamp) == *last_in && > + record_read(&rec_map, current_context_index) == *id && > + record_read(&rec_map, total_runtime) == *total) > break; > } while (++i < 6); > } -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 840 bytes --]
next prev parent reply other threads:[~2022-02-04 19:23 UTC|newest] Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-04 17:44 [PATCH 00/19] drm/i915/guc: Refactor ADS access to use iosys_map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 01/19] dma-buf-map: Rename to iosys-map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 02/19] iosys-map: Add offset to iosys_map_memcpy_to() Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` Lucas De Marchi 2022-02-04 18:35 ` Christian König 2022-02-04 18:35 ` [Intel-gfx] " Christian König 2022-02-04 18:35 ` Christian König 2022-02-04 18:48 ` Thomas Zimmermann 2022-02-04 18:48 ` [Intel-gfx] " Thomas Zimmermann 2022-02-04 19:28 ` Lucas De Marchi 2022-02-04 19:28 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 19:28 ` Lucas De Marchi 2022-02-04 17:44 ` [PATCH 03/19] iosys-map: Add a few more helpers Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` Lucas De Marchi 2022-02-04 19:05 ` Thomas Zimmermann 2022-02-04 19:05 ` [Intel-gfx] " Thomas Zimmermann 2022-02-04 19:05 ` Thomas Zimmermann 2022-02-04 19:44 ` Lucas De Marchi 2022-02-04 19:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 19:44 ` Lucas De Marchi 2022-02-07 8:36 ` Thomas Zimmermann 2022-02-07 8:36 ` [Intel-gfx] " Thomas Zimmermann 2022-02-04 17:44 ` [PATCH 04/19] drm/i915/gt: Add helper for shmem copy to iosys_map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 19:15 ` Thomas Zimmermann 2022-02-04 19:15 ` [Intel-gfx] " Thomas Zimmermann 2022-02-07 20:35 ` Lucas De Marchi 2022-02-07 20:35 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 05/19] drm/i915/guc: Keep iosys_map of ads_blob around Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 06/19] drm/i915/guc: Add read/write helpers for ADS blob Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 07/19] drm/i915/guc: Convert golden context init to iosys_map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 19:19 ` Thomas Zimmermann 2022-02-04 19:19 ` [Intel-gfx] " Thomas Zimmermann 2022-02-04 17:44 ` [PATCH 08/19] drm/i915/guc: Convert policies update " Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] [PATCH 09/19] drm/i915/guc: Convert engine record " Lucas De Marchi 2022-02-04 17:44 ` Lucas De Marchi 2022-02-04 19:23 ` Thomas Zimmermann [this message] 2022-02-04 19:23 ` [Intel-gfx] " Thomas Zimmermann 2022-02-04 17:44 ` [Intel-gfx] [PATCH 10/19] drm/i915/guc: Convert guc_ads_private_data_reset " Lucas De Marchi 2022-02-04 17:44 ` Lucas De Marchi 2022-02-04 17:44 ` [PATCH 11/19] drm/i915/guc: Convert golden context prep " Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 12/19] drm/i915/guc: Replace check for golden context size Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 13/19] drm/i915/guc: Convert mapping table to iosys_map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 14/19] drm/i915/guc: Convert capture list " Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 15/19] drm/i915/guc: Prepare for error propagation Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 16/19] drm/i915/guc: Use a single pass to calculate regset Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 17/19] drm/i915/guc: Convert guc_mmio_reg_state_init to iosys_map Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 18/19] drm/i915/guc: Convert __guc_ads_init " Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 17:44 ` [PATCH 19/19] drm/i915/guc: Remove plain ads_blob pointer Lucas De Marchi 2022-02-04 17:44 ` [Intel-gfx] " Lucas De Marchi 2022-02-04 18:38 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/guc: Refactor ADS access to use iosys_map Patchwork 2022-02-04 18:40 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-02-04 19:12 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1f665285-fcaf-1990-2204-16a46c699f43@suse.de \ --to=tzimmermann@suse.de \ --cc=John.C.Harrison@Intel.com \ --cc=christian.koenig@amd.com \ --cc=daniele.ceraolospurio@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=lucas.demarchi@intel.com \ --cc=matthew.brost@intel.com \ --cc=thomas.hellstrom@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.