From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: dmatest: fix container_of member in dmatest_callback From: Vinod Koul Message-Id: <20180129044547.GK18649@localhost> Date: Mon, 29 Jan 2018 10:15:48 +0530 To: Yang Shunyong Cc: dan.j.williams@intel.com, awallis@codeaurora.org, yu.zheng@hxt-semitech.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gTW9uLCBKYW4gMjIsIDIwMTggYXQgMDM6Mjg6MjhQTSArMDgwMCwgWWFuZyBTaHVueW9uZyB3 cm90ZToKPiBUaGUgdHlwZSBvZiBhcmcgcGFzc2VkIHRvIGRtYXRlc3RfY2FsbGJhY2sgaXMgc3Ry dWN0IGRtYXRlc3RfZG9uZS4KPiBJdCByZWZlcnMgdG8gdGVzdF9kb25lIGluIHN0cnVjdCBkbWF0 ZXN0X3RocmVhZCwgbm90IGRvbmVfd2FpdC4KPiAKPiBGaXhlczogNmY2YTIzYTIxM2JlICgiZG1h ZW5naW5lOiBkbWF0ZXN0OiBtb3ZlIGNhbGxiYWNrIHdhaXQgLi4uIikKPiBTaWduZWQtb2ZmLWJ5 OiBZYW5nIFNodW55b25nIDxzaHVueW9uZy55YW5nQGh4dC1zZW1pdGVjaC5jb20+Cj4gLS0tCj4g IGRyaXZlcnMvZG1hL2RtYXRlc3QuYyB8IDIgKy0KPiAgMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0 aW9uKCspLCAxIGRlbGV0aW9uKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hL2RtYXRl c3QuYyBiL2RyaXZlcnMvZG1hL2RtYXRlc3QuYwo+IGluZGV4IGVjNWY5ZDJiYzgyMC4uOTA2ZTg1 ZDZkZWRjIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZG1hL2RtYXRlc3QuYwo+ICsrKyBiL2RyaXZl cnMvZG1hL2RtYXRlc3QuYwo+IEBAIC0zNTUsNyArMzU1LDcgQEAgc3RhdGljIHZvaWQgZG1hdGVz dF9jYWxsYmFjayh2b2lkICphcmcpCj4gIHsKPiAgCXN0cnVjdCBkbWF0ZXN0X2RvbmUgKmRvbmUg PSBhcmc7Cj4gIAlzdHJ1Y3QgZG1hdGVzdF90aHJlYWQgKnRocmVhZCA9Cj4gLQkJY29udGFpbmVy X29mKGFyZywgc3RydWN0IGRtYXRlc3RfdGhyZWFkLCBkb25lX3dhaXQpOwo+ICsJCWNvbnRhaW5l cl9vZihhcmcsIHN0cnVjdCBkbWF0ZXN0X3RocmVhZCwgdGVzdF9kb25lKTsKClRoaXMgZml4ZXMg aXQgYnV0IG9uZSBvZiB0aGUgcmVhc29uIHdoeSBjb21waWxlcnMgZGlkbid0IGNhdGNoIHRoaXMK d2FzIHRoZSB2b2lkIGFyZy4gSSBqdXN0IHRlc3RlZCBhbmQgdXNlZCAnZG9uZScgYXMgdGhlIGFy Z3VtZW50IGhlcmUKcmF0aGVyIHRoYW4gJ2FyZycgYW5kIGNvbXBpbGVyIHdhcyBxdWljayB0byBw b2ludCBvdXQgdGhlIGVycm9yLgoKU28gYSBiZXR0ZXIgZml4IElNTyB3b3VsZCBiZToKCi0tID44 IC0tCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9kbWEvZG1hdGVzdC5jIGIvZHJpdmVycy9kbWEvZG1h dGVzdC5jCmluZGV4IGVjNWY5ZDJiYzgyMC4uODBjYzJiZTY0ODNjIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2RtYS9kbWF0ZXN0LmMKKysrIGIvZHJpdmVycy9kbWEvZG1hdGVzdC5jCkBAIC0zNTUsNyAr MzU1LDcgQEAgc3RhdGljIHZvaWQgZG1hdGVzdF9jYWxsYmFjayh2b2lkICphcmcpCiB7CiAgICAg ICAgc3RydWN0IGRtYXRlc3RfZG9uZSAqZG9uZSA9IGFyZzsKICAgICAgICBzdHJ1Y3QgZG1hdGVz dF90aHJlYWQgKnRocmVhZCA9Ci0gICAgICAgICAgICAgICBjb250YWluZXJfb2YoYXJnLCBzdHJ1 Y3QgZG1hdGVzdF90aHJlYWQsIGRvbmVfd2FpdCk7CisgICAgICAgICAgICAgICBjb250YWluZXJf b2YoZG9uZSwgc3RydWN0IGRtYXRlc3RfdGhyZWFkLCB0ZXN0X2RvbmUpOwogICAgICAgIGlmICgh dGhyZWFkLT5kb25lKSB7CiAgICAgICAgICAgICAgICBkb25lLT5kb25lID0gdHJ1ZTsKICAgICAg ICAgICAgICAgIHdha2VfdXBfYWxsKGRvbmUtPndhaXQpOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751349AbeA2ElS (ORCPT ); Sun, 28 Jan 2018 23:41:18 -0500 Received: from mga11.intel.com ([192.55.52.93]:22650 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127AbeA2ElQ (ORCPT ); Sun, 28 Jan 2018 23:41:16 -0500 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,429,1511856000"; d="scan'208";a="13773590" Date: Mon, 29 Jan 2018 10:15:48 +0530 From: Vinod Koul To: Yang Shunyong Cc: dan.j.williams@intel.com, awallis@codeaurora.org, yu.zheng@hxt-semitech.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] dmaengine: dmatest: fix container_of member in dmatest_callback Message-ID: <20180129044547.GK18649@localhost> References: <1516606108-40562-1-git-send-email-shunyong.yang@hxt-semitech.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1516606108-40562-1-git-send-email-shunyong.yang@hxt-semitech.com> User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 22, 2018 at 03:28:28PM +0800, Yang Shunyong wrote: > The type of arg passed to dmatest_callback is struct dmatest_done. > It refers to test_done in struct dmatest_thread, not done_wait. > > Fixes: 6f6a23a213be ("dmaengine: dmatest: move callback wait ...") > Signed-off-by: Yang Shunyong > --- > drivers/dma/dmatest.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c > index ec5f9d2bc820..906e85d6dedc 100644 > --- a/drivers/dma/dmatest.c > +++ b/drivers/dma/dmatest.c > @@ -355,7 +355,7 @@ static void dmatest_callback(void *arg) > { > struct dmatest_done *done = arg; > struct dmatest_thread *thread = > - container_of(arg, struct dmatest_thread, done_wait); > + container_of(arg, struct dmatest_thread, test_done); This fixes it but one of the reason why compilers didn't catch this was the void arg. I just tested and used 'done' as the argument here rather than 'arg' and compiler was quick to point out the error. So a better fix IMO would be: -- >8 -- diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index ec5f9d2bc820..80cc2be6483c 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -355,7 +355,7 @@ static void dmatest_callback(void *arg) { struct dmatest_done *done = arg; struct dmatest_thread *thread = - container_of(arg, struct dmatest_thread, done_wait); + container_of(done, struct dmatest_thread, test_done); if (!thread->done) { done->done = true; wake_up_all(done->wait); -- ~Vinod