From patchwork Wed Dec 5 05:48:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10713017 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D2A15157A for ; Wed, 5 Dec 2018 05:49:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C2D362C8A5 for ; Wed, 5 Dec 2018 05:49:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B6F7A2C8AC; Wed, 5 Dec 2018 05:49:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E5F72C8A5 for ; Wed, 5 Dec 2018 05:49:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 154906B72CB; Wed, 5 Dec 2018 00:49:00 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 103336B72CD; Wed, 5 Dec 2018 00:49:00 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1BB66B72CB; Wed, 5 Dec 2018 00:48:59 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id AFA0F6B72CB for ; Wed, 5 Dec 2018 00:48:59 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id s14so15930225pfk.16 for ; Tue, 04 Dec 2018 21:48:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vWhAhLkOVslUb8AGYpRlcTEDGRqYlnK33vbjofTVSKg=; b=Jqr0HkBvqAwz014e9/UViKNqxrPj9mFeNgrFf/AbEdJD+68JsfjUq/qOzGX6jChFgZ c9kwzXrizFyOb30kbXKbBEgkUj70ea9sA3XKK786/OPiwmvBIAHGqGAsZ6c0MKR6GIqN 2ttA0ipStay7/FZF/IfEUkre0wLLagOFKihrGTEzQTBAqeUsD/HlUcVpQLK7hggm/MIP rl1B9DY7gLFhEePtiCtc4s72OfDfYpYBr5iQdvaBkz+haRLTfLLySw3cL9c+fxQL2R9P wxUYMozR5OsHvgPXXJOLNVxZ6ACHaP/Bpot6lADlAaowGQ9UotCosR2zT/urMTNKlzEM u4Cg== X-Gm-Message-State: AA+aEWb2zG/TFrETAUu+bwn2gBf7zANUPoosFhLhPu7ZVl6LYyLLZRh+ HAUlBXyT92JQ2lcO0osm6lOemmXVtw0vQDGJX9USA0nTkB6TBaNzMyJv3SssDfMNkVSbYMEMZO8 sfNi1vaKWvohB+tLQi0eaS80nsnV+9HaLI3e24FACLv8xiLbyJKd841SFm0QgLfkbhua/ZGgAdv y1xBEXKoZwsHMKWP9oHkopsOg0kF71sCPgp/nNwehZSg7pynoKdIrTojweQL/47CjZ0vT/mCRaw hr9Y49Z0bAyjtZcigr+umnqT1sVIkDG2UkKlUmew59lW549P2le43SrDYTSYBlyZ2n967u1ORXG LX0ymH1tpThq+98RWcGp60I++VeP3BYyEn5ENP1VLZ8OueZ1dWjdfOMKEHCQXDjwTe/ddGmWzEF Q X-Received: by 2002:a63:b218:: with SMTP id x24mr18728964pge.223.1543988939362; Tue, 04 Dec 2018 21:48:59 -0800 (PST) X-Received: by 2002:a63:b218:: with SMTP id x24mr18728944pge.223.1543988938536; Tue, 04 Dec 2018 21:48:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543988938; cv=none; d=google.com; s=arc-20160816; b=IveiFU9IZv+3CvbH7FFUvxRFP+c9aOQQJr4mGfjkXkJZ3Lk4Xz1Owp1gd/YMxl+KjB JPLcz9CNseaot4zSj2LJxEKC4VDTYL41m66w+PKcywt7pj4fyPyQ1GWCKUoxcXaSL0kj bIFXwI7cm6mfah8z3DuVf+uh5ofvBlC/4Q3lVao+T9nBC6+TeSVmYsOmXjnrKq6uxubH M5/QYHBFj3qKfv6bwKmBIpK1V2DdNF1Mvh6FEx2VURAchuZtcEn0KNH/Es4YOrXNHxgL fmQ7gt5l4zANObPBDTqrRIoJvfnVHD6TIe8FqDWwWwrlWxfTqSrUAzxk9a2aJyGOrQkV ptbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vWhAhLkOVslUb8AGYpRlcTEDGRqYlnK33vbjofTVSKg=; b=VQCsJksLN4skfnEUxJWXp8l0iUX8hNadPJZTCqB8ZRL9mrRHwpsQUmg6uuY3u0xgaw 0Vc4gJs6Rc3Yt/ots93tC11FW3aFJyrK4yrM+OQTitz87itJLJBsqkSJL8P2xQ+HGMVo J538vbuPz+cXxo84Nzemk9yWX3ZfjyOoNomW3se1Tl0QH0MZrjUvbE25Bvz48TIXlpZ3 sUTXlM0AxN/1xD8PlyWggNv4jrv7aeKvJgNLzgECRgfp2fidupiNSLfd0TD/0RWW2FYd qCln2fprq+9vzW8NVuuZqMREf+AuolbK1di1+mzg0ZkGbS43fUOtUk9/7F9oI+V5CUpd 6A9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Ghvx7Srz; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k11sor26087189pll.39.2018.12.04.21.48.58 for (Google Transport Security); Tue, 04 Dec 2018 21:48:58 -0800 (PST) Received-SPF: pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Ghvx7Srz; spf=pass (google.com: domain of drinkcat@chromium.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=drinkcat@chromium.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vWhAhLkOVslUb8AGYpRlcTEDGRqYlnK33vbjofTVSKg=; b=Ghvx7SrzrvOWt9iw9+n5jZ87Tl7UOaD02HoAC3peGH3KyiLo3niR48nxltOOoNpikP AXmdTlvLOzKrhtYVVs6NFLm5qNAqhe/Pw0Xcp6dwMzbyvMW5RPBAcWGEnKb508AfoBlt iwIXiQWvM4l59LTcMGKwE6VDaNtnpp7RulPmg= X-Google-Smtp-Source: AFSGD/VxTWcri7yQ/slMRzGNhZW0Xvh/a+9X/iz/yVfMl1irVge09KKfwpdURxLUulLz9sebxIBWHQ== X-Received: by 2002:a17:902:2468:: with SMTP id m37mr4041699plg.314.1543988938116; Tue, 04 Dec 2018 21:48:58 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id 4sm30806513pfq.10.2018.12.04.21.48.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Dec 2018 21:48:57 -0800 (PST) From: Nicolas Boichat To: Will Deacon Cc: Robin Murphy , Joerg Roedel , Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Michal Hocko , Mel Gorman , Levin Alexander , Huaisheng Ye , Mike Rapoport , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Yong Wu , Matthias Brugger , Tomasz Figa , yingjoe.chen@mediatek.com, hch@infradead.org, Matthew Wilcox Subject: [PATCH v4 3/3] iommu/io-pgtable-arm-v7s: Request DMA32 memory, and improve debugging Date: Wed, 5 Dec 2018 13:48:28 +0800 Message-Id: <20181205054828.183476-4-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc1.387.gf8505762e3-goog In-Reply-To: <20181205054828.183476-1-drinkcat@chromium.org> References: <20181205054828.183476-1-drinkcat@chromium.org> MIME-Version: 1.0 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP IOMMUs using ARMv7 short-descriptor format require page tables (level 1 and 2) to be allocated within the first 4GB of RAM, even on 64-bit systems. For level 1/2 pages, ensure GFP_DMA32 is used if CONFIG_ZONE_DMA32 is defined (e.g. on arm64 platforms). For level 2 pages, allocate a slab cache in SLAB_CACHE_DMA32. Also, print an error when the physical address does not fit in 32-bit, to make debugging easier in the future. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- Changes since v2: - Commit message (v3 used the page_frag approach) drivers/iommu/io-pgtable-arm-v7s.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 445c3bde04800c..996f7b6d00b44a 100644 --- a/drivers/iommu/io-pgtable-arm-v7s.c +++ b/drivers/iommu/io-pgtable-arm-v7s.c @@ -161,6 +161,14 @@ #define ARM_V7S_TCR_PD1 BIT(5) +#ifdef CONFIG_ZONE_DMA32 +#define ARM_V7S_TABLE_GFP_DMA GFP_DMA32 +#define ARM_V7S_TABLE_SLAB_CACHE SLAB_CACHE_DMA32 +#else +#define ARM_V7S_TABLE_GFP_DMA GFP_DMA +#define ARM_V7S_TABLE_SLAB_CACHE SLAB_CACHE_DMA +#endif + typedef u32 arm_v7s_iopte; static bool selftest_running; @@ -198,13 +206,17 @@ static void *__arm_v7s_alloc_table(int lvl, gfp_t gfp, void *table = NULL; if (lvl == 1) - table = (void *)__get_dma_pages(__GFP_ZERO, get_order(size)); + table = (void *)__get_free_pages( + __GFP_ZERO | ARM_V7S_TABLE_GFP_DMA, get_order(size)); else if (lvl == 2) - table = kmem_cache_zalloc(data->l2_tables, gfp | GFP_DMA); + table = kmem_cache_zalloc(data->l2_tables, + gfp | ARM_V7S_TABLE_GFP_DMA); phys = virt_to_phys(table); - if (phys != (arm_v7s_iopte)phys) + if (phys != (arm_v7s_iopte)phys) { /* Doesn't fit in PTE */ + dev_err(dev, "Page table does not fit in PTE: %pa", &phys); goto out_free; + } if (table && !(cfg->quirks & IO_PGTABLE_QUIRK_NO_DMA)) { dma = dma_map_single(dev, table, size, DMA_TO_DEVICE); if (dma_mapping_error(dev, dma)) @@ -737,7 +749,7 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, data->l2_tables = kmem_cache_create("io-pgtable_armv7s_l2", ARM_V7S_TABLE_SIZE(2), ARM_V7S_TABLE_SIZE(2), - SLAB_CACHE_DMA, NULL); + ARM_V7S_TABLE_SLAB_CACHE, NULL); if (!data->l2_tables) goto out_free_data;