From patchwork Wed May 23 16:38:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huaisheng Ye X-Patchwork-Id: 10421915 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 E512260224 for ; Wed, 23 May 2018 16:39:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D406828E7C for ; Wed, 23 May 2018 16:39:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5C9228F48; Wed, 23 May 2018 16:39:23 +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, FREEMAIL_FROM, 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 EEE7828E7C for ; Wed, 23 May 2018 16:39:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 313D36B0007; Wed, 23 May 2018 12:39:22 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 29C8E6B0008; Wed, 23 May 2018 12:39:22 -0400 (EDT) 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 119546B026C; Wed, 23 May 2018 12:39:22 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id C4D296B0007 for ; Wed, 23 May 2018 12:39:21 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id a6-v6so14371372pll.22 for ; Wed, 23 May 2018 09:39:21 -0700 (PDT) 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; bh=1zBkKMItrypN9B4fxKZ67AXYmiFJtTKxi6aHDwsB9Dw=; b=OHWKTFszMAMKwnSh20Hu2J+LegoqK6Le9q6W0N8Pv3XkrQ8JwNSLKCPpiEbv8PJ8A/ Lnx9uCnd0VfQ+f07FoQ8VZQrKeLMyfLq4obVxnDsJ6LjSjw6ElyMSkQ9IoaXxv/t0+cQ k6ilbCH9qn8cEDCuTfHQTHJ2AY+8eaqBTkTCG29pisd3BkFZZEFU6CvfOt3la7485Brr LqZLodamd0pdWn0KG9k94tYHx2udAfZNErOykEAA8Z1eBk15q1/ClHmW6dWtXKEfUiaW Sfccqizi3rsjGqWTQexOXvPtBOXiNQ3oRVSwjJHg4XLLaStR7DUsN9SlXopvSlvCj8rw 4isA== X-Gm-Message-State: ALKqPwdx0fLc9lQfQFCbZhKuTYEZASqIrfAX2fB+vKWZ2feHilHmGv+S 0oY/eepj3Pr6DlsizQv8LU4WhTufDhaerWiq4NlR73l267uDmZwMhVKEfgXdw4XqaP1GfMWek8O 5Um/wJb/S6XVB91EGfY6iyJuw5uLxajdfexzDTGD7604QvISrnOTJyCZwAXzy78vThMJ2lv23HI r/dH6Vc8GZYUcGCStQWLcI5KJbpn4MkNO/P1iHI6c+B21t4w3Ue0UfA+FjO4q41auFuWHRxYBht mfd+a/XKjTF5pdRu2h9dDcyJjaj7HdCyrM8w9LE1W3IaJw+9lxtcxKTe2lzm9WswJY77LlxnJpx 5zfvCxVGHcgB1164LG1zt6J8f8fK2VgtNjlm65rogvgS/+UEQjs1+QnriyEr2vhHh+HvbYDrHWT R X-Received: by 2002:a65:64c8:: with SMTP id t8-v6mr2882777pgv.414.1527093560878; Wed, 23 May 2018 09:39:20 -0700 (PDT) X-Received: by 2002:a65:64c8:: with SMTP id t8-v6mr2882755pgv.414.1527093560204; Wed, 23 May 2018 09:39:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527093560; cv=none; d=google.com; s=arc-20160816; b=OqARsZyvnpr6Pcm0B/cnTyhoH/370iLIZChj4CTd+k6Cgwfwg7iSyTtrGdeUVJV5Uy odULbu20uBtC3jSNrv2deM5ntgpqh1N8sDmOqenPSZZODc3CnLiD8P/+y2b7Y5IeKAXE WIMeWG5JmebOJe49LFmavXjZ/O25KeBIDDSAryq1q71zsOLl5lmB4pVL8y4IH6DRo9Ty vdrQc+LSBIWVrirQo1XUfEZpictbyhLpXJ6pW91eY9pFcnJ78n9iTPXUr4eUY1WJXaWC ukyd7DnN90Uq7ln9SPgYRkufiWEJt+IheGPzkRmqkokpKZBvtfvdQaytkeGI9i0On9+O UNSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=1zBkKMItrypN9B4fxKZ67AXYmiFJtTKxi6aHDwsB9Dw=; b=IOcIHZKrady0GLOSr8FLYr1uf4eYtcJUbgvpTX8y5i4HbRocugwamSaRCVr1HqLVtG 8RCnMshF4lm7L7/AEWWSAOM3mWadQJw8YDxTwME2T4BOCTJac/tls7vwerZqs7cV6XYl k8nIceSrFWCBza+3ExKkubHEILyatqeL/TNlpofSU/wsHjffJ/k0/Tp3YwHtPF0SdhWl NBoDAMLeItaeT9R3zF5sRXS25BrRQNL892AGnO0f6baxAGW9HbC60eKtNx6RfQoDo89d NiBWLLdRr1LVSrCM+b+q9zKEgDUW3Zn9RLanGnpD1J2/mmJRVQGz4tkCbAzj42X+8ae4 iYAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=krI0dL1/; spf=pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yehs2007@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id i1-v6sor8413807pld.99.2018.05.23.09.39.19 for (Google Transport Security); Wed, 23 May 2018 09:39:20 -0700 (PDT) Received-SPF: pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=krI0dL1/; spf=pass (google.com: domain of yehs2007@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=yehs2007@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=1zBkKMItrypN9B4fxKZ67AXYmiFJtTKxi6aHDwsB9Dw=; b=krI0dL1/bZNYn5wbyHr/dHJ9gBYnIWGSxMGnoM89VmNTDSWew5+hzKg7FmdwXcJlrN 3wgts+Rt7VAtpTGUrY74MihJlzSCbMpq9WLvvhIB3keYl2u/NKM3T1rg+vEqvXr8M4XU oVCbp8+NoLey0HLQ5HVxZ8BKhFJK0IWgyUE9WhSIFxHHQxXjAVHGApc+EDD0RLyyOw3L YjYuo0CtB2GomQLX6piynhU+q4Mf11/oXie42VEe3VJbkPitN5IgTNuxf/4mOTUUoCHk ouGeXB7/XmCz5K3sNa5/nCdBcT155FuHZiCw4nMvOCdpEneo4MXJGhL29ogZBrqt3dN9 quQQ== X-Google-Smtp-Source: AB8JxZqyhfYx9llnrcDVfch2aZsZx9qK1CdAa+2yg6jnY+p4NlkdxlT49OLUTiakcoMX2C4OWqvYDA== X-Received: by 2002:a17:902:7283:: with SMTP id d3-v6mr3746074pll.192.1527093559692; Wed, 23 May 2018 09:39:19 -0700 (PDT) Received: from localhost.localdomain ([123.120.56.60]) by smtp.gmail.com with ESMTPSA id a77-v6sm34590320pfe.70.2018.05.23.09.39.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 May 2018 09:39:19 -0700 (PDT) From: Huaisheng Ye To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: mhocko@suse.com, willy@infradead.org, hch@lst.de, vbabka@suse.cz, mgorman@techsingularity.net, kstewart@linuxfoundation.org, 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 , Marek Szyprowski , Robin Murphy , Christoph Hellwig Subject: [RFC PATCH v3 2/9] include/linux/dma-mapping: update usage of zone modifiers Date: Thu, 24 May 2018 00:38:50 +0800 Message-Id: <1527093530-4000-1-git-send-email-yehs2007@gmail.com> X-Mailer: git-send-email 1.8.3.1 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 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 with each others by OR. Use GFP_NORMAL() to clear bottom 3 bits of GFP bitmaks. Signed-off-by: Huaisheng Ye Cc: Christoph Hellwig Cc: Marek Szyprowski Cc: Robin Murphy Cc: Christoph Hellwig --- include/linux/dma-mapping.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index f8ab1c0..8fe524d 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -519,7 +519,7 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size, return cpu_addr; /* let the implementation decide on the zone to allocate from: */ - flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM); + flag = GFP_NORMAL(flag); if (!arch_dma_alloc_attrs(&dev, &flag)) return NULL;