From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Date: Thu, 21 Mar 2019 08:58:40 +0000 Subject: Re: [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Message-Id: <8736ng1u4f.fsf@gaia.fi.intel.com> List-Id: References: <20190321083335.GA31210@kadam> In-Reply-To: <20190321083335.GA31210@kadam> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter , Jani Nikula , Chris Wilson Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld Dan Carpenter writes: > The mock_context() function returns NULL on error, it doesn't return > error pointers. > > Fixes: 85fddf0b0027 ("drm/i915: Introduce a context barrier callback") > Signed-off-by: Dan Carpenter > --- > .../gpu/drm/i915/selftests/i915_gem_context.c | 4 +- > drivers/staging/erofs/unzip_vle.c | 70 ++++++++++--------- > 2 files changed, 38 insertions(+), 36 deletions(-) > > diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/selftests/i915_gem_context.c > index 4399ef9ebf15..a172dbd9cb9e 100644 > --- a/drivers/gpu/drm/i915/selftests/i915_gem_context.c > +++ b/drivers/gpu/drm/i915/selftests/i915_gem_context.c > @@ -1620,8 +1620,8 @@ static int mock_context_barrier(void *arg) > mutex_lock(&i915->drm.struct_mutex); > > ctx = mock_context(i915, "mock"); > - if (IS_ERR(ctx)) { > - err = PTR_ERR(ctx); > + if (!ctx) { > + err = -ENOMEM; > goto unlock; > } Yup. The rest of the diff is unrelated tho, please resend. -Mika > > diff --git a/drivers/staging/erofs/unzip_vle.c b/drivers/staging/erofs/unzip_vle.c > index c7b3b21123c1..a711bf61f60c 100644 > --- a/drivers/staging/erofs/unzip_vle.c > +++ b/drivers/staging/erofs/unzip_vle.c > @@ -844,11 +844,9 @@ static void z_erofs_vle_unzip_kickoff(void *ptr, int bios) > static inline void z_erofs_vle_read_endio(struct bio *bio) > { > const blk_status_t err = bio->bi_status; > + struct erofs_sb_info *sbi = NULL; > unsigned int i; > struct bio_vec *bvec; > -#ifdef EROFS_FS_HAS_MANAGED_CACHE > - struct address_space *mc = NULL; > -#endif > struct bvec_iter_all iter_all; > > bio_for_each_segment_all(bvec, bio, i, iter_all) { > @@ -858,20 +856,12 @@ static inline void z_erofs_vle_read_endio(struct bio *bio) > DBG_BUGON(PageUptodate(page)); > DBG_BUGON(!page->mapping); > > -#ifdef EROFS_FS_HAS_MANAGED_CACHE > - if (unlikely(!mc && !z_erofs_is_stagingpage(page))) { > - struct inode *const inode = page->mapping->host; > - struct super_block *const sb = inode->i_sb; > - > - mc = MNGD_MAPPING(EROFS_SB(sb)); > - } > + if (unlikely(!sbi && !z_erofs_is_stagingpage(page))) > + sbi = EROFS_SB(page->mapping->host->i_sb); > > - /* > - * If mc has not gotten, it equals NULL, > - * however, page->mapping never be NULL if working properly. > - */ > - cachemngd = (page->mapping = mc); > -#endif > + /* sbi should already be gotten if the page is managed */ > + if (sbi) > + cachemngd = erofs_page_is_managed(sbi, page); > > if (unlikely(err)) > SetPageError(page); > @@ -972,6 +962,7 @@ static int z_erofs_vle_unzip(struct super_block *sb, > overlapped = false; > compressed_pages = grp->compressed_pages; > > + err = 0; > for (i = 0; i < clusterpages; ++i) { > unsigned int pagenr; > > @@ -981,26 +972,37 @@ static int z_erofs_vle_unzip(struct super_block *sb, > DBG_BUGON(!page); > DBG_BUGON(!page->mapping); > > - if (z_erofs_is_stagingpage(page)) > - continue; > -#ifdef EROFS_FS_HAS_MANAGED_CACHE > - if (page->mapping = MNGD_MAPPING(sbi)) { > - DBG_BUGON(!PageUptodate(page)); > - continue; > - } > -#endif > + if (!z_erofs_is_stagingpage(page)) { > + if (erofs_page_is_managed(sbi, page)) { > + if (unlikely(!PageUptodate(page))) > + err = -EIO; > + continue; > + } > + > + /* > + * only if non-head page can be selected > + * for inplace decompression > + */ > + pagenr = z_erofs_onlinepage_index(page); > > - /* only non-head page could be reused as a compressed page */ > - pagenr = z_erofs_onlinepage_index(page); > + DBG_BUGON(pagenr >= nr_pages); > + DBG_BUGON(pages[pagenr]); > + ++sparsemem_pages; > + pages[pagenr] = page; > > - DBG_BUGON(pagenr >= nr_pages); > - DBG_BUGON(pages[pagenr]); > - ++sparsemem_pages; > - pages[pagenr] = page; > + overlapped = true; > + } > > - overlapped = true; > + /* PG_error needs checking for inplaced and staging pages */ > + if (unlikely(PageError(page))) { > + DBG_BUGON(PageUptodate(page)); > + err = -EIO; > + } > } > > + if (unlikely(err)) > + goto out; > + > llen = (nr_pages << PAGE_SHIFT) - work->pageofs; > > if (z_erofs_vle_workgrp_fmt(grp) = Z_EROFS_VLE_WORKGRP_FMT_PLAIN) { > @@ -1044,10 +1046,9 @@ static int z_erofs_vle_unzip(struct super_block *sb, > for (i = 0; i < clusterpages; ++i) { > page = compressed_pages[i]; > > -#ifdef EROFS_FS_HAS_MANAGED_CACHE > - if (page->mapping = MNGD_MAPPING(sbi)) > + if (erofs_page_is_managed(sbi, page)) > continue; > -#endif > + > /* recycle all individual staging pages */ > (void)z_erofs_gather_if_stagingpage(page_pool, page); > > @@ -1198,6 +1199,7 @@ pickup_page_for_submission(struct z_erofs_vle_workgroup *grp, > if (page->mapping = mc) { > WRITE_ONCE(grp->compressed_pages[nr], page); > > + ClearPageError(page); > if (!PagePrivate(page)) { > /* > * impossible to be !PagePrivate(page) for > -- > 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mika Kuoppala Subject: Re: [PATCH] drm/i915/selftests: fix NULL vs IS_ERR() check in mock_context_barrier() Date: Thu, 21 Mar 2019 10:58:40 +0200 Message-ID: <8736ng1u4f.fsf@gaia.fi.intel.com> References: <20190321083335.GA31210@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4001D89EBB for ; Thu, 21 Mar 2019 08:59:28 +0000 (UTC) In-Reply-To: <20190321083335.GA31210@kadam> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Dan Carpenter , Jani Nikula , Chris Wilson Cc: David Airlie , intel-gfx@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Matthew Auld List-Id: intel-gfx@lists.freedesktop.org RGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPiB3cml0ZXM6Cgo+IFRoZSBt b2NrX2NvbnRleHQoKSBmdW5jdGlvbiByZXR1cm5zIE5VTEwgb24gZXJyb3IsIGl0IGRvZXNuJ3Qg cmV0dXJuCj4gZXJyb3IgcG9pbnRlcnMuCj4KPiBGaXhlczogODVmZGRmMGIwMDI3ICgiZHJtL2k5 MTU6IEludHJvZHVjZSBhIGNvbnRleHQgYmFycmllciBjYWxsYmFjayIpCj4gU2lnbmVkLW9mZi1i eTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgo+IC0tLQo+ICAuLi4v Z3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dlbV9jb250ZXh0LmMgfCAgNCArLQo+ICBkcml2 ZXJzL3N0YWdpbmcvZXJvZnMvdW56aXBfdmxlLmMgICAgICAgICAgICAgfCA3MCArKysrKysrKysr LS0tLS0tLS0tCj4gIDIgZmlsZXMgY2hhbmdlZCwgMzggaW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRp b25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5 MTVfZ2VtX2NvbnRleHQuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L3NlbGZ0ZXN0cy9pOTE1X2dl bV9jb250ZXh0LmMKPiBpbmRleCA0Mzk5ZWY5ZWJmMTUuLmExNzJkYmQ5Y2I5ZSAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9zZWxmdGVzdHMvaTkxNV9nZW1fY29udGV4dC5jCj4g KysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvc2VsZnRlc3RzL2k5MTVfZ2VtX2NvbnRleHQuYwo+ IEBAIC0xNjIwLDggKzE2MjAsOCBAQCBzdGF0aWMgaW50IG1vY2tfY29udGV4dF9iYXJyaWVyKHZv aWQgKmFyZykKPiAgCW11dGV4X2xvY2soJmk5MTUtPmRybS5zdHJ1Y3RfbXV0ZXgpOwo+ICAKPiAg CWN0eCA9IG1vY2tfY29udGV4dChpOTE1LCAibW9jayIpOwo+IC0JaWYgKElTX0VSUihjdHgpKSB7 Cj4gLQkJZXJyID0gUFRSX0VSUihjdHgpOwo+ICsJaWYgKCFjdHgpIHsKPiArCQllcnIgPSAtRU5P TUVNOwo+ICAJCWdvdG8gdW5sb2NrOwo+ICAJfQoKWXVwLgoKVGhlIHJlc3Qgb2YgdGhlIGRpZmYg aXMgdW5yZWxhdGVkIHRobywgcGxlYXNlIHJlc2VuZC4KCi1NaWthCgo+ICAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9zdGFnaW5nL2Vyb2ZzL3VuemlwX3ZsZS5jIGIvZHJpdmVycy9zdGFnaW5nL2Vy b2ZzL3VuemlwX3ZsZS5jCj4gaW5kZXggYzdiM2IyMTEyM2MxLi5hNzExYmY2MWY2MGMgMTAwNjQ0 Cj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL2Vyb2ZzL3VuemlwX3ZsZS5jCj4gKysrIGIvZHJpdmVy cy9zdGFnaW5nL2Vyb2ZzL3VuemlwX3ZsZS5jCj4gQEAgLTg0NCwxMSArODQ0LDkgQEAgc3RhdGlj IHZvaWQgel9lcm9mc192bGVfdW56aXBfa2lja29mZih2b2lkICpwdHIsIGludCBiaW9zKQo+ICBz dGF0aWMgaW5saW5lIHZvaWQgel9lcm9mc192bGVfcmVhZF9lbmRpbyhzdHJ1Y3QgYmlvICpiaW8p Cj4gIHsKPiAgCWNvbnN0IGJsa19zdGF0dXNfdCBlcnIgPSBiaW8tPmJpX3N0YXR1czsKPiArCXN0 cnVjdCBlcm9mc19zYl9pbmZvICpzYmkgPSBOVUxMOwo+ICAJdW5zaWduZWQgaW50IGk7Cj4gIAlz dHJ1Y3QgYmlvX3ZlYyAqYnZlYzsKPiAtI2lmZGVmIEVST0ZTX0ZTX0hBU19NQU5BR0VEX0NBQ0hF Cj4gLQlzdHJ1Y3QgYWRkcmVzc19zcGFjZSAqbWMgPSBOVUxMOwo+IC0jZW5kaWYKPiAgCXN0cnVj dCBidmVjX2l0ZXJfYWxsIGl0ZXJfYWxsOwo+ICAKPiAgCWJpb19mb3JfZWFjaF9zZWdtZW50X2Fs bChidmVjLCBiaW8sIGksIGl0ZXJfYWxsKSB7Cj4gQEAgLTg1OCwyMCArODU2LDEyIEBAIHN0YXRp YyBpbmxpbmUgdm9pZCB6X2Vyb2ZzX3ZsZV9yZWFkX2VuZGlvKHN0cnVjdCBiaW8gKmJpbykKPiAg CQlEQkdfQlVHT04oUGFnZVVwdG9kYXRlKHBhZ2UpKTsKPiAgCQlEQkdfQlVHT04oIXBhZ2UtPm1h cHBpbmcpOwo+ICAKPiAtI2lmZGVmIEVST0ZTX0ZTX0hBU19NQU5BR0VEX0NBQ0hFCj4gLQkJaWYg KHVubGlrZWx5KCFtYyAmJiAhel9lcm9mc19pc19zdGFnaW5ncGFnZShwYWdlKSkpIHsKPiAtCQkJ c3RydWN0IGlub2RlICpjb25zdCBpbm9kZSA9IHBhZ2UtPm1hcHBpbmctPmhvc3Q7Cj4gLQkJCXN0 cnVjdCBzdXBlcl9ibG9jayAqY29uc3Qgc2IgPSBpbm9kZS0+aV9zYjsKPiAtCj4gLQkJCW1jID0g TU5HRF9NQVBQSU5HKEVST0ZTX1NCKHNiKSk7Cj4gLQkJfQo+ICsJCWlmICh1bmxpa2VseSghc2Jp ICYmICF6X2Vyb2ZzX2lzX3N0YWdpbmdwYWdlKHBhZ2UpKSkKPiArCQkJc2JpID0gRVJPRlNfU0Io cGFnZS0+bWFwcGluZy0+aG9zdC0+aV9zYik7Cj4gIAo+IC0JCS8qCj4gLQkJICogSWYgbWMgaGFz IG5vdCBnb3R0ZW4sIGl0IGVxdWFscyBOVUxMLAo+IC0JCSAqIGhvd2V2ZXIsIHBhZ2UtPm1hcHBp bmcgbmV2ZXIgYmUgTlVMTCBpZiB3b3JraW5nIHByb3Blcmx5Lgo+IC0JCSAqLwo+IC0JCWNhY2hl bW5nZCA9IChwYWdlLT5tYXBwaW5nID09IG1jKTsKPiAtI2VuZGlmCj4gKwkJLyogc2JpIHNob3Vs ZCBhbHJlYWR5IGJlIGdvdHRlbiBpZiB0aGUgcGFnZSBpcyBtYW5hZ2VkICovCj4gKwkJaWYgKHNi aSkKPiArCQkJY2FjaGVtbmdkID0gZXJvZnNfcGFnZV9pc19tYW5hZ2VkKHNiaSwgcGFnZSk7Cj4g IAo+ICAJCWlmICh1bmxpa2VseShlcnIpKQo+ICAJCQlTZXRQYWdlRXJyb3IocGFnZSk7Cj4gQEAg LTk3Miw2ICs5NjIsNyBAQCBzdGF0aWMgaW50IHpfZXJvZnNfdmxlX3VuemlwKHN0cnVjdCBzdXBl cl9ibG9jayAqc2IsCj4gIAlvdmVybGFwcGVkID0gZmFsc2U7Cj4gIAljb21wcmVzc2VkX3BhZ2Vz ID0gZ3JwLT5jb21wcmVzc2VkX3BhZ2VzOwo+ICAKPiArCWVyciA9IDA7Cj4gIAlmb3IgKGkgPSAw OyBpIDwgY2x1c3RlcnBhZ2VzOyArK2kpIHsKPiAgCQl1bnNpZ25lZCBpbnQgcGFnZW5yOwo+ICAK PiBAQCAtOTgxLDI2ICs5NzIsMzcgQEAgc3RhdGljIGludCB6X2Vyb2ZzX3ZsZV91bnppcChzdHJ1 Y3Qgc3VwZXJfYmxvY2sgKnNiLAo+ICAJCURCR19CVUdPTighcGFnZSk7Cj4gIAkJREJHX0JVR09O KCFwYWdlLT5tYXBwaW5nKTsKPiAgCj4gLQkJaWYgKHpfZXJvZnNfaXNfc3RhZ2luZ3BhZ2UocGFn ZSkpCj4gLQkJCWNvbnRpbnVlOwo+IC0jaWZkZWYgRVJPRlNfRlNfSEFTX01BTkFHRURfQ0FDSEUK PiAtCQlpZiAocGFnZS0+bWFwcGluZyA9PSBNTkdEX01BUFBJTkcoc2JpKSkgewo+IC0JCQlEQkdf QlVHT04oIVBhZ2VVcHRvZGF0ZShwYWdlKSk7Cj4gLQkJCWNvbnRpbnVlOwo+IC0JCX0KPiAtI2Vu ZGlmCj4gKwkJaWYgKCF6X2Vyb2ZzX2lzX3N0YWdpbmdwYWdlKHBhZ2UpKSB7Cj4gKwkJCWlmIChl cm9mc19wYWdlX2lzX21hbmFnZWQoc2JpLCBwYWdlKSkgewo+ICsJCQkJaWYgKHVubGlrZWx5KCFQ YWdlVXB0b2RhdGUocGFnZSkpKQo+ICsJCQkJCWVyciA9IC1FSU87Cj4gKwkJCQljb250aW51ZTsK PiArCQkJfQo+ICsKPiArCQkJLyoKPiArCQkJICogb25seSBpZiBub24taGVhZCBwYWdlIGNhbiBi ZSBzZWxlY3RlZAo+ICsJCQkgKiBmb3IgaW5wbGFjZSBkZWNvbXByZXNzaW9uCj4gKwkJCSAqLwo+ ICsJCQlwYWdlbnIgPSB6X2Vyb2ZzX29ubGluZXBhZ2VfaW5kZXgocGFnZSk7Cj4gIAo+IC0JCS8q IG9ubHkgbm9uLWhlYWQgcGFnZSBjb3VsZCBiZSByZXVzZWQgYXMgYSBjb21wcmVzc2VkIHBhZ2Ug Ki8KPiAtCQlwYWdlbnIgPSB6X2Vyb2ZzX29ubGluZXBhZ2VfaW5kZXgocGFnZSk7Cj4gKwkJCURC R19CVUdPTihwYWdlbnIgPj0gbnJfcGFnZXMpOwo+ICsJCQlEQkdfQlVHT04ocGFnZXNbcGFnZW5y XSk7Cj4gKwkJCSsrc3BhcnNlbWVtX3BhZ2VzOwo+ICsJCQlwYWdlc1twYWdlbnJdID0gcGFnZTsK PiAgCj4gLQkJREJHX0JVR09OKHBhZ2VuciA+PSBucl9wYWdlcyk7Cj4gLQkJREJHX0JVR09OKHBh Z2VzW3BhZ2Vucl0pOwo+IC0JCSsrc3BhcnNlbWVtX3BhZ2VzOwo+IC0JCXBhZ2VzW3BhZ2Vucl0g PSBwYWdlOwo+ICsJCQlvdmVybGFwcGVkID0gdHJ1ZTsKPiArCQl9Cj4gIAo+IC0JCW92ZXJsYXBw ZWQgPSB0cnVlOwo+ICsJCS8qIFBHX2Vycm9yIG5lZWRzIGNoZWNraW5nIGZvciBpbnBsYWNlZCBh bmQgc3RhZ2luZyBwYWdlcyAqLwo+ICsJCWlmICh1bmxpa2VseShQYWdlRXJyb3IocGFnZSkpKSB7 Cj4gKwkJCURCR19CVUdPTihQYWdlVXB0b2RhdGUocGFnZSkpOwo+ICsJCQllcnIgPSAtRUlPOwo+ ICsJCX0KPiAgCX0KPiAgCj4gKwlpZiAodW5saWtlbHkoZXJyKSkKPiArCQlnb3RvIG91dDsKPiAr Cj4gIAlsbGVuID0gKG5yX3BhZ2VzIDw8IFBBR0VfU0hJRlQpIC0gd29yay0+cGFnZW9mczsKPiAg Cj4gIAlpZiAoel9lcm9mc192bGVfd29ya2dycF9mbXQoZ3JwKSA9PSBaX0VST0ZTX1ZMRV9XT1JL R1JQX0ZNVF9QTEFJTikgewo+IEBAIC0xMDQ0LDEwICsxMDQ2LDkgQEAgc3RhdGljIGludCB6X2Vy b2ZzX3ZsZV91bnppcChzdHJ1Y3Qgc3VwZXJfYmxvY2sgKnNiLAo+ICAJZm9yIChpID0gMDsgaSA8 IGNsdXN0ZXJwYWdlczsgKytpKSB7Cj4gIAkJcGFnZSA9IGNvbXByZXNzZWRfcGFnZXNbaV07Cj4g IAo+IC0jaWZkZWYgRVJPRlNfRlNfSEFTX01BTkFHRURfQ0FDSEUKPiAtCQlpZiAocGFnZS0+bWFw cGluZyA9PSBNTkdEX01BUFBJTkcoc2JpKSkKPiArCQlpZiAoZXJvZnNfcGFnZV9pc19tYW5hZ2Vk KHNiaSwgcGFnZSkpCj4gIAkJCWNvbnRpbnVlOwo+IC0jZW5kaWYKPiArCj4gIAkJLyogcmVjeWNs ZSBhbGwgaW5kaXZpZHVhbCBzdGFnaW5nIHBhZ2VzICovCj4gIAkJKHZvaWQpel9lcm9mc19nYXRo ZXJfaWZfc3RhZ2luZ3BhZ2UocGFnZV9wb29sLCBwYWdlKTsKPiAgCj4gQEAgLTExOTgsNiArMTE5 OSw3IEBAIHBpY2t1cF9wYWdlX2Zvcl9zdWJtaXNzaW9uKHN0cnVjdCB6X2Vyb2ZzX3ZsZV93b3Jr Z3JvdXAgKmdycCwKPiAgCWlmIChwYWdlLT5tYXBwaW5nID09IG1jKSB7Cj4gIAkJV1JJVEVfT05D RShncnAtPmNvbXByZXNzZWRfcGFnZXNbbnJdLCBwYWdlKTsKPiAgCj4gKwkJQ2xlYXJQYWdlRXJy b3IocGFnZSk7Cj4gIAkJaWYgKCFQYWdlUHJpdmF0ZShwYWdlKSkgewo+ICAJCQkvKgo+ICAJCQkg KiBpbXBvc3NpYmxlIHRvIGJlICFQYWdlUHJpdmF0ZShwYWdlKSBmb3IKPiAtLSAKPiAyLjE3LjEK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4