From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Date: Wed, 28 Feb 2018 17:57:15 +0200 Message-ID: <20180228155715.GL5453@intel.com> References: <20180228152741.22507-1-Liviu.Dudau@arm.com> <20180228154041.GK5453@intel.com> <20180228154444.GA20827@e110455-lin.cambridge.arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 964126EABB for ; Wed, 28 Feb 2018 15:57:19 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20180228154444.GA20827@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 , LKML , DRI-devel List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDM6NDQ6NDRQTSArMDAwMCwgTGl2aXUgRHVkYXUgd3Jv dGU6Cj4gT24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDU6NDA6NDFQTSArMDIwMCwgVmlsbGUgU3ly asOkbMOkIHdyb3RlOgo+ID4gT24gV2VkLCBGZWIgMjgsIDIwMTggYXQgMDM6Mjc6NDFQTSArMDAw MCwgTGl2aXUgRHVkYXUgd3JvdGU6Cj4gPiA+IFRoZSBkcm1fc2V0Y2xpZW50Y2FwKCkgZnVuY3Rp b24gaW1wbGVtZW50aW5nIHRoZSBEUk1fSU9DVExfU0VUX0NMSUVOVF9DQVAKPiA+ID4gaW9jdGwg ZXhwZWN0cyB0aGF0IGFueSBjYXBhYmlsaXR5IHNldCBieSB0aGUgY2xpZW50IHdpbGwgaGF2ZSBh IHZhbHVlIG9mIDEuCj4gPiA+IE1ha2UgdGhlIGNoZWNrIGVhcmx5IHNvIHRoYXQgd2UgZG9uJ3Qg aGF2ZSB0byB0ZXN0IHRoZSB2YWx1ZSBmb3IgZWFjaAo+ID4gPiBjYXBhYmlsaXR5Lgo+ID4gCj4g PiBXaGF0IGlmIHdlIHdhbnQgYSBhIG5vbi1ib29sZWFuIGNhcGFiaWxpdHkgYXQgc29tZSBwb2lu dD8KPiAKPiBXZWxsLCBJJ20gYWRkaW5nIGFub3RoZXIgYm9vbGVhbiBjYXBhYmlsaXR5IHNvb24s IHNvIHlvdSB3aWxsIGJlIGdvaW5nCj4gYWdhaW5zdCB0aGUgdHJlbmQgOikKClBsZW50eSBvZiBu b24tYm9vbHMgaW4gZHJpdmVyIHNwZWNpZmljIGNvdW50ZXJwYXJ0cyBJIGJlbGlldmUuCgo+IEkg Z3Vlc3MgeW91IHdpbGwgaGF2ZSAyIG9wdGlvbnM6IHJldmVydCB0aGUgcGF0Y2ggb3IgYWRkIGEg Y29uZGl0aW9uIHRvCj4gdGhlIHRlc3QuCj4gCj4gSSBkb24ndCBoYXZlIHN0cm9uZyBmZWVsaW5n cywganVzdCBmZWx0IGxpa2UgdG9vIG11Y2ggY29weWluZyB3aGVuCj4gYWRkaW5nIGFub3RoZXIg Y2FwYWJpbGl0eSBzbyBJIHRob3VnaHQgdG8gZG8gc29tZSAiY2xlYW51cCIuCj4gCj4gQmVzdCBy ZWdhcmRzLAo+IExpdml1Cj4gCj4gPiAKPiA+ID4gCj4gPiA+IFNpZ25lZC1vZmYtYnk6IExpdml1 IER1ZGF1IDxsaXZpdS5kdWRhdUBhcm0uY29tPgo+ID4gPiAtLS0KPiA+ID4gIGRyaXZlcnMvZ3B1 L2RybS9kcm1faW9jdGwuYyB8IDkgKysrLS0tLS0tCj4gPiA+ICAxIGZpbGUgY2hhbmdlZCwgMyBp bnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+ID4gPiAKPiA+ID4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9kcm1faW9jdGwuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1faW9jdGwuYwo+ ID4gPiBpbmRleCBhZjc4MjkxMWM1MDUuLjAyZmZhMGU4ZDc3YiAxMDA2NDQKPiA+ID4gLS0tIGEv ZHJpdmVycy9ncHUvZHJtL2RybV9pb2N0bC5jCj4gPiA+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9k cm1faW9jdGwuYwo+ID4gPiBAQCAtMzA2LDIyICszMDYsMTkgQEAgZHJtX3NldGNsaWVudGNhcChz dHJ1Y3QgZHJtX2RldmljZSAqZGV2LCB2b2lkICpkYXRhLCBzdHJ1Y3QgZHJtX2ZpbGUgKmZpbGVf cHJpdikKPiA+ID4gIHsKPiA+ID4gIAlzdHJ1Y3QgZHJtX3NldF9jbGllbnRfY2FwICpyZXEgPSBk YXRhOwo+ID4gPiAgCj4gPiA+ICsJaWYgKHJlcS0+dmFsdWUgPiAxKQo+ID4gPiArCQlyZXR1cm4g LUVJTlZBTDsKPiA+ID4gKwo+ID4gPiAgCXN3aXRjaCAocmVxLT5jYXBhYmlsaXR5KSB7Cj4gPiA+ ICAJY2FzZSBEUk1fQ0xJRU5UX0NBUF9TVEVSRU9fM0Q6Cj4gPiA+IC0JCWlmIChyZXEtPnZhbHVl ID4gMSkKPiA+ID4gLQkJCXJldHVybiAtRUlOVkFMOwo+ID4gPiAgCQlmaWxlX3ByaXYtPnN0ZXJl b19hbGxvd2VkID0gcmVxLT52YWx1ZTsKPiA+ID4gIAkJYnJlYWs7Cj4gPiA+ICAJY2FzZSBEUk1f Q0xJRU5UX0NBUF9VTklWRVJTQUxfUExBTkVTOgo+ID4gPiAtCQlpZiAocmVxLT52YWx1ZSA+IDEp Cj4gPiA+IC0JCQlyZXR1cm4gLUVJTlZBTDsKPiA+ID4gIAkJZmlsZV9wcml2LT51bml2ZXJzYWxf cGxhbmVzID0gcmVxLT52YWx1ZTsKPiA+ID4gIAkJYnJlYWs7Cj4gPiA+ICAJY2FzZSBEUk1fQ0xJ RU5UX0NBUF9BVE9NSUM6Cj4gPiA+ICAJCWlmICghZHJtX2NvcmVfY2hlY2tfZmVhdHVyZShkZXYs IERSSVZFUl9BVE9NSUMpKQo+ID4gPiAgCQkJcmV0dXJuIC1FSU5WQUw7Cj4gPiA+IC0JCWlmIChy ZXEtPnZhbHVlID4gMSkKPiA+ID4gLQkJCXJldHVybiAtRUlOVkFMOwo+ID4gPiAgCQlmaWxlX3By aXYtPmF0b21pYyA9IHJlcS0+dmFsdWU7Cj4gPiA+ICAJCWZpbGVfcHJpdi0+dW5pdmVyc2FsX3Bs YW5lcyA9IHJlcS0+dmFsdWU7Cj4gPiA+ICAJCWJyZWFrOwo+ID4gPiAtLSAKPiA+ID4gMi4xNi4y Cj4gPiA+IAo+ID4gPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwo+ID4gPiBkcmktZGV2ZWwgbWFpbGluZyBsaXN0Cj4gPiA+IGRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKPiA+ID4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1h bi9saXN0aW5mby9kcmktZGV2ZWwKPiA+IAo+ID4gLS0gCj4gPiBWaWxsZSBTeXJqw6Rsw6QKPiA+ IEludGVsIE9UQwo+IAo+IC0tIAo+ID09PT09PT09PT09PT09PT09PT09Cj4gfCBJIHdvdWxkIGxp a2UgdG8gfAo+IHwgZml4IHRoZSB3b3JsZCwgIHwKPiB8IGJ1dCB0aGV5J3JlIG5vdCB8Cj4gfCBn aXZpbmcgbWUgdGhlICAgfAo+ICBcIHNvdXJjZSBjb2RlISAgLwo+ICAgLS0tLS0tLS0tLS0tLS0t Cj4gICAgIMKvXF8o44OEKV8vwq8KCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwgT1RDCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933996AbeB1P5W (ORCPT ); Wed, 28 Feb 2018 10:57:22 -0500 Received: from mga07.intel.com ([134.134.136.100]:49694 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752924AbeB1P5U (ORCPT ); Wed, 28 Feb 2018 10:57:20 -0500 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,406,1515484800"; d="scan'208";a="23930231" Date: Wed, 28 Feb 2018 17:57:15 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Liviu Dudau Cc: DRI-devel , David Airlie , Daniel Vetter , LKML Subject: Re: [PATCH] drm/drm_ioctl.c: Test client capability value early when setting. Message-ID: <20180228155715.GL5453@intel.com> References: <20180228152741.22507-1-Liviu.Dudau@arm.com> <20180228154041.GK5453@intel.com> <20180228154444.GA20827@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: <20180228154444.GA20827@e110455-lin.cambridge.arm.com> User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > 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