From patchwork Mon May 21 15:20:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaisheng Ye X-Patchwork-Id: 10415647 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 00FA4600CC for ; Mon, 21 May 2018 15:24:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 745A1289AE for ; Mon, 21 May 2018 15:24:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72C18289BC; Mon, 21 May 2018 15:24:57 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EB26289B2 for ; Mon, 21 May 2018 15:23:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211AbeEUPWm (ORCPT ); Mon, 21 May 2018 11:22:42 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:36712 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843AbeEUPVC (ORCPT ); Mon, 21 May 2018 11:21:02 -0400 Received: by mail-pg0-f66.google.com with SMTP id 63-v6so4352739pgg.3; Mon, 21 May 2018 08:21:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gCVeji/sj287tYAdssy/5sld4ZpSGcCIq6efDVH4m0A=; b=BXvzDbOhgTTupQjFciYLyk8d0/yYwpFMbuz3zpD2qo17Eqc+MVaVA9p92EELGC4L2z f92f66WKY5M2e57DUdpzGrwJYsyT2nHTSNeyCpJg3v6vu6OqfAK8G2JrwrnUUT78QL/t vOIY+3Wc2ntN1L0OIOFmDuapA8Sxkt1zf6mbV7nfrHiK/OtrHxlz5tH0Mwpg25jdODVD +HeNHR3xT9owX6NYzc2UMsyl5LhH94zbo2tL0KdS3HVdPuE6K+xYrEKo/OjAHJJEr7cx jUnD9YwuQcAuzk13wmG2WhrnO+nmCYumj0f9irDVU1uuf5V05jdTaP+Cm4E3UReoxj1K 8SmA== 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; bh=gCVeji/sj287tYAdssy/5sld4ZpSGcCIq6efDVH4m0A=; b=K34ryHrjm5ZYbEVNXql6+1V9BS/Yeh6UR2ht3uEGeFRe/IId8WoUYlX2AOsq/OORDX yNLAI4mD6CBXG+JP46F0Rw8AXFgP7I5baZvIVOlr7rJ44JaGQv6NMQyTVIEhanyCyBdf sK13/aVuNgyzwHXDgIz86VFrkaPq4lJylcBSWneRuo++gc7pvMBYsEwmQSHT6+X6prvr eVhKMJ4JgF+b6o2tX+ws8vPwYBEPqF8zaFhuI6xdV6CdRgXQiw1X7tNSMulaRllzB/sE 33F9p+EJN4BdGsrQR6xRjPB8mDgP1T8CoxvsM8gYGEh5ouIqzO1F3Cxb2j8457+W75if oMlw== X-Gm-Message-State: ALKqPwevuZSYsbkJbL6MMsXqFxB2Mt4mTZ1hLNMbuzBiYk7CYWrqd1R8 6eASbMHR9UmRXH2kCG5hBg4= X-Google-Smtp-Source: AB8JxZrAVYVwjqdf6R5rZmASog1IIgq3LzXj6kL3m/+HAwjZcmaBn+BSUjHEhS8RpB2wn2D7TxjLPg== X-Received: by 2002:a62:9fca:: with SMTP id v71-v6mr20423139pfk.233.1526916062212; Mon, 21 May 2018 08:21:02 -0700 (PDT) Received: from localhost.localdomain ([125.33.105.40]) by smtp.gmail.com with ESMTPSA id t14-v6sm30844344pfh.109.2018.05.21.08.20.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 May 2018 08:21:01 -0700 (PDT) From: Huaisheng Ye To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: mhocko@suse.com, willy@infradead.org, vbabka@suse.cz, mgorman@techsingularity.net, kstewart@linuxfoundation.org, alexander.levin@verizon.com, gregkh@linuxfoundation.org, colyli@suse.de, chengnt@lenovo.com, hehy1@lenovo.com, linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-btrfs@vger.kernel.org, Huaisheng Ye , Joerg Roedel Subject: [RFC PATCH v2 04/12] drivers/iommu/amd_iommu: update usage of address zone modifiers Date: Mon, 21 May 2018 23:20:25 +0800 Message-Id: <1526916033-4877-5-git-send-email-yehs2007@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526916033-4877-1-git-send-email-yehs2007@gmail.com> References: <1526916033-4877-1-git-send-email-yehs2007@gmail.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Huaisheng Ye Use __GFP_ZONE_MASK to replace (__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32). ___GFP_DMA, ___GFP_HIGHMEM and ___GFP_DMA32 have been deleted from GFP bitmasks, the bottom three bits of GFP mask is reserved for storing encoded zone number. __GFP_DMA, __GFP_HIGHMEM and __GFP_DMA32 should not be operated by OR. Signed-off-by: Huaisheng Ye Cc: Joerg Roedel --- drivers/iommu/amd_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 74788fd..3921d53 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -2614,7 +2614,7 @@ static void *alloc_coherent(struct device *dev, size_t size, dma_dom = to_dma_ops_domain(domain); size = PAGE_ALIGN(size); dma_mask = dev->coherent_dma_mask; - flag &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32); + flag &= ~__GFP_ZONE_MASK; flag |= __GFP_ZERO; page = alloc_pages(flag | __GFP_NOWARN, get_order(size));