From patchwork Fri Nov 9 08:24:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Boichat X-Patchwork-Id: 10675511 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 0C82914D6 for ; Fri, 9 Nov 2018 08:25:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F13CA2E661 for ; Fri, 9 Nov 2018 08:25:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4C1A2E664; Fri, 9 Nov 2018 08:25:29 +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.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 95BA72E661 for ; Fri, 9 Nov 2018 08:25:29 +0000 (UTC) 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=Mc4YzfrNTU9pWPmLngfwletxgxS8K8G00zClfmSXEB8=; b=XgWTFQcgHoc/vV A57avkTh0/+UBU/kubHaDtIeK8MB+W4f5Yt0YpA5Vy6pRUgRxv542lLLH6s+vjquiFtpnxvKdq1nP FvXkg4GZFao7U5yamNdUgbJzvumzvJyoP/jfI7leO+b78Qa0/dzY2HDEWlSfKCrwOGgT3HnmTkCkJ p53ClWt9EohuGFLb3yh9+wyT3My3KuucmPROXoHDi/Pf9OtAaE5lG+CdKYNBHHRGeo8N3QRnOw6ur bl/84dk4cz9nZX+TSGrayrCp4UzAggymxmTA6a4F/xfrW53JYNm3h6NBy1C+Sip9XjZxJatKl3b02 UCaQdcQc6NOgFFIhiLjw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL26T-0007XE-T1; Fri, 09 Nov 2018 08:25:21 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gL26L-0006IR-MD for linux-arm-kernel@lists.infradead.org; Fri, 09 Nov 2018 08:25:15 +0000 Received: by mail-pg1-x544.google.com with SMTP id q5-v6so565039pgv.0 for ; Fri, 09 Nov 2018 00:25:03 -0800 (PST) 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=InnuhSOGBaveThAeEjWNNfjdxk+ZL+DS5Ky3lmpgzcQ=; b=MAme0Iyr8teK/Ki5Pc6avc9NyM1ZACSxW+qUvWNMrPDfd+5+hhO3XR+a7YzIULs9Xw LTuccIQILw7lwgZkGKEYJ8IkgnwH17FFLvdUjMzhtytWGx+RpaPlb9jroe0/Joy2LiKV ehgDDj7Tu9x1mC2VMBhEPgXrCnbFfg6c2FBlk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=InnuhSOGBaveThAeEjWNNfjdxk+ZL+DS5Ky3lmpgzcQ=; b=ibP19q8ro/rtN2r1ZLKpCpn7+G6xAgFJkRBF1YMTVL+B2mv/nuooHJCd1Aegslq1rC 54Zzyd4BxqP6uga5BsJKSL2RXIBRrmxa5aStfunV68JzdBTw5bfIb11u3OaBOSqDnlDl kpupnAkrbhPyAtTda+KmsbWD9jWbOCuYFDAKyr3iVLFEIb5qLyjIXHlPClI1ug0Jl5zb kQOhl1Gc0ikBe1b4hW4X64gyt+xV7FXNY3wfFuJUIJliUDD4p3J+jiElr2wdEfRDYoeN QUHtFjrddrXJa0XkCkZ//T2oS2lDQ+Tz2rkyedfSrcQCGDTYr9FDIa1XWB3C5GRJBpry uWXg== X-Gm-Message-State: AGRZ1gKwWAof88zUL1SZvbcSs+0UqC9EgoD13Z2MzGHkzO7h+itj9jVk 7BtV1L7Udj83FNiD2m1l9dX6/g== X-Google-Smtp-Source: AJdET5f+WYjZSeRCglfwtnuJ6P5AzPDF6WiYotJEhF1tiG0JcbiXu7QnCbiBFLT3EFeBo3Z6Nv0E6w== X-Received: by 2002:a62:5e83:: with SMTP id s125-v6mr7944253pfb.232.1541751902866; Fri, 09 Nov 2018 00:25:02 -0800 (PST) Received: from drinkcat2.tpe.corp.google.com ([2401:fa00:1:b:f659:7f17:ea11:4e8e]) by smtp.gmail.com with ESMTPSA id u2-v6sm6415667pfn.50.2018.11.09.00.24.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 00:25:02 -0800 (PST) From: Nicolas Boichat To: Robin Murphy Subject: [PATCH RFC 1/3] mm: When CONFIG_ZONE_DMA32 is set, use DMA32 for SLAB_CACHE_DMA Date: Fri, 9 Nov 2018 16:24:46 +0800 Message-Id: <20181109082448.150302-2-drinkcat@chromium.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog In-Reply-To: <20181109082448.150302-1-drinkcat@chromium.org> References: <20181109082448.150302-1-drinkcat@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181109_002513_725240_4F066530 X-CRM114-Status: GOOD ( 14.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michal Hocko , Andrew Morton , Huaisheng Ye , Tomasz Figa , Joerg Roedel , Will Deacon , linux-kernel@vger.kernel.org, Levin Alexander , Pekka Enberg , linux-mm@kvack.org, iommu@lists.linux-foundation.org, Mike Rapoport , linux-arm-kernel@lists.infradead.org, David Rientjes , Matthias Brugger , yingjoe.chen@mediatek.com, Joonsoo Kim , Yong Wu , Mel Gorman , Christoph Lameter , Vlastimil Babka Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Some callers, namely iommu/io-pgtable-arm-v7s, expect the physical address returned by kmem_cache_alloc with GFP_DMA parameter to be a 32-bit address. Instead of adding a separate SLAB_CACHE_DMA32 (and then audit all the calls to check if they require memory from DMA or DMA32 zone), we simply allocate SLAB_CACHE_DMA cache in DMA32 region, if CONFIG_ZONE_DMA32 is set. Fixes: ad67f5a6545f ("arm64: replace ZONE_DMA with ZONE_DMA32") Signed-off-by: Nicolas Boichat --- include/linux/slab.h | 13 ++++++++++++- mm/slab.c | 2 +- mm/slub.c | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 918f374e7156f4..390afe90c5dec0 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -30,7 +30,7 @@ #define SLAB_POISON ((slab_flags_t __force)0x00000800U) /* Align objs on cache lines */ #define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U) -/* Use GFP_DMA memory */ +/* Use GFP_DMA or GFP_DMA32 memory */ #define SLAB_CACHE_DMA ((slab_flags_t __force)0x00004000U) /* DEBUG: Store the last owner for bug hunting */ #define SLAB_STORE_USER ((slab_flags_t __force)0x00010000U) @@ -126,6 +126,17 @@ #define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \ (unsigned long)ZERO_SIZE_PTR) +/* + * When ZONE_DMA32 is defined, have SLAB_CACHE_DMA allocate memory with + * GFP_DMA32 instead of GFP_DMA, as this is what some of the callers + * require (instead of duplicating cache for DMA and DMA32 zones). + */ +#ifdef CONFIG_ZONE_DMA32 +#define SLAB_CACHE_DMA_GFP GFP_DMA32 +#else +#define SLAB_CACHE_DMA_GFP GFP_DMA +#endif + #include struct mem_cgroup; diff --git a/mm/slab.c b/mm/slab.c index 2a5654bb3b3ff3..8810daa052dcdc 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2121,7 +2121,7 @@ int __kmem_cache_create(struct kmem_cache *cachep, slab_flags_t flags) cachep->flags = flags; cachep->allocflags = __GFP_COMP; if (flags & SLAB_CACHE_DMA) - cachep->allocflags |= GFP_DMA; + cachep->allocflags |= SLAB_CACHE_DMA_GFP; if (flags & SLAB_RECLAIM_ACCOUNT) cachep->allocflags |= __GFP_RECLAIMABLE; cachep->size = size; diff --git a/mm/slub.c b/mm/slub.c index e3629cd7aff164..fdd05323e54cbd 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -3575,7 +3575,7 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) s->allocflags |= __GFP_COMP; if (s->flags & SLAB_CACHE_DMA) - s->allocflags |= GFP_DMA; + s->allocflags |= SLAB_CACHE_DMA_GFP; if (s->flags & SLAB_RECLAIM_ACCOUNT) s->allocflags |= __GFP_RECLAIMABLE;