drm/i915: Do not allocate unused PPAT entries
Subsystems (2)
PATCH v18 1/2 drm/i915: Do not allocate unused PPAT entries
Only PPAT entries 0/2/3/4 are using. Remove extra PPAT entry allocation during initialization.
v17:
- Refine ppat_index() and move the comments. (Joonas)
v8:
- Move ppat_index() into i915_gem_gtt.c. (Chris)
- Change the name of ppat_bits_to_index to ppat_index.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +26 -26
@@ -230,9 +230,11 @@ static gen8_pte_t gen8_pte_encode(dma_addr_t addr,switch (level) {case I915_CACHE_NONE : +/* Uncached objects, mostly for scanout */ pte |=PPAT_UNCACHED ;break ;case I915_CACHE_WT : +/* for scanout with eLLC */ pte |=PPAT_DISPLAY_ELLC ;break ;default :
@@ -249,6 +251,7 @@ static gen8_pde_t gen8_pde_encode(const dma_addr_t addr,gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; pde |= addr;if (level !=I915_CACHE_NONE ) +/* for normal objects, no eLLC */ pde |=PPAT_CACHED_PDE ;else pde |=PPAT_UNCACHED ;
@@ -2988,6 +2991,14 @@ static unsigned int chv_private_pat_match(u8 src, u8 dst) INTEL_PPAT_PERFECT_MATCH :0 ; } +/* PPAT index = 4 * PAT + 2 * PCD + PWT */ +static inline unsigned int ppat_index (unsigned int bits) +{ +return (4 * !!(bits & _PAGE_PAT) + +2 * !!(bits & _PAGE_PCD) + + !!(bits & _PAGE_PWT)); +} +static void cnl_setup_private_ppat (struct intel_ppat *ppat) { ppat->max_entries =8 ;
@@ -2997,18 +3008,14 @@ static void cnl_setup_private_ppat(struct intel_ppat *ppat)/* XXX: spec is unclear if this is still needed for CNL+ */ if (!USES_PPGTT (ppat->i915)) { -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_UC );return ; } -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ); -__alloc_ppat_entry (ppat,1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,3 ,GEN8_PPAT_UC ); -__alloc_ppat_entry (ppat,4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -__alloc_ppat_entry (ppat,5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -__alloc_ppat_entry (ppat,6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -__alloc_ppat_entry (ppat,7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability
@@ -3035,18 +3042,14 @@ static void bdw_setup_private_ppat(struct intel_ppat *ppat)* So we can still hold onto all our assumptions wrt cpu * clflushing on LLC machines. */ -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_UC );return ; } -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC );/* for normal objects, no eLLC */ -__alloc_ppat_entry (ppat,1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC );/* for something pointing to ptes? */ -__alloc_ppat_entry (ppat,2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC );/* for scanout with eLLC */ -__alloc_ppat_entry (ppat,3 ,GEN8_PPAT_UC );/* Uncached objects, mostly for scanout */ -__alloc_ppat_entry (ppat,4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -__alloc_ppat_entry (ppat,5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -__alloc_ppat_entry (ppat,6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -__alloc_ppat_entry (ppat,7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }static void chv_setup_private_ppat (struct intel_ppat *ppat)
@@ -3075,14 +3078,11 @@ static void chv_setup_private_ppat(struct intel_ppat *ppat)* in order to keep the global status page working. */ -__alloc_ppat_entry (ppat,0 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,1 ,0 ); -__alloc_ppat_entry (ppat,2 ,0 ); -__alloc_ppat_entry (ppat,3 ,0 ); -__alloc_ppat_entry (ppat,4 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,5 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,6 ,CHV_PPAT_SNOOP ); -__alloc_ppat_entry (ppat,7 ,CHV_PPAT_SNOOP ); +/* See gen8_pte_encode() for the mapping from cache-level to PPAT */ +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),CHV_PPAT_SNOOP ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),0 ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),0 ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),CHV_PPAT_SNOOP ); }static void gen6_gmch_remove (struct i915_address_space *vm)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v18 2/2 drm/i915/selftests: Introduce live tests of private PAT management
Introduce two live tests of private PAT management:
igt_ppat_init - This test is to check if all the PPAT configurations are written into HW.
igt_ppat_get - This test performs several sub-tests on intel_ppat_get() and intel_ppat_put().
The "perfect match" test case will try to get a PPAT entry with an existing value, then check if the returned PPAT entry is the same one.
The "alloc entries" test case will run out of PPAT table, and check if all the requested values are put into the newly allocated PPAT entries.
The negative test case will try to generate a new PPAT value, and get it when PPAT table is full.
The "partial match" test case will generate a parital matched value from the existing PPAT table and try to match it.
The "re-alloc" test case will try to free and then allocate a new entry when the PPAT table is full.
The "put entries" test case will free all the PPAT entries that allocated in "alloc entries" test case. It will check if the values of freed PPAT entries turn into ppat->clear_value.
v18:
- Refine the test to catch a corner case.
v10:
- Refine code structure.
- Introduce "re-alloc" test case. (Chris)
v9:
- Refine generate_new_value(). (Chris)
- Refine failure output. (Chris)
- Refine test flow of "perfect match". (Chris)
- Introduce another negative test case after "partial match". (Chris)
v8:
- Remove noisy output. (Chris)
- Add negative test case. (Chris)
--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 372 ++++++++++++++++++++++++++ 1 file changed, 372 insertions(+)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +372 -0
@@ -1094,6 +1094,376 @@ static int igt_ggtt_page(void *arg)return err; } +static int check_cnl_ppat (struct drm_i915_private *dev_priv) +{ +struct intel_ppat *ppat = &dev_priv->ppat; +int i; + +for (i =0 ; i < ppat->max_entries; i++) { +u32 value =I915_READ (GEN10_PAT_INDEX (i)); + +if (value != ppat->entries[i].value) { +pr_err ("check PPAT failed: expected %x found %x\n" , + ppat->entries[i].value, value); +return -EINVAL ; + } + } +return 0 ; +} + +static int check_bdw_ppat (struct drm_i915_private *dev_priv) +{ +struct intel_ppat *ppat = &dev_priv->ppat; +u64 pat, hw_pat; +int i; + + pat = hw_pat =0 ; + +for (i =0 ; i < ppat->max_entries; i++) + pat |=GEN8_PPAT (i, ppat->entries[i].value); + + hw_pat =I915_READ (GEN8_PRIVATE_PAT_HI ); + hw_pat <<=32 ; + hw_pat |=I915_READ (GEN8_PRIVATE_PAT_LO ); + +if (pat != hw_pat) { +pr_err ("check PPAT failed: expected %llx found %llx\n" , + pat, hw_pat); +return -EINVAL ; + } +return 0 ; +} + +static int igt_ppat_check (void *arg) +{ +struct drm_i915_private *i915 = arg; +int ret; + +if (!i915->ppat.max_entries) +return 0 ; + +if (INTEL_GEN (i915) >=10 ) + ret =check_cnl_ppat (i915); +else + ret =check_bdw_ppat (i915); + +if (ret) +pr_err ("check PPAT failed\n" ); + +return ret; +} + +static bool value_is_new (struct intel_ppat *ppat,u8 value) +{ +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (value != ppat->entries[i].value) +continue ; + +return false; + } +return true; +} + +static bool value_for_partial_test (struct intel_ppat *ppat,u8 value) +{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* At least, there should be one entry whose cache attribute is +* same with the required value. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) != +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +continue ; + +return true; + } +return false; +} + +static bool value_for_negative_test (struct intel_ppat *ppat,u8 value) +{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* cache attribute has to be different, so i915_ppat_get() would +* allocate a new entry. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) == +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +return false; + } +return true; +} + +static u8 generate_new_value (struct intel_ppat *ppat, +bool (*check_value)(struct intel_ppat *,u8 )) +{ +u8 ca[] = {GEN8_PPAT_WB ,GEN8_PPAT_WT ,GEN8_PPAT_UC ,GEN8_PPAT_WC }; +u8 tc[] = {GEN8_PPAT_LLC ,GEN8_PPAT_LLCELLC , GEN8_PPAT_LLCeLLC }; +u8 age[] = {GEN8_PPAT_AGE (3 ),GEN8_PPAT_AGE (2 ),GEN8_PPAT_AGE (1 ), +GEN8_PPAT_AGE (0 ) }; +int ca_index, tc_index, age_index; +u8 value; + +#define for_each_ppat_attr (ca_index, tc_index, age_index) \ + for ((ca_index) = 0 ; (ca_index) < ARRAY_SIZE(ca); (ca_index)++) \ + for ((tc_index) = 0; (tc_index) < ARRAY_SIZE(tc); (tc_index)++) \ + for ((age_index) = 0; (age_index) < ARRAY_SIZE(age); (age_index)++) + +for_each_ppat_attr (ca_index, tc_index, age_index) { + value = age[age_index] | ca[ca_index] | tc[tc_index]; +if (check_value (ppat, value)) +return value; + } +#undef for_each_ppat_attr +return 0 ; +} + +static const struct intel_ppat_entry * +generate_and_check_new_value (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; +DECLARE_BITMAP (used,INTEL_MAX_PPAT_ENTRIES ); + + value =generate_new_value (ppat, value_is_new); +if (!value) { +pr_err ("fail to generate new value\n" ); +return ERR_PTR (-EINVAL ); + } + +bitmap_copy (used, ppat->used, ppat->max_entries); + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return ERR_PTR (-EINVAL ); + } + +if (entry->value != value) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); + goto err; + } + +if (bitmap_equal (used, ppat->used, ppat->max_entries)) { +pr_err ("fail to alloc a new entry\n" ); + goto err; + } + +return entry; +err: +intel_ppat_put (entry); +return ERR_PTR (-EINVAL ); +} + +static int put_and_check_entry (const struct intel_ppat_entry *entry) +{ +intel_ppat_put (entry); + +if (entry->value != entry->ppat->clear_value) { +pr_err ("fail to put ppat value\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_perfect_match_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { + entry =intel_ppat_get (i915, ppat->entries[i].value); +if (IS_ERR (entry)) +return PTR_ERR (entry); + +if (entry != &ppat->entries[i]) { +pr_err ("entry is not expected\n" ); +intel_ppat_put (entry); +return -EINVAL ; + } +intel_ppat_put (entry); + } +return 0 ; +} + +static int perform_negative_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_negative_test); +if (!value) { +pr_err ("fail to generate new value for negative test 2\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (!IS_ERR (entry) ||PTR_ERR (entry) != -ENOSPC ) { +pr_err ("fail on negative test\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_partial_match_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_partial_test); +if (!value) { +pr_err ("fail to generate new value for partial test\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return PTR_ERR (entry); + } + +if (!(entry->value != value && +GEN8_PPAT_GET_CA (entry->value) ==GEN8_PPAT_GET_CA (value))) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); +intel_ppat_put (entry); +return -EINVAL ; + } + +intel_ppat_put (entry); +return 0 ; +} + +static int igt_ppat_get (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_ppat *ppat = &i915->ppat; +const struct intel_ppat_entry **entries, **p; +const struct intel_ppat_entry *entry; +unsigned int size =0 ; +int i, ret; + +if (!ppat->max_entries) +return 0 ; + + ret =igt_ppat_check (i915); +if (ret) +return ret; + +/* case 1: alloc new entries */ + entries =NULL ; + ret =0 ; + +while (!bitmap_full (ppat->used, ppat->max_entries)) { + p =krealloc (entries, (size +1 ) * +sizeof (struct intel_ppat_entry *), +GFP_KERNEL ); +if (!p) { + ret = -ENOMEM ; + goto ppat_put; + } + + entries = p; + + p = &entries[size++]; + *p =NULL ; + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on alloc new entries test\n" ); + goto ppat_put; + } + *p = entry; + } + +/* case 2: perfect match */ + ret =perform_perfect_match_test (ppat); +if (ret) { +pr_err ("fail on perfect match test\n" ); +return ret; + } + +/* case 3: negative test 1, suppose PPAT table is full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 1\n" ); + goto ppat_put; + } + +/* case 4: partial match */ + ret =perform_partial_match_test (ppat); +if (ret) { +pr_err ("fail on partial match test\n" ); + goto ppat_put; + } + +/* case 3: negative test 2, suppose PPAT table is still full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 2\n" ); + goto ppat_put; + } + +/* case 5: re-alloc test, make a hole and it should work again */ +if (entries) { +for (i =0 ; i < size; i++) { + entry = entries[i]; + + ret =put_and_check_entry (entry); + entries[i] =NULL ; +if (ret) { +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + entries[i] = entry; + } + } + +ppat_put: +if (entries) { +for (i =0 ; i < size; i++) { +if (IS_ERR (entries[i]) || !entries[i]) +continue ; + +if (ret) +intel_ppat_put (entry); +else + ret =put_and_check_entry (entries[i]); + } +kfree (entries); + entries =NULL ; + } +if (ret) +return ret; + +return igt_ppat_check (i915); +} +static void track_vma_bind (struct i915_vma *vma) {struct drm_i915_gem_object *obj = vma->obj;
@@ -1560,6 +1930,8 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915)SUBTEST (igt_ggtt_pot),SUBTEST (igt_ggtt_fill),SUBTEST (igt_ggtt_page), +SUBTEST (igt_ppat_check), +SUBTEST (igt_ppat_get), };GEM_BUG_ON (offset_in_page (i915->ggtt.base.total));
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v18 2/2] drm/i915/selftests: Introduce live tests of private PAT management
This patch is the rest part of the introducing PAT interface patch series. Please review. :) Thanks.
-----Original Message-----
From: intel-gvt-dev [mailto:[email protected]] On Behalf Of Zhi Wang
Sent: Thursday, September 21, 2017 8:29 PM
To: [email protected]; [email protected]
Cc: [email protected]; Vivi, Rodrigo <[email protected]>; [email protected]; [email protected]; Widawsky, Benjamin <[email protected]>; Wang, Zhi A <[email protected]>
Subject: [PATCH v18 2/2] drm/i915/selftests: Introduce live tests of private PAT management
Introduce two live tests of private PAT management:
igt_ppat_init - This test is to check if all the PPAT configurations are written into HW.
igt_ppat_get - This test performs several sub-tests on intel_ppat_get() and intel_ppat_put().
The "perfect match" test case will try to get a PPAT entry with an existing value, then check if the returned PPAT entry is the same one.
The "alloc entries" test case will run out of PPAT table, and check if all the requested values are put into the newly allocated PPAT entries.
The negative test case will try to generate a new PPAT value, and get it when PPAT table is full.
The "partial match" test case will generate a parital matched value from the existing PPAT table and try to match it.
The "re-alloc" test case will try to free and then allocate a new entry when the PPAT table is full.
The "put entries" test case will free all the PPAT entries that allocated in "alloc entries" test case. It will check if the values of freed PPAT entries turn into ppat->clear_value.
v18:
- Refine the test to catch a corner case.
v10:
- Refine code structure.
- Introduce "re-alloc" test case. (Chris)
v9:
- Refine generate_new_value(). (Chris)
- Refine failure output. (Chris)
- Refine test flow of "perfect match". (Chris)
- Introduce another negative test case after "partial match". (Chris)
v8:
- Remove noisy output. (Chris)
- Add negative test case. (Chris)
--- drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 372 ++++++++++++++++++++++++++ 1 file changed, 372 insertions(+)
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +360 -0
@@ -1094,6 +1094,376 @@ static int igt_ggtt_page(void *arg)return err; } +static int check_cnl_ppat (struct drm_i915_private *dev_priv) { +struct intel_ppat *ppat = &dev_priv->ppat; +int i; + +for (i =0 ; i < ppat->max_entries; i++) { +u32 value =I915_READ (GEN10_PAT_INDEX (i)); + +if (value != ppat->entries[i].value) { +pr_err ("check PPAT failed: expected %x found %x\n" , + ppat->entries[i].value, value); +return -EINVAL ; + } + } +return 0 ; +} + +static int check_bdw_ppat (struct drm_i915_private *dev_priv) { +struct intel_ppat *ppat = &dev_priv->ppat; +u64 pat, hw_pat; +int i; + + pat = hw_pat =0 ; + +for (i =0 ; i < ppat->max_entries; i++) + pat |=GEN8_PPAT (i, ppat->entries[i].value); + + hw_pat =I915_READ (GEN8_PRIVATE_PAT_HI ); + hw_pat <<=32 ; + hw_pat |=I915_READ (GEN8_PRIVATE_PAT_LO ); + +if (pat != hw_pat) { +pr_err ("check PPAT failed: expected %llx found %llx\n" , + pat, hw_pat); +return -EINVAL ; + } +return 0 ; +} + +static int igt_ppat_check (void *arg) +{ +struct drm_i915_private *i915 = arg; +int ret; + +if (!i915->ppat.max_entries) +return 0 ; + +if (INTEL_GEN (i915) >=10 ) + ret =check_cnl_ppat (i915); +else + ret =check_bdw_ppat (i915); + +if (ret) +pr_err ("check PPAT failed\n" ); + +return ret; +} + +static bool value_is_new (struct intel_ppat *ppat,u8 value) { +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (value != ppat->entries[i].value) +continue ; + +return false; + } +return true; +} + +static bool value_for_partial_test (struct intel_ppat *ppat,u8 value) { +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* At least, there should be one entry whose cache attribute is +* same with the required value. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) != +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +continue ; + +return true; + } +return false; +} + +static bool value_for_negative_test (struct intel_ppat *ppat,u8 value) +{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* cache attribute has to be different, so i915_ppat_get() would +* allocate a new entry. +*/ +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) == +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +return false; + } +return true; +} + +static u8 generate_new_value (struct intel_ppat *ppat, +bool (*check_value)(struct intel_ppat *,u8 )) { +u8 ca[] = {GEN8_PPAT_WB ,GEN8_PPAT_WT ,GEN8_PPAT_UC ,GEN8_PPAT_WC }; +u8 tc[] = {GEN8_PPAT_LLC ,GEN8_PPAT_LLCELLC , GEN8_PPAT_LLCeLLC }; +u8 age[] = {GEN8_PPAT_AGE (3 ),GEN8_PPAT_AGE (2 ),GEN8_PPAT_AGE (1 ), +GEN8_PPAT_AGE (0 ) }; +int ca_index, tc_index, age_index; +u8 value; + +#define for_each_ppat_attr (ca_index, tc_index, age_index) \ + for ((ca_index) = 0 ; (ca_index) < ARRAY_SIZE(ca); (ca_index)++) \ + for ((tc_index) = 0; (tc_index) < ARRAY_SIZE(tc); (tc_index)++) \ + for ((age_index) = 0; (age_index) < ARRAY_SIZE(age); (age_index)++) + +for_each_ppat_attr (ca_index, tc_index, age_index) { + value = age[age_index] | ca[ca_index] | tc[tc_index]; +if (check_value (ppat, value)) +return value; + } +#undef for_each_ppat_attr +return 0 ; +} + +static const struct intel_ppat_entry * +generate_and_check_new_value (struct intel_ppat *ppat) { +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; +DECLARE_BITMAP (used,INTEL_MAX_PPAT_ENTRIES ); + + value =generate_new_value (ppat, value_is_new); +if (!value) { +pr_err ("fail to generate new value\n" ); +return ERR_PTR (-EINVAL ); + } + +bitmap_copy (used, ppat->used, ppat->max_entries); + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return ERR_PTR (-EINVAL ); + } + +if (entry->value != value) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); + goto err; + } + +if (bitmap_equal (used, ppat->used, ppat->max_entries)) { +pr_err ("fail to alloc a new entry\n" ); + goto err; + } + +return entry; +err: +intel_ppat_put (entry); +return ERR_PTR (-EINVAL ); +} + +static int put_and_check_entry (const struct intel_ppat_entry *entry) { +intel_ppat_put (entry); + +if (entry->value != entry->ppat->clear_value) { +pr_err ("fail to put ppat value\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_perfect_match_test (struct intel_ppat *ppat) { +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { + entry =intel_ppat_get (i915, ppat->entries[i].value); +if (IS_ERR (entry)) +return PTR_ERR (entry); + +if (entry != &ppat->entries[i]) { +pr_err ("entry is not expected\n" ); +intel_ppat_put (entry); +return -EINVAL ; + } +intel_ppat_put (entry); + } +return 0 ; +} + +static int perform_negative_test (struct intel_ppat *ppat) { +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_negative_test); +if (!value) { +pr_err ("fail to generate new value for negative test 2\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (!IS_ERR (entry) ||PTR_ERR (entry) != -ENOSPC ) { +pr_err ("fail on negative test\n" ); +return -EINVAL ; + } +return 0 ; +} + +static int perform_partial_match_test (struct intel_ppat *ppat) { +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_partial_test); +if (!value) { +pr_err ("fail to generate new value for partial test\n" ); +return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return PTR_ERR (entry); + } + +if (!(entry->value != value && +GEN8_PPAT_GET_CA (entry->value) ==GEN8_PPAT_GET_CA (value))) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); +intel_ppat_put (entry); +return -EINVAL ; + } + +intel_ppat_put (entry); +return 0 ; +} + +static int igt_ppat_get (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_ppat *ppat = &i915->ppat; +const struct intel_ppat_entry **entries, **p; +const struct intel_ppat_entry *entry; +unsigned int size =0 ; +int i, ret; + +if (!ppat->max_entries) +return 0 ; + + ret =igt_ppat_check (i915); +if (ret) +return ret; + +/* case 1: alloc new entries */ + entries =NULL ; + ret =0 ; + +while (!bitmap_full (ppat->used, ppat->max_entries)) { + p =krealloc (entries, (size +1 ) * +sizeof (struct intel_ppat_entry *), +GFP_KERNEL ); +if (!p) { + ret = -ENOMEM ; + goto ppat_put; + } + + entries = p; + + p = &entries[size++]; + *p =NULL ; + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on alloc new entries test\n" ); + goto ppat_put; + } + *p = entry; + } + +/* case 2: perfect match */ + ret =perform_perfect_match_test (ppat); +if (ret) { +pr_err ("fail on perfect match test\n" ); +return ret; + } + +/* case 3: negative test 1, suppose PPAT table is full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 1\n" ); + goto ppat_put; + } + +/* case 4: partial match */ + ret =perform_partial_match_test (ppat); +if (ret) { +pr_err ("fail on partial match test\n" ); + goto ppat_put; + } + +/* case 3: negative test 2, suppose PPAT table is still full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 2\n" ); + goto ppat_put; + } + +/* case 5: re-alloc test, make a hole and it should work again */ +if (entries) { +for (i =0 ; i < size; i++) { + entry = entries[i]; + + ret =put_and_check_entry (entry); + entries[i] =NULL ; +if (ret) { +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + entries[i] = entry; + } + } + +ppat_put: +if (entries) { +for (i =0 ; i < size; i++) { +if (IS_ERR (entries[i]) || !entries[i]) +continue ; + +if (ret) +intel_ppat_put (entry); +else + ret =put_and_check_entry (entries[i]); + } +kfree (entries); + entries =NULL ; + } +if (ret) +return ret; + +return igt_ppat_check (i915); +} +static void track_vma_bind (struct i915_vma *vma) { struct drm_i915_gem_object *obj = vma->obj; @@ -1560,6 +1930,8 @@ int i915_gem_gtt_live_selftests(struct drm_i915_private *i915) SUBTEST(igt_ggtt_pot),
SUBTEST(igt_ggtt_fill),
SUBTEST(igt_ggtt_page),
+ SUBTEST(igt_ppat_check),
+ SUBTEST(igt_ppat_get),
};
GEM_BUG_ON(offset_in_page(i915->ggtt.base.total));
--
2.7.4
_______________________________________________
intel-gvt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gvt-dev
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v18 2/2] drm/i915/selftests: Introduce live tests of private PAT management
In reply to Zhi WangQuoted 53 lines · Zhi Wang
Introduce two live tests of private PAT management:
igt_ppat_init- This test is to check if all the PPAT configurations are written into HW.
igt_ppat_get- This test performs several sub-tests onintel_ppat_get()andintel_ppat_put().The "perfect match" test case will try to get a PPAT entry with an existing value, then check if the returned PPAT entry is the same one.
The "alloc entries" test case will run out of PPAT table, and check if all the requested values are put into the newly allocated PPAT entries.
The negative test case will try to generate a new PPAT value, and get it when PPAT table is full.
The "partial match" test case will generate a parital matched value from the existing PPAT table and try to match it.
The "re-alloc" test case will try to free and then allocate a new entry when the PPAT table is full.
The "put entries" test case will free all the PPAT entries that allocated in "alloc entries" test case. It will check if the values of freed PPAT entries turn into
ppat->clear_value.v18:
- Refine the test to catch a corner case.
v10:
- Refine code structure.
- Introduce "re-alloc" test case. (Chris)v9:
- Refine
generate_new_value(). (Chris)
- Refine failure output. (Chris)
- Refine test flow of "perfect match". (Chris)
- Introduce another negative test case after "partial match". (Chris)v8:
- Remove noisy output. (Chris)
- Add negative test case. (Chris)Cc Ben Widawsky <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Joonas Lahtinen <[email protected]>Suggested-by Chris Wilson <[email protected]>Signed-off-by Zhi Wang <[email protected]>
<SNIP>
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +5
-0+static int igt_ppat_check (void *arg) +{ +struct drm_i915_private *i915 = arg; +int ret; +
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1151
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+if (!i915->ppat.max_entries) +return 0 ; + +if (INTEL_GEN (i915) >=10 ) + ret =check_cnl_ppat (i915); +else + ret =check_bdw_ppat (i915); + +if (ret) +pr_err ("check PPAT failed\n" );
This is just extra noise, both individual dest already say check PPAT failed.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1156
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +5
-0+ +return ret; +} + +static bool value_is_new (struct intel_ppat *ppat,u8 value)
Bit overly generic name for selftests/i915_gem_gtt.c, how about 'ppat_is_new' or 'ppat_find_match_all'.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1161
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +5
-0+{ +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (value != ppat->entries[i].value)
if (value == ppat->entries[i]) return i;
And drop the braces around for.
return -ENOENT;
Quoted 1 line
+static bool
value_for_partial_test(struct intel_ppat *ppat, u8 value)
Maybe 'ppat_find_match_ca', similar changes to above function to return index.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1179
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* At least, there should be one entry whose cache attribute is +* same with the required value. +*/
Comment says what the code does, so can be dropped.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1182
Quoted 3 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +3
-0+for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) != +GEN8_PPAT_GET_CA (ppat->entries[i].value))
Again '==' and return true.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1190
Quoted 8 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +8
-0+continue ; + +return true; + } +return false; +} + +static bool value_for_negative_test (struct intel_ppat *ppat,u8 value)
Maybe 'ppat_find_not_match_ca', same with returning index / -ENOENT.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1200
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+{ +int i; + +if (!value_is_new (ppat, value)) +return false; + +/* +* cache attribute has to be different, so i915_ppat_get() would +* allocate a new entry. +*/
Ditto.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1204
Quoted 4 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +4
-0+for_each_set_bit (i, ppat->used, ppat->max_entries) { +if (GEN8_PPAT_GET_CA (value) == +GEN8_PPAT_GET_CA (ppat->entries[i].value)) +return false;
You can drop the braces, here too.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1210
Quoted 6 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +6
-0+ } +return true; +} + +static u8 generate_new_value (struct intel_ppat *ppat, +bool (*check_value)(struct intel_ppat *,u8 ))
'ppat_generate_new' or so. Also, by definition of _new, this function should be doing the check if it already exists, not the filter function (unnecessary code duplication).
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+{ +u8 ca[] = {GEN8_PPAT_WB ,GEN8_PPAT_WT ,GEN8_PPAT_UC ,GEN8_PPAT_WC }; +u8 tc[] = {GEN8_PPAT_LLC ,GEN8_PPAT_LLCELLC , GEN8_PPAT_LLCeLLC }; +u8 age[] = {GEN8_PPAT_AGE (3 ),GEN8_PPAT_AGE (2 ),GEN8_PPAT_AGE (1 ), +GEN8_PPAT_AGE (0 ) }; +int ca_index, tc_index, age_index; +u8 value; + +#define for_each_ppat_attr (ca_index, tc_index, age_index) \ + for ((ca_index) = 0 ; (ca_index) < ARRAY_SIZE(ca); (ca_index)++) \
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1230
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+for ((tc_index) =0 ; (tc_index) <ARRAY_SIZE (tc); (tc_index)++) \ +for ((age_index) =0 ; (age_index) <ARRAY_SIZE (age); (age_index)++) + +for_each_ppat_attr (ca_index, tc_index, age_index) { + value = age[age_index] | ca[ca_index] | tc[tc_index]; +if (check_value (ppat, value)) +return value; + } +#undef for_each_ppat_attr +return 0 ;
-ENOSPC?
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1238
Quoted 8 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +8
-0+} + +static const struct intel_ppat_entry * +generate_and_check_new_value (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value;
Maybe swap these two declarations for extra fine tune.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1245
Quoted 7 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +7
-0+DECLARE_BITMAP (used,INTEL_MAX_PPAT_ENTRIES ); + + value =generate_new_value (ppat, value_is_new); +if (!value) { +pr_err ("fail to generate new value\n" ); +return ERR_PTR (-EINVAL ); + }
It's better to propagate errors, as much as possible, will be easier for the next person to extend the tests, possibly adding new error conditions.
value = ppat_generate_new(..);
if (IS_ERR(value)) {
..
return ERR_PTR(value);
}drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1253
Quoted 7 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +7
-0+bitmap_copy (used, ppat->used, ppat->max_entries); + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return ERR_PTR (-EINVAL ); + }
Shouldn't the selftest very strictly differentiate between, "unable to run test" (resources are in use, for example) and "i915 driver failed the test". Here both problems translate into -EINVAL. Please check the drm_mm tests for examples.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1264
Quoted 11 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +11
-0+ +if (entry->value != value) { +pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); + goto err; + } + +if (bitmap_equal (used, ppat->used, ppat->max_entries)) { +pr_err ("fail to alloc a new entry\n" ); + goto err; + }
This would be the more logical test to do first, I don't think it gets triggered otherwise.
Review
Quoted 2 lines
(quoted diff) +2
-0+ + return entry;
Newline here.
Review
Quoted 2 lines
(quoted diff) +2
-0+err: + intel_ppat_put(entry);
Usually here too.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1272
Quoted 4 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +4
-0+return ERR_PTR (-EINVAL ); +} + +static int put_and_check_entry (const struct intel_ppat_entry *entry)
add word 'ppat' somewhere.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1277
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +5
-0+{ +intel_ppat_put (entry); + +if (entry->value != entry->ppat->clear_value) { +pr_err ("fail to put ppat value\n" );
Wouldn't 'ppat value was not cleared' be more informative, if intel_ppat_put returned error, this would be appropriate.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1283
Quoted 6 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +6
-0+return -EINVAL ; + } +return 0 ; +} + +static int perform_perfect_match_test (struct intel_ppat *ppat)
s/perform/ppat/
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1293
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +int i; + +for_each_set_bit (i, ppat->used, ppat->max_entries) { + entry =intel_ppat_get (i915, ppat->entries[i].value); +if (IS_ERR (entry)) +return PTR_ERR (entry); +
It's not obvious without looking elsewhere in the code, so it might be worth mentioning that all entries have been generated to be unique.
/* All generated PPAT entries are unique */
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1295
Quoted 2 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +2
-0+if (entry != &ppat->entries[i]) { +pr_err ("entry is not expected\n" );
Do add "goto err" and this becomes.
if (entry != ..) goto err;
Just by glancing at the code, you can see we're doing an extremely simple test. Then, without disrupting the code flow, at err: label, you can add details about what was expected and what we got.
Quoted 7 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +7
-0+intel_ppat_put (entry); +return -EINVAL ; + } +intel_ppat_put (entry); + } +return 0 ; +}
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1312
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+ +static int perform_negative_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_negative_test); +if (!value) { +pr_err ("fail to generate new value for negative test 2\n" );
Drop 'test 2'.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1320
Quoted 8 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +8
-0+return -EINVAL ; + } + + entry =intel_ppat_get (i915, value); +if (!IS_ERR (entry) ||PTR_ERR (entry) != -ENOSPC ) { +pr_err ("fail on negative test\n" ); +return -EINVAL ; + }
Again, differentiate "could not run logic" vs. "failure in logic". Lets try to propagate the error to the topmost function, and we have possibility to report SKIP vs FAILURE to I-G-T.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1330
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+return 0 ; +} + +static int perform_partial_match_test (struct intel_ppat *ppat) +{ +struct drm_i915_private *i915 = ppat->i915; +const struct intel_ppat_entry *entry; +u8 value; + + value =generate_new_value (ppat, value_for_partial_test);
These will read much better when the filter function has meaningful name.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1333
Quoted 3 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +3
-0+if (!value) { +pr_err ("fail to generate new value for partial test\n" ); +return -EINVAL ;
This would be a 'could not perform test' instead of test failure.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1292
Quoted 6 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +6
-0+ } + + entry =intel_ppat_get (i915, value); +if (IS_ERR (entry)) { +pr_err ("fail to get new entry\n" ); +return PTR_ERR (entry);
This would be too a 'don't have space to execute test error', so here propagating the error would be good idea.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1343
Quoted 4 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +4
-0+ } + +if (!(entry->value != value && +GEN8_PPAT_GET_CA (entry->value) ==GEN8_PPAT_GET_CA (value))) {
Wrong indent, you're negating both, so need to indent to the inner '('
Instead, negating the whole thing allows dropping the fancy indent and makes the condition much more understandable:
if (entry->value == value || .._CA != _CA
'We should not get equal value, and we should not get different _CA'
That's what partial match is about :)
Quoted 19 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +19
-0+pr_err ("value is not expected, expected %x found %x\n" , + value, entry->value); +intel_ppat_put (entry); +return -EINVAL ; + } + +intel_ppat_put (entry); +return 0 ; +} + +static int igt_ppat_get (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct intel_ppat *ppat = &i915->ppat; +const struct intel_ppat_entry **entries, **p; +const struct intel_ppat_entry *entry; +unsigned int size =0 ; +int i, ret; +
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1372
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+if (!ppat->max_entries) +return 0 ; + + ret =igt_ppat_check (i915); +if (ret) +return ret; + +/* case 1: alloc new entries */ + entries =NULL ; + ret =0 ;
This ret = 0 is not needed, we already have preceding 'if (ret) return ret;'
Then drop the extra newline, we're looping to change entries, it should be close to the beginning of loop.
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1377
Quoted 5 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +5
-0+ +while (!bitmap_full (ppat->used, ppat->max_entries)) { + p =krealloc (entries, (size +1 ) * +sizeof (struct intel_ppat_entry *), +GFP_KERNEL );
Weird indent, you can even reduce line length with (size + 1)*sizeof(*entries).
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1386
Quoted 9 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +9
-0+if (!p) { + ret = -ENOMEM ; + goto ppat_put; + } + + entries = p; + + p = &entries[size++]; + *p =NULL ;
I think we could allocate at one go, it's literally a couple of pointers (ppat->max_entries), I think this is bit much for allocating pointers.
Quoted 30 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +30
-0+ + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) { + ret =PTR_ERR (entry); +pr_err ("fail on alloc new entries test\n" ); + goto ppat_put; + } + *p = entry; + } + +/* case 2: perfect match */ + ret =perform_perfect_match_test (ppat); +if (ret) { +pr_err ("fail on perfect match test\n" ); +return ret; + } + +/* case 3: negative test 1, suppose PPAT table is full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 1\n" ); + goto ppat_put; + } + +/* case 4: partial match */ + ret =perform_partial_match_test (ppat); +if (ret) { +pr_err ("fail on partial match test\n" ); + goto ppat_put; + }
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1426
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+ +/* case 3: negative test 2, suppose PPAT table is still full now */ + ret =perform_negative_test (ppat); +if (ret) { +pr_err ("fail on negative test 2\n" ); + goto ppat_put; + } + +/* case 5: re-alloc test, make a hole and it should work again */ +if (entries) {
entries should not be NULL here, we're skipping function krealloc fails. So causes extra indent.
Quoted 12 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +12
-0+for (i =0 ; i < size; i++) { + entry = entries[i]; + + ret =put_and_check_entry (entry); + entries[i] =NULL ; +if (ret) { +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + + entry =generate_and_check_new_value (ppat); +if (IS_ERR (entry)) {
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1448
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+ ret =PTR_ERR (entry); +pr_err ("fail on re-alloc test\n" ); + goto ppat_put; + } + entries[i] = entry; + } + } + +ppat_put: +if (entries) {
This extra indent can go when we we have goto out; at the allocation error for entries.
Review
Quoted 2 lines
(quoted diff) +2
-0+ for (i = 0; i < size; i++) { + if (IS_ERR(entries[i]) || !entries[i])
IS_ERR_OR_NULL
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1460
Quoted 10 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +10
-0+continue ; + +if (ret) +intel_ppat_put (entry); +else + ret =put_and_check_entry (entries[i]); + } +kfree (entries); + entries =NULL ; + }
out:
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c static int igt_ggtt_page(void *arg) · line 1466
Quoted 6 lines
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c +6
-0+if (ret) +return ret; + +return igt_ppat_check (i915); +} +
With the modifications we should be very much ready with the kselftest, as I see it.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
This patch is the rest part of the introducing PAT interface patch series. Please review. :) Thanks.
-----Original Message-----
From: Wang, Zhi A
Sent: Thursday, September 21, 2017 8:29 PM
To: [email protected]; [email protected]
Cc: [email protected]; [email protected]; [email protected]; Wang, Zhi A <[email protected]>; Widawsky, Benjamin <[email protected]>; Vivi, Rodrigo <[email protected]>
Subject: [PATCH v18 1/2] drm/i915: Do not allocate unused PPAT entries
Only PPAT entries 0/2/3/4 are using. Remove extra PPAT entry allocation during initialization.
v17:
- Refine ppat_index() and move the comments. (Joonas)
v8:
- Move ppat_index() into i915_gem_gtt.c. (Chris)
- Change the name of ppat_bits_to_index to ppat_index.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +16 -9
@@ -230,9 +230,11 @@ static gen8_pte_t gen8_pte_encode(dma_addr_t addr,switch (level) {case I915_CACHE_NONE : +/* Uncached objects, mostly for scanout */ pte |=PPAT_UNCACHED ;break ;case I915_CACHE_WT : +/* for scanout with eLLC */ pte |=PPAT_DISPLAY_ELLC ;break ;default :
@@ -249,6 +251,7 @@ static gen8_pde_t gen8_pde_encode(const dma_addr_t addr,gen8_pde_t pde = _PAGE_PRESENT | _PAGE_RW; pde |= addr;if (level !=I915_CACHE_NONE ) +/* for normal objects, no eLLC */ pde |=PPAT_CACHED_PDE ;else pde |=PPAT_UNCACHED ;
@@ -2988,6 +2991,14 @@ static unsigned int chv_private_pat_match(u8 src, u8 dst) INTEL_PPAT_PERFECT_MATCH :0 ; } +/* PPAT index = 4 * PAT + 2 * PCD + PWT */ static inline unsigned int +ppat_index (unsigned int bits) { +return (4 * !!(bits & _PAGE_PAT) + +2 * !!(bits & _PAGE_PCD) + + !!(bits & _PAGE_PWT)); +} +static void cnl_setup_private_ppat (struct intel_ppat *ppat) { ppat->max_entries =8 ;
@@ -2997,18 +3008,14 @@ static void cnl_setup_private_ppat(struct intel_ppat *ppat)/* XXX: spec is unclear if this is still needed for CNL+ */ if (!USES_PPGTT (ppat->i915)) { -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_UC );return ; } -__alloc_ppat_entry (ppat,0 ,GEN8_PPAT_WB |GEN8_PPAT_LLC ); -__alloc_ppat_entry (ppat,1 ,GEN8_PPAT_WC |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,2 ,GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); -__alloc_ppat_entry (ppat,3 ,GEN8_PPAT_UC ); -__alloc_ppat_entry (ppat,4 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); -__alloc_ppat_entry (ppat,5 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (1 )); -__alloc_ppat_entry (ppat,6 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (2 )); -__alloc_ppat_entry (ppat,7 ,GEN8_PPAT_WB |GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (3 )); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED_PDE ),GEN8_PPAT_WB |GEN8_PPAT_LLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_DISPLAY_ELLC ),GEN8_PPAT_WT |GEN8_PPAT_LLCELLC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_UNCACHED ),GEN8_PPAT_UC ); +__alloc_ppat_entry (ppat,ppat_index (PPAT_CACHED ),GEN8_PPAT_WB | +GEN8_PPAT_LLCELLC |GEN8_PPAT_AGE (0 )); }
/* The GGTT and PPGTT need a private PPAT setup in order to handle cacheability @@ -3035,18 +3042,14 @@ static void bdw_setup_private_ppat(struct intel_ppat *ppat)
* So we can still hold onto all our assumptions wrt cpu
* clflushing on LLC machines.
*/
- __alloc_ppat_entry(ppat, 0, GEN8_PPAT_UC);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_CACHED_PDE), GEN8_PPAT_UC);
return;
}
- __alloc_ppat_entry(ppat, 0, GEN8_PPAT_WB | GEN8_PPAT_LLC); /* for normal objects, no eLLC */ - __alloc_ppat_entry(ppat, 1, GEN8_PPAT_WC | GEN8_PPAT_LLCELLC); /* for something pointing to ptes? */ - __alloc_ppat_entry(ppat, 2, GEN8_PPAT_WT | GEN8_PPAT_LLCELLC); /* for scanout with eLLC */ - __alloc_ppat_entry(ppat, 3, GEN8_PPAT_UC); /* Uncached objects, mostly for scanout */ - __alloc_ppat_entry(ppat, 4, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(0)); - __alloc_ppat_entry(ppat, 5, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(1)); - __alloc_ppat_entry(ppat, 6, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(2)); - __alloc_ppat_entry(ppat, 7, GEN8_PPAT_WB | GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(3));
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_CACHED_PDE), GEN8_PPAT_WB | GEN8_PPAT_LLC);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_DISPLAY_ELLC), GEN8_PPAT_WT | GEN8_PPAT_LLCELLC);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_UNCACHED), GEN8_PPAT_UC);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_CACHED), GEN8_PPAT_WB |
+GEN8_PPAT_LLCELLC | GEN8_PPAT_AGE(0));
}
static void chv_setup_private_ppat(struct intel_ppat *ppat) @@ -3075,14 +3078,11 @@ static void chv_setup_private_ppat(struct intel_ppat *ppat)
* in order to keep the global status page working.
*/
- __alloc_ppat_entry(ppat, 0, CHV_PPAT_SNOOP);
- __alloc_ppat_entry(ppat, 1, 0);
- __alloc_ppat_entry(ppat, 2, 0);
- __alloc_ppat_entry(ppat, 3, 0);
- __alloc_ppat_entry(ppat, 4, CHV_PPAT_SNOOP);
- __alloc_ppat_entry(ppat, 5, CHV_PPAT_SNOOP);
- __alloc_ppat_entry(ppat, 6, CHV_PPAT_SNOOP);
- __alloc_ppat_entry(ppat, 7, CHV_PPAT_SNOOP);
+ /* See gen8_pte_encode() for the mapping from cache-level to PPAT */
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_CACHED_PDE), CHV_PPAT_SNOOP);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_DISPLAY_ELLC), 0);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_UNCACHED), 0);
+ __alloc_ppat_entry(ppat, ppat_index(PPAT_CACHED), CHV_PPAT_SNOOP);
}
static void gen6_gmch_remove(struct i915_address_space *vm)
--
2.7.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [v18,1/2] drm/i915: Do not allocate unused PPAT entries
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [v18,1/2] drm/i915: Do not allocate unused PPAT entries
URL : https://patchwork.freedesktop.org/series/30714/
State : success
== Summary ==
Series 30714v1 series starting with [v18,1/2] drm/i915: Do not allocate unused PPAT entries
https://patchwork.freedesktop.org/api/1.0/series/30714/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test gem_exec_store:
Subgroup basic-all:
dmesg-warn -> PASS (fi-kbl-7500u) fdo#102849
Subgroup basic-default:
dmesg-warn -> PASS (fi-kbl-7500u)
Test gem_exec_suspend:
Subgroup basic-s3:
incomplete -> PASS (fi-kbl-7500u) fdo#102850
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215
Test pm_rpm:
Subgroup basic-rte:
dmesg-warn -> PASS (fi-cfl-s) fdo#102294
Test drv_module_reload:
Subgroup basic-reload:
dmesg-warn -> PASS (fi-glk-1) fdo#102777fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102849 https://bugs.freedesktop.org/show_bug.cgi?id=102849
fdo#102850 https://bugs.freedesktop.org/show_bug.cgi?id=102850
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294
fdo#102777 https://bugs.freedesktop.org/show_bug.cgi?id=102777
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:442s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:473s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:421s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:508s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:278s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:502s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:491s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:486s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:543s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:415s fi-glk-1 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:560s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:426s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:406s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:434s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:488s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:461s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:472s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:574s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:593s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:547s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:447s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:750s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:489s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:476s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:563s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:1 skip:39 time:410s
35f6d27736f70caa580b7a6030528afa765bd76a drm-tip: 2017y-09m-21d-16h-20m-08s UTC integration manifest 7416bcd7c000 drm/i915/selftests: Introduce live tests of private PAT management 53d0f733cda1 drm/i915: Do not allocate unused PPAT entries
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5783/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: warning for series starting with [v18,1/2] drm/i915: Do not allocate unused PPAT entries
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [v18,1/2] drm/i915: Do not allocate unused PPAT entries
URL : https://patchwork.freedesktop.org/series/30714/
State : warning
== Summary ==
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-primscrn-cur-indfb-draw-blt:
pass -> SKIP (shard-hsw)
Test kms_draw_crc:
Subgroup draw-method-xrgb2101010-render-untiled:
pass -> SKIP (shard-hsw)
Test kms_setmode:
Subgroup basic:
fail -> PASS (shard-hsw) fdo#99912
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252
Test kms_atomic_transition:
Subgroup plane-all-modeset-transition-fencing:
dmesg-warn -> PASS (shard-hsw) fdo#102614fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
shard-hsw total:2429 pass:1329 dwarn:4 dfail:0 fail:11 skip:1085 time:9806s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5783/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx