Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 12 Jul 2022 17:44:00 -0400
From:   Rodrigo Vivi <rodrigo.vivi@intel.com>
To:     Mauro Carvalho Chehab <mchehab@kernel.org>
CC:     Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        Andi Shyti <andi.shyti@linux.intel.com>,
        Thomas =?iso-8859-1?Q?Hellstr=F6m?= 
        <thomas.hellstrom@linux.intel.com>,
        David Airlie <airlied@linux.ie>,
        <dri-devel@lists.freedesktop.org>,
        Lucas De Marchi <lucas.demarchi@intel.com>,
        <linux-kernel@vger.kernel.org>,
        Chris Wilson <chris.p.wilson@intel.com>,
        Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
        Dave Airlie <airlied@redhat.com>, <stable@vger.kernel.org>,
        <intel-gfx@lists.freedesktop.org>,
        John Harrison <John.C.Harrison@intel.com>
Subject: Re: [PATCH v5 2/2] drm/i915/gt: Serialize TLB invalidates with GT
 resets
Message-ID: <Ys3rIMMROTZB8JBh@intel.com>
References: <cover.1657639152.git.mchehab@kernel.org>
 <1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org>
Content-Type: text/plain; charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <1e59a7c45dd919a530256b9ac721ac6ea86c0677.1657639152.git.mchehab@kernel.org>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?iso-8859-1?Q?Qf5+EHix0/t0m7i6Fj4qMEvqJFb/lfRXva4OGVm6FaO6ZHjZKK67aqp3oj?=
 =?iso-8859-1?Q?+v4FfcwxZRNZdobKMEr8SB9o8mfpyV0wmL4gpvU9YCJfuSl7iNZVi9bYB7?=
 =?iso-8859-1?Q?2dSyEDjAGRmtQhk3PMBmShIW7QoUPW+0icZAVjTaO+D7QpTG/i0nkWVrdf?=
 =?iso-8859-1?Q?jV8RhYJ9kyYIoUEzoIoexZmUEAGXJn4Z8lVpuN+pICdd5UO9ERdby2Qrsu?=
 =?iso-8859-1?Q?MUTlsHwFHrVR4oP8uh+BxpMXrgyMktLNW5eI22b92Jg49Jq6TQFBxfVGRS?=
 =?iso-8859-1?Q?ngYeUTkxusI/mRj2qjWCBIe7UdtNEk4nblpSAHPFqGxfiIjFIC/aZrN8BQ?=
 =?iso-8859-1?Q?JIdpqGerDCFrHAs/h0dCzzd31EzMy2ohnnUP5dtVxWkf+K0Foaek/owXxd?=
 =?iso-8859-1?Q?xjK57S5g+E4NlOqXXrelv9fx0gva/2FHuSzSTBInrpzp0fFLpX3gLglSdF?=
 =?iso-8859-1?Q?IF1f4xbAM8wKqfYsE08WpfRSk8RUBz0oilzwRJe4gjPs4QMxiQbBnvSWUR?=
 =?iso-8859-1?Q?uVfj59Kv9Dz5HqNheXXGNbU6YGf3rfG0MMJQMLjv3KBEg3sTQ3UlrWkpyJ?=
 =?iso-8859-1?Q?iiIfOzkORORNOT4Y17/nMxdGlYezHAMWIy3AR26yVdGcb+Gm4zzbJpE73X?=
 =?iso-8859-1?Q?dT5ltRiiw5fQdzYP7n42vXaYMdAhUWI0F6VfkMJytUG6YH6pi9cNXZMLhG?=
 =?iso-8859-1?Q?Ovwzv8fjq3vLXDckO2JTb3j5bmXPlsxDjmx162OAkp6h66gzLBLoF+WITi?=
 =?iso-8859-1?Q?QkFNBjbzKuLNVxFd5/Dq7y+Lk65e62YKN199wSvtOPg2N4Arvh3Y2eFjVb?=
 =?iso-8859-1?Q?cCo4s7kra5UyUYvZo7Q/FUSk0Qmyj3jaV3OAy+jxlWTphR2K9/M0UfDSqD?=
 =?iso-8859-1?Q?y0OXlEKpLhM1rg/Je0VZthlM3SVTfDvf5daVhLXmZ46CS0FO1R/JMJBZ15?=
 =?iso-8859-1?Q?SRFnedDLpPlYY2ZSg3YkxgB/WHUSOLF9CeK8X1Hlsbn58yBGOx6FD0YqfB?=
 =?iso-8859-1?Q?r+4YdMcUENUSuacnJCvmfWjuFUyUS804Xkw3nOESAgV+8S2KevAUCdWeDj?=
 =?iso-8859-1?Q?UO2liuD03bBrZc3FvCNj21leEhKNwk68ylRfDZu9lCl75BSriQwbIExBSj?=
 =?iso-8859-1?Q?aHorZBlHK+5y7/oZ+anCZ40J79tFN60A1d9xjFRsx8PpFqzfhBhbVrjSkq?=
 =?iso-8859-1?Q?zKQnwoPSUirnUc5Ezt66DnkEFT3jFbjl4dzsIMgoD6IzxBUkYTGMRAk1mn?=
 =?iso-8859-1?Q?GUQKBgTS0aFY99gc/skAl0j4UhKgTdzZrMF0Goslde9Jm1Nu6DGfH3kmqX?=
 =?iso-8859-1?Q?c4P0ljgziBWotcbqTzbnz8w3Z6Lfg37DYRN3/bMrWe0jnzfn/8S4bSYfH6?=
 =?iso-8859-1?Q?+bfbQHV+OM458JnsdhGcjQNLxrsLoKdz/srI2oivB6lCmruzFKE4GGQw0h?=
 =?iso-8859-1?Q?+SGiXY9lvMQctkvMQ7C/3x0Yhy/9s54dtZ8wFGU5xRWMyyzG0dvuyUZz7Z?=
 =?iso-8859-1?Q?6CVRkDk3toIymaoMqm1M8eRCyy/ils08pO6f5zOoU9Usrwue+H/J81N/wV?=
 =?iso-8859-1?Q?zLgpFzdbTtEYw0WfGjdmvI2SbXmGT13yGAkuIpknxsRFJd76QBoBLtdDxQ?=
 =?iso-8859-1?Q?OZxq4o4YyurZSqraTm1jZ19Dy9MEuPWhIuYTr4ci3r3yZxOzQOZgahog?=
 =?iso-8859-1?Q?=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: e3665584-45b3-4e6a-cddc-08da644fa4cc
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6059.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2022 21:44:06.0643
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: ueSUWzWNu4nz6H98EDWk7+sxDXKG+DLhlHIXRmXvk8Ypz9pYFCqhBOYcBz8cDDPV+2puyl0GrC8PgS0ClGqWtA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4961
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI,
        SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Jul 12, 2022 at 04:21:33PM +0100, Mauro Carvalho Chehab wrote:
> From: Chris Wilson <chris.p.wilson@intel.com>
> 
> Avoid trying to invalidate the TLB in the middle of performing an
> engine reset, as this may result in the reset timing out. Currently,
> the TLB invalidate is only serialised by its own mutex, forgoing the
> uncore lock, but we can take the uncore->lock as well to serialise
> the mmio access, thereby serialising with the GDRST.
> 
> Tested on a NUC5i7RYB, BIOS RYBDWi35.86A.0380.2019.0517.1530 with
> i915 selftest/hangcheck.
> 
> Cc: stable@vger.kernel.org  # v4.4 and upper
> Fixes: 7938d61591d3 ("drm/i915: Flush TLBs before releasing backing store")
> Reported-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> Tested-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> Reviewed-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> Signed-off-by: Chris Wilson <chris.p.wilson@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
> Acked-by: Thomas Hellstr?m <thomas.hellstrom@linux.intel.com>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

pushed to drm-intel-gt-next. Thanks for the patches, tests, reviews and patience.

> ---
> 
> See [PATCH v5 0/2] at: https://lore.kernel.org/all/cover.1657639152.git.mchehab@kernel.org/
> 
>  drivers/gpu/drm/i915/gt/intel_gt.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c
> index 8da3314bb6bf..68c2b0d8f187 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
> @@ -952,6 +952,20 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
>  	mutex_lock(&gt->tlb_invalidate_lock);
>  	intel_uncore_forcewake_get(uncore, FORCEWAKE_ALL);
>  
> +	spin_lock_irq(&uncore->lock); /* serialise invalidate with GT reset */
> +
> +	for_each_engine(engine, gt, id) {
> +		struct reg_and_bit rb;
> +
> +		rb = get_reg_and_bit(engine, regs == gen8_regs, regs, num);
> +		if (!i915_mmio_reg_offset(rb.reg))
> +			continue;
> +
> +		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
> +	}
> +
> +	spin_unlock_irq(&uncore->lock);
> +
>  	for_each_engine(engine, gt, id) {
>  		/*
>  		 * HW architecture suggest typical invalidation time at 40us,
> @@ -966,7 +980,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt)
>  		if (!i915_mmio_reg_offset(rb.reg))
>  			continue;
>  
> -		intel_uncore_write_fw(uncore, rb.reg, rb.bit);
>  		if (__intel_wait_for_register_fw(uncore,
>  						 rb.reg, rb.bit, 0,
>  						 timeout_us, timeout_ms,
> -- 
> 2.36.1
>