Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   "Pan, Xinhui" <Xinhui.Pan@amd.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linaro-mm-sig@lists.linaro.org" <linaro-mm-sig@lists.linaro.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-media@vger.kernel.org" <linux-media@vger.kernel.org>
CC:     "sumit.semwal@linaro.org" <sumit.semwal@linaro.org>,
        "daniel.vetter@ffwll.ch" <daniel.vetter@ffwll.ch>,
        "Koenig, Christian" <Christian.Koenig@amd.com>
Subject: [PATCH] dma-buf: Fix missing excl fence waiting
Thread-Topic: [PATCH] dma-buf: Fix missing excl fence waiting
Thread-Index: AQHV6kBADZ+jdaLUr0CyJYyj5pb2Hg==
Date:   Sun, 23 Feb 2020 11:56:15 +0000
Message-ID: <B737F1D5-292E-4FE2-89A5-6EF72CB3EED1@amd.com>
Accept-Language: zh-CN, en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: amd.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-ID: <2673CC912478F547BA3CE5D28290070F@namprd12.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 891c2a85-e7f8-47e6-4fa0-08d7b85762c2
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Feb 2020 11:56:15.2293
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: HzaejKnVZPiMXNYp+OkcZz5QxdBfhzf1kKf89KQr8ANZUm7DQzAcoZRwTWoC455c
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2701
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

If shared fence list is not empty, even we want to test all fences, excl fe=
nce is ignored.
That is abviously wrong, so fix it.

Signed-off-by: xinhui pan <xinhui.pan@amd.com>
---
 drivers/dma-buf/dma-resv.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 4264e64788c4..44dc64c547c6 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -632,14 +632,14 @@ static inline int dma_resv_test_signaled_single(struc=
t dma_fence *passed_fence)
  */
 bool dma_resv_test_signaled_rcu(struct dma_resv *obj, bool test_all)
 {
-	unsigned seq, shared_count;
+	unsigned int seq, shared_count, left;
 	int ret;
=20
 	rcu_read_lock();
 retry:
 	ret =3D true;
 	shared_count =3D 0;
-	seq =3D read_seqcount_begin(&obj->seq);
+	left =3D seq =3D read_seqcount_begin(&obj->seq);
=20
 	if (test_all) {
 		unsigned i;
@@ -647,7 +647,7 @@ bool dma_resv_test_signaled_rcu(struct dma_resv *obj, b=
ool test_all)
 		struct dma_resv_list *fobj =3D rcu_dereference(obj->fence);
=20
 		if (fobj)
-			shared_count =3D fobj->shared_count;
+			left =3D shared_count =3D fobj->shared_count;
=20
 		for (i =3D 0; i < shared_count; ++i) {
 			struct dma_fence *fence =3D rcu_dereference(fobj->shared[i]);
@@ -657,13 +657,14 @@ bool dma_resv_test_signaled_rcu(struct dma_resv *obj,=
 bool test_all)
 				goto retry;
 			else if (!ret)
 				break;
+			left--;
 		}
=20
 		if (read_seqcount_retry(&obj->seq, seq))
 			goto retry;
 	}
=20
-	if (!shared_count) {
+	if (!left) {
 		struct dma_fence *fence_excl =3D rcu_dereference(obj->fence_excl);
=20
 		if (fence_excl) {
--=20
2.21.0 (Apple Git-122)