From patchwork Wed Apr 3 09:13:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunke Cao X-Patchwork-Id: 13615551 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87E866FE05 for ; Wed, 3 Apr 2024 09:13:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135597; cv=none; b=jW5yLCcxQIIwRTFN5XnPIVLyLBvJ1OIlPp5LN8LurUtI14EdmKU8bQ3Bt2cTAm+/v+Cfzsu7HShEcU0eLUTroq32albkyoxMClQWm9NZe2bYRF1iILRs7tgOucV2AdVpWhNJyV2bTSmOXk9v9mqSSlDlmWR9SyVHClI8pegoShg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135597; c=relaxed/simple; bh=kPJ3qjufZNJhSRlMqwht8mg5xpGzMfW3PDbcwKHQ4Mk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GnTWhQWXQXm1nm8S9nFXiG8RWfku+l3Nlfo0/ofwL4RmsP+b7Dz7gsAH5+U8Oy9hCl5eE1MlXawqJBGNV2S2bz2EFHtIc8EfykFE9K4lhLhWTkuAxdYx9kwbuoNnaT/pRMXpKp4LyAk1n442WM6P0PQzssXu3dgawWXAIXnoH5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Nqf1foKK; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Nqf1foKK" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1e0878b76f3so6090875ad.0 for ; Wed, 03 Apr 2024 02:13:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1712135595; x=1712740395; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6Q6naeswlCg1RFODdohQF8TohLRu7F+DupH02PoNoNg=; b=Nqf1foKKAsaDPORaLZVfBb2NwMgSz7IW3EznpiJ2uXcHrIZroCvgXHr6p5F6iBKJeh Qe7gCvRbC4TJvcVcTal4R/Ul/DWV3IyW42mPra6VYTvyMkp3JtmEUml2FF8pzm79rLRd 4SDNkWPeUT7avniHORYAppaqXiO0gK38mBTuA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712135595; x=1712740395; 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=6Q6naeswlCg1RFODdohQF8TohLRu7F+DupH02PoNoNg=; b=UJmL+zqli55q3JePx129qpSqDGrPoP3isICsN1QGhVTPgeqgGwGBBB3GDbYfVZiN36 P4PCioOizvRD9ZzKa2/wgXqt8qd7O4RmoCbsq4wStR6kMwAZ0sZi6y9OTT+PJZsOrOzm Fb0AbMliSEjjl2Xdiup2evrusSg3W3FF0XO3d6Jt6XQX7GGF5EjvnJgO9c6t9lK8wATA IDu30wkhwR3Okj5t1k8lKRjrOkXaEjDS6P//I1YbqFuevyxoSAaopmGCxIilvMoq5Bf9 ROg0IUx9S9bemmpd+krb4vpD6In4n6ayr3o6nAY+qO/LYRvEWmmfXwCzgZr1qsUxlUYz Yulg== X-Gm-Message-State: AOJu0YxE1eiZKc/WoTTiWNXWsK+eeaXcaEFUHBHCI4htVNXvP+CulGyg 48vN7XLPUheJ17BCXufUIoYMcVhQNZNfXZVSo5aEgICxXAvtwThjfF8+LNlyCw== X-Google-Smtp-Source: AGHT+IFbjY7JYqnsv43pzQbTsKYVXKErsbPmPcBfkA3wJZ6QN4DEiyrIVb5hDV4SgU8WeqrXsIa2aw== X-Received: by 2002:a17:903:22c2:b0:1e0:9926:aded with SMTP id y2-20020a17090322c200b001e09926adedmr2366272plg.24.1712135594943; Wed, 03 Apr 2024 02:13:14 -0700 (PDT) Received: from yunkec1.tok.corp.google.com ([2401:fa00:8f:203:d5be:b59a:f5f7:246d]) by smtp.gmail.com with ESMTPSA id lo14-20020a170903434e00b001e0aded0ca7sm12692811plb.239.2024.04.03.02.13.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 02:13:14 -0700 (PDT) From: Yunke Cao To: Tomasz Figa , Marek Szyprowski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Yunke Cao Subject: [PATCH v2 1/3] media: videobuf2-core: release all planes first in __prepare_dmabuf() Date: Wed, 3 Apr 2024 18:13:04 +0900 Message-ID: <20240403091306.1308878-2-yunkec@chromium.org> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog In-Reply-To: <20240403091306.1308878-1-yunkec@chromium.org> References: <20240403091306.1308878-1-yunkec@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The existing implementation, validating planes, checking if the planes changed, releasing previous planes and reaquiring new planes all happens in the same for loop. Split the for loop into 3 parts 1. In the first for loop, validate planes and check if planes changed. 2. Call __vb2_buf_dmabuf_put() to release all planes. 3. In the second for loop, reaquire new planes. Signed-off-by: Yunke Cao --- .../media/common/videobuf2/videobuf2-core.c | 64 ++++++++++--------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index b6bf8f232f48..702f7b6f783a 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -1341,11 +1341,13 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) for (plane = 0; plane < vb->num_planes; ++plane) { struct dma_buf *dbuf = dma_buf_get(planes[plane].m.fd); + planes[plane].dbuf = dbuf; + if (IS_ERR_OR_NULL(dbuf)) { dprintk(q, 1, "invalid dmabuf fd for plane %d\n", plane); ret = -EINVAL; - goto err; + goto err_put_dbuf; } /* use DMABUF size if length is not provided */ @@ -1356,17 +1358,14 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) dprintk(q, 1, "invalid dmabuf length %u for plane %d, minimum length %u\n", planes[plane].length, plane, vb->planes[plane].min_length); - dma_buf_put(dbuf); ret = -EINVAL; - goto err; + goto err_put_dbuf; } /* Skip the plane if already verified */ if (dbuf == vb->planes[plane].dbuf && - vb->planes[plane].length == planes[plane].length) { - dma_buf_put(dbuf); + vb->planes[plane].length == planes[plane].length) continue; - } dprintk(q, 3, "buffer for plane %d changed\n", plane); @@ -1375,29 +1374,30 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) vb->copied_timestamp = 0; call_void_vb_qop(vb, buf_cleanup, vb); } + } - /* Release previously acquired memory if present */ - __vb2_plane_dmabuf_put(vb, &vb->planes[plane]); - vb->planes[plane].bytesused = 0; - vb->planes[plane].length = 0; - vb->planes[plane].m.fd = 0; - vb->planes[plane].data_offset = 0; + if (reacquired) { + __vb2_buf_dmabuf_put(vb); + + for (plane = 0; plane < vb->num_planes; ++plane) { + /* Acquire each plane's memory */ + mem_priv = call_ptr_memop(attach_dmabuf, + vb, + q->alloc_devs[plane] ? : q->dev, + planes[plane].dbuf, + planes[plane].length); + if (IS_ERR(mem_priv)) { + dprintk(q, 1, "failed to attach dmabuf\n"); + ret = PTR_ERR(mem_priv); + goto err_put_dbuf; + } - /* Acquire each plane's memory */ - mem_priv = call_ptr_memop(attach_dmabuf, - vb, - q->alloc_devs[plane] ? : q->dev, - dbuf, - planes[plane].length); - if (IS_ERR(mem_priv)) { - dprintk(q, 1, "failed to attach dmabuf\n"); - ret = PTR_ERR(mem_priv); - dma_buf_put(dbuf); - goto err; + vb->planes[plane].dbuf = planes[plane].dbuf; + vb->planes[plane].mem_priv = mem_priv; } - - vb->planes[plane].dbuf = dbuf; - vb->planes[plane].mem_priv = mem_priv; + } else { + for (plane = 0; plane < vb->num_planes; ++plane) + dma_buf_put(planes[plane].dbuf); } /* @@ -1413,7 +1413,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) if (ret) { dprintk(q, 1, "failed to map dmabuf for plane %d\n", plane); - goto err; + goto err_put_vb2_buf; } vb->planes[plane].dbuf_mapped = 1; } @@ -1437,7 +1437,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) ret = call_vb_qop(vb, buf_init, vb); if (ret) { dprintk(q, 1, "buffer initialization failed\n"); - goto err; + goto err_put_vb2_buf; } } @@ -1445,11 +1445,15 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) if (ret) { dprintk(q, 1, "buffer preparation failed\n"); call_void_vb_qop(vb, buf_cleanup, vb); - goto err; + goto err_put_vb2_buf; } return 0; -err: + +err_put_dbuf: + for (plane = 0; plane < vb->num_planes; ++plane) + dma_buf_put(planes[plane].dbuf); +err_put_vb2_buf: /* In case of errors, release planes that were already acquired */ __vb2_buf_dmabuf_put(vb); From patchwork Wed Apr 3 09:13:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunke Cao X-Patchwork-Id: 13615552 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F86471B35 for ; Wed, 3 Apr 2024 09:13:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135598; cv=none; b=bStoIgn9TercjRbT+hkJkIC+ZRUoRz3njwGEAL//J+GO1WRd7qdf40+tXDH8n2IdnY8xJrZjIeYHgQXjZf8L0PXu20uBrBQIXRQXO5KprVIYQ6sYPh0jfnB/veUVXPLbXWBAkkSab5bw+kaQQyW/pHkLUv1sVEMUbCTzBX3qg2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135598; c=relaxed/simple; bh=bvbr37Ihsqw95eXTgs6rpM/YrpZdNfDaihQFNgL8Sdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i9/dnCUIJI6lCYq635h71uD75xnGBUR+PrYz7b/vkkFqVBEMNOeLwQNsl1R9fT3yMfP+IhsKjRKyxDHXXfc2VqtkPSuOEOxhVMb/ZmMy7Lu+ETfjyqrPwR4MO+FD0NhdJAVni6BkKMIZLP5AsPAr0GaMZj4mPSElw99CAGoNttU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=MMBse0GL; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="MMBse0GL" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1e2178b2cf2so47057435ad.0 for ; Wed, 03 Apr 2024 02:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1712135596; x=1712740396; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hY0y02PJpZeP35KcWNQezBlqu49OMdch68dl+7fGzyo=; b=MMBse0GL/Lf3UXzHRK0s4mLjYVyn7njmPAZCQs/Rig8u0n5NsEEnfckvNX4l2X8xlk aF8br+Vnook0b6I6cF6URMYCO8npCqijpc87XcgB1Qx2eSqAICRYP8vcN/0TDNq9n1mm SPNj3FAuAMvFml61azZjFSEI6IyyeLw2D0i/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712135596; x=1712740396; 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=hY0y02PJpZeP35KcWNQezBlqu49OMdch68dl+7fGzyo=; b=nrrY97QoB28zJyHoGWoR1OiT7vOF9h3IaG9z7BTbp+T9/y4nBdDMF2WesJD/V8fYRf r0y420pumupQyb9tc5IFQ0JB/mSLzTk7ag4HrL3Q3SdZzml0VD9W43W0HVgLACyJKLpK zA588LUBSRC6g8HdHBkbN+yBT2bsIYIaMkozieAOX8qeKH9+m/CMeqEkNkXp6Gu4CZKY bdHKnM1/6qCWOKCKCWXGt598PHpuKTgqdy0DHtVStusE4TEN2lBgKQOsdJ//wt1YjleY wRvJPpkO+E0jsTFTD5mwUm40RgUdfjwvQ3avskXU61eXyNNZjC9DhVtR42WWc364QK5a R7QQ== X-Gm-Message-State: AOJu0YyjfmwnYPk9uS0xAunoTgCsVIy/yaErnDbPIgBAjhy4K/kPsoVh YyHHzKEJo//UszlwJDSYwg9VurJ0PGyy48ovuv0Ir2GElsUqiQRarv2XmPe6yg== X-Google-Smtp-Source: AGHT+IGHt7KtLjqxqms1Zs04xzJZUgLr1AiqEYtq3Tkar7o+qpOs8VpLfk46IrjcgclZNOrn5+IePw== X-Received: by 2002:a17:902:c94f:b0:1e0:a784:f965 with SMTP id i15-20020a170902c94f00b001e0a784f965mr18202297pla.65.1712135596691; Wed, 03 Apr 2024 02:13:16 -0700 (PDT) Received: from yunkec1.tok.corp.google.com ([2401:fa00:8f:203:d5be:b59a:f5f7:246d]) by smtp.gmail.com with ESMTPSA id lo14-20020a170903434e00b001e0aded0ca7sm12692811plb.239.2024.04.03.02.13.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 02:13:16 -0700 (PDT) From: Yunke Cao To: Tomasz Figa , Marek Szyprowski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Yunke Cao Subject: [PATCH v2 2/3] media: videobuf2-core: reverse the iteration order in __vb2_buf_dmabuf_put Date: Wed, 3 Apr 2024 18:13:05 +0900 Message-ID: <20240403091306.1308878-3-yunkec@chromium.org> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog In-Reply-To: <20240403091306.1308878-1-yunkec@chromium.org> References: <20240403091306.1308878-1-yunkec@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Release the planes from num_planes - 1 to 0. Signed-off-by: Yunke Cao --- drivers/media/common/videobuf2/videobuf2-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index 702f7b6f783a..a5368cef73bb 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -320,10 +320,10 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p) */ static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb) { - unsigned int plane; + unsigned int i; - for (plane = 0; plane < vb->num_planes; ++plane) - __vb2_plane_dmabuf_put(vb, &vb->planes[plane]); + for (i = 0; i < vb->num_planes; ++i) + __vb2_plane_dmabuf_put(vb, &vb->planes[vb->num_planes - 1 - i]); } /* From patchwork Wed Apr 3 09:13:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunke Cao X-Patchwork-Id: 13615553 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F191171B4F for ; Wed, 3 Apr 2024 09:13:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135600; cv=none; b=pHCDcm7j+6v4NpmtTb5ahHEQc6xo9jVyPALLiwaDhDx6KuKUljPBBWtLUIyZoO5aioqA02lkN7g7knypWF+KfzMKL/mf3V/5gA97PCtiBIqgNG/oltSsdlz0PKSxwh+x0vAmacVgVJ04jURnL6iwtfjlTKdWaSsYrVm9jK0tcl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712135600; c=relaxed/simple; bh=POdkDInzdUvu0ghNCgxNK4ulMolIE+flfkF4jMBv0Vc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VXtzEqrGOK4zGxavYZgFJPSH2nqGWIJukLPkUhJukh9F4sFBRTBnVaskQCH4C96H5+IBVUDm9NbuliIiiRB3o8tuYB51EyBZZmaBH3wm9QlpoKkGbwdHFB/7r/lLMHOGWW6oS3G/sr8k5nxDlHK8atCmtwqafJmRF8gi+e6kstQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=fmq1uT1k; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fmq1uT1k" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1e0f2798cd8so50774345ad.3 for ; Wed, 03 Apr 2024 02:13:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1712135598; x=1712740398; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rvwLGUnkhMKJQa7aB2byIHr562jcELHGQ/vzY9XvszI=; b=fmq1uT1kgkZ9VDVOhLejN9Qih3PtP3SfDpItsMYRSntyG6SqoGoP+bRtZ/DapCK42p wPxqw0BDg6LUudJsoSr/ryiWJJtoODXHtbDAdImYMOPGpeF/RVHqxoUjpbuEi+/8fhj2 uqex7cYwwwjsel3xdtU+z7O4ZAAWnEOE2LDH4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712135598; x=1712740398; 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=rvwLGUnkhMKJQa7aB2byIHr562jcELHGQ/vzY9XvszI=; b=GlS/qR2OsXoRxqlA2phaV2dzF/+vMhxzfV+5d6DDVHRSs+tDQ/NAJwMPasX9kVPDRv BpWQaBbkzrolp9yazD/2FdzIL2pkwQyRu+UfrX+dZV8T/oJUEuasuPAiekgdzrsfxIBP ChK6h9bWa9jEIWpKZxUnl5TRFkDCAARsyqK59TDIUG61QKA1C/Cx17ib/Q+ypjdhzfV+ 7QGJKHvZ2sf8+j8Yzo0zsXbp8NRMX4hauqaFnVq3hBpmwro4Q9Q2vpwhbt7XSsOmP3bi lAT2w/vMUz0BBCwsCgCma6MQM69UaC2C00oXpEVVzse8FTVGCeoc8KYhi84+Ow34UDlf aNFw== X-Gm-Message-State: AOJu0Ywyqffws1eVlfIynk7fJ8mMXyG8dhfn33GbGx/FHIsmbNGLFyCB +R/I8LPXjMyxq9B0uljT34sBIKnRMv2vGaHxk1oUlClCsWHaHoAYH2SfHuS88w== X-Google-Smtp-Source: AGHT+IG/1npLPtoayDkIkgngDU0AXElvO6WVZRo6jM7auWAPU4ZT/lJjYcD51/AOjiLHamWFDREf0A== X-Received: by 2002:a17:902:eccc:b0:1e2:9aa7:fd21 with SMTP id a12-20020a170902eccc00b001e29aa7fd21mr391632plh.54.1712135598394; Wed, 03 Apr 2024 02:13:18 -0700 (PDT) Received: from yunkec1.tok.corp.google.com ([2401:fa00:8f:203:d5be:b59a:f5f7:246d]) by smtp.gmail.com with ESMTPSA id lo14-20020a170903434e00b001e0aded0ca7sm12692811plb.239.2024.04.03.02.13.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 02:13:18 -0700 (PDT) From: Yunke Cao To: Tomasz Figa , Marek Szyprowski , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, Yunke Cao Subject: [PATCH v2 3/3] media: videobuf2-core: attach once if multiple planes share the same dbuf Date: Wed, 3 Apr 2024 18:13:06 +0900 Message-ID: <20240403091306.1308878-4-yunkec@chromium.org> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog In-Reply-To: <20240403091306.1308878-1-yunkec@chromium.org> References: <20240403091306.1308878-1-yunkec@chromium.org> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When multiple planes use the same dma buf, each plane will have its own dma buf attachment and mapping. It is a waste of IOVA space. This patch adds a dbuf_duplicated boolean in vb2_plane. If a plane's dbuf is the same as an existing plane, do not create another attachment and mapping. Signed-off-by: Yunke Cao --- .../media/common/videobuf2/videobuf2-core.c | 27 +++++++++++++++---- include/media/videobuf2-core.h | 3 +++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c index a5368cef73bb..64fe3801b802 100644 --- a/drivers/media/common/videobuf2/videobuf2-core.c +++ b/drivers/media/common/videobuf2/videobuf2-core.c @@ -304,10 +304,13 @@ static void __vb2_plane_dmabuf_put(struct vb2_buffer *vb, struct vb2_plane *p) if (!p->mem_priv) return; - if (p->dbuf_mapped) - call_void_memop(vb, unmap_dmabuf, p->mem_priv); + if (!p->dbuf_duplicated) { + if (p->dbuf_mapped) + call_void_memop(vb, unmap_dmabuf, p->mem_priv); + + call_void_memop(vb, detach_dmabuf, p->mem_priv); + } - call_void_memop(vb, detach_dmabuf, p->mem_priv); dma_buf_put(p->dbuf); p->mem_priv = NULL; p->dbuf = NULL; @@ -1327,7 +1330,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) struct vb2_plane planes[VB2_MAX_PLANES]; struct vb2_queue *q = vb->vb2_queue; void *mem_priv; - unsigned int plane; + unsigned int plane, i; int ret = 0; bool reacquired = vb->planes[0].mem_priv == NULL; @@ -1380,6 +1383,19 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) __vb2_buf_dmabuf_put(vb); for (plane = 0; plane < vb->num_planes; ++plane) { + for (i = 0; i < plane; ++i) { + if (planes[plane].dbuf == vb->planes[i].dbuf) { + vb->planes[plane].dbuf_duplicated = true; + vb->planes[plane].dbuf = vb->planes[i].dbuf; + vb->planes[plane].mem_priv = vb->planes[i].mem_priv; + break; + } + } + + /* There's no need to attach a duplicated dbuf. */ + if (vb->planes[plane].dbuf_duplicated) + continue; + /* Acquire each plane's memory */ mem_priv = call_ptr_memop(attach_dmabuf, vb, @@ -1392,6 +1408,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) goto err_put_dbuf; } + vb->planes[plane].dbuf_duplicated = false; vb->planes[plane].dbuf = planes[plane].dbuf; vb->planes[plane].mem_priv = mem_priv; } @@ -1406,7 +1423,7 @@ static int __prepare_dmabuf(struct vb2_buffer *vb) * userspace knows sooner rather than later if the dma-buf map fails. */ for (plane = 0; plane < vb->num_planes; ++plane) { - if (vb->planes[plane].dbuf_mapped) + if (vb->planes[plane].dbuf_mapped || vb->planes[plane].dbuf_duplicated) continue; ret = call_memop(vb, map_dmabuf, vb->planes[plane].mem_priv); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 8b86996b2719..2484e7d2881d 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -154,6 +154,8 @@ struct vb2_mem_ops { * @mem_priv: private data with this plane. * @dbuf: dma_buf - shared buffer object. * @dbuf_mapped: flag to show whether dbuf is mapped or not + * @duplicated_dbuf: boolean to show whether dbuf is duplicated with a + * previous plane of the buffer. * @bytesused: number of bytes occupied by data in the plane (payload). * @length: size of this plane (NOT the payload) in bytes. The maximum * valid size is MAX_UINT - PAGE_SIZE. @@ -179,6 +181,7 @@ struct vb2_plane { void *mem_priv; struct dma_buf *dbuf; unsigned int dbuf_mapped; + bool dbuf_duplicated; unsigned int bytesused; unsigned int length; unsigned int min_length;