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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 492ADC4BA0E for ; Wed, 26 Feb 2020 12:02:52 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CBB924656 for ; Wed, 26 Feb 2020 12:02:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FSQGIv1G"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ENbT1nfH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CBB924656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TlERiejsIkkgBja+hCEvA9Jg8lL0xDHasr/HQm3xX3w=; b=FSQGIv1GGVXItl g+Ax78mRDT0uWFo9WIhe/7C04WflGoLiin3VIvr+6sRu61PQiZ8yWqXb5hrbKUihQLuwcw3scWePX AhNCpvZeUZEkHMAKprBL9BEF/0ixcQqtAiDspZRihir3Bt6G8wbZYStKVgDToLpgYqgOdzr/6j4/Y KLOXJiOOU5sjA5zb0y7RACq8undhfk4oIRwKt1ye6V7DCSPvxxF8iX1u7/7ClNn6+G5inc8Gi9CXA ZjG8MhqOS18DY7dzZ3bzYqn6mjXoNHFCMuEHLk7ILwBXPYwRTyfuftCw45PQwbCTQVCOa0QbsbC4e A850f/yveFBUoIs7orVw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6vOh-0004cA-HZ; Wed, 26 Feb 2020 12:02:39 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6vOS-0004Pd-MP; Wed, 26 Feb 2020 12:02:26 +0000 X-UUID: 18eb665f38ca4064bbf823ea432813ac-20200226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=HeqaTDjIL0PTx6tfNZRsJGOB5wSUUqHsQNV/Ncz2fJc=; b=ENbT1nfHLPmaa1KnVt+jRf/tknKxc2p2KiK+s6CU1rwJAp+Lk3CSRMzwDpCHeadWl1fqHuy8hhUWvULtNVcLJGPLWkNfldClAau63AQr7JW2Wod7LrFdac8b6i7YmPCYva695mdKqQLe76+fThWjqwBTnhRst8AF2MHGbGBUrjI=; X-UUID: 18eb665f38ca4064bbf823ea432813ac-20200226 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2023036988; Wed, 26 Feb 2020 04:02:21 -0800 Received: from MTKMBS01N2.mediatek.inc (172.21.101.79) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 26 Feb 2020 04:02:58 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 26 Feb 2020 19:57:57 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 26 Feb 2020 20:01:57 +0800 From: Macpaul Lin To: Matthias Brugger , Shen Jing , Sasha Levin , John Stultz , Andrzej Pietrasiewicz , Vincent Pelletier , Jerry Zhang , , , , , Mediatek WSD Upstream , CC Hwang , Loda Chou , Al Viro , , Subject: [PATCH v4] usb: gadget: f_fs: try to fix AIO issue under ARM 64 bit TAGGED mode Date: Wed, 26 Feb 2020 20:01:52 +0800 Message-ID: <1582718512-28923-1-git-send-email-macpaul.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> References: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 272F8CE54AD6E67D73DACACA69671537612B9D56AD5648D8354972DCC44EFC2F2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200226_040224_739274_FCFE9D27 X-CRM114-Status: GOOD ( 13.77 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Chen , Miles Chen , Macpaul Lin , Catalin Marinas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org This issue was found when adbd trying to open functionfs with AIO mode. Usually, we need to set "setprop sys.usb.ffs.aio_compat 0" to enable adbd with AIO mode on Android. When adbd is opening functionfs, it will try to read 24 bytes at the first read I/O control. If this reading has been failed, adbd will try to send FUNCTIONFS_CLEAR_HALT to functionfs. When adbd is in AIO mode, functionfs will be acted with asyncronized I/O path. After the successful read transfer has been completed by gadget hardware, the following series of functions will be called. ffs_epfile_async_io_complete() -> ffs_user_copy_worker() -> copy_to_iter() -> _copy_to_iter() -> copyout() -> iterate_and_advance() -> iterate_iovec() Adding debug trace to these functions, it has been found that in copyout(), access_ok() will check if the user space address is valid to write. However if CONFIG_ARM64_TAGGED_ADDR_ABI is enabled, adbd always passes user space address start with "0x3C" to gadget's AIO blocks. This tagged address will cause access_ok() check always fail. Which causes later calculation in iterate_iovec() turn zero. Copyout() won't copy data to user space since the length to be copied "v.iov_len" will be zero. Finally leads ffs_copy_to_iter() always return -EFAULT, causes adbd cannot open functionfs and send FUNCTIONFS_CLEAR_HALT. Signed-off-by: Macpaul Lin Cc: Peter Chen Cc: Catalin Marinas Cc: Miles Chen --- Changes for v4: - Abandon solution v3 by adding "TIF_TAGGED_ADDR" flag to gadget driver. According to Catalin's suggestion, change the solution by untagging user space address passed by AIO in gadget driver. Changes for v3: - Fix misspelling in commit message. Thanks for Peter's review. Changes for v2: - Fix build error for 32-bit load. An #if defined(CONFIG_ARM64) still need for avoiding undeclared defines. drivers/usb/gadget/function/f_fs.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index ce1d023..192935f 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -715,7 +715,20 @@ static void ffs_epfile_io_complete(struct usb_ep *_ep, struct usb_request *req) static ssize_t ffs_copy_to_iter(void *data, int data_len, struct iov_iter *iter) { - ssize_t ret = copy_to_iter(data, data_len, iter); + ssize_t ret; + +#if defined(CONFIG_ARM64) + /* + * Replace tagged address passed by user space application before + * copying. + */ + if (IS_ENABLED(CONFIG_ARM64_TAGGED_ADDR_ABI) && + (iter->type == ITER_IOVEC)) { + *(unsigned long *)&iter->iov->iov_base = + (unsigned long)untagged_addr(iter->iov->iov_base); + } +#endif + ret = copy_to_iter(data, data_len, iter); if (likely(ret == data_len)) return ret; -- 1.7.9.5 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MIME_BASE64_TEXT,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3ABD3C4BA0B for ; Wed, 26 Feb 2020 12:02:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0887524689 for ; Wed, 26 Feb 2020 12:02:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ENbT1nfH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726926AbgBZMCP (ORCPT ); Wed, 26 Feb 2020 07:02:15 -0500 Received: from mailgw01.mediatek.com ([210.61.82.183]:6851 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726272AbgBZMCP (ORCPT ); Wed, 26 Feb 2020 07:02:15 -0500 X-UUID: 618771a74bec4bba8d11e5bc7ea6f553-20200226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=HeqaTDjIL0PTx6tfNZRsJGOB5wSUUqHsQNV/Ncz2fJc=; b=ENbT1nfHLPmaa1KnVt+jRf/tknKxc2p2KiK+s6CU1rwJAp+Lk3CSRMzwDpCHeadWl1fqHuy8hhUWvULtNVcLJGPLWkNfldClAau63AQr7JW2Wod7LrFdac8b6i7YmPCYva695mdKqQLe76+fThWjqwBTnhRst8AF2MHGbGBUrjI=; X-UUID: 618771a74bec4bba8d11e5bc7ea6f553-20200226 Received: from mtkcas07.mediatek.inc [(172.21.101.84)] by mailgw01.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 804146539; Wed, 26 Feb 2020 20:02:07 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 26 Feb 2020 19:57:57 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 26 Feb 2020 20:01:57 +0800 From: Macpaul Lin To: Matthias Brugger , Shen Jing , Sasha Levin , John Stultz , Andrzej Pietrasiewicz , Vincent Pelletier , Jerry Zhang , , , , , Mediatek WSD Upstream , CC Hwang , Loda Chou , Al Viro , , CC: Macpaul Lin , Peter Chen , Catalin Marinas , Miles Chen Subject: [PATCH v4] usb: gadget: f_fs: try to fix AIO issue under ARM 64 bit TAGGED mode Date: Wed, 26 Feb 2020 20:01:52 +0800 Message-ID: <1582718512-28923-1-git-send-email-macpaul.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> References: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-SNTS-SMTP: 272F8CE54AD6E67D73DACACA69671537612B9D56AD5648D8354972DCC44EFC2F2000:8 X-MTK: N Content-Transfer-Encoding: base64 Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org VGhpcyBpc3N1ZSB3YXMgZm91bmQgd2hlbiBhZGJkIHRyeWluZyB0byBvcGVuIGZ1bmN0aW9uZnMg d2l0aCBBSU8gbW9kZS4NClVzdWFsbHksIHdlIG5lZWQgdG8gc2V0ICJzZXRwcm9wIHN5cy51c2Iu ZmZzLmFpb19jb21wYXQgMCIgdG8gZW5hYmxlDQphZGJkIHdpdGggQUlPIG1vZGUgb24gQW5kcm9p ZC4NCg0KV2hlbiBhZGJkIGlzIG9wZW5pbmcgZnVuY3Rpb25mcywgaXQgd2lsbCB0cnkgdG8gcmVh ZCAyNCBieXRlcyBhdCB0aGUNCmZpcnN0IHJlYWQgSS9PIGNvbnRyb2wuIElmIHRoaXMgcmVhZGlu ZyBoYXMgYmVlbiBmYWlsZWQsIGFkYmQgd2lsbA0KdHJ5IHRvIHNlbmQgRlVOQ1RJT05GU19DTEVB Ul9IQUxUIHRvIGZ1bmN0aW9uZnMuIFdoZW4gYWRiZCBpcyBpbiBBSU8NCm1vZGUsIGZ1bmN0aW9u ZnMgd2lsbCBiZSBhY3RlZCB3aXRoIGFzeW5jcm9uaXplZCBJL08gcGF0aC4gQWZ0ZXIgdGhlDQpz dWNjZXNzZnVsIHJlYWQgdHJhbnNmZXIgaGFzIGJlZW4gY29tcGxldGVkIGJ5IGdhZGdldCBoYXJk d2FyZSwgdGhlDQpmb2xsb3dpbmcgc2VyaWVzIG9mIGZ1bmN0aW9ucyB3aWxsIGJlIGNhbGxlZC4N CiAgZmZzX2VwZmlsZV9hc3luY19pb19jb21wbGV0ZSgpIC0+IGZmc191c2VyX2NvcHlfd29ya2Vy KCkgLT4NCiAgICBjb3B5X3RvX2l0ZXIoKSAtPiBfY29weV90b19pdGVyKCkgLT4gY29weW91dCgp IC0+DQogICAgaXRlcmF0ZV9hbmRfYWR2YW5jZSgpIC0+IGl0ZXJhdGVfaW92ZWMoKQ0KDQpBZGRp bmcgZGVidWcgdHJhY2UgdG8gdGhlc2UgZnVuY3Rpb25zLCBpdCBoYXMgYmVlbiBmb3VuZCB0aGF0 IGluDQpjb3B5b3V0KCksIGFjY2Vzc19vaygpIHdpbGwgY2hlY2sgaWYgdGhlIHVzZXIgc3BhY2Ug YWRkcmVzcyBpcyB2YWxpZA0KdG8gd3JpdGUuIEhvd2V2ZXIgaWYgQ09ORklHX0FSTTY0X1RBR0dF RF9BRERSX0FCSSBpcyBlbmFibGVkLCBhZGJkDQphbHdheXMgcGFzc2VzIHVzZXIgc3BhY2UgYWRk cmVzcyBzdGFydCB3aXRoICIweDNDIiB0byBnYWRnZXQncyBBSU8NCmJsb2Nrcy4gVGhpcyB0YWdn ZWQgYWRkcmVzcyB3aWxsIGNhdXNlIGFjY2Vzc19vaygpIGNoZWNrIGFsd2F5cyBmYWlsLg0KV2hp Y2ggY2F1c2VzIGxhdGVyIGNhbGN1bGF0aW9uIGluIGl0ZXJhdGVfaW92ZWMoKSB0dXJuIHplcm8u DQpDb3B5b3V0KCkgd29uJ3QgY29weSBkYXRhIHRvIHVzZXIgc3BhY2Ugc2luY2UgdGhlIGxlbmd0 aCB0byBiZSBjb3BpZWQNCiJ2Lmlvdl9sZW4iIHdpbGwgYmUgemVyby4gRmluYWxseSBsZWFkcyBm ZnNfY29weV90b19pdGVyKCkgYWx3YXlzIHJldHVybg0KLUVGQVVMVCwgY2F1c2VzIGFkYmQgY2Fu bm90IG9wZW4gZnVuY3Rpb25mcyBhbmQgc2VuZA0KRlVOQ1RJT05GU19DTEVBUl9IQUxULg0KDQpT aWduZWQtb2ZmLWJ5OiBNYWNwYXVsIExpbiA8bWFjcGF1bC5saW5AbWVkaWF0ZWsuY29tPg0KQ2M6 IFBldGVyIENoZW4gPHBldGVyLmNoZW5AbnhwLmNvbT4NCkNjOiBDYXRhbGluIE1hcmluYXMgPGNh dGFsaW4ubWFyaW5hc0Bhcm0uY29tPg0KQ2M6IE1pbGVzIENoZW4gPG1pbGVzLmNoZW5AbWVkaWF0 ZWsuY29tPg0KLS0tDQpDaGFuZ2VzIGZvciB2NDoNCiAgLSBBYmFuZG9uIHNvbHV0aW9uIHYzIGJ5 IGFkZGluZyAiVElGX1RBR0dFRF9BRERSIiBmbGFnIHRvIGdhZGdldCBkcml2ZXIuDQogICAgQWNj b3JkaW5nIHRvIENhdGFsaW4ncyBzdWdnZXN0aW9uLCBjaGFuZ2UgdGhlIHNvbHV0aW9uIGJ5IHVu dGFnZ2luZyANCiAgICB1c2VyIHNwYWNlIGFkZHJlc3MgcGFzc2VkIGJ5IEFJTyBpbiBnYWRnZXQg ZHJpdmVyLg0KDQpDaGFuZ2VzIGZvciB2MzoNCiAgLSBGaXggbWlzc3BlbGxpbmcgaW4gY29tbWl0 IG1lc3NhZ2UuDQogICAgVGhhbmtzIGZvciBQZXRlcidzIHJldmlldy4NCg0KQ2hhbmdlcyBmb3Ig djI6DQogIC0gRml4IGJ1aWxkIGVycm9yIGZvciAzMi1iaXQgbG9hZC4gQW4gI2lmIGRlZmluZWQo Q09ORklHX0FSTTY0KSBzdGlsbCBuZWVkDQogICAgZm9yIGF2b2lkaW5nIHVuZGVjbGFyZWQgZGVm aW5lcy4NCg0KIGRyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX2ZzLmMgfCAgIDE1ICsrKysr KysrKysrKysrLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxNCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9u KC0pDQoNCmRpZmYgLS1naXQgYS9kcml2ZXJzL3VzYi9nYWRnZXQvZnVuY3Rpb24vZl9mcy5jIGIv ZHJpdmVycy91c2IvZ2FkZ2V0L2Z1bmN0aW9uL2ZfZnMuYw0KaW5kZXggY2UxZDAyMy4uMTkyOTM1 ZiAxMDA2NDQNCi0tLSBhL2RyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX2ZzLmMNCisrKyBi L2RyaXZlcnMvdXNiL2dhZGdldC9mdW5jdGlvbi9mX2ZzLmMNCkBAIC03MTUsNyArNzE1LDIwIEBA IHN0YXRpYyB2b2lkIGZmc19lcGZpbGVfaW9fY29tcGxldGUoc3RydWN0IHVzYl9lcCAqX2VwLCBz dHJ1Y3QgdXNiX3JlcXVlc3QgKnJlcSkNCiANCiBzdGF0aWMgc3NpemVfdCBmZnNfY29weV90b19p dGVyKHZvaWQgKmRhdGEsIGludCBkYXRhX2xlbiwgc3RydWN0IGlvdl9pdGVyICppdGVyKQ0KIHsN Ci0Jc3NpemVfdCByZXQgPSBjb3B5X3RvX2l0ZXIoZGF0YSwgZGF0YV9sZW4sIGl0ZXIpOw0KKwlz c2l6ZV90IHJldDsNCisNCisjaWYgZGVmaW5lZChDT05GSUdfQVJNNjQpDQorCS8qDQorCSAqIFJl cGxhY2UgdGFnZ2VkIGFkZHJlc3MgcGFzc2VkIGJ5IHVzZXIgc3BhY2UgYXBwbGljYXRpb24gYmVm b3JlDQorCSAqIGNvcHlpbmcuDQorCSAqLw0KKwlpZiAoSVNfRU5BQkxFRChDT05GSUdfQVJNNjRf VEFHR0VEX0FERFJfQUJJKSAmJg0KKwkJKGl0ZXItPnR5cGUgPT0gSVRFUl9JT1ZFQykpIHsNCisJ CSoodW5zaWduZWQgbG9uZyAqKSZpdGVyLT5pb3YtPmlvdl9iYXNlID0NCisJCQkodW5zaWduZWQg bG9uZyl1bnRhZ2dlZF9hZGRyKGl0ZXItPmlvdi0+aW92X2Jhc2UpOw0KKwl9DQorI2VuZGlmDQor CXJldCA9IGNvcHlfdG9faXRlcihkYXRhLCBkYXRhX2xlbiwgaXRlcik7DQogCWlmIChsaWtlbHko cmV0ID09IGRhdGFfbGVuKSkNCiAJCXJldHVybiByZXQ7DQogDQotLSANCjEuNy45LjUNCg== 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DD70C4BA0B for ; Wed, 26 Feb 2020 12:02:28 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4013124656 for ; Wed, 26 Feb 2020 12:02:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Lb4/aMw/"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="ENbT1nfH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4013124656 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+sQFDa05Lit4fwst4HUCcdkR5dlRy/YyB4GAvFCjj3g=; b=Lb4/aMw/74E4yF BBle6JtcFT8heeBvJ1pwfVnyUj6B6e70aZ8QCV1nd2unDlLt5iqqsbfVdPfussMcbIvjWPLhG6Sil k+/0i5TYyzg/UrLlhxEPUy8X1bKnoKJnWEe8XsKMIbtCVxT5uqzGR/1nF7lfXiV3gteuYe0ZU0ojj sfOgoQpEC+TD3WDo9RAQrp+4LWni53FHBUAMATracZr7I+dv3TsMdXJc1ObNBX7WK2u0KP9ouhWBv DJl8e9kAhK6Rnc8rVAk0hRfn1/Ne0MEeV8XTNkOyyywpvwa0RRt7TFavIV00zJkeKGLkx2xE9A79S wAzqedXYn54c10CzyQrg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6vOV-0004QO-La; Wed, 26 Feb 2020 12:02:27 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j6vOS-0004Pd-MP; Wed, 26 Feb 2020 12:02:26 +0000 X-UUID: 18eb665f38ca4064bbf823ea432813ac-20200226 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=HeqaTDjIL0PTx6tfNZRsJGOB5wSUUqHsQNV/Ncz2fJc=; b=ENbT1nfHLPmaa1KnVt+jRf/tknKxc2p2KiK+s6CU1rwJAp+Lk3CSRMzwDpCHeadWl1fqHuy8hhUWvULtNVcLJGPLWkNfldClAau63AQr7JW2Wod7LrFdac8b6i7YmPCYva695mdKqQLe76+fThWjqwBTnhRst8AF2MHGbGBUrjI=; X-UUID: 18eb665f38ca4064bbf823ea432813ac-20200226 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 2023036988; Wed, 26 Feb 2020 04:02:21 -0800 Received: from MTKMBS01N2.mediatek.inc (172.21.101.79) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 26 Feb 2020 04:02:58 -0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n2.mediatek.inc (172.21.101.79) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Wed, 26 Feb 2020 19:57:57 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Wed, 26 Feb 2020 20:01:57 +0800 From: Macpaul Lin To: Matthias Brugger , Shen Jing , Sasha Levin , John Stultz , Andrzej Pietrasiewicz , Vincent Pelletier , Jerry Zhang , , , , , Mediatek WSD Upstream , CC Hwang , Loda Chou , Al Viro , , Subject: [PATCH v4] usb: gadget: f_fs: try to fix AIO issue under ARM 64 bit TAGGED mode Date: Wed, 26 Feb 2020 20:01:52 +0800 Message-ID: <1582718512-28923-1-git-send-email-macpaul.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> References: <1582627315-21123-1-git-send-email-macpaul.lin@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: 272F8CE54AD6E67D73DACACA69671537612B9D56AD5648D8354972DCC44EFC2F2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200226_040224_739274_FCFE9D27 X-CRM114-Status: GOOD ( 13.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Chen , Miles Chen , Macpaul Lin , Catalin Marinas Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org This issue was found when adbd trying to open functionfs with AIO mode. Usually, we need to set "setprop sys.usb.ffs.aio_compat 0" to enable adbd with AIO mode on Android. When adbd is opening functionfs, it will try to read 24 bytes at the first read I/O control. If this reading has been failed, adbd will try to send FUNCTIONFS_CLEAR_HALT to functionfs. When adbd is in AIO mode, functionfs will be acted with asyncronized I/O path. After the successful read transfer has been completed by gadget hardware, the following series of functions will be called. ffs_epfile_async_io_complete() -> ffs_user_copy_worker() -> copy_to_iter() -> _copy_to_iter() -> copyout() -> iterate_and_advance() -> iterate_iovec() Adding debug trace to these functions, it has been found that in copyout(), access_ok() will check if the user space address is valid to write. However if CONFIG_ARM64_TAGGED_ADDR_ABI is enabled, adbd always passes user space address start with "0x3C" to gadget's AIO blocks. This tagged address will cause access_ok() check always fail. Which causes later calculation in iterate_iovec() turn zero. Copyout() won't copy data to user space since the length to be copied "v.iov_len" will be zero. Finally leads ffs_copy_to_iter() always return -EFAULT, causes adbd cannot open functionfs and send FUNCTIONFS_CLEAR_HALT. Signed-off-by: Macpaul Lin Cc: Peter Chen Cc: Catalin Marinas Cc: Miles Chen --- Changes for v4: - Abandon solution v3 by adding "TIF_TAGGED_ADDR" flag to gadget driver. According to Catalin's suggestion, change the solution by untagging user space address passed by AIO in gadget driver. Changes for v3: - Fix misspelling in commit message. Thanks for Peter's review. Changes for v2: - Fix build error for 32-bit load. An #if defined(CONFIG_ARM64) still need for avoiding undeclared defines. drivers/usb/gadget/function/f_fs.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index ce1d023..192935f 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c @@ -715,7 +715,20 @@ static void ffs_epfile_io_complete(struct usb_ep *_ep, struct usb_request *req) static ssize_t ffs_copy_to_iter(void *data, int data_len, struct iov_iter *iter) { - ssize_t ret = copy_to_iter(data, data_len, iter); + ssize_t ret; + +#if defined(CONFIG_ARM64) + /* + * Replace tagged address passed by user space application before + * copying. + */ + if (IS_ENABLED(CONFIG_ARM64_TAGGED_ADDR_ABI) && + (iter->type == ITER_IOVEC)) { + *(unsigned long *)&iter->iov->iov_base = + (unsigned long)untagged_addr(iter->iov->iov_base); + } +#endif + ret = copy_to_iter(data, data_len, iter); if (likely(ret == data_len)) return ret; -- 1.7.9.5 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel