From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 668A610E073 for ; Fri, 13 Oct 2023 11:31:08 +0000 (UTC) From: =?UTF-8?q?Zbigniew=20Kempczy=C5=84ski?= To: igt-dev@lists.freedesktop.org Date: Fri, 13 Oct 2023 13:28:45 +0200 Message-Id: <20231013112848.68164-2-zbigniew.kempczynski@intel.com> In-Reply-To: <20231013112848.68164-1-zbigniew.kempczynski@intel.com> References: <20231013112848.68164-1-zbigniew.kempczynski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t v2 1/4] lib/intel_blt: Release an offset in the allocator on buffer destroy List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: Blitter library code requires allocator handle only at the execution time. That means blt_copy_object structure is allocator agnostic and offsets are taken for block-copy or fast-copy just before operation. Operations on bo's like close/create requires to reflect on the allocator state, otherwise allocator will contain outdated offsets + sizes leading to fail on allocator operations or the exec. Helpers blt_create_object() and blt_destroy_object() are unaware of allocator so if in the meantime object was used in block-copy or fast-copy it has assigned offset in the allocator. Destroying object with blt_destroy_object() doesn't release this offset what might cause failures described above. There're two possibilities how to solve this - to couple blitter library with allocator or provide additional helpers which will release offset in the allocator on destroy path. Latter one is easier to provide so this is a subject of this change. Signed-off-by: Zbigniew Kempczyński Cc: Karolina Stolarek Reviewed-by: Karolina Stolarek --- lib/intel_blt.c | 15 ++++++++++++++- lib/intel_blt.h | 2 ++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/intel_blt.c b/lib/intel_blt.c index a76c7a4045..3c5e97963d 100644 --- a/lib/intel_blt.c +++ b/lib/intel_blt.c @@ -1635,15 +1635,28 @@ blt_create_object(const struct blt_copy_data *blt, uint32_t region, return obj; } -void blt_destroy_object(int fd, struct blt_copy_object *obj) +static void __blt_destroy_object(int fd, uint64_t ahnd, struct blt_copy_object *obj) { if (obj->ptr) munmap(obj->ptr, obj->size); gem_close(fd, obj->handle); + if (ahnd) + intel_allocator_free(ahnd, obj->handle); free(obj); } +void blt_destroy_object(int fd, struct blt_copy_object *obj) +{ + __blt_destroy_object(fd, 0, obj); +} + +void blt_destroy_object_and_alloc_free(int fd, uint64_t ahnd, + struct blt_copy_object *obj) +{ + __blt_destroy_object(fd, ahnd, obj); +} + void blt_set_object(struct blt_copy_object *obj, uint32_t handle, uint64_t size, uint32_t region, uint8_t mocs_index, enum blt_tiling_type tiling, diff --git a/lib/intel_blt.h b/lib/intel_blt.h index 7b4271620a..657e51dd57 100644 --- a/lib/intel_blt.h +++ b/lib/intel_blt.h @@ -245,6 +245,8 @@ blt_create_object(const struct blt_copy_data *blt, uint32_t region, enum blt_compression_type compression_type, bool create_mapping); void blt_destroy_object(int fd, struct blt_copy_object *obj); +void blt_destroy_object_and_alloc_free(int fd, uint64_t ahnd, + struct blt_copy_object *obj); void blt_set_object(struct blt_copy_object *obj, uint32_t handle, uint64_t size, uint32_t region, uint8_t mocs_index, enum blt_tiling_type tiling, -- 2.34.1