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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6545AC38A2D for ; Thu, 27 Oct 2022 09:10:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235342AbiJ0JK4 (ORCPT ); Thu, 27 Oct 2022 05:10:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235254AbiJ0JKZ (ORCPT ); Thu, 27 Oct 2022 05:10:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EB6F10059 for ; Thu, 27 Oct 2022 02:10:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 09439B8255B for ; Thu, 27 Oct 2022 09:10:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4E26C433D6; Thu, 27 Oct 2022 09:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1666861817; bh=dQF2+43kff3gQF+6a/Xx6YbAFvzuGAzfM4cCujcupLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z5KcJGJ438pv+d34ILDz0V04vC4I9oPn7Hmkz1CPuZVp3/KS86bdeE50TbOFOYcAo lg4joZa9GLUa0HVww7Y7CBEPM4jhwygoBRb7EUXxz9H9uV1SL0Zx3OeKCWCNMuX0Jh PGOmyI6m95dE8ghv/V9vqMb+e3aTUDI+2tnkurxzEwmY12p6m5fCks+Pq9zrIXWrDI FZMMb+iyWD9mx05rnD+7qgpdI3udnzTIQKyB0caKKT9QtE6wNLjpp0xAAjff+23xiB hL263s8UaSIY6cgH0SpsFGpBFB0+CxneWqHlO09dWk7XlohRR26A+qRGnoiZHr4Tel pv0md0Z6AK7uA== From: Oded Gabbay To: linux-kernel@vger.kernel.org Cc: Dani Liberman Subject: [PATCH 04/15] habanalabs: fix user mappings calculation in case of page fault Date: Thu, 27 Oct 2022 12:09:56 +0300 Message-Id: <20221027091007.664797-4-ogabbay@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027091007.664797-1-ogabbay@kernel.org> References: <20221027091007.664797-1-ogabbay@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dani Liberman As there are 2 types of user mappings, pmmu and hmmu, calculate only the relevant mappings for the requested type. Signed-off-by: Dani Liberman Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay --- drivers/misc/habanalabs/common/device.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c index 0026fe42b3d2..0e88396744a1 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -2305,8 +2305,13 @@ static void hl_capture_user_mappings(struct hl_device *hdev, bool is_pmmu) } mutex_lock(&ctx->mem_hash_lock); - hash_for_each(ctx->mem_hash, i, hnode, node) - pgf_info->num_of_user_mappings++; + hash_for_each(ctx->mem_hash, i, hnode, node) { + vm_type = hnode->ptr; + if (((*vm_type == VM_TYPE_USERPTR) && is_pmmu) || + ((*vm_type == VM_TYPE_PHYS_PACK) && !is_pmmu)) + pgf_info->num_of_user_mappings++; + + } if (!pgf_info->num_of_user_mappings) goto finish; -- 2.25.1