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=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_SANE_2 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 2B993C56202 for ; Tue, 24 Nov 2020 09:24:59 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 8CACA2073C for ; Tue, 24 Nov 2020 09:24:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="m2MMLnmt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8CACA2073C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0BCB98639B; Tue, 24 Nov 2020 09:24:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lDb6BKq4Ue60; Tue, 24 Nov 2020 09:24:57 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by whitealder.osuosl.org (Postfix) with ESMTP id 556D28601E; Tue, 24 Nov 2020 09:24:57 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 119ACC163C; Tue, 24 Nov 2020 09:24:57 +0000 (UTC) Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 45DFBC0052 for ; Tue, 24 Nov 2020 09:24:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4008A8639B for ; Tue, 24 Nov 2020 09:24:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id obVDNZvVh6Ef for ; Tue, 24 Nov 2020 09:24:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw02.mediatek.com (unknown [1.203.163.81]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F1808601E for ; Tue, 24 Nov 2020 09:24:53 +0000 (UTC) X-UUID: 1173a46cb11f40ad99644152fce63674-20201124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=wruLeV1VxmJT3h8u8aTdJS9aBT3lPk6fj9q+96T1tpA=; b=m2MMLnmti+zD9v0lImNo8ElL5aR2YjwrH071EJaqDUgT7ZPCb9jIYWxOaEMU3HpRQDtoYc1rFHCBGeoEoiR1IHGVPXI4SzkmEIxuOXmv21BV1LLiQrDx/6AVdlNnU/eVSsK4TLIfWOu3BNRFFkonQJv5OQeceN6vpL8HCzPIPTI=; X-UUID: 1173a46cb11f40ad99644152fce63674-20201124 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1399213662; Tue, 24 Nov 2020 17:24:46 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N2.mediatek.inc (172.27.4.72) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 17:24:45 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Nov 2020 17:24:43 +0800 Message-ID: <1606209884.26323.132.camel@mhfsdcap03> Subject: Re: [PATCH] iommu: Improve the performance for direct_mapping From: Yong Wu To: Will Deacon Date: Tue, 24 Nov 2020 17:24:44 +0800 In-Reply-To: <20201123123258.GC10233@willie-the-truck> References: <20201120090628.6566-1-yong.wu@mediatek.com> <20201123123258.GC10233@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: EBCB8F6C7AAB7CEFD384B30FE7D298E2FA4811C473B599035C7F59E811168DC42000:8 X-MTK: N Cc: youlin.pei@mediatek.com, anan.sun@mediatek.com, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Tomasz Figa , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Robin Murphy , linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Mon, 2020-11-23 at 12:32 +0000, Will Deacon wrote: > On Fri, Nov 20, 2020 at 05:06:28PM +0800, Yong Wu wrote: > > Currently direct_mapping always use the smallest pgsize which is SZ_4K > > normally to mapping. This is unnecessary. we could gather the size, and > > call iommu_map then, iommu_map could decide how to map better with the > > just right pgsize. > > > > From the original comment, we should take care overlap, otherwise, > > iommu_map may return -EEXIST. In this overlap case, we should map the > > previous region before overlap firstly. then map the left part. > > > > Each a iommu device will call this direct_mapping when its iommu > > initialize, This patch is effective to improve the boot/initialization > > time especially while it only needs level 1 mapping. > > > > Signed-off-by: Anan Sun > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/iommu.c | 20 ++++++++++++++++++-- > > 1 file changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > > index df87c8e825f7..854a8fcb928d 100644 > > --- a/drivers/iommu/iommu.c > > +++ b/drivers/iommu/iommu.c > > @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > /* We need to consider overlapping regions for different devices */ > > list_for_each_entry(entry, &mappings, list) { > > dma_addr_t start, end, addr; > > + size_t unmapped_sz = 0; > > I think "unmapped" is the wrong word here, as this variable actually > represents the amount we want to map! I suggest "map_size" instead. > > > if (domain->ops->apply_resv_region) > > domain->ops->apply_resv_region(dev, domain, entry); > > @@ -752,10 +753,25 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > phys_addr_t phys_addr; > > > > phys_addr = iommu_iova_to_phys(domain, addr); > > - if (phys_addr) > > + if (phys_addr == 0) { > > + unmapped_sz += pg_size; /* Gather the size. */ > > continue; > > + } > > > > - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); > > + if (unmapped_sz) { > > + /* Map the region before the overlap. */ > > + ret = iommu_map(domain, start, start, > > + unmapped_sz, entry->prot); > > + if (ret) > > + goto out; > > + start += unmapped_sz; > > I think it's a bit confusing to update start like this. Can we call > iommu_map(domain, addr - map_size, addr - map_size, map_size, entry->prot) > instead? > > > + unmapped_sz = 0; > > + } > > + start += pg_size; > > + } > > + if (unmapped_sz) { > > + ret = iommu_map(domain, start, start, unmapped_sz, > > + entry->prot); > > Can you avoid this hunk by changing your loop check to something like: > > if (!phys_addr) { > map_size += pg_size; > if (addr + pg_size < end) > continue; > } Thanks for your quick review. I have fixed and tested it. the patch is simple. I copy it here. Is this readable for you now? --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, /* We need to consider overlapping regions for different devices */ list_for_each_entry(entry, &mappings, list) { dma_addr_t start, end, addr; + size_t map_size = 0; if (domain->ops->apply_resv_region) domain->ops->apply_resv_region(dev, domain, entry); @@ -752,12 +753,21 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, phys_addr_t phys_addr; phys_addr = iommu_iova_to_phys(domain, addr); - if (phys_addr) - continue; + if (!phys_addr) { + map_size += pg_size; + if (addr + pg_size < end) + continue; + else + addr += pg_size; /*Point to End */ + } - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); - if (ret) - goto out; + if (map_size) { + ret = iommu_map(domain, addr - map_size, addr - map_size, + map_size, entry->prot); + if (ret) + goto out; + map_size = 0; + } } > > Will _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 D0018C2D0E4 for ; Tue, 24 Nov 2020 09:25:10 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4AB302075A for ; Tue, 24 Nov 2020 09:25:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BH2G/YHA"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="MW/JNp9o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AB302075A 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=merlin.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:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+54edqthOZ/Chk3tr1tzyPTde7kufyqfT56mXR2JkCs=; b=BH2G/YHA+fYBJAC8e0xCulH/O 4NeLjTNNcQgqd5cyRGVwKHeqVH/RIhtTN9cDKKMF7ZkGu2s8jxOJVzwc3Dab1AEhiSpavfZW7G1Kz 8ap15NsllrGUjDjX3OGkiAC2/Dy1QG6Kemt2BPvCOuKYF93x8CU71uOUDxZY/jp1Rs1EhuNZc3CwN MNGw9Jz74U94jMb1gv9D5BwDnHQ4laJB1xdsw7drmUVCW4hBTNZzY0TbGlyFiUK1mvZkeTcamN4X7 qlyYqtMPb6qLPEpjEII1EvGRxvMjSuYn9ViPt62ntlVJWBYAfMkiPs1/W7xs30+/tWCZUCy7+QrGL 84O7GM53w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khUZK-0004SS-58; Tue, 24 Nov 2020 09:25:02 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khUZD-0004Qk-KD; Tue, 24 Nov 2020 09:24:57 +0000 X-UUID: 7065e78ff7fa4ea88189d139442de55e-20201124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=wruLeV1VxmJT3h8u8aTdJS9aBT3lPk6fj9q+96T1tpA=; b=MW/JNp9o0TEwri7Y7ZaZuubqQPaAUgXF2777Ep2zIgKq4V1ojy200tZSse7T+AwrAWfA/qGF1tr7IhGwFcB18Lvv+8fhjcxUsg1f4L0gzpe5a54sTDqBx/jKF6DcYZfsfROGSctyb18C61zOwbkffzL4sJbEYz26MWS1HbLPEWE=; X-UUID: 7065e78ff7fa4ea88189d139442de55e-20201124 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1858062677; Tue, 24 Nov 2020 01:24:50 -0800 Received: from MTKMBS32N2.mediatek.inc (172.27.4.72) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 01:24:43 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N2.mediatek.inc (172.27.4.72) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 17:24:45 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Nov 2020 17:24:43 +0800 Message-ID: <1606209884.26323.132.camel@mhfsdcap03> Subject: Re: [PATCH] iommu: Improve the performance for direct_mapping From: Yong Wu To: Will Deacon Date: Tue, 24 Nov 2020 17:24:44 +0800 In-Reply-To: <20201123123258.GC10233@willie-the-truck> References: <20201120090628.6566-1-yong.wu@mediatek.com> <20201123123258.GC10233@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: EBCB8F6C7AAB7CEFD384B30FE7D298E2FA4811C473B599035C7F59E811168DC42000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201124_042456_416473_D0DD315C X-CRM114-Status: GOOD ( 32.25 ) 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: youlin.pei@mediatek.com, anan.sun@mediatek.com, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Tomasz Figa , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Robin Murphy , linux-arm-kernel@lists.infradead.org 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 On Mon, 2020-11-23 at 12:32 +0000, Will Deacon wrote: > On Fri, Nov 20, 2020 at 05:06:28PM +0800, Yong Wu wrote: > > Currently direct_mapping always use the smallest pgsize which is SZ_4K > > normally to mapping. This is unnecessary. we could gather the size, and > > call iommu_map then, iommu_map could decide how to map better with the > > just right pgsize. > > > > From the original comment, we should take care overlap, otherwise, > > iommu_map may return -EEXIST. In this overlap case, we should map the > > previous region before overlap firstly. then map the left part. > > > > Each a iommu device will call this direct_mapping when its iommu > > initialize, This patch is effective to improve the boot/initialization > > time especially while it only needs level 1 mapping. > > > > Signed-off-by: Anan Sun > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/iommu.c | 20 ++++++++++++++++++-- > > 1 file changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > > index df87c8e825f7..854a8fcb928d 100644 > > --- a/drivers/iommu/iommu.c > > +++ b/drivers/iommu/iommu.c > > @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > /* We need to consider overlapping regions for different devices */ > > list_for_each_entry(entry, &mappings, list) { > > dma_addr_t start, end, addr; > > + size_t unmapped_sz = 0; > > I think "unmapped" is the wrong word here, as this variable actually > represents the amount we want to map! I suggest "map_size" instead. > > > if (domain->ops->apply_resv_region) > > domain->ops->apply_resv_region(dev, domain, entry); > > @@ -752,10 +753,25 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > phys_addr_t phys_addr; > > > > phys_addr = iommu_iova_to_phys(domain, addr); > > - if (phys_addr) > > + if (phys_addr == 0) { > > + unmapped_sz += pg_size; /* Gather the size. */ > > continue; > > + } > > > > - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); > > + if (unmapped_sz) { > > + /* Map the region before the overlap. */ > > + ret = iommu_map(domain, start, start, > > + unmapped_sz, entry->prot); > > + if (ret) > > + goto out; > > + start += unmapped_sz; > > I think it's a bit confusing to update start like this. Can we call > iommu_map(domain, addr - map_size, addr - map_size, map_size, entry->prot) > instead? > > > + unmapped_sz = 0; > > + } > > + start += pg_size; > > + } > > + if (unmapped_sz) { > > + ret = iommu_map(domain, start, start, unmapped_sz, > > + entry->prot); > > Can you avoid this hunk by changing your loop check to something like: > > if (!phys_addr) { > map_size += pg_size; > if (addr + pg_size < end) > continue; > } Thanks for your quick review. I have fixed and tested it. the patch is simple. I copy it here. Is this readable for you now? --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, /* We need to consider overlapping regions for different devices */ list_for_each_entry(entry, &mappings, list) { dma_addr_t start, end, addr; + size_t map_size = 0; if (domain->ops->apply_resv_region) domain->ops->apply_resv_region(dev, domain, entry); @@ -752,12 +753,21 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, phys_addr_t phys_addr; phys_addr = iommu_iova_to_phys(domain, addr); - if (phys_addr) - continue; + if (!phys_addr) { + map_size += pg_size; + if (addr + pg_size < end) + continue; + else + addr += pg_size; /*Point to End */ + } - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); - if (ret) - goto out; + if (map_size) { + ret = iommu_map(domain, addr - map_size, addr - map_size, + map_size, entry->prot); + if (ret) + goto out; + map_size = 0; + } } > > Will _______________________________________________ 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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 27EB8C2D0E4 for ; Tue, 24 Nov 2020 09:26:20 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 A18C02075A for ; Tue, 24 Nov 2020 09:26:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="h8kWRHUj"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="MW/JNp9o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A18C02075A 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+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=merlin.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:Date:To:From: Subject:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Y8SnqRcTNOBRM1XCn2kpIvddS6SA9t5V8Bm+p487by0=; b=h8kWRHUjxPGbQ6BfFOJ4nLkv/ GVdjoqsPEzbUAMGrmHf7S1Uqe/Rc2U5w9kSmB3bh9nNop9Vuk7gh1GPOlXkWoVf612Eyc2yPSk8ft iChyZUHclVpSl1wjGxF0toN3wc3PdPEUnDV0ekXCRlFvWBjRwK8acrXchbbUevCZiJHxnDaLu6Ohr uAe39SJWjuosUtWJP0p+w4IW0TrXlS7Jay6wPFl6zZVeN6sJWTDkzScKuOdmJtlzXFWs/13kPFKuf hI2nHXaPxnnT8c8j1VVHgB+XoILJo+UeL7SHawd0PdNNYSiu+VWw0Hm4POMHqNVJ7pqIMk5zjYXZ/ MzKKJBbOA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khUZH-0004RZ-Ju; Tue, 24 Nov 2020 09:24:59 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khUZD-0004Qk-KD; Tue, 24 Nov 2020 09:24:57 +0000 X-UUID: 7065e78ff7fa4ea88189d139442de55e-20201124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=wruLeV1VxmJT3h8u8aTdJS9aBT3lPk6fj9q+96T1tpA=; b=MW/JNp9o0TEwri7Y7ZaZuubqQPaAUgXF2777Ep2zIgKq4V1ojy200tZSse7T+AwrAWfA/qGF1tr7IhGwFcB18Lvv+8fhjcxUsg1f4L0gzpe5a54sTDqBx/jKF6DcYZfsfROGSctyb18C61zOwbkffzL4sJbEYz26MWS1HbLPEWE=; X-UUID: 7065e78ff7fa4ea88189d139442de55e-20201124 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1858062677; Tue, 24 Nov 2020 01:24:50 -0800 Received: from MTKMBS32N2.mediatek.inc (172.27.4.72) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 01:24:43 -0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N2.mediatek.inc (172.27.4.72) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 17:24:45 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Nov 2020 17:24:43 +0800 Message-ID: <1606209884.26323.132.camel@mhfsdcap03> Subject: Re: [PATCH] iommu: Improve the performance for direct_mapping From: Yong Wu To: Will Deacon Date: Tue, 24 Nov 2020 17:24:44 +0800 In-Reply-To: <20201123123258.GC10233@willie-the-truck> References: <20201120090628.6566-1-yong.wu@mediatek.com> <20201123123258.GC10233@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: EBCB8F6C7AAB7CEFD384B30FE7D298E2FA4811C473B599035C7F59E811168DC42000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201124_042456_416473_D0DD315C X-CRM114-Status: GOOD ( 32.25 ) 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: youlin.pei@mediatek.com, anan.sun@mediatek.com, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, Joerg Roedel , linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Tomasz Figa , iommu@lists.linux-foundation.org, linux-mediatek@lists.infradead.org, Matthias Brugger , Robin Murphy , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, 2020-11-23 at 12:32 +0000, Will Deacon wrote: > On Fri, Nov 20, 2020 at 05:06:28PM +0800, Yong Wu wrote: > > Currently direct_mapping always use the smallest pgsize which is SZ_4K > > normally to mapping. This is unnecessary. we could gather the size, and > > call iommu_map then, iommu_map could decide how to map better with the > > just right pgsize. > > > > From the original comment, we should take care overlap, otherwise, > > iommu_map may return -EEXIST. In this overlap case, we should map the > > previous region before overlap firstly. then map the left part. > > > > Each a iommu device will call this direct_mapping when its iommu > > initialize, This patch is effective to improve the boot/initialization > > time especially while it only needs level 1 mapping. > > > > Signed-off-by: Anan Sun > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/iommu.c | 20 ++++++++++++++++++-- > > 1 file changed, 18 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > > index df87c8e825f7..854a8fcb928d 100644 > > --- a/drivers/iommu/iommu.c > > +++ b/drivers/iommu/iommu.c > > @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > /* We need to consider overlapping regions for different devices */ > > list_for_each_entry(entry, &mappings, list) { > > dma_addr_t start, end, addr; > > + size_t unmapped_sz = 0; > > I think "unmapped" is the wrong word here, as this variable actually > represents the amount we want to map! I suggest "map_size" instead. > > > if (domain->ops->apply_resv_region) > > domain->ops->apply_resv_region(dev, domain, entry); > > @@ -752,10 +753,25 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, > > phys_addr_t phys_addr; > > > > phys_addr = iommu_iova_to_phys(domain, addr); > > - if (phys_addr) > > + if (phys_addr == 0) { > > + unmapped_sz += pg_size; /* Gather the size. */ > > continue; > > + } > > > > - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); > > + if (unmapped_sz) { > > + /* Map the region before the overlap. */ > > + ret = iommu_map(domain, start, start, > > + unmapped_sz, entry->prot); > > + if (ret) > > + goto out; > > + start += unmapped_sz; > > I think it's a bit confusing to update start like this. Can we call > iommu_map(domain, addr - map_size, addr - map_size, map_size, entry->prot) > instead? > > > + unmapped_sz = 0; > > + } > > + start += pg_size; > > + } > > + if (unmapped_sz) { > > + ret = iommu_map(domain, start, start, unmapped_sz, > > + entry->prot); > > Can you avoid this hunk by changing your loop check to something like: > > if (!phys_addr) { > map_size += pg_size; > if (addr + pg_size < end) > continue; > } Thanks for your quick review. I have fixed and tested it. the patch is simple. I copy it here. Is this readable for you now? --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -737,6 +737,7 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, /* We need to consider overlapping regions for different devices */ list_for_each_entry(entry, &mappings, list) { dma_addr_t start, end, addr; + size_t map_size = 0; if (domain->ops->apply_resv_region) domain->ops->apply_resv_region(dev, domain, entry); @@ -752,12 +753,21 @@ static int iommu_create_device_direct_mappings(struct iommu_group *group, phys_addr_t phys_addr; phys_addr = iommu_iova_to_phys(domain, addr); - if (phys_addr) - continue; + if (!phys_addr) { + map_size += pg_size; + if (addr + pg_size < end) + continue; + else + addr += pg_size; /*Point to End */ + } - ret = iommu_map(domain, addr, addr, pg_size, entry->prot); - if (ret) - goto out; + if (map_size) { + ret = iommu_map(domain, addr - map_size, addr - map_size, + map_size, entry->prot); + if (ret) + goto out; + map_size = 0; + } } > > Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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=-17.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_SANE_2 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 33F8FC2D0E4 for ; Tue, 24 Nov 2020 09:24:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCFD92075A for ; Tue, 24 Nov 2020 09:24:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="m2MMLnmt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731116AbgKXJYz (ORCPT ); Tue, 24 Nov 2020 04:24:55 -0500 Received: from mailgw02.mediatek.com ([1.203.163.81]:2919 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1730978AbgKXJYy (ORCPT ); Tue, 24 Nov 2020 04:24:54 -0500 X-UUID: 1173a46cb11f40ad99644152fce63674-20201124 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:MIME-Version:Content-Type:References:In-Reply-To:Date:CC:To:From:Subject:Message-ID; bh=wruLeV1VxmJT3h8u8aTdJS9aBT3lPk6fj9q+96T1tpA=; b=m2MMLnmti+zD9v0lImNo8ElL5aR2YjwrH071EJaqDUgT7ZPCb9jIYWxOaEMU3HpRQDtoYc1rFHCBGeoEoiR1IHGVPXI4SzkmEIxuOXmv21BV1LLiQrDx/6AVdlNnU/eVSsK4TLIfWOu3BNRFFkonQJv5OQeceN6vpL8HCzPIPTI=; X-UUID: 1173a46cb11f40ad99644152fce63674-20201124 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw02.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1399213662; Tue, 24 Nov 2020 17:24:46 +0800 Received: from MTKCAS36.mediatek.inc (172.27.4.186) by MTKMBS32N2.mediatek.inc (172.27.4.72) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Nov 2020 17:24:45 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS36.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Nov 2020 17:24:43 +0800 Message-ID: <1606209884.26323.132.camel@mhfsdcap03> Subject: Re: [PATCH] iommu: Improve the performance for direct_mapping From: Yong Wu To: Will Deacon CC: Joerg Roedel , Robin Murphy , Matthias Brugger , Krzysztof Kozlowski , Tomasz Figa , , , , , , , Nicolas Boichat , , Date: Tue, 24 Nov 2020 17:24:44 +0800 In-Reply-To: <20201123123258.GC10233@willie-the-truck> References: <20201120090628.6566-1-yong.wu@mediatek.com> <20201123123258.GC10233@willie-the-truck> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: EBCB8F6C7AAB7CEFD384B30FE7D298E2FA4811C473B599035C7F59E811168DC42000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org T24gTW9uLCAyMDIwLTExLTIzIGF0IDEyOjMyICswMDAwLCBXaWxsIERlYWNvbiB3cm90ZToNCj4g T24gRnJpLCBOb3YgMjAsIDIwMjAgYXQgMDU6MDY6MjhQTSArMDgwMCwgWW9uZyBXdSB3cm90ZToN Cj4gPiBDdXJyZW50bHkgZGlyZWN0X21hcHBpbmcgYWx3YXlzIHVzZSB0aGUgc21hbGxlc3QgcGdz aXplIHdoaWNoIGlzIFNaXzRLDQo+ID4gbm9ybWFsbHkgdG8gbWFwcGluZy4gVGhpcyBpcyB1bm5l Y2Vzc2FyeS4gd2UgY291bGQgZ2F0aGVyIHRoZSBzaXplLCBhbmQNCj4gPiBjYWxsIGlvbW11X21h cCB0aGVuLCBpb21tdV9tYXAgY291bGQgZGVjaWRlIGhvdyB0byBtYXAgYmV0dGVyIHdpdGggdGhl DQo+ID4ganVzdCByaWdodCBwZ3NpemUuDQo+ID4gDQo+ID4gRnJvbSB0aGUgb3JpZ2luYWwgY29t bWVudCwgd2Ugc2hvdWxkIHRha2UgY2FyZSBvdmVybGFwLCBvdGhlcndpc2UsDQo+ID4gaW9tbXVf bWFwIG1heSByZXR1cm4gLUVFWElTVC4gSW4gdGhpcyBvdmVybGFwIGNhc2UsIHdlIHNob3VsZCBt YXAgdGhlDQo+ID4gcHJldmlvdXMgcmVnaW9uIGJlZm9yZSBvdmVybGFwIGZpcnN0bHkuIHRoZW4g bWFwIHRoZSBsZWZ0IHBhcnQuDQo+ID4gDQo+ID4gRWFjaCBhIGlvbW11IGRldmljZSB3aWxsIGNh bGwgdGhpcyBkaXJlY3RfbWFwcGluZyB3aGVuIGl0cyBpb21tdQ0KPiA+IGluaXRpYWxpemUsIFRo aXMgcGF0Y2ggaXMgZWZmZWN0aXZlIHRvIGltcHJvdmUgdGhlIGJvb3QvaW5pdGlhbGl6YXRpb24N Cj4gPiB0aW1lIGVzcGVjaWFsbHkgd2hpbGUgaXQgb25seSBuZWVkcyBsZXZlbCAxIG1hcHBpbmcu DQo+ID4gDQo+ID4gU2lnbmVkLW9mZi1ieTogQW5hbiBTdW4gPGFuYW4uc3VuQG1lZGlhdGVrLmNv bT4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBZb25nIFd1IDx5b25nLnd1QG1lZGlhdGVrLmNvbT4NCj4g PiAtLS0NCj4gPiAgZHJpdmVycy9pb21tdS9pb21tdS5jIHwgMjAgKysrKysrKysrKysrKysrKysr LS0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0p DQo+ID4gDQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW9tbXUvaW9tbXUuYyBiL2RyaXZlcnMv aW9tbXUvaW9tbXUuYw0KPiA+IGluZGV4IGRmODdjOGU4MjVmNy4uODU0YThmY2I5MjhkIDEwMDY0 NA0KPiA+IC0tLSBhL2RyaXZlcnMvaW9tbXUvaW9tbXUuYw0KPiA+ICsrKyBiL2RyaXZlcnMvaW9t bXUvaW9tbXUuYw0KPiA+IEBAIC03MzcsNiArNzM3LDcgQEAgc3RhdGljIGludCBpb21tdV9jcmVh dGVfZGV2aWNlX2RpcmVjdF9tYXBwaW5ncyhzdHJ1Y3QgaW9tbXVfZ3JvdXAgKmdyb3VwLA0KPiA+ ICAJLyogV2UgbmVlZCB0byBjb25zaWRlciBvdmVybGFwcGluZyByZWdpb25zIGZvciBkaWZmZXJl bnQgZGV2aWNlcyAqLw0KPiA+ICAJbGlzdF9mb3JfZWFjaF9lbnRyeShlbnRyeSwgJm1hcHBpbmdz LCBsaXN0KSB7DQo+ID4gIAkJZG1hX2FkZHJfdCBzdGFydCwgZW5kLCBhZGRyOw0KPiA+ICsJCXNp emVfdCB1bm1hcHBlZF9zeiA9IDA7DQo+IA0KPiBJIHRoaW5rICJ1bm1hcHBlZCIgaXMgdGhlIHdy b25nIHdvcmQgaGVyZSwgYXMgdGhpcyB2YXJpYWJsZSBhY3R1YWxseQ0KPiByZXByZXNlbnRzIHRo ZSBhbW91bnQgd2Ugd2FudCB0byBtYXAhIEkgc3VnZ2VzdCAibWFwX3NpemUiIGluc3RlYWQuDQo+ IA0KPiA+ICAJCWlmIChkb21haW4tPm9wcy0+YXBwbHlfcmVzdl9yZWdpb24pDQo+ID4gIAkJCWRv bWFpbi0+b3BzLT5hcHBseV9yZXN2X3JlZ2lvbihkZXYsIGRvbWFpbiwgZW50cnkpOw0KPiA+IEBA IC03NTIsMTAgKzc1MywyNSBAQCBzdGF0aWMgaW50IGlvbW11X2NyZWF0ZV9kZXZpY2VfZGlyZWN0 X21hcHBpbmdzKHN0cnVjdCBpb21tdV9ncm91cCAqZ3JvdXAsDQo+ID4gIAkJCXBoeXNfYWRkcl90 IHBoeXNfYWRkcjsNCj4gPiAgDQo+ID4gIAkJCXBoeXNfYWRkciA9IGlvbW11X2lvdmFfdG9fcGh5 cyhkb21haW4sIGFkZHIpOw0KPiA+IC0JCQlpZiAocGh5c19hZGRyKQ0KPiA+ICsJCQlpZiAocGh5 c19hZGRyID09IDApIHsNCj4gPiArCQkJCXVubWFwcGVkX3N6ICs9IHBnX3NpemU7IC8qIEdhdGhl ciB0aGUgc2l6ZS4gKi8NCj4gPiAgCQkJCWNvbnRpbnVlOw0KPiA+ICsJCQl9DQo+ID4gIA0KPiA+ IC0JCQlyZXQgPSBpb21tdV9tYXAoZG9tYWluLCBhZGRyLCBhZGRyLCBwZ19zaXplLCBlbnRyeS0+ cHJvdCk7DQo+ID4gKwkJCWlmICh1bm1hcHBlZF9zeikgew0KPiA+ICsJCQkJLyogTWFwIHRoZSBy ZWdpb24gYmVmb3JlIHRoZSBvdmVybGFwLiAqLw0KPiA+ICsJCQkJcmV0ID0gaW9tbXVfbWFwKGRv bWFpbiwgc3RhcnQsIHN0YXJ0LA0KPiA+ICsJCQkJCQl1bm1hcHBlZF9zeiwgZW50cnktPnByb3Qp Ow0KPiA+ICsJCQkJaWYgKHJldCkNCj4gPiArCQkJCQlnb3RvIG91dDsNCj4gPiArCQkJCXN0YXJ0 ICs9IHVubWFwcGVkX3N6Ow0KPiANCj4gSSB0aGluayBpdCdzIGEgYml0IGNvbmZ1c2luZyB0byB1 cGRhdGUgc3RhcnQgbGlrZSB0aGlzLiBDYW4gd2UgY2FsbA0KPiBpb21tdV9tYXAoZG9tYWluLCBh ZGRyIC0gbWFwX3NpemUsIGFkZHIgLSBtYXBfc2l6ZSwgbWFwX3NpemUsIGVudHJ5LT5wcm90KQ0K PiBpbnN0ZWFkPw0KPiANCj4gPiArCQkJCXVubWFwcGVkX3N6ID0gMDsNCj4gPiArCQkJfQ0KPiA+ ICsJCQlzdGFydCArPSBwZ19zaXplOw0KPiA+ICsJCX0NCj4gPiArCQlpZiAodW5tYXBwZWRfc3op IHsNCj4gPiArCQkJcmV0ID0gaW9tbXVfbWFwKGRvbWFpbiwgc3RhcnQsIHN0YXJ0LCB1bm1hcHBl ZF9zeiwNCj4gPiArCQkJCQllbnRyeS0+cHJvdCk7DQo+IA0KPiBDYW4geW91IGF2b2lkIHRoaXMg aHVuayBieSBjaGFuZ2luZyB5b3VyIGxvb3AgY2hlY2sgdG8gc29tZXRoaW5nIGxpa2U6DQo+IA0K PiAJaWYgKCFwaHlzX2FkZHIpIHsNCj4gCQltYXBfc2l6ZSArPSBwZ19zaXplOw0KPiAJCWlmIChh ZGRyICsgcGdfc2l6ZSA8IGVuZCkNCj4gCQkJY29udGludWU7DQo+IAl9DQoNClRoYW5rcyBmb3Ig eW91ciBxdWljayByZXZpZXcuIEkgaGF2ZSBmaXhlZCBhbmQgdGVzdGVkIGl0LiB0aGUgcGF0Y2gg aXMNCnNpbXBsZS4gSSBjb3B5IGl0IGhlcmUuIElzIHRoaXMgcmVhZGFibGUgZm9yIHlvdSBub3c/ DQoNCg0KLS0tIGEvZHJpdmVycy9pb21tdS9pb21tdS5jDQorKysgYi9kcml2ZXJzL2lvbW11L2lv bW11LmMNCkBAIC03MzcsNiArNzM3LDcgQEAgc3RhdGljIGludA0KaW9tbXVfY3JlYXRlX2Rldmlj ZV9kaXJlY3RfbWFwcGluZ3Moc3RydWN0IGlvbW11X2dyb3VwICpncm91cCwNCiAJLyogV2UgbmVl ZCB0byBjb25zaWRlciBvdmVybGFwcGluZyByZWdpb25zIGZvciBkaWZmZXJlbnQgZGV2aWNlcyAq Lw0KIAlsaXN0X2Zvcl9lYWNoX2VudHJ5KGVudHJ5LCAmbWFwcGluZ3MsIGxpc3QpIHsNCiAJCWRt YV9hZGRyX3Qgc3RhcnQsIGVuZCwgYWRkcjsNCisJCXNpemVfdCBtYXBfc2l6ZSA9IDA7DQogDQog CQlpZiAoZG9tYWluLT5vcHMtPmFwcGx5X3Jlc3ZfcmVnaW9uKQ0KIAkJCWRvbWFpbi0+b3BzLT5h cHBseV9yZXN2X3JlZ2lvbihkZXYsIGRvbWFpbiwgZW50cnkpOw0KQEAgLTc1MiwxMiArNzUzLDIx IEBAIHN0YXRpYyBpbnQNCmlvbW11X2NyZWF0ZV9kZXZpY2VfZGlyZWN0X21hcHBpbmdzKHN0cnVj dCBpb21tdV9ncm91cCAqZ3JvdXAsDQogCQkJcGh5c19hZGRyX3QgcGh5c19hZGRyOw0KIA0KIAkJ CXBoeXNfYWRkciA9IGlvbW11X2lvdmFfdG9fcGh5cyhkb21haW4sIGFkZHIpOw0KLQkJCWlmIChw aHlzX2FkZHIpDQotCQkJCWNvbnRpbnVlOw0KKwkJCWlmICghcGh5c19hZGRyKSB7DQorCQkJCW1h cF9zaXplICs9IHBnX3NpemU7DQorCQkJCWlmIChhZGRyICsgcGdfc2l6ZSA8IGVuZCkNCisJCQkJ CWNvbnRpbnVlOw0KKwkJCQllbHNlDQorCQkJCQlhZGRyICs9IHBnX3NpemU7IC8qUG9pbnQgdG8g RW5kICovDQorCQkJfQ0KIA0KLQkJCXJldCA9IGlvbW11X21hcChkb21haW4sIGFkZHIsIGFkZHIs IHBnX3NpemUsIGVudHJ5LT5wcm90KTsNCi0JCQlpZiAocmV0KQ0KLQkJCQlnb3RvIG91dDsNCisJ CQlpZiAobWFwX3NpemUpIHsNCisJCQkJcmV0ID0gaW9tbXVfbWFwKGRvbWFpbiwgYWRkciAtIG1h cF9zaXplLCBhZGRyIC0gbWFwX3NpemUsDQorCQkJCQkJbWFwX3NpemUsIGVudHJ5LT5wcm90KTsN CisJCQkJaWYgKHJldCkNCisJCQkJCWdvdG8gb3V0Ow0KKwkJCQltYXBfc2l6ZSA9IDA7DQorCQkJ fQ0KIAkJfQ0KDQo+IA0KPiBXaWxsDQoNCg==