Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp438285imm; Mon, 21 May 2018 08:25:02 -0700 (PDT) X-Google-Smtp-Source: AB8JxZp1eJ7I57/+yPyVFwl/JFI3umXuHAcPywqYR/0GIUwxc6vhV6V0alivwymS6fGOu2thYj0F X-Received: by 2002:a17:902:aa95:: with SMTP id d21-v6mr20639605plr.73.1526916302606; Mon, 21 May 2018 08:25:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526916302; cv=none; d=google.com; s=arc-20160816; b=e5RpzncYEihirqYXO3pzlNOCpoIErT20fQ2UyY/1BUQpMX4oJrSFg0jpDXVUZhwqNz ztpsNeKxH5l7zBhLz1MLd5wWEdu7tc0l1NwIQyZatx+YfpCX3BecqXj9rjfaZ5gWcnRR 3+Se4wGBedJkFgtFUKlg8U5L5K2GPvqvwxSiwq03iCS4Kb4pwOUhXqegiw8zWvpFRtSR ztY/6+H6Lr8NVkoMstS+p7YTHKkrVpVViGwR3S1D6STXJdEQ1+u3B8HTlYFVSSOm/Xbv roJhhYM6o1GjPHwoDSa0pKCZsrNzH2Tabr0y7qJrfJjuAWCfyDBkd8TSIJG6flNSvG89 7hzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=gCVeji/sj287tYAdssy/5sld4ZpSGcCIq6efDVH4m0A=; b=eoUonFbdk4v1DWiM1mtOhyoJmLJqIy8wDxWaw7vilreQIrcTZus5YPaHcJSMWzJOOG H7NlMcmx6F7jzmIGQjLlmd7FCBDejh4L2ug4tGkX6mwdr/6dFIpwk3NG9omqoQ+eLeX1 Kp2/UIs9aK9eY8n3RrTLBhaaJokoBHXJpr9fudzqlHU5smSZ62rpHjjkKMbm5suYkmY3 oVS6Wwdziy99sf2qZGxWJ/7BPAinhmOA6JggpQTvpG5ENzyThlPcRkAReXJR5B8O5t4y Wov9laqYoL6jxWLGE+JmuahKqcNVNbdtjlTeAFXueoumpmfK8x4wO7IhRdVvgdJXUSqJ 2nPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BXvzDbOh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b40-v6si14225651plb.44.2018.05.21.08.24.47; Mon, 21 May 2018 08:25:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=BXvzDbOh; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753290AbeEUPWv (ORCPT + 99 others); Mon, 21 May 2018 11:22:51 -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-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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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)); -- 1.8.3.1