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 0768AC433F5 for ; Wed, 30 Mar 2022 17:32:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232304AbiC3Rdw (ORCPT ); Wed, 30 Mar 2022 13:33:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349441AbiC3Rd3 (ORCPT ); Wed, 30 Mar 2022 13:33:29 -0400 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47F974C400; Wed, 30 Mar 2022 10:31:42 -0700 (PDT) Received: by mail-wr1-x42a.google.com with SMTP id h23so30301646wrb.8; Wed, 30 Mar 2022 10:31:42 -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=MzOHSa1wGev7C61xNe7AlpnL6176z6/FaTx3bV4mjuY=; b=VpSVi2g7tol4ZEtmFAbrEKl2ClldYYPOqDfvuzHFwzN1r2GBUOmp+X5qC2sTOGTv+q VasI8bOaDB17Wj5zf6L3Vi7yNqMM+GuCL205yQjNT6GPsOlj6+OlpQwqpEvjuRUsNZfE C/azEpBsaT8HORk1sROgRQ8Th4grMWoEvzorWWrPiI6ky8S1auDWu6UaZz9+3BJNOaa2 yIrpyzcehU9u17ygGvZ6BJqsxzCVWFm8+RxbW29xvfyBYaZdDrZR3pEfnJXPGdQA3bYd eXnmrSEzBgpFA3JOZZEKy205JvU1lvDbhL30Ri3r8WDUcg6vb5+6MrByecZVrsy7dMNX 549g== 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=MzOHSa1wGev7C61xNe7AlpnL6176z6/FaTx3bV4mjuY=; b=X+I3Wx6tOZs9MexdqhRaiq/7xMEyjvrl9HPcc8R7vU95G/MQ2fiTbA0eiSOPMwCFIb OclIAe4P0oWrmds0NzJINCvwKsdcMm2d0Gsa6hrZLETHCjaMm7N/a3j9ss7luoBV0KDy sd9GuRKyMCIx7i1wklb+aZWY9RILQ5PN4GzMRmJjZt7++bfVTA/iV+hGTP8I2gmARe9T SOMetij1IRgMlnFfFWOgFT/JUUMR1+pP4818NDBQFBVEU8wNC0xf/rkeAtNHgj042H4F oDwLnJ3D3w+ULxDhmXbLFBE87qufiFizoVWNH85XF60tfGus93XlDoN45CLdPBn2+9pF YE9g== X-Gm-Message-State: AOAM533McLqTishdK/wlN8q8YG8822QQKRKxuNT8s9uwUa+YtCC4HzjP Mv/pZzNQT3g26o0q0aewnRqw40bej9jJb5ZrpX4= X-Google-Smtp-Source: ABdhPJxzLtFOHA8j1KP7060UxbMN89W0F5SOw0/ZWrSMMqfII6hCIzYI4qnQ5sVFdKPvpVEKavi+htl4y4KW0PBzBc0= X-Received: by 2002:adf:dd4d:0:b0:203:f178:b78b with SMTP id u13-20020adfdd4d000000b00203f178b78bmr622734wrm.93.1648661500674; Wed, 30 Mar 2022 10:31:40 -0700 (PDT) MIME-Version: 1.0 References: <20220329230105.601666-1-robdclark@gmail.com> <20220329230105.601666-4-robdclark@gmail.com> In-Reply-To: From: Rob Clark Date: Wed, 30 Mar 2022 10:32:32 -0700 Message-ID: Subject: Re: [PATCH 3/9] drm/msm/gem: Split out inuse helper To: Dmitry Baryshkov Cc: dri-devel , freedreno , linux-arm-msm , Rob Clark , Sean Paul , Abhinav Kumar , David Airlie , Daniel Vetter , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 30, 2022 at 4:32 AM Dmitry Baryshkov wrote: > > On Wed, 30 Mar 2022 at 02:00, Rob Clark wrote: > > > > From: Rob Clark > > > > Prep for a following patch. While we are at it, convert a few remaining > > WARN_ON()s to GEM_WARN_ON(). > > Well... GEM_WARN_ON doesn't really look like a 'while we are at it'. > It might be better to split it into a separate commit. it was a bit lazy.. I'll split it out > > > > Signed-off-by: Rob Clark > > --- > > drivers/gpu/drm/msm/msm_gem.c | 2 +- > > drivers/gpu/drm/msm/msm_gem.h | 1 + > > drivers/gpu/drm/msm/msm_gem_vma.c | 15 ++++++++++----- > > 3 files changed, 12 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c > > index a4f61972667b..f96d1dc72021 100644 > > --- a/drivers/gpu/drm/msm/msm_gem.c > > +++ b/drivers/gpu/drm/msm/msm_gem.c > > @@ -938,7 +938,7 @@ void msm_gem_describe(struct drm_gem_object *obj, struct seq_file *m, > > name, comm ? ":" : "", comm ? comm : "", > > vma->aspace, vma->iova, > > vma->mapped ? "mapped" : "unmapped", > > - vma->inuse); > > + msm_gem_vma_inuse(vma)); > > kfree(comm); > > } > > > > diff --git a/drivers/gpu/drm/msm/msm_gem.h b/drivers/gpu/drm/msm/msm_gem.h > > index 947ff7d9b471..1b7f0f0b88bf 100644 > > --- a/drivers/gpu/drm/msm/msm_gem.h > > +++ b/drivers/gpu/drm/msm/msm_gem.h > > @@ -61,6 +61,7 @@ struct msm_gem_vma { > > int msm_gem_init_vma(struct msm_gem_address_space *aspace, > > struct msm_gem_vma *vma, int npages, > > u64 range_start, u64 range_end); > > +bool msm_gem_vma_inuse(struct msm_gem_vma *vma); > > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > > struct msm_gem_vma *vma); > > void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, > > diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c > > index f914ddbaea89..dc2ae097805e 100644 > > --- a/drivers/gpu/drm/msm/msm_gem_vma.c > > +++ b/drivers/gpu/drm/msm/msm_gem_vma.c > > @@ -37,6 +37,11 @@ msm_gem_address_space_get(struct msm_gem_address_space *aspace) > > return aspace; > > } > > > > +bool msm_gem_vma_inuse(struct msm_gem_vma *vma) > > +{ > > + return !!vma->inuse; > > +} > > It almost asks to be a static inline. The patch 04 makes it complex, > so it's probably not that important. yeah, that is the reason I didn't make it static inline BR, -R > > + > > /* Actually unmap memory for the vma */ > > void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > > struct msm_gem_vma *vma) > > @@ -44,7 +49,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > > unsigned size = vma->node.size << PAGE_SHIFT; > > > > /* Print a message if we try to purge a vma in use */ > > - if (WARN_ON(vma->inuse > 0)) > > + if (GEM_WARN_ON(msm_gem_vma_inuse(vma))) > > return; > > > > /* Don't do anything if the memory isn't mapped */ > > @@ -61,7 +66,7 @@ void msm_gem_purge_vma(struct msm_gem_address_space *aspace, > > void msm_gem_unmap_vma(struct msm_gem_address_space *aspace, > > struct msm_gem_vma *vma) > > { > > - if (!WARN_ON(!vma->iova)) > > + if (!GEM_WARN_ON(!vma->iova)) > > vma->inuse--; > > } > > > > @@ -73,7 +78,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, > > unsigned size = npages << PAGE_SHIFT; > > int ret = 0; > > > > - if (WARN_ON(!vma->iova)) > > + if (GEM_WARN_ON(!vma->iova)) > > return -EINVAL; > > > > /* Increase the usage counter */ > > @@ -100,7 +105,7 @@ msm_gem_map_vma(struct msm_gem_address_space *aspace, > > void msm_gem_close_vma(struct msm_gem_address_space *aspace, > > struct msm_gem_vma *vma) > > { > > - if (WARN_ON(vma->inuse > 0 || vma->mapped)) > > + if (GEM_WARN_ON(msm_gem_vma_inuse(vma) || vma->mapped)) > > return; > > > > spin_lock(&aspace->lock); > > @@ -120,7 +125,7 @@ int msm_gem_init_vma(struct msm_gem_address_space *aspace, > > { > > int ret; > > > > - if (WARN_ON(vma->iova)) > > + if (GEM_WARN_ON(vma->iova)) > > return -EBUSY; > > > > spin_lock(&aspace->lock); > > -- > > 2.35.1 > > > > > -- > With best wishes > Dmitry