From patchwork Wed Dec 22 23:29:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Brost X-Patchwork-Id: 12697635 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 55712C433F5 for ; Wed, 22 Dec 2021 23:34:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 78B3810E11F; Wed, 22 Dec 2021 23:34:30 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7DF7810E119; Wed, 22 Dec 2021 23:34:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1640216068; x=1671752068; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cXJENaIlfOcA6CiVQBL0eK2WDfL4vdWxuNgXOb5rCZM=; b=RrlwCSixYe1UKxAT0M+58RNaUJ+zrwYPh6D3A9n1CuCVZxGS0hnct80m bAUxedfdMuDXDrAEO8M0R6LE2APfBGcju74z3YZnzC9CPZcsLBfct7iWQ lenTTwXTVjMhqNZFMMPLqj38EoFXkdqDwvV6vODvXuRGEapeTHQ3CjTZY bjiY4fQqquqGw1VTWGzK0/lBOetgkR1WwN+2FNleI4b9bJ95X47vA+doN DM7/+gEN5JTodosN61tTCDvOYjoUyhMr0jex+RHmAapPiMTBKDwvoHU+H gA2QFmKxS0I1bvd8yd0GclI0amcyLfxpSS2bE7zws7ej9pSzT6c16MGXP w==; X-IronPort-AV: E=McAfee;i="6200,9189,10206"; a="327031451" X-IronPort-AV: E=Sophos;i="5.88,227,1635231600"; d="scan'208";a="327031451" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2021 15:34:27 -0800 X-IronPort-AV: E=Sophos;i="5.88,227,1635231600"; d="scan'208";a="521867622" Received: from jons-linux-dev-box.fm.intel.com ([10.1.27.20]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2021 15:34:27 -0800 From: Matthew Brost To: , Subject: [PATCH] drm/i915/guc: Use lockless list for destroyed contexts Date: Wed, 22 Dec 2021 15:29:07 -0800 Message-Id: <20211222232907.12735-1-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: daniele.ceraolospurio@intel.com, john.c.harrison@intel.com, tvrtko.ursulin@intel.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use a lockless list structure for destroyed contexts to avoid hammering on global submission spin lock. Suggested-by: Tvrtko Ursulin Signed-off-by: Matthew Brost --- drivers/gpu/drm/i915/gt/intel_context.c | 2 - drivers/gpu/drm/i915/gt/intel_context_types.h | 3 +- drivers/gpu/drm/i915/gt/uc/intel_guc.h | 3 +- .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 44 +++++-------------- 4 files changed, 16 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c index 5d0ec7c49b6a..4aacb4b0418d 100644 --- a/drivers/gpu/drm/i915/gt/intel_context.c +++ b/drivers/gpu/drm/i915/gt/intel_context.c @@ -403,8 +403,6 @@ intel_context_init(struct intel_context *ce, struct intel_engine_cs *engine) ce->guc_id.id = GUC_INVALID_LRC_ID; INIT_LIST_HEAD(&ce->guc_id.link); - INIT_LIST_HEAD(&ce->destroyed_link); - INIT_LIST_HEAD(&ce->parallel.child_list); /* diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h index 30cd81ad8911..4532d43ec9c0 100644 --- a/drivers/gpu/drm/i915/gt/intel_context_types.h +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -224,7 +225,7 @@ struct intel_context { * list when context is pending to be destroyed (deregistered with the * GuC), protected by guc->submission_state.lock */ - struct list_head destroyed_link; + struct llist_node destroyed_link; /** @parallel: sub-structure for parallel submission members */ struct { diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index f9240d4baa69..705085058411 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -8,6 +8,7 @@ #include #include +#include #include "intel_uncore.h" #include "intel_guc_fw.h" @@ -112,7 +113,7 @@ struct intel_guc { * @destroyed_contexts: list of contexts waiting to be destroyed * (deregistered with the GuC) */ - struct list_head destroyed_contexts; + struct llist_head destroyed_contexts; /** * @destroyed_worker: worker to deregister contexts, need as we * need to take a GT PM reference and can't from destroy diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 0a03a30e4c6d..6f7643edc139 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -1771,7 +1771,7 @@ int intel_guc_submission_init(struct intel_guc *guc) spin_lock_init(&guc->submission_state.lock); INIT_LIST_HEAD(&guc->submission_state.guc_id_list); ida_init(&guc->submission_state.guc_ids); - INIT_LIST_HEAD(&guc->submission_state.destroyed_contexts); + init_llist_head(&guc->submission_state.destroyed_contexts); INIT_WORK(&guc->submission_state.destroyed_worker, destroyed_worker_func); @@ -2696,26 +2696,18 @@ static void __guc_context_destroy(struct intel_context *ce) } } +#define take_destroyed_contexts(guc) \ + llist_del_all(&guc->submission_state.destroyed_contexts) + static void guc_flush_destroyed_contexts(struct intel_guc *guc) { - struct intel_context *ce; - unsigned long flags; + struct intel_context *ce, *cn; GEM_BUG_ON(!submission_disabled(guc) && guc_submission_initialized(guc)); - while (!list_empty(&guc->submission_state.destroyed_contexts)) { - spin_lock_irqsave(&guc->submission_state.lock, flags); - ce = list_first_entry_or_null(&guc->submission_state.destroyed_contexts, - struct intel_context, - destroyed_link); - if (ce) - list_del_init(&ce->destroyed_link); - spin_unlock_irqrestore(&guc->submission_state.lock, flags); - - if (!ce) - break; - + llist_for_each_entry_safe(ce, cn, take_destroyed_contexts(guc), + destroyed_link) { release_guc_id(guc, ce); __guc_context_destroy(ce); } @@ -2723,23 +2715,11 @@ static void guc_flush_destroyed_contexts(struct intel_guc *guc) static void deregister_destroyed_contexts(struct intel_guc *guc) { - struct intel_context *ce; - unsigned long flags; - - while (!list_empty(&guc->submission_state.destroyed_contexts)) { - spin_lock_irqsave(&guc->submission_state.lock, flags); - ce = list_first_entry_or_null(&guc->submission_state.destroyed_contexts, - struct intel_context, - destroyed_link); - if (ce) - list_del_init(&ce->destroyed_link); - spin_unlock_irqrestore(&guc->submission_state.lock, flags); - - if (!ce) - break; + struct intel_context *ce, *cn; + llist_for_each_entry_safe(ce, cn, take_destroyed_contexts(guc), + destroyed_link) guc_lrc_desc_unpin(ce); - } } static void destroyed_worker_func(struct work_struct *w) @@ -2771,8 +2751,8 @@ static void guc_context_destroy(struct kref *kref) if (likely(!destroy)) { if (!list_empty(&ce->guc_id.link)) list_del_init(&ce->guc_id.link); - list_add_tail(&ce->destroyed_link, - &guc->submission_state.destroyed_contexts); + llist_add(&ce->destroyed_link, + &guc->submission_state.destroyed_contexts); } else { __release_guc_id(guc, ce); }