From patchwork Fri Nov 24 23:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 169601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp1613127vqx; Fri, 24 Nov 2023 15:37:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IFT8SjszKSvQZLsamHM8zYKe4IGfXjpg1axVJogw1Y9/HxB3V0B1GWyiLoBj+epkNtOjgRv X-Received: by 2002:a92:cdab:0:b0:35b:37a:f25e with SMTP id g11-20020a92cdab000000b0035b037af25emr6544690ild.5.1700869045772; Fri, 24 Nov 2023 15:37:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700869045; cv=none; d=google.com; s=arc-20160816; b=OaE1rl6HHxzdsrgL+nxh0GLR9m7Uv6z/eHKRI0JhN0M6x3kSs8Yq8iKPn94gK+ENf/ j4Qr3arnN4R1UrrzRf3q9o8RUUKCmAe0P3XF7O8GeutX6eVHU7Qi6vkSKZW6OZsznVcR ikNraKltahJFZFdRzZQms73Jj9u7vQplqpbpxlDlqw6QX2Ts+nrDrBB/UTYm7dZ3MNUz N//7qJXjHoN6unYg+rKPW08HNB0ScmH5xtAtGeBZOLmB4VxlFxRm2uX921uQ4ANRrLzd 1jdIX0Ewom0PjVov1TTRDjJp+uRHu68wL+cIMAJ6khU7eMgZhglH+wP19KC6lRvbre/y OPyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=auqPkghBUASB9YQ336TJ1HIAZATGxqMLyF8qUrxjjf4=; fh=OEokdMqw5RbGHy9m78HSs9oFbRwlGySZx4sfUy7gRow=; b=S6yejjQvmQO7DskVHx4y4kjEH6Ex2vGzjngVgzhwqq0mlhICLH0jdbQWGY6seGoBm4 28pLaBjAk7xls4FTYDW16N4dc1iuOyjAB/p/km8su53bHXH/aqOegCusm+rIqlOw1Y5h 8zheIJOUdgfqo41G6STgNCpaKIMnwvysWD55Mn6MinLfp63cbjzl10z7/hUaJ34miQYR wcE0kxjX9uJKVlOWCuiqZPs+L6eIPURmLCdYbeVZbGn98LKBoaoixmKtI7GgUZKdr/g7 fqRmdNqSIa6xqYZHTK5vLkqAVjDixA5hhCHT4jCTjH8eReXEj93maWU2HXgKHNEsmkKa vHWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dqsGKT6N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id x16-20020a056a00189000b006be1a0457d9si4816718pfh.10.2023.11.24.15.37.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 15:37:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=dqsGKT6N; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 529848042D2A; Fri, 24 Nov 2023 15:37:23 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231600AbjKXXhB (ORCPT + 99 others); Fri, 24 Nov 2023 18:37:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229557AbjKXXg5 (ORCPT ); Fri, 24 Nov 2023 18:36:57 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A2861987 for ; Fri, 24 Nov 2023 15:37:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700869023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=auqPkghBUASB9YQ336TJ1HIAZATGxqMLyF8qUrxjjf4=; b=dqsGKT6N7wd7HjWEEzLVqrEs2+3QoNubzikGYtUumXO/DTrUt67XldTrIZy0u61XkEYEFl u4Vj2cOEyCrEsR2vvvoetaguM/58dtP/ja7b+lMj4sW4nxroLYDj7tA9K77opidxqCadga 6L6524AFxxE2q5bg7jPszpe4py4J9Dg= Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-157-52IQSqG-OvypV8siHo3dOA-1; Fri, 24 Nov 2023 18:37:02 -0500 X-MC-Unique: 52IQSqG-OvypV8siHo3dOA-1 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2c52cbb64c9so21308421fa.1 for ; Fri, 24 Nov 2023 15:37:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700869020; x=1701473820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=auqPkghBUASB9YQ336TJ1HIAZATGxqMLyF8qUrxjjf4=; b=rrjxvDf1BovDtrjPxYZcu0g3wdWGoaZy6v4Yi6xKOM0fnlA2bQyto5CnbvNK/7gEk1 Oey9xzAQUXeejJgXlZnnklO5Dt5+73cBDyXZKFyzNn+ncHr80/zjUDAO8MeVY77ZPvUE r+vkaBYkj6ol8hbyGP5mBzKWjdJo6QXApgLY3loHUrLtzevCOM6QFQvIPjTCY48yjem4 ltmW7S+qD0b+FPzDjjKvdi8DiSI+ja+N7rHlQjnfOTtUKgn3mALVybhDG9obx1AL2usS wGAj68GBgi5E+PDVbFPhd5Mil+b4P75gL061ygliyCZGyUO1f4ItFCBTH/OyfrEnchsg 5kHg== X-Gm-Message-State: AOJu0Yz00AjZPL1Xq194/GTVSp87hm1xxtjleOMEZDGrhwmtSfIDA9U7 6jIV/kA5ZBPBygrqH3zx6r6oOBJ6HsfhrRbrBzwDDM9+GcS7GUPWYkxBlr4etM9W3VF23GsIvdb bjgWDkVzOt2yyvbYEoSCvo9HS X-Received: by 2002:a2e:9dd9:0:b0:2c5:183d:42bf with SMTP id x25-20020a2e9dd9000000b002c5183d42bfmr3147727ljj.45.1700869020662; Fri, 24 Nov 2023 15:37:00 -0800 (PST) X-Received: by 2002:a2e:9dd9:0:b0:2c5:183d:42bf with SMTP id x25-20020a2e9dd9000000b002c5183d42bfmr3147720ljj.45.1700869020366; Fri, 24 Nov 2023 15:37:00 -0800 (PST) Received: from pollux.. ([2a02:810d:4b3f:de9c:abf:b8ff:feee:998b]) by smtp.gmail.com with ESMTPSA id q22-20020a1709064c9600b009ae69c303aasm2631313eju.137.2023.11.24.15.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Nov 2023 15:36:59 -0800 (PST) From: Danilo Krummrich To: mripard@kernel.org, airlied@gmail.com, daniel@ffwll.ch, frank.binns@imgtec.com, donald.robson@imgtec.com, matt.coster@imgtec.com, sarah.walker@imgtec.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Danilo Krummrich Subject: [PATCH drm-misc-next 1/5] drm/imagination: vm: prevent duplicate drm_gpuvm_bo instances Date: Sat, 25 Nov 2023 00:36:36 +0100 Message-ID: <20231124233650.152653-2-dakr@redhat.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231124233650.152653-1-dakr@redhat.com> References: <20231124233650.152653-1-dakr@redhat.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Fri, 24 Nov 2023 15:37:23 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783490460160532059 X-GMAIL-MSGID: 1783490460160532059 Use drm_gpuvm_bo_obtain() instead of drm_gpuvm_bo_create(). The latter should only be used in conjunction with drm_gpuvm_bo_obtain_prealloc(). drm_gpuvm_bo_obtain() re-uses existing instances of a given VM and BO combination, whereas drm_gpuvm_bo_create() would always create a new instance of struct drm_gpuvm_bo and hence leave us with duplicates. Fixes: ff5f643de0bf ("drm/imagination: Add GEM and VM related code") Signed-off-by: Danilo Krummrich Reviewed-by: Donald Robson --- drivers/gpu/drm/imagination/pvr_vm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/imagination/pvr_vm.c b/drivers/gpu/drm/imagination/pvr_vm.c index 3ad1366294b9..09d481c575b0 100644 --- a/drivers/gpu/drm/imagination/pvr_vm.c +++ b/drivers/gpu/drm/imagination/pvr_vm.c @@ -224,6 +224,7 @@ pvr_vm_bind_op_map_init(struct pvr_vm_bind_op *bind_op, struct pvr_gem_object *pvr_obj, u64 offset, u64 device_addr, u64 size) { + struct drm_gem_object *obj = gem_from_pvr_gem(pvr_obj); const bool is_user = vm_ctx == vm_ctx->pvr_dev->kernel_vm_ctx; const u64 pvr_obj_size = pvr_gem_object_size(pvr_obj); struct sg_table *sgt; @@ -245,10 +246,11 @@ pvr_vm_bind_op_map_init(struct pvr_vm_bind_op *bind_op, bind_op->type = PVR_VM_BIND_TYPE_MAP; - bind_op->gpuvm_bo = drm_gpuvm_bo_create(&vm_ctx->gpuvm_mgr, - gem_from_pvr_gem(pvr_obj)); - if (!bind_op->gpuvm_bo) - return -ENOMEM; + dma_resv_lock(obj->resv, NULL); + bind_op->gpuvm_bo = drm_gpuvm_bo_obtain(&vm_ctx->gpuvm_mgr, obj); + dma_resv_unlock(obj->resv); + if (IS_ERR(bind_op->gpuvm_bo)) + return PTR_ERR(bind_op->gpuvm_bo); bind_op->new_va = kzalloc(sizeof(*bind_op->new_va), GFP_KERNEL); bind_op->prev_va = kzalloc(sizeof(*bind_op->prev_va), GFP_KERNEL);