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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 2CD84C2BB48 for ; Tue, 15 Dec 2020 01:08:31 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DD40920705 for ; Tue, 15 Dec 2020 01:08:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD40920705 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 374216E17A; Tue, 15 Dec 2020 01:08:30 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 772A06E154 for ; Tue, 15 Dec 2020 01:08:03 +0000 (UTC) IronPort-SDR: K0cvmgbO8eLWPF30FadUVXp44CfgaEpQFk0oHWHFIgyhKjsxPBGi6zekfQEe71AzhKASboBGmk n6QIyFzf486Q== X-IronPort-AV: E=McAfee;i="6000,8403,9835"; a="171298003" X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="171298003" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Dec 2020 17:08:01 -0800 IronPort-SDR: Cr9QZGhp3flPLkwJLCIC+SEaVWYm8rnKpUadzONYW6wSzNvyzJAMnLSP0fr5Xcy2lVLorjYQ3U Zh9gk44HRWXA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,420,1599548400"; d="scan'208";a="331861150" Received: from sean-virtualbox.fm.intel.com ([10.105.158.96]) by fmsmga007.fm.intel.com with ESMTP; 14 Dec 2020 17:08:01 -0800 From: "Huang, Sean Z" To: Intel-gfx@lists.freedesktop.org Date: Mon, 14 Dec 2020 17:07:22 -0800 Message-Id: <20201215010726.15898-20-sean.z.huang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215010726.15898-1-sean.z.huang@intel.com> References: <20201215010726.15898-1-sean.z.huang@intel.com> Subject: [Intel-gfx] [RFC-v9 19/23] drm/i915/pxp: Termiante the session upon app crash X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" PXP should terminate the hardware session and cleanup the software state gracefully when the application has established the protection session, but doesn't close the session correctly due to some cases like application crash. Signed-off-by: Huang, Sean Z --- drivers/gpu/drm/i915/i915_drv.c | 3 +++ drivers/gpu/drm/i915/pxp/intel_pxp.c | 15 +++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp.h | 5 +++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.c | 25 +++++++++++++++++++++++++ drivers/gpu/drm/i915/pxp/intel_pxp_sm.h | 1 + 5 files changed, 49 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 3dbda949bf71..e74201e81369 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -69,6 +69,7 @@ #include "gt/intel_rc6.h" #include "pxp/intel_pxp_pm.h" +#include "pxp/intel_pxp.h" #include "i915_debugfs.h" #include "i915_drv.h" @@ -1026,6 +1027,8 @@ static void i915_driver_postclose(struct drm_device *dev, struct drm_file *file) /* Catch up with all the deferred frees from "this" client */ i915_gem_flush_free_objects(to_i915(dev)); + + intel_pxp_close(&(to_i915(dev)->gt.pxp), file); } static void intel_suspend_encoders(struct drm_i915_private *dev_priv) diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.c b/drivers/gpu/drm/i915/pxp/intel_pxp.c index 46ad2ab229c1..3a49dd97cab2 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.c @@ -320,3 +320,18 @@ int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmf ret = -EFAULT; return ret; } + +void intel_pxp_close(struct intel_pxp *pxp, struct drm_file *drmfile) +{ + int ret; + struct intel_gt *gt = container_of(pxp, typeof(*gt), pxp); + + if (pxp->ctx.id == 0 || !drmfile) + return; + + mutex_lock(&pxp->ctx.mutex); + ret = intel_pxp_sm_close(pxp, drmfile); + if (ret) + drm_err(>->i915->drm, "Failed to %s, ret=[%d]\n", __func__, ret); + mutex_unlock(&pxp->ctx.mutex); +} diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp.h b/drivers/gpu/drm/i915/pxp/intel_pxp.h index 133e3df9b1f6..ffb460327315 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp.h +++ b/drivers/gpu/drm/i915/pxp/intel_pxp.h @@ -64,6 +64,7 @@ int intel_pxp_init(struct intel_pxp *pxp); void intel_pxp_uninit(struct intel_pxp *pxp); bool intel_pxp_gem_object_status(struct drm_i915_private *i915); int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct drm_file *drmfile); +void intel_pxp_close(struct intel_pxp *pxp, struct drm_file *drmfile); #else static inline void intel_pxp_irq_handler(struct intel_pxp *pxp, u16 iir) { @@ -97,6 +98,10 @@ static inline int i915_pxp_ops_ioctl(struct drm_device *dev, void *data, struct { return 0; } + +static inline void intel_pxp_close(struct intel_pxp *pxp, struct drm_file *drmfile) +{ +} #endif #endif /* __INTEL_PXP_PM_H__ */ diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c index c4b55e1531c1..e03c2b039192 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.c @@ -460,3 +460,28 @@ int intel_pxp_sm_ioctl_query_pxp_tag(struct intel_pxp *pxp, return 0; } + +int intel_pxp_sm_close(struct intel_pxp *pxp, struct drm_file *drmfile) +{ + int ret; + struct intel_pxp_sm_session *curr, *n; + + list_for_each_entry_safe(curr, n, session_list(pxp, SESSION_TYPE_TYPE0), list) { + if (curr->drmfile && curr->drmfile == drmfile && + curr->pid == pid_nr(drmfile->pid)) { + ret = pxp_terminate_hw_session(pxp, curr->type, + curr->index); + if (ret) + return ret; + + ret = pxp_set_pxp_tag(pxp, curr->type, curr->index, + PROTECTION_MODE_NONE); + if (ret) + return ret; + + list_del(&curr->list); + kfree(curr); + } + } + return 0; +} diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h index 09a26bb7a1a4..d2acbd1298b4 100644 --- a/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_sm.h @@ -50,4 +50,5 @@ int intel_pxp_sm_ioctl_query_pxp_tag(struct intel_pxp *pxp, bool intel_pxp_sm_is_hw_session_in_play(struct intel_pxp *pxp, int session_type, int session_index); int intel_pxp_sm_terminate_all_sessions(struct intel_pxp *pxp, int session_type); +int intel_pxp_sm_close(struct intel_pxp *pxp, struct drm_file *drmfile); #endif /* __INTEL_PXP_SM_H__ */ -- 2.17.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx