Received: by 2002:a05:6a10:d5a5:0:0:0:0 with SMTP id gn37csp662395pxb; Thu, 30 Sep 2021 14:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz13Wn75ZxOjHndR1JO0BrPCxbVmxZCtcGqUKQynGVUPrw3BUpmlQtP7eLH9cvmProW/HQE X-Received: by 2002:a17:90b:381:: with SMTP id ga1mr8755963pjb.5.1633037047958; Thu, 30 Sep 2021 14:24:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633037047; cv=none; d=google.com; s=arc-20160816; b=d5lwlhnNb3s67ly/sZWHDWPn3A433iP9XctlH2FgtzeBVutag++L+QHzsxWAxBr2xl UtHaePOXYGH4dRoJY1c+zNj1rIMRcfspcY4YTaWtcW6jYJHtNh4pJaxHc20TFWhaD64y +oMirbg0OYp/ocSlau6b1KsIS7Fy5B+ctF/sZB3Vui809hwWJwl2qU1sLgMMuuSwm6Fa w1hmlus93oqNc9O+ZhLrxwP5KWbk/Q2lfQG7mK14KwS9DxJH6qfGiBBRbxCG9wVY3CG2 TRK9yNve8LLutlhcxCPETHHVT/ppxcWOg5JzPFOQLyw68iXkcDgKQMn52rr6COgWr2PN IZ2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=GtHR/5mhoD+jbjzzofM3zeDSQMp6/bJoeja1COQo/fU=; b=d4jbAIGR19WL9V6JqPhTpmWbDmNGLIS/RUAnxkg9kGx3i23GfQRpxHjqv/cKgQMQ1J DHSuRu4nwRdSXUKQU5OdS5u1c4a2uoyh0wyrmI/jjpeU1EJAgVJNTx2R23FCNP3h4eYb oXOAZlDh9hrQRym49BLU3huROsUGhdF56oHPXMDF+qsn/o8HeZQG5tFYz8Rkvy7GxWgi XyRTl509k8hgmUrUY6uIIb3wfd6CUPn7kZRACFDECJrP9/W2xV+ce3Nv1yw+uAubmDAT 6TYCsdbOvtUZzoAyJIVjd2OCy1aYIMgSSfZknOgEoCPMIQXmRv0ip/Mpi8o4cbU5hRM/ 5bIA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Rue0cEAx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g11si5111063plp.180.2021.09.30.14.23.54; Thu, 30 Sep 2021 14:24:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=Rue0cEAx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345074AbhI3TBO (ORCPT + 99 others); Thu, 30 Sep 2021 15:01:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344221AbhI3TBN (ORCPT ); Thu, 30 Sep 2021 15:01:13 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4EB9C06176A; Thu, 30 Sep 2021 11:59:29 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id q2so1833288wrc.4; Thu, 30 Sep 2021 11:59:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=GtHR/5mhoD+jbjzzofM3zeDSQMp6/bJoeja1COQo/fU=; b=Rue0cEAxWW1ZqJcStxVmkOOQUKd4yTba2mlu7wbp4BiLmo71fXj5pV5d7nddvA/HnP Qo8Dez5nAUTT6TwQswJl0YMZVKam36NG8MGhA13s7sDCEYjn4YEuZ3nKa/8ZsxE5M0gc CMyRMJqhEOoft3QEH2iyBrSUJvodvt/NX6xaRiBaV61stg1sG7vi3QvkBJ9M20UItNqC 36YNk/3N/AhDPuM7dmQz7Zgm33zhHLqRcaMZXZ8M3BxlBsNgX7VCpg1Xzk/GM0WJbN+6 CWf1eLXxhsg1uIH+u+OYfANqlH3nQK5IJehFNEkxCQFj29TQ6maZ5mIKm2eJrpHe26CS kntA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=GtHR/5mhoD+jbjzzofM3zeDSQMp6/bJoeja1COQo/fU=; b=eDIMbJe8tUjy2LM7TgZSAXVUH4zL704Oykv0kvBon/vVzsXr04lkDKg+1lvHlKbm8V 3Eb/VKnQ7TfF0JHVoEEVMAjBHvf7JJkUYxDMNTUyTWcIHQaCMaLh0/AoQBWWdZ8c3qFp Yarkrsw6Uvnu4E2OSXJhJKCJhGltkSdd8rRcRDKUloN+jFv19StzBYL71gDLu6Q+i38r pBo2uaxWL5UpIOCgEWra/uhs7TmAK4I24HX6GidCxifd+8u9pZ9klzbwRr991HssLpYw jcCjbPNEEMovcY4aukuaangDjntPK4gSQ2nXkiwAKBUtq3udgGnM+WbC3EBkQm4xyiv6 Vp8A== X-Gm-Message-State: AOAM532Wiv21pgmnz+cKG5afximD/BE4EPAH/iTm/q9ie4iWPaPmto33 BDqzjaHWNneWxME7BlUg5ZjA6REkrI+M2CsQEUc= X-Received: by 2002:a5d:544c:: with SMTP id w12mr8240896wrv.398.1633028368278; Thu, 30 Sep 2021 11:59:28 -0700 (PDT) MIME-Version: 1.0 References: <20210930182506.1236811-1-robdclark@gmail.com> In-Reply-To: From: Rob Clark Date: Thu, 30 Sep 2021 12:04:02 -0700 Message-ID: Subject: Re: [PATCH] drm/msm/a6xx: Track current ctx by seqno To: Daniel Vetter Cc: dri-devel , freedreno , linux-arm-msm , Jordan Crouse , Rob Clark , Sean Paul , David Airlie , Akhil P Oommen , Jonathan Marek , Dmitry Baryshkov , Sharat Masetty , Douglas Anderson , Sai Prakash Ranjan , Yangtao Li , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Sep 30, 2021 at 11:34 AM Daniel Vetter wrote: > > On Thu, Sep 30, 2021 at 8:20 PM Rob Clark wrote: > > > > From: Rob Clark > > > > In theory a context can be destroyed and a new one allocated at the same > > address, making the pointer comparision to detect when we don't need to > > update the current pagetables invalid. Instead assign a sequence number > > to each context on creation, and use this for the check. > > > > Fixes: 84c31ee16f90 ("drm/msm/a6xx: Add support for per-instance pagetables") > > Signed-off-by: Rob Clark > > Usually the weak reference pattern is to wrap a spinlock or something > around it and clear it out on destruction. Or hold a full reference > (e.g. on intel hw the hw goes unhappy if there's no context/pagetables > at all, so we always need some). But I guess this works too. yeah, the seqno approach was so that gen agnostic code didn't have to go fishing around in a6xx_gpu.. I guess the downside is userspace could open/close the dev file 2^32 times without submitting any rendering to trigger the same sort of issue. But there are plenty of easier ways for userspace to trigger faults if it wanted. BR, -R > -Daniel > > > --- > > drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 6 +++--- > > drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 11 ++++++++++- > > drivers/gpu/drm/msm/msm_drv.c | 3 +++ > > drivers/gpu/drm/msm/msm_drv.h | 1 + > > 4 files changed, 17 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > > index 5e1ae3df42ba..e0a8b2fd1ff0 100644 > > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c > > @@ -106,7 +106,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, > > u32 asid; > > u64 memptr = rbmemptr(ring, ttbr0); > > > > - if (ctx == a6xx_gpu->cur_ctx) > > + if (ctx->seqno == a6xx_gpu->cur_ctx_seqno) > > return; > > > > if (msm_iommu_pagetable_params(ctx->aspace->mmu, &ttbr, &asid)) > > @@ -139,7 +139,7 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu, > > OUT_PKT7(ring, CP_EVENT_WRITE, 1); > > OUT_RING(ring, 0x31); > > > > - a6xx_gpu->cur_ctx = ctx; > > + a6xx_gpu->cur_ctx_seqno = ctx->seqno; > > } > > > > static void a6xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) > > @@ -1081,7 +1081,7 @@ static int hw_init(struct msm_gpu *gpu) > > /* Always come up on rb 0 */ > > a6xx_gpu->cur_ring = gpu->rb[0]; > > > > - a6xx_gpu->cur_ctx = NULL; > > + a6xx_gpu->cur_ctx_seqno = 0; > > > > /* Enable the SQE_to start the CP engine */ > > gpu_write(gpu, REG_A6XX_CP_SQE_CNTL, 1); > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h > > index 0bc2d062f54a..8e5527c881b1 100644 > > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h > > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h > > @@ -19,7 +19,16 @@ struct a6xx_gpu { > > uint64_t sqe_iova; > > > > struct msm_ringbuffer *cur_ring; > > - struct msm_file_private *cur_ctx; > > + > > + /** > > + * cur_ctx_seqno: > > + * > > + * The ctx->seqno value of the context with current pgtables > > + * installed. Tracked by seqno rather than pointer value to > > + * avoid dangling pointers, and cases where a ctx can be freed > > + * and a new one created with the same address. > > + */ > > + int cur_ctx_seqno; > > > > struct a6xx_gmu gmu; > > > > diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c > > index 624078b3adf2..30c1efc3d8a0 100644 > > --- a/drivers/gpu/drm/msm/msm_drv.c > > +++ b/drivers/gpu/drm/msm/msm_drv.c > > @@ -711,6 +711,7 @@ static void load_gpu(struct drm_device *dev) > > > > static int context_init(struct drm_device *dev, struct drm_file *file) > > { > > + static atomic_t ident = ATOMIC_INIT(0); > > struct msm_drm_private *priv = dev->dev_private; > > struct msm_file_private *ctx; > > > > @@ -727,6 +728,8 @@ static int context_init(struct drm_device *dev, struct drm_file *file) > > ctx->aspace = msm_gpu_create_private_address_space(priv->gpu, current); > > file->driver_priv = ctx; > > > > + ctx->seqno = atomic_inc_return(&ident); > > + > > return 0; > > } > > > > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > > index de062450add4..8633d0059a3e 100644 > > --- a/drivers/gpu/drm/msm/msm_drv.h > > +++ b/drivers/gpu/drm/msm/msm_drv.h > > @@ -59,6 +59,7 @@ struct msm_file_private { > > int queueid; > > struct msm_gem_address_space *aspace; > > struct kref ref; > > + int seqno; > > }; > > > > enum msm_mdp_plane_property { > > -- > > 2.31.1 > > > > > -- > Daniel Vetter > Software Engineer, Intel Corporation > http://blog.ffwll.ch