From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Date: Mon, 07 Jan 2019 08:42:00 +0000 Subject: Re: [PATCH] drm/etnaviv: fix some off by one bugs Message-Id: <1546850520.3580.1.camel@pengutronix.de> List-Id: References: <20180713145631.qxd3pzk72v4bshii@kili.mountain> <20181221202406.GF2240@kadam> In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: Daniel Vetter , Dan Carpenter Cc: David Airlie , kernel-janitors@vger.kernel.org, The etnaviv authors , dri-devel , Russell King Hi Daniel, Am Montag, den 24.12.2018, 10:32 +0100 schrieb Daniel Vetter: > On Fri, Dec 21, 2018 at 9:24 PM Dan Carpenter om> wrote: > > > > I don't think anyone responded to this one? > > Maybe time to move etnaviv into drm-misc so that there's a notch more > redundancy in maintainers? Lucas, Christian, others? Sorry, but no thanks. The current model guarantees that we have at least some testing of the patches flowing through the etnaviv tree with realworld use-cases. We certainly don't have the resources to track a rapidly changing target like drm-misc with our testing. Regards, Lucas > -Daniel > > > > > regards, > > dan carpenter > > > > On Fri, Jul 13, 2018 at 06:00:18PM +0300, Dan Carpenter wrote: > > > The ->nr_signal is the supposed to be the number of elements in > > > the > > > ->signal array.  There was one place where it was 5 but it was > > > supposed > > > to be 4.  That looks like a copy and paste bug.  There were also > > > two > > > checks that were off by one. > > > > > > Fixes: 9e2c2e273012 ("drm/etnaviv: add infrastructure to query > > > perf counter") > > > Signed-off-by: Dan Carpenter > > > --- > > > Not tested. > > > > > > diff --git a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > > > b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > > > index 9980d81a26e3..4227a4006c34 100644 > > > --- a/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > > > +++ b/drivers/gpu/drm/etnaviv/etnaviv_perfmon.c > > > @@ -113,7 +113,7 @@ static const struct etnaviv_pm_domain > > > doms_3d[] = { > > >               .name = "PE", > > >               .profile_read = VIVS_MC_PROFILE_PE_READ, > > >               .profile_config = VIVS_MC_PROFILE_CONFIG0, > > > -             .nr_signals = 5, > > > +             .nr_signals = 4, > > >               .signal = (const struct etnaviv_pm_signal[]) { > > >                       { > > >                               "PIXEL_COUNT_KILLED_BY_COLOR_PIPE", > > > @@ -435,7 +435,7 @@ int etnaviv_pm_query_sig(struct etnaviv_gpu > > > *gpu, > > > > > >       dom = meta->domains + signal->domain; > > > > > > -     if (signal->iter > dom->nr_signals) > > > +     if (signal->iter >= dom->nr_signals) > > >               return -EINVAL; > > > > > >       sig = &dom->signal[signal->iter]; > > > @@ -461,7 +461,7 @@ int etnaviv_pm_req_validate(const struct > > > drm_etnaviv_gem_submit_pmr *r, > > > > > >       dom = meta->domains + r->domain; > > > > > > -     if (r->signal > dom->nr_signals) > > > +     if (r->signal >= dom->nr_signals) > > >               return -EINVAL; > > > > > >       return 0; > > > > _______________________________________________ > > dri-devel mailing list > > dri-devel@lists.freedesktop.org > > https://lists.freedesktop.org/mailman/listinfo/dri-devel > > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lucas Stach Subject: Re: [PATCH] drm/etnaviv: fix some off by one bugs Date: Mon, 07 Jan 2019 09:42:00 +0100 Message-ID: <1546850520.3580.1.camel@pengutronix.de> References: <20180713145631.qxd3pzk72v4bshii@kili.mountain> <20181221202406.GF2240@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by gabe.freedesktop.org (Postfix) with ESMTPS id E8B386E3C7 for ; Mon, 7 Jan 2019 08:42:08 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter , Dan Carpenter Cc: David Airlie , kernel-janitors@vger.kernel.org, The etnaviv authors , dri-devel , Russell King List-Id: dri-devel@lists.freedesktop.org SGkgRGFuaWVsLAoKQW0gTW9udGFnLCBkZW4gMjQuMTIuMjAxOCwgMTA6MzIgKzAxMDAgc2Nocmll YiBEYW5pZWwgVmV0dGVyOgo+IE9uIEZyaSwgRGVjIDIxLCAyMDE4IGF0IDk6MjQgUE0gRGFuIENh cnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuYwo+IG9tPiB3cm90ZToKPiA+IAo+ID4gSSBk b24ndCB0aGluayBhbnlvbmUgcmVzcG9uZGVkIHRvIHRoaXMgb25lPwo+IAo+IE1heWJlIHRpbWUg dG8gbW92ZSBldG5hdml2IGludG8gZHJtLW1pc2Mgc28gdGhhdCB0aGVyZSdzIGEgbm90Y2ggbW9y ZQo+IHJlZHVuZGFuY3kgaW4gbWFpbnRhaW5lcnM/IEx1Y2FzLCBDaHJpc3RpYW4sIG90aGVycz8K ClNvcnJ5LCBidXQgbm8gdGhhbmtzLiBUaGUgY3VycmVudCBtb2RlbCBndWFyYW50ZWVzIHRoYXQg d2UgaGF2ZSBhdApsZWFzdCBzb21lIHRlc3Rpbmcgb2YgdGhlIHBhdGNoZXMgZmxvd2luZyB0aHJv dWdoIHRoZSBldG5hdml2IHRyZWUgd2l0aApyZWFsd29ybGQgdXNlLWNhc2VzLiBXZSBjZXJ0YWlu bHkgZG9uJ3QgaGF2ZSB0aGUgcmVzb3VyY2VzIHRvIHRyYWNrIGEKcmFwaWRseSBjaGFuZ2luZyB0 YXJnZXQgbGlrZSBkcm0tbWlzYyB3aXRoIG91ciB0ZXN0aW5nLgoKUmVnYXJkcywKTHVjYXMKCj4g LURhbmllbAo+IAo+ID4gCj4gPiByZWdhcmRzLAo+ID4gZGFuIGNhcnBlbnRlcgo+ID4gCj4gPiBP biBGcmksIEp1bCAxMywgMjAxOCBhdCAwNjowMDoxOFBNICswMzAwLCBEYW4gQ2FycGVudGVyIHdy b3RlOgo+ID4gPiBUaGUgLT5ucl9zaWduYWwgaXMgdGhlIHN1cHBvc2VkIHRvIGJlIHRoZSBudW1i ZXIgb2YgZWxlbWVudHMgaW4KPiA+ID4gdGhlCj4gPiA+IC0+c2lnbmFsIGFycmF5LsKgwqBUaGVy ZSB3YXMgb25lIHBsYWNlIHdoZXJlIGl0IHdhcyA1IGJ1dCBpdCB3YXMKPiA+ID4gc3VwcG9zZWQK PiA+ID4gdG8gYmUgNC7CoMKgVGhhdCBsb29rcyBsaWtlIGEgY29weSBhbmQgcGFzdGUgYnVnLsKg wqBUaGVyZSB3ZXJlIGFsc28KPiA+ID4gdHdvCj4gPiA+IGNoZWNrcyB0aGF0IHdlcmUgb2ZmIGJ5 IG9uZS4KPiA+ID4gCj4gPiA+IEZpeGVzOiA5ZTJjMmUyNzMwMTIgKCJkcm0vZXRuYXZpdjogYWRk IGluZnJhc3RydWN0dXJlIHRvIHF1ZXJ5Cj4gPiA+IHBlcmYgY291bnRlciIpCj4gPiA+IFNpZ25l ZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KPiA+ID4g LS0tCj4gPiA+IE5vdCB0ZXN0ZWQuCj4gPiA+IAo+ID4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9n cHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9wZXJmbW9uLmMKPiA+ID4gYi9kcml2ZXJzL2dwdS9kcm0v ZXRuYXZpdi9ldG5hdml2X3BlcmZtb24uYwo+ID4gPiBpbmRleCA5OTgwZDgxYTI2ZTMuLjQyMjdh NDAwNmMzNCAxMDA2NDQKPiA+ID4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZp dl9wZXJmbW9uLmMKPiA+ID4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2V0bmF2aXYvZXRuYXZpdl9w ZXJmbW9uLmMKPiA+ID4gQEAgLTExMyw3ICsxMTMsNyBAQCBzdGF0aWMgY29uc3Qgc3RydWN0IGV0 bmF2aXZfcG1fZG9tYWluCj4gPiA+IGRvbXNfM2RbXSA9IHsKPiA+ID4gwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqDCoC5uYW1lID0gIlBFIiwKPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoC5wcm9maWxlX3JlYWQgPSBWSVZTX01DX1BST0ZJTEVfUEVfUkVBRCwKPiA+ID4gwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoC5wcm9maWxlX2NvbmZpZyA9IFZJVlNfTUNfUFJPRklMRV9D T05GSUcwLAo+ID4gPiAtwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqAubnJfc2lnbmFscyA9IDUs Cj4gPiA+ICvCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoC5ucl9zaWduYWxzID0gNCwKPiA+ID4g wqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoC5zaWduYWwgPSAoY29uc3Qgc3RydWN0IGV0bmF2 aXZfcG1fc2lnbmFsW10pIHsKPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgwqB7Cj4gPiA+IMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKg wqDCoMKgwqDCoMKgwqDCoMKgwqDCoCJQSVhFTF9DT1VOVF9LSUxMRURfQllfQ09MT1JfUElQRSIs Cj4gPiA+IEBAIC00MzUsNyArNDM1LDcgQEAgaW50IGV0bmF2aXZfcG1fcXVlcnlfc2lnKHN0cnVj dCBldG5hdml2X2dwdQo+ID4gPiAqZ3B1LAo+ID4gPiAKPiA+ID4gwqDCoMKgwqDCoMKgZG9tID0g bWV0YS0+ZG9tYWlucyArIHNpZ25hbC0+ZG9tYWluOwo+ID4gPiAKPiA+ID4gLcKgwqDCoMKgwqBp ZiAoc2lnbmFsLT5pdGVyID4gZG9tLT5ucl9zaWduYWxzKQo+ID4gPiArwqDCoMKgwqDCoGlmIChz aWduYWwtPml0ZXIgPj0gZG9tLT5ucl9zaWduYWxzKQo+ID4gPiDCoMKgwqDCoMKgwqDCoMKgwqDC oMKgwqDCoMKgcmV0dXJuIC1FSU5WQUw7Cj4gPiA+IAo+ID4gPiDCoMKgwqDCoMKgwqBzaWcgPSAm ZG9tLT5zaWduYWxbc2lnbmFsLT5pdGVyXTsKPiA+ID4gQEAgLTQ2MSw3ICs0NjEsNyBAQCBpbnQg ZXRuYXZpdl9wbV9yZXFfdmFsaWRhdGUoY29uc3Qgc3RydWN0Cj4gPiA+IGRybV9ldG5hdml2X2dl bV9zdWJtaXRfcG1yICpyLAo+ID4gPiAKPiA+ID4gwqDCoMKgwqDCoMKgZG9tID0gbWV0YS0+ZG9t YWlucyArIHItPmRvbWFpbjsKPiA+ID4gCj4gPiA+IC3CoMKgwqDCoMKgaWYgKHItPnNpZ25hbCA+ IGRvbS0+bnJfc2lnbmFscykKPiA+ID4gK8KgwqDCoMKgwqBpZiAoci0+c2lnbmFsID49IGRvbS0+ bnJfc2lnbmFscykKPiA+ID4gwqDCoMKgwqDCoMKgwqDCoMKgwqDCoMKgwqDCoHJldHVybiAtRUlO VkFMOwo+ID4gPiAKPiA+ID4gwqDCoMKgwqDCoMKgcmV0dXJuIDA7Cj4gPiAKPiA+IF9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gPiBkcmktZGV2ZWwgbWFp bGluZyBsaXN0Cj4gPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4gPiBodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo+IAo+IAo+ IApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9s aXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK