From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECC81C2D0A3 for ; Wed, 4 Nov 2020 14:09:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91AF0223C7 for ; Wed, 4 Nov 2020 14:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604498971; bh=7Q93x05g8QOOufgWmR0/nAxTYkD6UJ/V5DYN5c3zWWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sN93XzrYzK8yyHVBl+FNG1ZHoOA0V3Uo/2NDSsxfB7GjpXpG0s3qSDWEbVh8YRubi 2x2ahfBveb+O2ooHfrrfS6+rOL/Tz84xg0DQ7IqXaUjRNFk1hT0NfyUBFDzwXDV57j LgZOSRx2R8/ZuEYy2vP5vAVKK2v0wFe4ety2zQYs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730088AbgKDOJa (ORCPT ); Wed, 4 Nov 2020 09:09:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:37668 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730019AbgKDOJ0 (ORCPT ); Wed, 4 Nov 2020 09:09:26 -0500 Received: from ogabbay-VM.habana-labs.com (unknown [213.57.90.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BD56621734; Wed, 4 Nov 2020 14:09:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604498965; bh=7Q93x05g8QOOufgWmR0/nAxTYkD6UJ/V5DYN5c3zWWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F+vNkCCNcpu0VZCoyOCgjjVwi4DyMky8zVElFgZ4s1VAjLd1TFg3LDSblYCCr0VUS lR0l8ZbAEyekaQYaU4JEts2OEFymZekVHjvnzzvcZPCYpcLUhsAeO94YG/v/LbrsJl wV1qTu3YWalGsDzzDMInUYIobnFRv+F5yOxoRi0Y= From: Oded Gabbay To: linux-kernel@vger.kernel.org Cc: SW_Drivers@habana.ai, Ofir Bitton Subject: [PATCH] habanalabs: release signal if collective wait was dropped Date: Wed, 4 Nov 2020 16:09:02 +0200 Message-Id: <20201104140908.10178-6-ogabbay@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201104140908.10178-1-ogabbay@kernel.org> References: <20201104140908.10178-1-ogabbay@kernel.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ofir Bitton As in standard wait cs, we must release a signal fence once a collective wait cs was dropped and not submitted. Signed-off-by: Ofir Bitton Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/command_submission.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/misc/habanalabs/common/command_submission.c b/drivers/misc/habanalabs/common/command_submission.c index 18cd20eec4c5..6de4b161856c 100644 --- a/drivers/misc/habanalabs/common/command_submission.c +++ b/drivers/misc/habanalabs/common/command_submission.c @@ -300,9 +300,11 @@ static void cs_do_release(struct kref *ref) if (!cs->submitted) { /* In case the wait for signal CS was submitted, the put occurs - * in init_signal_wait_cs() right before hanging on the PQ. + * in init_signal_wait_cs() or collective_wait_init_cs() + * right before hanging on the PQ. */ - if (cs->type == CS_TYPE_WAIT) + if (cs->type == CS_TYPE_WAIT || + cs->type == CS_TYPE_COLLECTIVE_WAIT) hl_fence_put(cs->signal_fence); goto out; -- 2.17.1