From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2075B2DCF7C for ; Wed, 17 Sep 2025 14:15:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758118517; cv=none; b=IhH2Vky9jCFJHtT9cjOzvFluU3Tg97lW+4qA/3JZ4VYwQ7OaAWRhlzPaO9TbI3fm9pHXq6da9LOTDr9gecZm1gqb5Hgwu85UzNvaDK3reYIDkTAdA3md8NiDysM9qSAN8FL1xyrRv+l/tPX7cIBptZt4gupEmzHwVHhAoewa2eM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758118517; c=relaxed/simple; bh=PvjMnOUKLqdPV8xVLo20HFKg/yu6uJC0sbCEMxaY1GE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=pM3jVWwagxCPaTXf0jaMjyZKv4ZRQQ/X16BmR78uPlEB5X8X1TxywM38ZGbczKiYZpYR3LoytUP0MrRh//FDsDrQf8f1DaCqVEFut8d1sZl6AfWSW0JyCOSpH+UujejDuisKHNnsqn8y/OF/Q9HAC3YtP/bdj59RlCULcnRJKrc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=U7ySC5Bo; arc=none smtp.client-ip=198.175.65.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="U7ySC5Bo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1758118515; x=1789654515; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=PvjMnOUKLqdPV8xVLo20HFKg/yu6uJC0sbCEMxaY1GE=; b=U7ySC5BovCCZBZmoLoTMf8KKZjs/Fg56yZzc/qRzX9DfgagwanifoQkh 3HNEGMS/OVd8PTnvBSD607aKGFmhvINWE/9oUvy/jXdlsn46rN7GpU4b/ Na/Qf6NpOleZqfZacbMJ6zOj0Oh8JpdG40TDsEBO5VSZXWv1VnjHY664T 1LOPE035bMHI86k6bkcMk5Y9nc/Jf0pImwR39cPmNYVlW5OWcmnWuYjXe +VWbzGvjXukrWcXWY/uQERT8lQ7dlwR+V2YReYrNbNChlyJ1w8J91BnMm XEhqMEoS3LHInWVes6KrJBjfrXwBtBGrSZcn6whSo++4hT80KWmsS994H A==; X-CSE-ConnectionGUID: gcmjyQxvSmGFXh6Pz9Jm8w== X-CSE-MsgGUID: qP7R+BQ5TP2IN5nQX60JsA== X-IronPort-AV: E=McAfee;i="6800,10657,11556"; a="60305590" X-IronPort-AV: E=Sophos;i="6.18,272,1751266800"; d="scan'208";a="60305590" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2025 07:15:14 -0700 X-CSE-ConnectionGUID: Q5ny7hW3TBCcs6wQCEYGew== X-CSE-MsgGUID: KqteOelKRHeBSHX7pWIwPA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.18,272,1751266800"; d="scan'208";a="206192108" Received: from mfalkows-mobl.ger.corp.intel.com (HELO [10.245.84.158]) ([10.245.84.158]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2025 07:15:12 -0700 Message-ID: Date: Wed, 17 Sep 2025 16:15:06 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V2] accel/amdxdna: Call dma_buf_vmap_unlocked() for imported object To: Lizhi Hou , ogabbay@kernel.org, quic_jhugo@quicinc.com, dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, max.zhen@amd.com, sonal.santan@amd.com, mario.limonciello@amd.com References: <20250916174842.234709-1-lizhi.hou@amd.com> Content-Language: en-US From: "Falkowski, Maciej" In-Reply-To: <20250916174842.234709-1-lizhi.hou@amd.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Reviewed-by: Maciej Falkowski On 9/16/2025 7:48 PM, Lizhi Hou wrote: > In amdxdna_gem_obj_vmap(), calling dma_buf_vmap() triggers a kernel > warning if LOCKDEP is enabled. So for imported object, use > dma_buf_vmap_unlocked(). Then, use drm_gem_vmap() for other objects. > The similar change applies to vunmap code. > > Fixes: bd72d4acda10 ("accel/amdxdna: Support user space allocated buffer") > Signed-off-by: Lizhi Hou > --- > drivers/accel/amdxdna/amdxdna_gem.c | 47 ++++++++++++----------------- > 1 file changed, 20 insertions(+), 27 deletions(-) > > diff --git a/drivers/accel/amdxdna/amdxdna_gem.c b/drivers/accel/amdxdna/amdxdna_gem.c > index d407a36eb412..7f91863c3f24 100644 > --- a/drivers/accel/amdxdna/amdxdna_gem.c > +++ b/drivers/accel/amdxdna/amdxdna_gem.c > @@ -392,35 +392,33 @@ static const struct dma_buf_ops amdxdna_dmabuf_ops = { > .vunmap = drm_gem_dmabuf_vunmap, > }; > > -static int amdxdna_gem_obj_vmap(struct drm_gem_object *obj, struct iosys_map *map) > +static int amdxdna_gem_obj_vmap(struct amdxdna_gem_obj *abo, void **vaddr) > { > - struct amdxdna_gem_obj *abo = to_xdna_obj(obj); > - > - iosys_map_clear(map); > - > - dma_resv_assert_held(obj->resv); > + struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL); > + int ret; > > if (is_import_bo(abo)) > - dma_buf_vmap(abo->dma_buf, map); > + ret = dma_buf_vmap_unlocked(abo->dma_buf, &map); > else > - drm_gem_shmem_object_vmap(obj, map); > - > - if (!map->vaddr) > - return -ENOMEM; > + ret = drm_gem_vmap(to_gobj(abo), &map); > > - return 0; > + *vaddr = map.vaddr; > + return ret; > } > > -static void amdxdna_gem_obj_vunmap(struct drm_gem_object *obj, struct iosys_map *map) > +static void amdxdna_gem_obj_vunmap(struct amdxdna_gem_obj *abo) > { > - struct amdxdna_gem_obj *abo = to_xdna_obj(obj); > + struct iosys_map map; > + > + if (!abo->mem.kva) > + return; > > - dma_resv_assert_held(obj->resv); > + iosys_map_set_vaddr(&map, abo->mem.kva); > > if (is_import_bo(abo)) > - dma_buf_vunmap(abo->dma_buf, map); > + dma_buf_vunmap_unlocked(abo->dma_buf, &map); > else > - drm_gem_shmem_object_vunmap(obj, map); > + drm_gem_vunmap(to_gobj(abo), &map); > } > > static struct dma_buf *amdxdna_gem_prime_export(struct drm_gem_object *gobj, int flags) > @@ -455,7 +453,6 @@ static void amdxdna_gem_obj_free(struct drm_gem_object *gobj) > { > struct amdxdna_dev *xdna = to_xdna_dev(gobj->dev); > struct amdxdna_gem_obj *abo = to_xdna_obj(gobj); > - struct iosys_map map = IOSYS_MAP_INIT_VADDR(abo->mem.kva); > > XDNA_DBG(xdna, "BO type %d xdna_addr 0x%llx", abo->type, abo->mem.dev_addr); > > @@ -468,7 +465,7 @@ static void amdxdna_gem_obj_free(struct drm_gem_object *gobj) > if (abo->type == AMDXDNA_BO_DEV_HEAP) > drm_mm_takedown(&abo->mm); > > - drm_gem_vunmap(gobj, &map); > + amdxdna_gem_obj_vunmap(abo); > mutex_destroy(&abo->lock); > > if (is_import_bo(abo)) { > @@ -489,8 +486,8 @@ static const struct drm_gem_object_funcs amdxdna_gem_shmem_funcs = { > .pin = drm_gem_shmem_object_pin, > .unpin = drm_gem_shmem_object_unpin, > .get_sg_table = drm_gem_shmem_object_get_sg_table, > - .vmap = amdxdna_gem_obj_vmap, > - .vunmap = amdxdna_gem_obj_vunmap, > + .vmap = drm_gem_shmem_object_vmap, > + .vunmap = drm_gem_shmem_object_vunmap, > .mmap = amdxdna_gem_obj_mmap, > .vm_ops = &drm_gem_shmem_vm_ops, > .export = amdxdna_gem_prime_export, > @@ -663,7 +660,6 @@ amdxdna_drm_create_dev_heap(struct drm_device *dev, > struct drm_file *filp) > { > struct amdxdna_client *client = filp->driver_priv; > - struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL); > struct amdxdna_dev *xdna = to_xdna_dev(dev); > struct amdxdna_gem_obj *abo; > int ret; > @@ -692,12 +688,11 @@ amdxdna_drm_create_dev_heap(struct drm_device *dev, > abo->mem.dev_addr = client->xdna->dev_info->dev_mem_base; > drm_mm_init(&abo->mm, abo->mem.dev_addr, abo->mem.size); > > - ret = drm_gem_vmap(to_gobj(abo), &map); > + ret = amdxdna_gem_obj_vmap(abo, &abo->mem.kva); > if (ret) { > XDNA_ERR(xdna, "Vmap heap bo failed, ret %d", ret); > goto release_obj; > } > - abo->mem.kva = map.vaddr; > > client->dev_heap = abo; > drm_gem_object_get(to_gobj(abo)); > @@ -748,7 +743,6 @@ amdxdna_drm_create_cmd_bo(struct drm_device *dev, > struct amdxdna_drm_create_bo *args, > struct drm_file *filp) > { > - struct iosys_map map = IOSYS_MAP_INIT_VADDR(NULL); > struct amdxdna_dev *xdna = to_xdna_dev(dev); > struct amdxdna_gem_obj *abo; > int ret; > @@ -770,12 +764,11 @@ amdxdna_drm_create_cmd_bo(struct drm_device *dev, > abo->type = AMDXDNA_BO_CMD; > abo->client = filp->driver_priv; > > - ret = drm_gem_vmap(to_gobj(abo), &map); > + ret = amdxdna_gem_obj_vmap(abo, &abo->mem.kva); > if (ret) { > XDNA_ERR(xdna, "Vmap cmd bo failed, ret %d", ret); > goto release_obj; > } > - abo->mem.kva = map.vaddr; > > return abo; >