From patchwork Fri Dec 7 06:16:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10717489 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 18D2A17D5 for ; Fri, 7 Dec 2018 06:16:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0306C2EB2A for ; Fri, 7 Dec 2018 06:16:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DFBD42EB43; Fri, 7 Dec 2018 06:16:55 +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 590692EB2A for ; Fri, 7 Dec 2018 06:16:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0E86C6B7EE8; Fri, 7 Dec 2018 01:16:54 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 06D946B7EE9; Fri, 7 Dec 2018 01:16:54 -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 E52136B7EEA; Fri, 7 Dec 2018 01:16:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 9F4E16B7EE8 for ; Fri, 7 Dec 2018 01:16:53 -0500 (EST) Received: by mail-pg1-f197.google.com with SMTP id a18so1875296pga.16 for ; Thu, 06 Dec 2018 22:16:53 -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=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=V3Tp7fi37gRl6wdbbznSGQCWZn1NXc6qZobKiQoq3w1zVY9FwViBd5NGnnSPy1h2l0 hbWoJhRmoKo+lq+0ufMhJXR5EZIrcy0YHuxiKwNIjghMlOnfN8fqv9CP96/m9pFwdogc xxO2Y58Z4/J9RD/v2N7ioFeNzgNXF+JRFNKJIbdfxaBtws1AFV9UdM8bReCczuHuU1S2 4WmTs6grmeZ/F6g+CdgTAf4re32nOVPM1t38VK9tWMDBgX9uidUmAu6rtQ87xKUpoKj9 x1yW9VWDzfFajpdVhuIfqijIWVYgG9rq4F8groNryeemvdFOLR87uQwkdDLDz0/UkwzN Mudw== X-Gm-Message-State: AA+aEWYR7+JeFszZOqjR2+CzWpGFxQs5kjfjbqoThIDH4mx0u3NiZkW+ ZaEwPbB8dCsHOQjfcGQJh6vZz2LiQSKOmwN72D8bOEU78SiKLA43Vy3IOTVBXq6wI8Xrv7qhyeq 9v0DRhYgMXzhwInx6ynhcSTX9GMQuTlXt53LZp60epQf4pWK7pyRzWnwJeRMpsvSnI+/E2Js5IP kfhopOKzWKdmIokAaFqqDYrNDnr4bPGTu1R7DYdVpdPqcjm8DXXXUZiN9uhnUJk/qOvYbLnPkw0 UZfojnuNjCZrhx4P+0OuyHHpW2vmmyCAlcvRmZTnz14cdmRGW21JK12mtZQAfZsHYKvWXzm3mtZ lgoy1jueNdxCiV1x99y6RYImZmK/KHJ2KHR3bShfmUv4BQ+cTl6dAHRCAygLEpunD/SaEAJSN55 k X-Received: by 2002:a62:18ce:: with SMTP id 197mr1071115pfy.88.1544163413308; Thu, 06 Dec 2018 22:16:53 -0800 (PST) X-Received: by 2002:a62:18ce:: with SMTP id 197mr1071072pfy.88.1544163412306; Thu, 06 Dec 2018 22:16:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544163412; cv=none; d=google.com; s=arc-20160816; b=TB94dfIskdq+z2pn66NLItd/vv33nvrMujE9U32eMz890y+HX1RvaRwUbu0wJYg83N Ow0Ha9IbOwrzkzPG7JEHg0nBk03JAHLP83ybXUZbmZE+Qg/FpE4QFeXwJaeLbr1tukNL WalxA1nxKboZjOzga3dzEC5Yr7VzIDZtNr53lRtN21z1jzW54ZP63SGvkQxB66XPwdeF +dl+yF32cLAms8/UI0DWCmqNVsyYXcswer1JeYmOdha530QSzpl4r2guUGJ7YfHJ5TH7 COQMDmKHNcwDesFnB/RpGJyRNE5RRkuHOSF8GjhizDkI4Iz6I2nVz+0EgnGzLHIb54bK eOcw== 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=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=OESq85y8eUzRPJ1yhTfJaUWortHHN5qMt1bDVKaEyxpm4L71qcSFl65LX+VTsL4Hpd 9lYRwoZBbBsmS1wMjJO+b8V3G7ceXpmcQHtTGtbk2bkW/lElUmTUg2hj1ywFNm0FGYEr fnS8OHYAPatrzA7PSzpFPa+FDfyRJIFRLaYuS77hzZPEgNYgCDXxDO9WQPT6a2pp88OY mVHZwNGdyZ67NUVZgxwlJruaT2E9Cl5oRjkLHknobObAv1ZCSmZ4ClvzWhh05NBWN+oR okJxig8Cx6BAwLAc1j0ZpSm2ZBRCYIaodhQhXIogoha43MXoTAXm8LUFuTrk5DPBUFKS cpYg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Gkfg+veq; 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 t1sor3896677plr.61.2018.12.06.22.16.52 for (Google Transport Security); Thu, 06 Dec 2018 22:16:52 -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=Gkfg+veq; 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=uJoswCrlfo65GP7YSjDD5Dxde1TEKzOE1bHdE5k2YXA=; b=Gkfg+veq3tFoCNjzTVVK4MzF1+VxmDDREWTh7F/H38sptZ3jt6fe3ndCmar2DUe88M oshVn2q+niIJDMUfWeFJfKyH74cwlJzUYMUI+jek4GUAaKZJrUA5/Wt8W8OCBlnE+JYt uX3zOPZH8Nwsy5ulmVaJycpdrDUdwiSAerjcw= X-Google-Smtp-Source: AFSGD/XZa6HFUd/c5IPU8LIhweh/OmveFRXhgV1EPw5ux8VC+DfGZoBXt4ZppI0AFEFQOSUKgZ7anw== X-Received: by 2002:a17:902:74c1:: with SMTP id f1mr928632plt.273.1544163411694; Thu, 06 Dec 2018 22:16:51 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id z30-v6sm2995944pfg.41.2018.12.06.22.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 22:16:51 -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 v5 2/3] iommu/io-pgtable-arm-v7s: Request DMA32 memory, and improve debugging Date: Fri, 7 Dec 2018 14:16:19 +0800 Message-Id: <20181207061620.107881-3-drinkcat@chromium.org> X-Mailer: git-send-email 2.20.0.rc2.403.gdbc3b29805-goog In-Reply-To: <20181207061620.107881-1-drinkcat@chromium.org> References: <20181207061620.107881-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. Note that we do not explicitly pass GFP_DMA[32] to kmem_cache_zalloc, as this is not strictly necessary, and would cause a warning in mm/sl*b.c, as we did not update GFP_SLAB_BUG_MASK. 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) Changes since v4: - Do not pass ARM_V7S_TABLE_GFP_DMA to kmem_cache_zalloc, as this is unnecessary, and would trigger a warning. drivers/iommu/io-pgtable-arm-v7s.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm-v7s.c b/drivers/iommu/io-pgtable-arm-v7s.c index 445c3bde04800c..f311fe1dfa47b7 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,16 @@ 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); 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 +748,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;