Received: by 2002:a05:7412:419a:b0:f3:1519:9f41 with SMTP id i26csp4563382rdh; Wed, 29 Nov 2023 05:10:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGXHphafJv6vqHWovz9QK8t+pwXQ27OhYprctXumK7/sKnJ60ch8WiXy6M7fsBOvCoAiInc X-Received: by 2002:a05:6a20:7494:b0:18b:386a:46a4 with SMTP id p20-20020a056a20749400b0018b386a46a4mr23743172pzd.18.1701263408094; Wed, 29 Nov 2023 05:10:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701263408; cv=none; d=google.com; s=arc-20160816; b=uOAbDtM2QR9TGqVeyFVCxRhA8Yb+WRkbET2njgf/BF1H5mNm7AnN974gLryNHBwfvE hSVoN67+JKyue/eoJ7xxMltB/V+SRnEApcyIGAhbfN8UNrCvIA0vpL4YOFr2pvGS18Dg WTs4ApjsSuLqClnXNfYJx4LGmgfASJK2gTer/FsidYuueOmx6EmrRQK8rsBGsaV4TJmg rOh6ctoD+90Qyyffqy9hqzdZdqBJkmNkCCImvLGfNlYQ3xHE+fT+1ZNi0rvjtdpXSUr0 BsALyTubr42JL1J0cowwlkaxJryS1RAHGUduneCrqlQuroyQkSmoYuAqBCC+QALTRhoa 9F8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=wKMhUmVaTQdIEAE8i1UzQyQ+wc4UuriG3aPNBDPGyus=; fh=JMATQZ6ibRl3eyuQLADwzYkhYBKdu/2gHu7BVYHakXs=; b=Nagv+ohWI+UqjRJbRGspkyTYdR2/UySKJhTY4Chg/KKdh9fOZpRtH//JcYgi8wWMkv RyFpzBVJTPTVggRzb6zH6LVm55OWkayZnfFeL+pbnRX9teGO5vQDCubqQYZGMW9CYvcS L5+pvW4NRr7FKlGgp3ib1xf+9XTy3V5+Tsd7DrLeqN+U8J0F4tafmFZmYwWAWLcSMA/w wIS6KprCAySA4TAW5kJ7w9NwIB82ZnXid+5KvWPXEV7keUit66im0HSvzUV7YvP3KwYH rcWKLT58Q5RUelEvzRE8A1xFIZWg3h6jO94X65REJw2/RnMSta4uyBO395QKkXpFKJui PdMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=adfO+nP8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id 95-20020a17090a09e800b002859110dcf0si1275957pjo.125.2023.11.29.05.10.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 05:10:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=adfO+nP8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 804DA8039F7F; Wed, 29 Nov 2023 05:10:04 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233785AbjK2NJq (ORCPT + 99 others); Wed, 29 Nov 2023 08:09:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39562 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232906AbjK2NJp (ORCPT ); Wed, 29 Nov 2023 08:09:45 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3363B2 for ; Wed, 29 Nov 2023 05:09:50 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E4D5DC433C7; Wed, 29 Nov 2023 13:09:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701263390; bh=FcQeM2JW0pjz/qIZ9iJf3ARTCkbeamq2sZ+rfbVwJ78=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=adfO+nP8B+tVqAa7DCLXrG5jzIDzuIcnffcWyWxe5P8FpNuz7n+03zStpJsg3prnz Ep9Aamqr7xUxxbMucrQUimNguhqrX05Ke1I4WHWUmTXbUc5NMsHIPscshwJsJnp0RP 48UnBZ+4PUsgOL9AStGB5Xgq5YCEkgSMwBVaOzbU1EKTmypo+CR2N4CSezj7YSDph8 SVod70ImVNS4EuiYv5hcidAX+82+F3syAbySXnuttBMCCmLeSTj2N0AH3MKeGm3thG giPR9zUj9E7s2JdSpk9hEpNbdsXU/OV/xb4pk44GCEvRWPgu5Poo1lGC8eAAronD6W KsoNsDKX+PvlA== Date: Wed, 29 Nov 2023 14:09:47 +0100 From: Maxime Ripard To: Boris Brezillon Cc: Dmitry Osipenko , David Airlie , Gerd Hoffmann , Gurchetan Singh , Chia-I Wu , Daniel Vetter , Maarten Lankhorst , Thomas Zimmermann , Christian =?utf-8?B?S8O2bmln?= , Qiang Yu , Steven Price , Emma Anholt , Melissa Wen , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel@collabora.com, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v18 04/26] drm/shmem-helper: Refactor locked/unlocked functions Message-ID: References: <20231029230205.93277-1-dmitry.osipenko@collabora.com> <20231029230205.93277-5-dmitry.osipenko@collabora.com> <20231124115911.79ab24af@collabora.com> <20231128133712.53a6f6cb@collabora.com> <37208c72-7908-0a78-fc89-2fa9b8d756a5@collabora.com> <20231129085330.7ccb35d3@collabora.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="zn7b5h5ehnk335hq" Content-Disposition: inline In-Reply-To: <20231129085330.7ccb35d3@collabora.com> X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 29 Nov 2023 05:10:04 -0800 (PST) --zn7b5h5ehnk335hq Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Nov 29, 2023 at 08:53:30AM +0100, Boris Brezillon wrote: > On Wed, 29 Nov 2023 01:05:14 +0300 > Dmitry Osipenko wrote: >=20 > > On 11/28/23 15:37, Boris Brezillon wrote: > > > On Tue, 28 Nov 2023 12:14:42 +0100 > > > Maxime Ripard wrote: > > > =20 > > >> Hi, > > >> > > >> On Fri, Nov 24, 2023 at 11:59:11AM +0100, Boris Brezillon wrote: =20 > > >>> On Fri, 24 Nov 2023 11:40:06 +0100 > > >>> Maxime Ripard wrote: > > >>> =20 > > >>>> On Mon, Oct 30, 2023 at 02:01:43AM +0300, Dmitry Osipenko wrote: = =20 > > >>>>> Add locked and remove unlocked postfixes from drm-shmem function = names, > > >>>>> making names consistent with the drm/gem core code. > > >>>>> > > >>>>> Reviewed-by: Boris Brezillon > > >>>>> Suggested-by: Boris Brezillon > > >>>>> Signed-off-by: Dmitry Osipenko = =20 > > >>>> > > >>>> This contradicts my earlier ack on a patch but... > > >>>> =20 > > >>>>> --- > > >>>>> drivers/gpu/drm/drm_gem_shmem_helper.c | 64 +++++++++----= ------ > > >>>>> drivers/gpu/drm/lima/lima_gem.c | 8 +-- > > >>>>> drivers/gpu/drm/panfrost/panfrost_drv.c | 2 +- > > >>>>> drivers/gpu/drm/panfrost/panfrost_gem.c | 6 +- > > >>>>> .../gpu/drm/panfrost/panfrost_gem_shrinker.c | 2 +- > > >>>>> drivers/gpu/drm/panfrost/panfrost_mmu.c | 2 +- > > >>>>> drivers/gpu/drm/v3d/v3d_bo.c | 4 +- > > >>>>> drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- > > >>>>> include/drm/drm_gem_shmem_helper.h | 36 +++++------ > > >>>>> 9 files changed, 64 insertions(+), 64 deletions(-) > > >>>>> > > >>>>> diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu= /drm/drm_gem_shmem_helper.c > > >>>>> index 0d61f2b3e213..154585ddae08 100644 > > >>>>> --- a/drivers/gpu/drm/drm_gem_shmem_helper.c > > >>>>> +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c > > >>>>> @@ -43,8 +43,8 @@ static const struct drm_gem_object_funcs drm_ge= m_shmem_funcs =3D { > > >>>>> .pin =3D drm_gem_shmem_object_pin, > > >>>>> .unpin =3D drm_gem_shmem_object_unpin, > > >>>>> .get_sg_table =3D drm_gem_shmem_object_get_sg_table, > > >>>>> - .vmap =3D drm_gem_shmem_object_vmap, > > >>>>> - .vunmap =3D drm_gem_shmem_object_vunmap, > > >>>>> + .vmap =3D drm_gem_shmem_object_vmap_locked, > > >>>>> + .vunmap =3D drm_gem_shmem_object_vunmap_locked, =20 > > >>>> > > >>>> While I think we should indeed be consistent with the names, I wou= ld > > >>>> also expect helpers to get the locking right by default. =20 > > >>> > > >>> Wait, actually I think this patch does what you suggest already. The > > >>> _locked() prefix tells the caller: "you should take care of the loc= king, > > >>> I expect the lock to be held when this is hook/function is called".= So > > >>> helpers without the _locked() prefix take care of the locking (whic= h I > > >>> guess matches your 'helpers get the locking right' expectation), and > > >>> those with the _locked() prefix don't. =20 > > >> > > >> What I meant by "getting the locking right" is indeed a bit ambiguou= s, > > >> sorry. What I'm trying to say I guess is that, in this particular ca= se, > > >> I don't think you can expect the vmap implementation to be called wi= th > > >> or without the locks held. The doc for that function will say that i= t's > > >> either one or the other, but not both. > > >> > > >> So helpers should follow what is needed to provide a default vmap/vu= nmap > > >> implementation, including what locking is expected from a vmap/vunmap > > >> implementation. =20 > > >=20 > > > Hm, yeah, I think that's a matter of taste. When locking is often > > > deferrable, like it is in DRM, I find it beneficial for funcions and > > > function pointers to reflect the locking scheme, rather than relying = on > > > people properly reading the doc, especially when this is the only > > > outlier in the group of drm_gem_object_funcs we already have, and it's > > > not event documented at the drm_gem_object_funcs level [1] :P. > > > =20 > > >> > > >> If that means that vmap is always called with the locks taken, then > > >> drm_gem_shmem_object_vmap can just assume that it will be called with > > >> the locks taken and there's no need to mention it in the name (and y= ou > > >> can probably sprinkle a couple of lockdep assertion to make sure the > > >> locking is indeed consistent). =20 > > >=20 > > > Things get very confusing when you end up having drm_gem_shmem helpers > > > that are suffixed with _locked() to encode the fact locking is the > > > caller's responsibility and no suffix for the > > > callee-takes-care-of-the-locking semantics, while other helpers that = are > > > not suffixed at all actually implement the > > > caller-should-take-care-of-the-locking semantics. > > > =20 > > >> =20 > > >>>> I'm not sure how reasonable it is, but I think I'd prefer to turn = this > > >>>> around and keep the drm_gem_shmem_object_vmap/unmap helpers name, = and > > >>>> convert whatever function needs to be converted to the unlock suff= ix so > > >>>> we get a consistent naming. =20 > > >>> > > >>> That would be an _unlocked() prefix if we do it the other way aroun= d. I > > >>> think the main confusion comes from the names of the hooks in > > >>> drm_gem_shmem_funcs. Some of them, like drm_gem_shmem_funcs::v[un]m= ap() > > >>> are called with the GEM resv lock held, and locking is handled by t= he > > >>> core, others, like drm_gem_shmem_funcs::[un]pin() are called > > >>> without the GEM resv lock held, and locking is deferred to the > > >>> implementation. As I said, I don't mind prefixing hooks/helpers with > > >>> _unlocked() for those that take care of the locking, and no prefix = for > > >>> those that expects locks to be held, as long as it's consistent, bu= t I > > >>> just wanted to make sure we're on the same page :-). =20 > > >> > > >> What about _nolock then? It's the same number of characters than > > >> _locked, plus it expresses what the function is (not) doing, not what > > >> context it's supposed to be called in? =20 > > >=20 > > > Just did a quick > > >=20 > > > git grep _nolock drivers/gpu/drm > > >=20 > > > and it returns zero result, where the _locked/_unlocked pattern seems > > > to already be widely used. Not saying we shouldn't change that, but it > > > doesn't feel like a change we should do as part of this series. > > >=20 > > > Regards, > > >=20 > > > Boris > > >=20 > > > [1]https://elixir.bootlin.com/linux/v6.7-rc3/source/include/drm/drm_g= em.h#L155 =20 > >=20 > > I'm fine with dropping the _locked() postfix from the common GEM helpers > > and documenting the locking rule in drm_gem. Thank you all for the > > suggestions :) >=20 > Sorry to disagree, but I think a proper function name/suffix is > sometimes worth a few lines of doc. Not saying we should do one or the > other, I think we should do both. But when I see a function suffixed > _locked, _unlocked or _nolock, I can immediately tell if this function > defers the locking to the caller or not, and then go check which lock > in the function doc. >=20 > And the second thing I'm not happy with, is the fact we go back to an > inconsistent naming in drm_gem_shmem_helper.c, where some functions > deferring the locking to the caller are suffixed _locked and others are > not, because ultimately, you need a different name when you expose the > two variants... I guess one of the point I was trying to make was also: why do you need both? If one is better than the other (whatever better means here), then all drivers should use it. The counterpart being that if provided a choice, you can be sure that a lot of people will get it wrong. The one example I have in mind for example was the drm_atomic_helper_commit_tail vs drm_atomic_helper_commit_tail_rpm. The latter is now widely used, and most of it is cargo-cult. I think you were referring to the locks being deferred vs taken right now before, why do we need to have the choice between the two? Maxime --zn7b5h5ehnk335hq Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHQEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCZWc4GwAKCRDj7w1vZxhR xVncAQCtMh5CKO38Mc9v9Nwxs5iWT7DQzCblQKsI9Q56bmYZ5gD4lQd6ZqippxDh iVlD3jO8k5m/lih2vEs8Ku5NIxwlCw== =M3GF -----END PGP SIGNATURE----- --zn7b5h5ehnk335hq--