From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark yao Subject: Re: [PATCH 2/2] drm/rockchip: don't leak iommu mapping Date: Mon, 11 Apr 2016 10:52:49 +0800 Message-ID: <570B1181.706@rock-chips.com> References: <1459864232-25033-1-git-send-email-john@metanate.com> <1459864232-25033-2-git-send-email-john@metanate.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1459864232-25033-2-git-send-email-john@metanate.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: John Keeping Cc: linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: linux-rockchip.vger.kernel.org T24gMjAxNuW5tDA05pyIMDXml6UgMjE6NTAsIEpvaG4gS2VlcGluZyB3cm90ZToKPiBhcm1faW9t bXVfYXR0YWNoX2RldmljZSgpIHRha2VzIGl0cyBvd24gcmVmZXJlbmNlIHRvIHRoZSBtYXBwaW5n IHdlIGdpdmUKPiBpdC4gIFNpbmNlIHdlIGRvIG5vdCBrZWVwIGEgcmVmZXJlbmNlIHRvIHRoZSBt YXBwaW5nIG91cnNlbHZlcywgd2UgbXVzdAo+IHJlbGVhc2UgaXQgYmVmb3JlIHJldHVybmluZy4K Pgo+IEFsc28gZml4IHRoZSBlcnJvciBwYXRoLCB3aGljaCBmYWlscyB0byByZWxlYXNlIHRoZSBt YXBwaW5nIGlmIGl0IGhhcwo+IGNhbGxlZCBhcm1faW9tbXVfZGV0YWNoX2RldmljZSgpIHNpbmNl IHRoYXQgY2xlYXJzIGFyY2hkYXRhLm1hcHBpbmcuCj4KPiBTaWduZWQtb2ZmLWJ5OiBKb2huIEtl ZXBpbmcgPGpvaG5AbWV0YW5hdGUuY29tPgo+IC0tLQo+ICAgZHJpdmVycy9ncHUvZHJtL3JvY2tj aGlwL3JvY2tjaGlwX2RybV9kcnYuYyB8IDMgKystCj4gICAxIGZpbGUgY2hhbmdlZCwgMiBpbnNl cnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJt L3JvY2tjaGlwL3JvY2tjaGlwX2RybV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9y b2NrY2hpcF9kcm1fZHJ2LmMKPiBpbmRleCA3Njk1Yzc5Li4xZTJkODhiIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9yb2NrY2hpcC9yb2NrY2hpcF9kcm1fZHJ2LmMKPiArKysgYi9kcml2 ZXJzL2dwdS9kcm0vcm9ja2NoaXAvcm9ja2NoaXBfZHJtX2Rydi5jCj4gQEAgLTIxOCw2ICsyMTgs NyBAQCBzdGF0aWMgaW50IHJvY2tjaGlwX2RybV9sb2FkKHN0cnVjdCBkcm1fZGV2aWNlICpkcm1f ZGV2LCB1bnNpZ25lZCBsb25nIGZsYWdzKQo+ICAgCWlmIChyZXQpCj4gICAJCWdvdG8gZXJyX3Zi bGFua19jbGVhbnVwOwo+ICAgCj4gKwlhcm1faW9tbXVfcmVsZWFzZV9tYXBwaW5nKG1hcHBpbmcp Owo+ICAgCXJldHVybiAwOwo+ICAgZXJyX3ZibGFua19jbGVhbnVwOgo+ICAgCWRybV92Ymxhbmtf Y2xlYW51cChkcm1fZGV2KTsKPiBAQCAtMjI4LDcgKzIyOSw3IEBAIGVycl91bmJpbmQ6Cj4gICBl cnJfZGV0YWNoX2RldmljZToKPiAgIAlhcm1faW9tbXVfZGV0YWNoX2RldmljZShkZXYpOwo+ICAg ZXJyX3JlbGVhc2VfbWFwcGluZzoKPiAtCWFybV9pb21tdV9yZWxlYXNlX21hcHBpbmcoZGV2LT5h cmNoZGF0YS5tYXBwaW5nKTsKPiArCWFybV9pb21tdV9yZWxlYXNlX21hcHBpbmcobWFwcGluZyk7 Cj4gICBlcnJfY29uZmlnX2NsZWFudXA6Cj4gICAJZHJtX21vZGVfY29uZmlnX2NsZWFudXAoZHJt X2Rldik7Cj4gICAJZHJtX2Rldi0+ZGV2X3ByaXZhdGUgPSBOVUxMOwpBcHBsaWVkIHRvIG15IGRy bS1maXhlcwoKVGhhbmtzLgoKLS0gCu+8rWFyayBZYW8KCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: mark.yao@rock-chips.com (Mark yao) Date: Mon, 11 Apr 2016 10:52:49 +0800 Subject: [PATCH 2/2] drm/rockchip: don't leak iommu mapping In-Reply-To: <1459864232-25033-2-git-send-email-john@metanate.com> References: <1459864232-25033-1-git-send-email-john@metanate.com> <1459864232-25033-2-git-send-email-john@metanate.com> Message-ID: <570B1181.706@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016?04?05? 21:50, John Keeping wrote: > arm_iommu_attach_device() takes its own reference to the mapping we give > it. Since we do not keep a reference to the mapping ourselves, we must > release it before returning. > > Also fix the error path, which fails to release the mapping if it has > called arm_iommu_detach_device() since that clears archdata.mapping. > > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 7695c79..1e2d88b 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -218,6 +218,7 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) > if (ret) > goto err_vblank_cleanup; > > + arm_iommu_release_mapping(mapping); > return 0; > err_vblank_cleanup: > drm_vblank_cleanup(drm_dev); > @@ -228,7 +229,7 @@ err_unbind: > err_detach_device: > arm_iommu_detach_device(dev); > err_release_mapping: > - arm_iommu_release_mapping(dev->archdata.mapping); > + arm_iommu_release_mapping(mapping); > err_config_cleanup: > drm_mode_config_cleanup(drm_dev); > drm_dev->dev_private = NULL; Applied to my drm-fixes Thanks. -- ?ark Yao From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751787AbcDKCxQ (ORCPT ); Sun, 10 Apr 2016 22:53:16 -0400 Received: from regular1.263xmail.com ([211.150.99.132]:52881 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751130AbcDKCxO (ORCPT ); Sun, 10 Apr 2016 22:53:14 -0400 X-263anti-spam: BIG:0;ABS:1;DNS:0;ATT:0;SPF:S;KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-KSVirus-check: 0 X-RL-SENDER: mark.yao@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: mark.yao@rock-chips.com X-UNIQUE-TAG: <29b39b723ccb3f93b0e12d2f89280219> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <570B1181.706@rock-chips.com> Date: Mon, 11 Apr 2016 10:52:49 +0800 From: Mark yao User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: John Keeping CC: Heiko Stuebner , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] drm/rockchip: don't leak iommu mapping References: <1459864232-25033-1-git-send-email-john@metanate.com> <1459864232-25033-2-git-send-email-john@metanate.com> In-Reply-To: <1459864232-25033-2-git-send-email-john@metanate.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016年04月05日 21:50, John Keeping wrote: > arm_iommu_attach_device() takes its own reference to the mapping we give > it. Since we do not keep a reference to the mapping ourselves, we must > release it before returning. > > Also fix the error path, which fails to release the mapping if it has > called arm_iommu_detach_device() since that clears archdata.mapping. > > Signed-off-by: John Keeping > --- > drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > index 7695c79..1e2d88b 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c > @@ -218,6 +218,7 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) > if (ret) > goto err_vblank_cleanup; > > + arm_iommu_release_mapping(mapping); > return 0; > err_vblank_cleanup: > drm_vblank_cleanup(drm_dev); > @@ -228,7 +229,7 @@ err_unbind: > err_detach_device: > arm_iommu_detach_device(dev); > err_release_mapping: > - arm_iommu_release_mapping(dev->archdata.mapping); > + arm_iommu_release_mapping(mapping); > err_config_cleanup: > drm_mode_config_cleanup(drm_dev); > drm_dev->dev_private = NULL; Applied to my drm-fixes Thanks. -- Ｍark Yao