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=-11.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 0D96CC388F9 for ; Mon, 26 Oct 2020 07:49:30 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.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 9C49B223AB for ; Mon, 26 Oct 2020 07:49:29 +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="GK3lXmtL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9C49B223AB 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 hemlock.osuosl.org (Postfix) with ESMTP id 444EE8713A; Mon, 26 Oct 2020 07:49:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id j-ziR+Q0GBRH; Mon, 26 Oct 2020 07:49:28 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id A540A87029; Mon, 26 Oct 2020 07:49:28 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 96BCDC088B; Mon, 26 Oct 2020 07:49:28 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id 26F74C0051 for ; Mon, 26 Oct 2020 07:49:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 15269870FE for ; Mon, 26 Oct 2020 07:49:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9q1QiHwHNPRD for ; Mon, 26 Oct 2020 07:49:26 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailgw01.mediatek.com (unknown [1.203.163.78]) by hemlock.osuosl.org (Postfix) with ESMTP id 6F83987029 for ; Mon, 26 Oct 2020 07:49:25 +0000 (UTC) X-UUID: 731fa5de79564a608bbad1f3dc118972-20201026 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=SfAVNttk78qRQKKemA7Ud33MHHCmqu34nhu5o0stHqY=; b=GK3lXmtLj3iv9AASn1C2y5H111pxhpl4J4M72mq7Xmt2HX4honnrtf3zbZ6kYjswx8Y3FOzyLuAsyn+x/4SU9iEiG4R2SLI+p9qT0cRPMNPOSwQHuMDJT3Jr2QU1PCZ4F6DichSbrHg0LJ/lgTa84la/iifiJpas+muKM3Gd+ls=; X-UUID: 731fa5de79564a608bbad1f3dc118972-20201026 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1870587162; Mon, 26 Oct 2020 15:49:22 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 15:49:07 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 26 Oct 2020 15:49:06 +0800 Message-ID: <1603698546.26323.89.camel@mhfsdcap03> Subject: Re: [PATCH v3 08/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap From: Yong Wu To: Will Deacon Date: Mon, 26 Oct 2020 15:49:06 +0800 In-Reply-To: <20201023111740.GA20933@willie-the-truck> References: <20200930070647.10188-1-yong.wu@mediatek.com> <20200930070647.10188-9-yong.wu@mediatek.com> <20201023111740.GA20933@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 8750D7412EF4047F0F7D427B7CA7C541119F84D3827A3506E3419C88D3EFEC702000:8 X-MTK: N Cc: youlin.pei@mediatek.com, devicetree@vger.kernel.org, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, kernel-team@android.com, Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Evan Green , Tomasz Figa , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, 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 Fri, 2020-10-23 at 12:17 +0100, Will Deacon wrote: > On Wed, Sep 30, 2020 at 03:06:31PM +0800, Yong Wu wrote: > > Use the ias for the valid iova checking in arm_v7s_unmap. This is a > > preparing patch for supporting iova 34bit for MediaTek. > > BTW, change the ias/oas checking format in arm_v7s_map. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/io-pgtable-arm-v7s.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > > index a688f22cbe3b..4c9d8dccfc5a 100644 > > --- a/drivers/iommu/io-pgtable-arm-v7s.c > > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > > @@ -526,8 +526,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova, > > if (!(prot & (IOMMU_READ | IOMMU_WRITE))) > > return 0; > > > > - if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) || > > - paddr >= (1ULL << data->iop.cfg.oas))) > > + if (WARN_ON(iova >> data->iop.cfg.ias || paddr >> data->iop.cfg.oas)) > > return -ERANGE; > > As discussed when reviewing these for Android, please leave this code as-is. > > > > > ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp); > > @@ -717,7 +716,7 @@ static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova, > > { > > struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops); > > > > - if (WARN_ON(upper_32_bits(iova))) > > + if (WARN_ON(iova >> data->iop.cfg.ias)) > > return 0; > > And avoid the UB here for 32-bit machines by comparing with 1ULL << > iop.cfg.ias instead. Thanks. I will fix it in next version. > > Thanks, > > 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=-11.2 required=3.0 tests=BAYES_00,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, 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 05C2DC2D0A3 for ; Mon, 26 Oct 2020 07:49:46 +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 8A40B222EA for ; Mon, 26 Oct 2020 07:49:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tQ+OpROW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u+fN7kJl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A40B222EA 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=OBmNQjYV+eXNoBEMuqEn8x14j5FRZmIwSWw0b97/vlg=; b=tQ+OpROWKPlT/gFFQLSKd5FFS rEAd5GUx4s23sOKecvrxLgnLa+EBA6tFfmvy1PGKI6SjUChAwBvPTlczd40+FV9LNIZ27sTxn4THn CW0baIF5lg3BXottCyWviUvUs3uWn4XX79NcVA6IjoSXLIkNSy6DtGt8Ytdhcltq6dH+BvRm3G8ae l5nlZgjSbkwp7Mes2F0b0ol9b/DCZYQHUZjFzuYdWxh1CnY+S6glUm03D6zIkw2hftNVZBjIn0wNo 5i8NoWJ2rad8mBO2by6FyS+FpMLmnZwAfWFbksiPMtWmQ+UanGhcrH0m8MV+ZuFKn4JAsDs8sTZve BGL9WZ6LQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWxFz-0001aU-9V; Mon, 26 Oct 2020 07:49:31 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWxFw-0001Z8-Da; Mon, 26 Oct 2020 07:49:29 +0000 X-UUID: bfacdd3ac4a04ba0b200aaa86bc6b4b3-20201025 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=SfAVNttk78qRQKKemA7Ud33MHHCmqu34nhu5o0stHqY=; b=u+fN7kJlDgpXkW2VyRhnBLoYkwrtZD/IKv0DltJ4yn/yUhJ6/XAcoxgJ1ymkA6l94fhp982U8WIBhhdG185QV79GLcNnvBRM8FuBARjRYMUvhsN+kfSMcHaochbt3/boH8Ks/otCXQkqbjTb+F6GgQhdwMYjiBqI1fEuHhkMfXE=; X-UUID: bfacdd3ac4a04ba0b200aaa86bc6b4b3-20201025 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1811044683; Sun, 25 Oct 2020 23:49:25 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 00:49:23 -0700 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 15:49:07 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 26 Oct 2020 15:49:06 +0800 Message-ID: <1603698546.26323.89.camel@mhfsdcap03> Subject: Re: [PATCH v3 08/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap From: Yong Wu To: Will Deacon Date: Mon, 26 Oct 2020 15:49:06 +0800 In-Reply-To: <20201023111740.GA20933@willie-the-truck> References: <20200930070647.10188-1-yong.wu@mediatek.com> <20200930070647.10188-9-yong.wu@mediatek.com> <20201023111740.GA20933@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 8750D7412EF4047F0F7D427B7CA7C541119F84D3827A3506E3419C88D3EFEC702000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_034928_634946_B695E3B2 X-CRM114-Status: GOOD ( 22.41 ) 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, devicetree@vger.kernel.org, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, kernel-team@android.com, Joerg Roedel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Evan Green , Tomasz Figa , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, 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 Fri, 2020-10-23 at 12:17 +0100, Will Deacon wrote: > On Wed, Sep 30, 2020 at 03:06:31PM +0800, Yong Wu wrote: > > Use the ias for the valid iova checking in arm_v7s_unmap. This is a > > preparing patch for supporting iova 34bit for MediaTek. > > BTW, change the ias/oas checking format in arm_v7s_map. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/io-pgtable-arm-v7s.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > > index a688f22cbe3b..4c9d8dccfc5a 100644 > > --- a/drivers/iommu/io-pgtable-arm-v7s.c > > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > > @@ -526,8 +526,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova, > > if (!(prot & (IOMMU_READ | IOMMU_WRITE))) > > return 0; > > > > - if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) || > > - paddr >= (1ULL << data->iop.cfg.oas))) > > + if (WARN_ON(iova >> data->iop.cfg.ias || paddr >> data->iop.cfg.oas)) > > return -ERANGE; > > As discussed when reviewing these for Android, please leave this code as-is. > > > > > ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp); > > @@ -717,7 +716,7 @@ static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova, > > { > > struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops); > > > > - if (WARN_ON(upper_32_bits(iova))) > > + if (WARN_ON(iova >> data->iop.cfg.ias)) > > return 0; > > And avoid the UB here for 32-bit machines by comparing with 1ULL << > iop.cfg.ias instead. Thanks. I will fix it in next version. > > Thanks, > > 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=-11.2 required=3.0 tests=BAYES_00,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, 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 4EBF4C2D0A3 for ; Mon, 26 Oct 2020 07:51:16 +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 DBAF1222EA for ; Mon, 26 Oct 2020 07:51:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tjHqQdoH"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="u+fN7kJl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBAF1222EA 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=RRqI0/uL1hQ8r+fru7piW7i/BlCfglu1J+e+isALNGI=; b=tjHqQdoHeKdxFfu4iAPdLewFo ozmOBypZEW1g3+r/k8kgrf9xrEpnheEHnjRKpLxmxORLglJZoHgUbVSV8C7dnPgdOGqbZLoc6gkmL AOmx5cvYUu3lhXAL6BVhRY7JNdO91ZbnlB4L/XZqQy1plW3zExql0CXnbTF4y8/Gs6tZxzNgPOICQ HoVI0wbK6ZSTd6p9v4oGCMXp+GkmE24OHv48SZLJW5i5xfeWSQvtItLkGU+5x7rWkIZqAsA56kRf/ QXUiDHxX9IEO5es/S7hn4RB1H3l/8AfgxCaFS1hPEd/1Gkw+ABbgJ1++75TgUkI9rLIn0XkHUasZD kjm6tU2Zw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWxG0-0001ao-Na; Mon, 26 Oct 2020 07:49:32 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kWxFw-0001Z8-Da; Mon, 26 Oct 2020 07:49:29 +0000 X-UUID: bfacdd3ac4a04ba0b200aaa86bc6b4b3-20201025 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=SfAVNttk78qRQKKemA7Ud33MHHCmqu34nhu5o0stHqY=; b=u+fN7kJlDgpXkW2VyRhnBLoYkwrtZD/IKv0DltJ4yn/yUhJ6/XAcoxgJ1ymkA6l94fhp982U8WIBhhdG185QV79GLcNnvBRM8FuBARjRYMUvhsN+kfSMcHaochbt3/boH8Ks/otCXQkqbjTb+F6GgQhdwMYjiBqI1fEuHhkMfXE=; X-UUID: bfacdd3ac4a04ba0b200aaa86bc6b4b3-20201025 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1811044683; Sun, 25 Oct 2020 23:49:25 -0800 Received: from MTKMBS31DR.mediatek.inc (172.27.6.102) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 00:49:23 -0700 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 15:49:07 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 26 Oct 2020 15:49:06 +0800 Message-ID: <1603698546.26323.89.camel@mhfsdcap03> Subject: Re: [PATCH v3 08/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap From: Yong Wu To: Will Deacon Date: Mon, 26 Oct 2020 15:49:06 +0800 In-Reply-To: <20201023111740.GA20933@willie-the-truck> References: <20200930070647.10188-1-yong.wu@mediatek.com> <20200930070647.10188-9-yong.wu@mediatek.com> <20201023111740.GA20933@willie-the-truck> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: 8750D7412EF4047F0F7D427B7CA7C541119F84D3827A3506E3419C88D3EFEC702000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_034928_634946_B695E3B2 X-CRM114-Status: GOOD ( 22.41 ) 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, devicetree@vger.kernel.org, Nicolas Boichat , srv_heupstream@mediatek.com, chao.hao@mediatek.com, kernel-team@android.com, Joerg Roedel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Evan Green , Tomasz Figa , iommu@lists.linux-foundation.org, Rob Herring , linux-mediatek@lists.infradead.org, Krzysztof Kozlowski , Matthias Brugger , ming-fan.chen@mediatek.com, anan.sun@mediatek.com, 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 Fri, 2020-10-23 at 12:17 +0100, Will Deacon wrote: > On Wed, Sep 30, 2020 at 03:06:31PM +0800, Yong Wu wrote: > > Use the ias for the valid iova checking in arm_v7s_unmap. This is a > > preparing patch for supporting iova 34bit for MediaTek. > > BTW, change the ias/oas checking format in arm_v7s_map. > > > > Signed-off-by: Yong Wu > > --- > > drivers/iommu/io-pgtable-arm-v7s.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c > > index a688f22cbe3b..4c9d8dccfc5a 100644 > > --- a/drivers/iommu/io-pgtable-arm-v7s.c > > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > > @@ -526,8 +526,7 @@ static int arm_v7s_map(struct io_pgtable_ops *ops, unsigned long iova, > > if (!(prot & (IOMMU_READ | IOMMU_WRITE))) > > return 0; > > > > - if (WARN_ON(iova >= (1ULL << data->iop.cfg.ias) || > > - paddr >= (1ULL << data->iop.cfg.oas))) > > + if (WARN_ON(iova >> data->iop.cfg.ias || paddr >> data->iop.cfg.oas)) > > return -ERANGE; > > As discussed when reviewing these for Android, please leave this code as-is. > > > > > ret = __arm_v7s_map(data, iova, paddr, size, prot, 1, data->pgd, gfp); > > @@ -717,7 +716,7 @@ static size_t arm_v7s_unmap(struct io_pgtable_ops *ops, unsigned long iova, > > { > > struct arm_v7s_io_pgtable *data = io_pgtable_ops_to_data(ops); > > > > - if (WARN_ON(upper_32_bits(iova))) > > + if (WARN_ON(iova >> data->iop.cfg.ias)) > > return 0; > > And avoid the UB here for 32-bit machines by comparing with 1ULL << > iop.cfg.ias instead. Thanks. I will fix it in next version. > > Thanks, > > 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=-11.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,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 D7A56C2D0A3 for ; Mon, 26 Oct 2020 07:49:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57170223AB for ; Mon, 26 Oct 2020 07:49:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="GK3lXmtL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422046AbgJZHt0 (ORCPT ); Mon, 26 Oct 2020 03:49:26 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:28466 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1420449AbgJZHt0 (ORCPT ); Mon, 26 Oct 2020 03:49:26 -0400 X-UUID: 731fa5de79564a608bbad1f3dc118972-20201026 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=SfAVNttk78qRQKKemA7Ud33MHHCmqu34nhu5o0stHqY=; b=GK3lXmtLj3iv9AASn1C2y5H111pxhpl4J4M72mq7Xmt2HX4honnrtf3zbZ6kYjswx8Y3FOzyLuAsyn+x/4SU9iEiG4R2SLI+p9qT0cRPMNPOSwQHuMDJT3Jr2QU1PCZ4F6DichSbrHg0LJ/lgTa84la/iifiJpas+muKM3Gd+ls=; X-UUID: 731fa5de79564a608bbad1f3dc118972-20201026 Received: from mtkcas34.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1870587162; Mon, 26 Oct 2020 15:49:22 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 26 Oct 2020 15:49:07 +0800 Received: from [10.17.3.153] (10.17.3.153) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 26 Oct 2020 15:49:06 +0800 Message-ID: <1603698546.26323.89.camel@mhfsdcap03> Subject: Re: [PATCH v3 08/24] iommu/io-pgtable-arm-v7s: Use ias to check the valid iova in unmap From: Yong Wu To: Will Deacon CC: Joerg Roedel , Matthias Brugger , Rob Herring , Robin Murphy , Krzysztof Kozlowski , Evan Green , Tomasz Figa , , , , , , , , Nicolas Boichat , , , , Greg Kroah-Hartman , Date: Mon, 26 Oct 2020 15:49:06 +0800 In-Reply-To: <20201023111740.GA20933@willie-the-truck> References: <20200930070647.10188-1-yong.wu@mediatek.com> <20200930070647.10188-9-yong.wu@mediatek.com> <20201023111740.GA20933@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: 8750D7412EF4047F0F7D427B7CA7C541119F84D3827A3506E3419C88D3EFEC702000:8 X-MTK: N Content-Transfer-Encoding: base64 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org T24gRnJpLCAyMDIwLTEwLTIzIGF0IDEyOjE3ICswMTAwLCBXaWxsIERlYWNvbiB3cm90ZToNCj4g T24gV2VkLCBTZXAgMzAsIDIwMjAgYXQgMDM6MDY6MzFQTSArMDgwMCwgWW9uZyBXdSB3cm90ZToN Cj4gPiBVc2UgdGhlIGlhcyBmb3IgdGhlIHZhbGlkIGlvdmEgY2hlY2tpbmcgaW4gYXJtX3Y3c191 bm1hcC4gVGhpcyBpcyBhDQo+ID4gcHJlcGFyaW5nIHBhdGNoIGZvciBzdXBwb3J0aW5nIGlvdmEg MzRiaXQgZm9yIE1lZGlhVGVrLg0KPiA+IEJUVywgY2hhbmdlIHRoZSBpYXMvb2FzIGNoZWNraW5n IGZvcm1hdCBpbiBhcm1fdjdzX21hcC4NCj4gPiANCj4gPiBTaWduZWQtb2ZmLWJ5OiBZb25nIFd1 IDx5b25nLnd1QG1lZGlhdGVrLmNvbT4NCj4gPiAtLS0NCj4gPiAgZHJpdmVycy9pb21tdS9pby1w Z3RhYmxlLWFybS12N3MuYyB8IDUgKystLS0NCj4gPiAgMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0 aW9ucygrKSwgMyBkZWxldGlvbnMoLSkNCj4gPiANCj4gPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9p b21tdS9pby1wZ3RhYmxlLWFybS12N3MuYyBiL2RyaXZlcnMvaW9tbXUvaW8tcGd0YWJsZS1hcm0t djdzLmMNCj4gPiBpbmRleCBhNjg4ZjIyY2JlM2IuLjRjOWQ4ZGNjZmM1YSAxMDA2NDQNCj4gPiAt LS0gYS9kcml2ZXJzL2lvbW11L2lvLXBndGFibGUtYXJtLXY3cy5jDQo+ID4gKysrIGIvZHJpdmVy cy9pb21tdS9pby1wZ3RhYmxlLWFybS12N3MuYw0KPiA+IEBAIC01MjYsOCArNTI2LDcgQEAgc3Rh dGljIGludCBhcm1fdjdzX21hcChzdHJ1Y3QgaW9fcGd0YWJsZV9vcHMgKm9wcywgdW5zaWduZWQg bG9uZyBpb3ZhLA0KPiA+ICAJaWYgKCEocHJvdCAmIChJT01NVV9SRUFEIHwgSU9NTVVfV1JJVEUp KSkNCj4gPiAgCQlyZXR1cm4gMDsNCj4gPiAgDQo+ID4gLQlpZiAoV0FSTl9PTihpb3ZhID49ICgx VUxMIDw8IGRhdGEtPmlvcC5jZmcuaWFzKSB8fA0KPiA+IC0JCSAgICBwYWRkciA+PSAoMVVMTCA8 PCBkYXRhLT5pb3AuY2ZnLm9hcykpKQ0KPiA+ICsJaWYgKFdBUk5fT04oaW92YSA+PiBkYXRhLT5p b3AuY2ZnLmlhcyB8fCBwYWRkciA+PiBkYXRhLT5pb3AuY2ZnLm9hcykpDQo+ID4gIAkJcmV0dXJu IC1FUkFOR0U7DQo+IA0KPiBBcyBkaXNjdXNzZWQgd2hlbiByZXZpZXdpbmcgdGhlc2UgZm9yIEFu ZHJvaWQsIHBsZWFzZSBsZWF2ZSB0aGlzIGNvZGUgYXMtaXMuDQo+IA0KPiA+ICANCj4gPiAgCXJl dCA9IF9fYXJtX3Y3c19tYXAoZGF0YSwgaW92YSwgcGFkZHIsIHNpemUsIHByb3QsIDEsIGRhdGEt PnBnZCwgZ2ZwKTsNCj4gPiBAQCAtNzE3LDcgKzcxNiw3IEBAIHN0YXRpYyBzaXplX3QgYXJtX3Y3 c191bm1hcChzdHJ1Y3QgaW9fcGd0YWJsZV9vcHMgKm9wcywgdW5zaWduZWQgbG9uZyBpb3ZhLA0K PiA+ICB7DQo+ID4gIAlzdHJ1Y3QgYXJtX3Y3c19pb19wZ3RhYmxlICpkYXRhID0gaW9fcGd0YWJs ZV9vcHNfdG9fZGF0YShvcHMpOw0KPiA+ICANCj4gPiAtCWlmIChXQVJOX09OKHVwcGVyXzMyX2Jp dHMoaW92YSkpKQ0KPiA+ICsJaWYgKFdBUk5fT04oaW92YSA+PiBkYXRhLT5pb3AuY2ZnLmlhcykp DQo+ID4gIAkJcmV0dXJuIDA7DQo+IA0KPiBBbmQgYXZvaWQgdGhlIFVCIGhlcmUgZm9yIDMyLWJp dCBtYWNoaW5lcyBieSBjb21wYXJpbmcgd2l0aCAxVUxMIDw8DQo+IGlvcC5jZmcuaWFzIGluc3Rl YWQuDQoNClRoYW5rcy4gSSB3aWxsIGZpeCBpdCBpbiBuZXh0IHZlcnNpb24uDQoNCj4gDQo+IFRo YW5rcywNCj4gDQo+IFdpbGwNCg0K