From patchwork Thu Sep 14 23:27:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 140085 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp777692vqi; Thu, 14 Sep 2023 20:27:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGr2QJ6sPFSJ/w1+MJhgMCdO667EUKtfAqlbntJetR1zWr5jyYEKO6uJnDQ/LVTN7K4f89k X-Received: by 2002:a17:90b:4b46:b0:267:ffcf:e9e3 with SMTP id mi6-20020a17090b4b4600b00267ffcfe9e3mr341877pjb.46.1694748455391; Thu, 14 Sep 2023 20:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694748455; cv=none; d=google.com; s=arc-20160816; b=0Exa7zvVOnEitMDFZQvR8OhEMxet/6+92QPhzDAj5EKKCOPlCKI3AZClkKdpL/qEKi Hq2x8ZxcLhOcepkPXLJXdc/L6250hzvpMExsCcfgMnZkxbofKFoQYnSAm7UaNENsWbem 9fxJFDOngMRwtbI/YWyBnBQ58sD0v/UvH/Ll8rGvvmzSXb9pB79QvLxRaNiPYaCxo15p VcON+CxGWwsgeijltj2Y4dKAGphmEWjCUJV/IZGuXMLSywJzlX8IX3sMutjA+Zjy6y+9 VEHneeI/6Qw0eE4dxKTb19nz4/zKgn9klVhFow2tzk7eilDNYD0uTiTtxdTRTbEMUDdJ NQFQ== 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=SXVoMwwnh3PVgRflLaLB+BroWyizg/l7OjSsWcacVik=; fh=5cel2jD5h+yPMXVwxbomyVhwojHUqATy6nFjd4aOh4o=; b=VfcSk5kV8Wh4J81VaxqCBIoO5b4e0bILMeSgGnR7j8GGGdZ23nypnQLjqJz1xShiSN qA++UiPLfJ6x24lKRtgKmWOtgdxGBsO30W4SmW/S26ULAXMaYOhfv79d7cMmDCCwWWkV IRsfLGbb3wXZuCpQmY/9tSNBpvg4PjHF+bvmOg0+mM/SlYJty0nQ/oHvjJiYooDuVhnS VBoO/Tini2bLJ7zxq7MMkinBhMgToNvQtDQX3Eh1A1+PxP6Z0DY/UmdA0Wa/9smr6Nbk n6yRL7wl3YzqfAlzBBewT8jG3FTZD6e9ixsJjodd9Na+6N5/nq7Oi+IvyYjYZSgTFXmE iRPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FESwGYWa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id v15-20020a17090abb8f00b002568a675b65si4740693pjr.141.2023.09.14.20.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 20:27:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FESwGYWa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 4F538844D509; Thu, 14 Sep 2023 16:29:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231143AbjINX3i (ORCPT + 33 others); Thu, 14 Sep 2023 19:29:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230519AbjINX3U (ORCPT ); Thu, 14 Sep 2023 19:29:20 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A2722717 for ; Thu, 14 Sep 2023 16:29:15 -0700 (PDT) Received: from workpc.. (109-252-153-31.dynamic.spd-mgts.ru [109.252.153.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: dmitry.osipenko) by madras.collabora.co.uk (Postfix) with ESMTPSA id 88FB26607355; Fri, 15 Sep 2023 00:29:12 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1694734153; bh=NYBZUXkwlnba9uS/DTRAc0OWLbbAgnC6TGMpLFWWzHk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FESwGYWauB9XDkampwVrtcAARQwz/q5ArfDM/gjc0/eFIbRZwrm4BYzrX3SgAI+HI atAeblijs3Ca98BkeNuNUOffwt/bEamEQe1/wIexmpdLLnAT0caUrQTLsvqqaY5ToO 1wqoAuTIaJNGvI6aaizAgZlQ/ySdvIyAVAeXQHIQyBDZuuneLDG5Cfliy5HfuNHoyp ii2C3suH9aYRQzcaovq2tM30/et7ypoUW/mlATxK+K246U1ORytwv7fXr4dX9c0kKW JXHKK1tl5pceKSI7Gq5D4Uq57b5qkak0+uTuTYqBDHm1qUpf9poFbvjOj3CxvzoPej XYjNeuM7cIWNg== From: Dmitry Osipenko To: David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , =?utf-8?q?Christian_K=C3=B6nig?= , Qiang Yu , Steven Price , Boris Brezillon , Emma Anholt , Melissa Wen Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: [PATCH v17 11/18] drm/shmem-helper: Improve drm_gem_shmem_vmap_locked() error handling Date: Fri, 15 Sep 2023 02:27:14 +0300 Message-ID: <20230914232721.408581-12-dmitry.osipenko@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230914232721.408581-1-dmitry.osipenko@collabora.com> References: <20230914232721.408581-1-dmitry.osipenko@collabora.com> MIME-Version: 1.0 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 (howler.vger.email [0.0.0.0]); Thu, 14 Sep 2023 16:29:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777072555863807281 X-GMAIL-MSGID: 1777072555863807281 Remove error unwinding from drm_gem_shmem_vmap_locked() making error paths consistent for both dmabuf and non-dmabuf cases and improving readability of the code. Often it's preferred to do the explicit error unwinding, but this multi-path function is an exception. Suggested-by: Boris Brezillon Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/drm_gem_shmem_helper.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index e1fcb5154209..8a8eab4d0332 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -334,7 +334,7 @@ int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, struct iosys_map *map) { struct drm_gem_object *obj = &shmem->base; - int ret = 0; + int ret; if (obj->import_attach) { ret = dma_buf_vmap(obj->import_attach->dmabuf, map); @@ -357,6 +357,7 @@ int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, shmem->vaddr = vmap(shmem->pages, obj->size >> PAGE_SHIFT, VM_MAP, prot); if (!shmem->vaddr) { + drm_gem_shmem_unpin_locked(shmem); ret = -ENOMEM; } else { iosys_map_set_vaddr(map, shmem->vaddr); @@ -364,16 +365,8 @@ int drm_gem_shmem_vmap_locked(struct drm_gem_shmem_object *shmem, } } - if (ret) { + if (ret) drm_dbg_kms(obj->dev, "Failed to vmap pages, error %d\n", ret); - goto err_put_pages; - } - - return 0; - -err_put_pages: - if (!obj->import_attach) - drm_gem_shmem_unpin_locked(shmem); return ret; }