From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Date: Tue, 6 Mar 2018 11:13:31 +0100 Message-ID: <20180306101331.GD22212@phenom.ffwll.local> References: <20180228152741.22507-1-Liviu.Dudau@arm.com> <20180228154041.GK5453@intel.com> <20180228154444.GA20827@e110455-lin.cambridge.arm.com> <20180228155715.GL5453@intel.com> <20180228163430.GB20827@e110455-lin.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7F90F6E603 for ; Tue, 6 Mar 2018 10:13:35 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id w128so21702477wmw.0 for ; Tue, 06 Mar 2018 02:13:35 -0800 (PST) Content-Disposition: inline In-Reply-To: <20180228163430.GB20827@e110455-lin.cambridge.arm.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Liviu Dudau Cc: David Airlie , Daniel Vetter , DRI-devel , LKML List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDQ6MzQ6MzBQTSArMDAwMCwgTGl2aXUgRHVkYXUgd3Jv dGU6Cj4gT24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDU6NTc6MTVQTSArMDIwMCwgVmlsbGUgU3ly asOkbMOkIHdyb3RlOgo+ID4gT24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDM6NDQ6NDRQTSArMDAw MCwgTGl2aXUgRHVkYXUgd3JvdGU6Cj4gPiA+IE9uIFdlZCwgRmViIDI4LCAyMDE4IGF0IDA1OjQw OjQxUE0gKzAyMDAsIFZpbGxlIFN5cmrDpGzDpCB3cm90ZToKPiA+ID4gPiBPbiBXZWQsIEZlYiAy OCwgMjAxOCBhdCAwMzoyNzo0MVBNICswMDAwLCBMaXZpdSBEdWRhdSB3cm90ZToKPiA+ID4gPiA+ IFRoZSBkcm1fc2V0Y2xpZW50Y2FwKCkgZnVuY3Rpb24gaW1wbGVtZW50aW5nIHRoZSBEUk1fSU9D VExfU0VUX0NMSUVOVF9DQVAKPiA+ID4gPiA+IGlvY3RsIGV4cGVjdHMgdGhhdCBhbnkgY2FwYWJp bGl0eSBzZXQgYnkgdGhlIGNsaWVudCB3aWxsIGhhdmUgYSB2YWx1ZSBvZiAxLgo+ID4gPiA+ID4g TWFrZSB0aGUgY2hlY2sgZWFybHkgc28gdGhhdCB3ZSBkb24ndCBoYXZlIHRvIHRlc3QgdGhlIHZh bHVlIGZvciBlYWNoCj4gPiA+ID4gPiBjYXBhYmlsaXR5Lgo+ID4gPiA+IAo+ID4gPiA+IFdoYXQg aWYgd2Ugd2FudCBhIGEgbm9uLWJvb2xlYW4gY2FwYWJpbGl0eSBhdCBzb21lIHBvaW50Pwo+ID4g PiAKPiA+ID4gV2VsbCwgSSdtIGFkZGluZyBhbm90aGVyIGJvb2xlYW4gY2FwYWJpbGl0eSBzb29u LCBzbyB5b3Ugd2lsbCBiZSBnb2luZwo+ID4gPiBhZ2FpbnN0IHRoZSB0cmVuZCA6KQo+ID4gCj4g PiBQbGVudHkgb2Ygbm9uLWJvb2xzIGluIGRyaXZlciBzcGVjaWZpYyBjb3VudGVycGFydHMgSSBi ZWxpZXZlLgo+IAo+IFNvLCBpcyB0aGF0IGEgTkFDSz8gCgpZZWFoIEkgdGhpbmsgdGhpcyBpcyBv dmVyb3B0aW1pemluZyBmb3Igbm90IHJlcGVhdGluZyBjb2RlLgotRGFuaWVsCgo+IAo+IAo+ID4g Cj4gPiA+IEkgZ3Vlc3MgeW91IHdpbGwgaGF2ZSAyIG9wdGlvbnM6IHJldmVydCB0aGUgcGF0Y2gg b3IgYWRkIGEgY29uZGl0aW9uIHRvCj4gPiA+IHRoZSB0ZXN0Lgo+ID4gPiAKPiA+ID4gSSBkb24n dCBoYXZlIHN0cm9uZyBmZWVsaW5ncywganVzdCBmZWx0IGxpa2UgdG9vIG11Y2ggY29weWluZyB3 aGVuCj4gPiA+IGFkZGluZyBhbm90aGVyIGNhcGFiaWxpdHkgc28gSSB0aG91Z2h0IHRvIGRvIHNv bWUgImNsZWFudXAiLgo+ID4gPiAKPiA+ID4gQmVzdCByZWdhcmRzLAo+ID4gPiBMaXZpdQo+ID4g PiAKPiA+ID4gPiAKPiA+ID4gPiA+IAo+ID4gPiA+ID4gU2lnbmVkLW9mZi1ieTogTGl2aXUgRHVk YXUgPGxpdml1LmR1ZGF1QGFybS5jb20+Cj4gPiA+ID4gPiAtLS0KPiA+ID4gPiA+ICBkcml2ZXJz L2dwdS9kcm0vZHJtX2lvY3RsLmMgfCA5ICsrKy0tLS0tLQo+ID4gPiA+ID4gIDEgZmlsZSBjaGFu Z2VkLCAzIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCj4gPiA+ID4gPiAKPiA+ID4gPiA+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2lvY3RsLmMgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX2lvY3RsLmMKPiA+ID4gPiA+IGluZGV4IGFmNzgyOTExYzUwNS4uMDJmZmEwZThkNzdi IDEwMDY0NAo+ID4gPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9pb2N0bC5jCj4gPiA+ ID4gPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2lvY3RsLmMKPiA+ID4gPiA+IEBAIC0zMDYs MjIgKzMwNiwxOSBAQCBkcm1fc2V0Y2xpZW50Y2FwKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZv aWQgKmRhdGEsIHN0cnVjdCBkcm1fZmlsZSAqZmlsZV9wcml2KQo+ID4gPiA+ID4gIHsKPiA+ID4g PiA+ICAJc3RydWN0IGRybV9zZXRfY2xpZW50X2NhcCAqcmVxID0gZGF0YTsKPiA+ID4gPiA+ICAK PiA+ID4gPiA+ICsJaWYgKHJlcS0+dmFsdWUgPiAxKQo+ID4gPiA+ID4gKwkJcmV0dXJuIC1FSU5W QUw7Cj4gPiA+ID4gPiArCj4gPiA+ID4gPiAgCXN3aXRjaCAocmVxLT5jYXBhYmlsaXR5KSB7Cj4g PiA+ID4gPiAgCWNhc2UgRFJNX0NMSUVOVF9DQVBfU1RFUkVPXzNEOgo+ID4gPiA+ID4gLQkJaWYg KHJlcS0+dmFsdWUgPiAxKQo+ID4gPiA+ID4gLQkJCXJldHVybiAtRUlOVkFMOwo+ID4gPiA+ID4g IAkJZmlsZV9wcml2LT5zdGVyZW9fYWxsb3dlZCA9IHJlcS0+dmFsdWU7Cj4gPiA+ID4gPiAgCQli cmVhazsKPiA+ID4gPiA+ICAJY2FzZSBEUk1fQ0xJRU5UX0NBUF9VTklWRVJTQUxfUExBTkVTOgo+ ID4gPiA+ID4gLQkJaWYgKHJlcS0+dmFsdWUgPiAxKQo+ID4gPiA+ID4gLQkJCXJldHVybiAtRUlO VkFMOwo+ID4gPiA+ID4gIAkJZmlsZV9wcml2LT51bml2ZXJzYWxfcGxhbmVzID0gcmVxLT52YWx1 ZTsKPiA+ID4gPiA+ICAJCWJyZWFrOwo+ID4gPiA+ID4gIAljYXNlIERSTV9DTElFTlRfQ0FQX0FU T01JQzoKPiA+ID4gPiA+ICAJCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYsIERSSVZF Ul9BVE9NSUMpKQo+ID4gPiA+ID4gIAkJCXJldHVybiAtRUlOVkFMOwo+ID4gPiA+ID4gLQkJaWYg KHJlcS0+dmFsdWUgPiAxKQo+ID4gPiA+ID4gLQkJCXJldHVybiAtRUlOVkFMOwo+ID4gPiA+ID4g IAkJZmlsZV9wcml2LT5hdG9taWMgPSByZXEtPnZhbHVlOwo+ID4gPiA+ID4gIAkJZmlsZV9wcml2 LT51bml2ZXJzYWxfcGxhbmVzID0gcmVxLT52YWx1ZTsKPiA+ID4gPiA+ICAJCWJyZWFrOwo+ID4g PiA+ID4gLS0gCj4gPiA+ID4gPiAyLjE2LjIKPiA+ID4gPiA+IAo+ID4gPiA+ID4gX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPiA+ID4gPiA+IGRyaS1kZXZl bCBtYWlsaW5nIGxpc3QKPiA+ID4gPiA+IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcK PiA+ID4gPiA+IGh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVsCj4gPiA+ID4gCj4gPiA+ID4gLS0gCj4gPiA+ID4gVmlsbGUgU3lyasOkbMOkCj4g PiA+ID4gSW50ZWwgT1RDCj4gPiA+IAo+ID4gPiAtLSAKPiA+ID4gPT09PT09PT09PT09PT09PT09 PT0KPiA+ID4gfCBJIHdvdWxkIGxpa2UgdG8gfAo+ID4gPiB8IGZpeCB0aGUgd29ybGQsICB8Cj4g PiA+IHwgYnV0IHRoZXkncmUgbm90IHwKPiA+ID4gfCBnaXZpbmcgbWUgdGhlICAgfAo+ID4gPiAg XCBzb3VyY2UgY29kZSEgIC8KPiA+ID4gICAtLS0tLS0tLS0tLS0tLS0KPiA+ID4gICAgIMKvXF8o 44OEKV8vwq8KPiA+IAo+ID4gLS0gCj4gPiBWaWxsZSBTeXJqw6Rsw6QKPiA+IEludGVsIE9UQwo+ IAo+IC0tIAo+ID09PT09PT09PT09PT09PT09PT09Cj4gfCBJIHdvdWxkIGxpa2UgdG8gfAo+IHwg Zml4IHRoZSB3b3JsZCwgIHwKPiB8IGJ1dCB0aGV5J3JlIG5vdCB8Cj4gfCBnaXZpbmcgbWUgdGhl ICAgfAo+ICBcIHNvdXJjZSBjb2RlISAgLwo+ICAgLS0tLS0tLS0tLS0tLS0tCj4gICAgIMKvXF8o 44OEKV8vwq8KCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jw b3JhdGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753335AbeCFKNh (ORCPT ); Tue, 6 Mar 2018 05:13:37 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:53162 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750838AbeCFKNf (ORCPT ); Tue, 6 Mar 2018 05:13:35 -0500 X-Google-Smtp-Source: AG47ELstWQ2iUCqLeBp2MsCa9ITTqKrJ/aAIr+Y6gKc/6VcA0vNVP3hK1bpIrGHHDb8YRXUDQ9/YxA== Date: Tue, 6 Mar 2018 11:13:31 +0100 From: Daniel Vetter To: Liviu Dudau Cc: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , DRI-devel , David Airlie , Daniel Vetter , LKML Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Message-ID: <20180306101331.GD22212@phenom.ffwll.local> Mail-Followup-To: Liviu Dudau , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= , DRI-devel , David Airlie , LKML References: <20180228152741.22507-1-Liviu.Dudau@arm.com> <20180228154041.GK5453@intel.com> <20180228154444.GA20827@e110455-lin.cambridge.arm.com> <20180228155715.GL5453@intel.com> <20180228163430.GB20827@e110455-lin.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20180228163430.GB20827@e110455-lin.cambridge.arm.com> X-Operating-System: Linux phenom 4.14.0-3-amd64 User-Agent: Mutt/1.9.3 (2018-01-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 28, 2018 at 04:34:30PM +0000, Liviu Dudau wrote: > On Wed, Feb 28, 2018 at 05:57:15PM +0200, Ville Syrjälä wrote: > > On Wed, Feb 28, 2018 at 03:44:44PM +0000, Liviu Dudau wrote: > > > On Wed, Feb 28, 2018 at 05:40:41PM +0200, Ville Syrjälä wrote: > > > > On Wed, Feb 28, 2018 at 03:27:41PM +0000, Liviu Dudau wrote: > > > > > The drm_setclientcap() function implementing the DRM_IOCTL_SET_CLIENT_CAP > > > > > ioctl expects that any capability set by the client will have a value of 1. > > > > > Make the check early so that we don't have to test the value for each > > > > > capability. > > > > > > > > What if we want a a non-boolean capability at some point? > > > > > > Well, I'm adding another boolean capability soon, so you will be going > > > against the trend :) > > > > Plenty of non-bools in driver specific counterparts I believe. > > So, is that a NACK? Yeah I think this is overoptimizing for not repeating code. -Daniel > > > > > > > I guess you will have 2 options: revert the patch or add a condition to > > > the test. > > > > > > I don't have strong feelings, just felt like too much copying when > > > adding another capability so I thought to do some "cleanup". > > > > > > Best regards, > > > Liviu > > > > > > > > > > > > > > > > > Signed-off-by: Liviu Dudau > > > > > --- > > > > > drivers/gpu/drm/drm_ioctl.c | 9 +++------ > > > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > > > > > diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c > > > > > index af782911c505..02ffa0e8d77b 100644 > > > > > --- a/drivers/gpu/drm/drm_ioctl.c > > > > > +++ b/drivers/gpu/drm/drm_ioctl.c > > > > > @@ -306,22 +306,19 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) > > > > > { > > > > > struct drm_set_client_cap *req = data; > > > > > > > > > > + if (req->value > 1) > > > > > + return -EINVAL; > > > > > + > > > > > switch (req->capability) { > > > > > case DRM_CLIENT_CAP_STEREO_3D: > > > > > - if (req->value > 1) > > > > > - return -EINVAL; > > > > > file_priv->stereo_allowed = req->value; > > > > > break; > > > > > case DRM_CLIENT_CAP_UNIVERSAL_PLANES: > > > > > - if (req->value > 1) > > > > > - return -EINVAL; > > > > > file_priv->universal_planes = req->value; > > > > > break; > > > > > case DRM_CLIENT_CAP_ATOMIC: > > > > > if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) > > > > > return -EINVAL; > > > > > - if (req->value > 1) > > > > > - return -EINVAL; > > > > > file_priv->atomic = req->value; > > > > > file_priv->universal_planes = req->value; > > > > > break; > > > > > -- > > > > > 2.16.2 > > > > > > > > > > _______________________________________________ > > > > > dri-devel mailing list > > > > > dri-devel@lists.freedesktop.org > > > > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > > > > > > -- > > > > Ville Syrjälä > > > > Intel OTC > > > > > > -- > > > ==================== > > > | I would like to | > > > | fix the world, | > > > | but they're not | > > > | giving me the | > > > \ source code! / > > > --------------- > > > ¯\_(ツ)_/¯ > > > > -- > > Ville Syrjälä > > Intel OTC > > -- > ==================== > | I would like to | > | fix the world, | > | but they're not | > | giving me the | > \ source code! / > --------------- > ¯\_(ツ)_/¯ -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch