From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Tue, 12 Jun 2018 09:23:07 +0000 Subject: Re: [PATCH][V2] drm/i915/guc: fix GEM_BUG_ON check Message-Id: <87d0ww2was.fsf@intel.com> List-Id: References: <20180611164653.13691-1-colin.king@canonical.com> <20180612091016.yi4lbmdgcltmcen3@mwanda> In-Reply-To: <20180612091016.yi4lbmdgcltmcen3@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Dan Carpenter , Colin King Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi On Tue, 12 Jun 2018, Dan Carpenter wrote: > On Mon, Jun 11, 2018 at 05:46:53PM +0100, Colin King wrote: >> From: Colin Ian King >> >> The check for level being less than zero always false because flags >> is currently unsigned and can never be negative. Fix this by making >> flags a s32. >> >> Detected by CoverityScan, CID#1468363 ("Macro compares unsigned to 0") >> >> Signed-off-by: Colin Ian King >> >> --- >> V2: Make flags s32 rather than remove the GEM_BUG_ON check, thanks to >> Ville Syrjälä for spotting the mistake in my first attempt. >> --- >> drivers/gpu/drm/i915/intel_guc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c >> index 116f4ccf1bbd..fb31f5004bcf 100644 >> --- a/drivers/gpu/drm/i915/intel_guc.c >> +++ b/drivers/gpu/drm/i915/intel_guc.c >> @@ -206,7 +206,7 @@ void intel_guc_fini(struct intel_guc *guc) >> static u32 get_log_control_flags(void) >> { >> u32 level = i915_modparams.guc_log_level; >> - u32 flags = 0; >> + s32 flags = 0; >> >> GEM_BUG_ON(level < 0); > > Only insane people use "s32" when it's not part of the hardware spec and > you changed the wrong variable... Yeah, int level. Also, Fixes: cb5d64e9f13e ("drm/i915/guc: Allow user to control default GuC logging") BR, Jani. > > regards, > dan carpenter > -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH][V2] drm/i915/guc: fix GEM_BUG_ON check Date: Tue, 12 Jun 2018 12:23:07 +0300 Message-ID: <87d0ww2was.fsf@intel.com> References: <20180611164653.13691-1-colin.king@canonical.com> <20180612091016.yi4lbmdgcltmcen3@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20180612091016.yi4lbmdgcltmcen3@mwanda> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dan Carpenter , Colin King Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Rodrigo Vivi List-Id: dri-devel@lists.freedesktop.org T24gVHVlLCAxMiBKdW4gMjAxOCwgRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUu Y29tPiB3cm90ZToKPiBPbiBNb24sIEp1biAxMSwgMjAxOCBhdCAwNTo0Njo1M1BNICswMTAwLCBD b2xpbiBLaW5nIHdyb3RlOgo+PiBGcm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5v bmljYWwuY29tPgo+PiAKPj4gVGhlIGNoZWNrIGZvciBsZXZlbCBiZWluZyBsZXNzIHRoYW4gemVy byBhbHdheXMgZmFsc2UgYmVjYXVzZSBmbGFncwo+PiBpcyBjdXJyZW50bHkgdW5zaWduZWQgYW5k IGNhbiBuZXZlciBiZSBuZWdhdGl2ZS4gRml4IHRoaXMgYnkgbWFraW5nCj4+IGZsYWdzIGEgczMy Lgo+PiAKPj4gRGV0ZWN0ZWQgYnkgQ292ZXJpdHlTY2FuLCBDSUQjMTQ2ODM2MyAoIk1hY3JvIGNv bXBhcmVzIHVuc2lnbmVkIHRvIDAiKQo+PiAKPj4gU2lnbmVkLW9mZi1ieTogQ29saW4gSWFuIEtp bmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4KPj4gCj4+IC0tLQo+PiBWMjogTWFrZSBmbGFn cyBzMzIgcmF0aGVyIHRoYW4gcmVtb3ZlIHRoZSBHRU1fQlVHX09OIGNoZWNrLCB0aGFua3MgdG8K Pj4gVmlsbGUgU3lyasOkbMOkIGZvciBzcG90dGluZyB0aGUgbWlzdGFrZSBpbiBteSBmaXJzdCBh dHRlbXB0Lgo+PiAtLS0KPj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2ludGVsX2d1Yy5jIHwgMiAr LQo+PiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pCj4+IAo+ PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMgYi9kcml2ZXJz L2dwdS9kcm0vaTkxNS9pbnRlbF9ndWMuYwo+PiBpbmRleCAxMTZmNGNjZjFiYmQuLmZiMzFmNTAw NGJjZiAxMDA2NDQKPj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKPj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaW50ZWxfZ3VjLmMKPj4gQEAgLTIwNiw3ICsyMDYs NyBAQCB2b2lkIGludGVsX2d1Y19maW5pKHN0cnVjdCBpbnRlbF9ndWMgKmd1YykKPj4gIHN0YXRp YyB1MzIgZ2V0X2xvZ19jb250cm9sX2ZsYWdzKHZvaWQpCj4+ICB7Cj4+ICAJdTMyIGxldmVsID0g aTkxNV9tb2RwYXJhbXMuZ3VjX2xvZ19sZXZlbDsKPj4gLQl1MzIgZmxhZ3MgPSAwOwo+PiArCXMz MiBmbGFncyA9IDA7Cj4+ICAKPj4gIAlHRU1fQlVHX09OKGxldmVsIDwgMCk7Cj4KPiBPbmx5IGlu c2FuZSBwZW9wbGUgdXNlICJzMzIiIHdoZW4gaXQncyBub3QgcGFydCBvZiB0aGUgaGFyZHdhcmUg c3BlYyBhbmQKPiB5b3UgY2hhbmdlZCB0aGUgd3JvbmcgdmFyaWFibGUuLi4KClllYWgsIGludCBs ZXZlbC4KCkFsc28sCgpGaXhlczogY2I1ZDY0ZTlmMTNlICgiZHJtL2k5MTUvZ3VjOiBBbGxvdyB1 c2VyIHRvIGNvbnRyb2wgZGVmYXVsdCBHdUMgbG9nZ2luZyIpCgpCUiwKSmFuaS4KCgo+Cj4gcmVn YXJkcywKPiBkYW4gY2FycGVudGVyCj4KCi0tIApKYW5pIE5pa3VsYSwgSW50ZWwgT3BlbiBTb3Vy Y2UgR3JhcGhpY3MgQ2VudGVyCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fCmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNr dG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2Ry aS1kZXZlbAo= 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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by aws-us-west-2-korg-lkml-1.web.codeaurora.org (Postfix) with ESMTP id 56488C433EF for ; Tue, 12 Jun 2018 09:23:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 14FC120693 for ; Tue, 12 Jun 2018 09:23:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 14FC120693 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933563AbeFLJXV convert rfc822-to-8bit (ORCPT ); Tue, 12 Jun 2018 05:23:21 -0400 Received: from mga01.intel.com ([192.55.52.88]:15984 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932639AbeFLJXR (ORCPT ); Tue, 12 Jun 2018 05:23:17 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jun 2018 02:23:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,213,1526367600"; d="scan'208";a="63355266" Received: from jnikula-mobl2.fi.intel.com (HELO localhost) ([10.237.72.62]) by fmsmga001.fm.intel.com with ESMTP; 12 Jun 2018 02:23:14 -0700 From: Jani Nikula To: Dan Carpenter , Colin King Cc: Joonas Lahtinen , Rodrigo Vivi , David Airlie , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][V2] drm/i915/guc: fix GEM_BUG_ON check In-Reply-To: <20180612091016.yi4lbmdgcltmcen3@mwanda> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20180611164653.13691-1-colin.king@canonical.com> <20180612091016.yi4lbmdgcltmcen3@mwanda> Date: Tue, 12 Jun 2018 12:23:07 +0300 Message-ID: <87d0ww2was.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 12 Jun 2018, Dan Carpenter wrote: > On Mon, Jun 11, 2018 at 05:46:53PM +0100, Colin King wrote: >> From: Colin Ian King >> >> The check for level being less than zero always false because flags >> is currently unsigned and can never be negative. Fix this by making >> flags a s32. >> >> Detected by CoverityScan, CID#1468363 ("Macro compares unsigned to 0") >> >> Signed-off-by: Colin Ian King >> >> --- >> V2: Make flags s32 rather than remove the GEM_BUG_ON check, thanks to >> Ville Syrjälä for spotting the mistake in my first attempt. >> --- >> drivers/gpu/drm/i915/intel_guc.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_guc.c b/drivers/gpu/drm/i915/intel_guc.c >> index 116f4ccf1bbd..fb31f5004bcf 100644 >> --- a/drivers/gpu/drm/i915/intel_guc.c >> +++ b/drivers/gpu/drm/i915/intel_guc.c >> @@ -206,7 +206,7 @@ void intel_guc_fini(struct intel_guc *guc) >> static u32 get_log_control_flags(void) >> { >> u32 level = i915_modparams.guc_log_level; >> - u32 flags = 0; >> + s32 flags = 0; >> >> GEM_BUG_ON(level < 0); > > Only insane people use "s32" when it's not part of the hardware spec and > you changed the wrong variable... Yeah, int level. Also, Fixes: cb5d64e9f13e ("drm/i915/guc: Allow user to control default GuC logging") BR, Jani. > > regards, > dan carpenter > -- Jani Nikula, Intel Open Source Graphics Center