From patchwork Mon Jan 30 20:18:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 50460 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2378958wrn; Mon, 30 Jan 2023 12:22:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXsBpvQJy2u3T5J/hktuVIo5yph/PqpOxAfeqo0X35u1LdGGouyxWVyNhBctztg69d090D2p X-Received: by 2002:a05:6402:5419:b0:49e:351d:37 with SMTP id ev25-20020a056402541900b0049e351d0037mr52366261edb.8.1675110168486; Mon, 30 Jan 2023 12:22:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675110168; cv=none; d=google.com; s=arc-20160816; b=m2x2XQuj7QC9aHFj8lfiqXWWKfJZeWjgPtaa7PnMnXCvAriS42wX+2QbB7lLUws7u0 BnqDxdGA5maKTbtAdB4sUj2mW/X/BGzdauPdOC2XO0WP/MQuRCRDJMNkR2kVZhO5PcfE P9O9BVfnAEOzVNrc/rrbc4i3ii6K4a/NZOPHLlGL7pMCxMI2g0V7oo1dphvKUPF0bWhL QT4G5cFXqitbJKuUkssKM3EX7ZzvUddOLbt3eiC9ciLBu1gKUxxfG4qtXmYQEMUynMml LPFLLHzE+UhmgeZqvAqe9uH3G4zKq4N1i5DfkJaITF3ckSe1ZG/R1n+Fvxk/BGwp6MEb b6XQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xJQ5OTdh+fc+ccMNlHyYjb+fYbFIfXaQUDxSd+sy4Ac=; b=s6CV1Z9JGjSC3brmYYLe9kIlrnV4khrZYFz5DKs/nsB/vcmIbBG06kNS4QpQC7+Bd2 +rjRyHIbPx8p9tHDDWQDKfJJ3kFHhUgNRTCcpIpPcwUr91bGmJ/fyZhmCpKGvdQsSgFY F9xJM59K15+vN/qu9sIDRW51N5Z4BJHJ7YN7sje3f/8jJY5aXjpsnsnSNauXOoAZzXkK 7n+jG0ssBZZes00bvIjx13TivDlsCrunmg0GrMRaHUuolcR9tF97z6ty4OTQ7nTat/HY 3rl6+m+C8LogYjWWcXm6YU0n9sTEYy4d6L28euqdZJPguPuK3NxrHFdrm+0JieP/OWn8 VuNQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PEUIZrC+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u1-20020a05640207c100b004a212080564si10178115edy.339.2023.01.30.12.22.25; Mon, 30 Jan 2023 12:22:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=PEUIZrC+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S229695AbjA3UTF (ORCPT + 99 others); Mon, 30 Jan 2023 15:19:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjA3USs (ORCPT ); Mon, 30 Jan 2023 15:18:48 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B54B6470AD for ; Mon, 30 Jan 2023 12:18:46 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id j5so12175747pjn.5 for ; Mon, 30 Jan 2023 12:18:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xJQ5OTdh+fc+ccMNlHyYjb+fYbFIfXaQUDxSd+sy4Ac=; b=PEUIZrC+RH5+9pYkh6XYzKYqbMb8jOHl+69QZ/Lb2+tXCHO+jqtbDIZKClYL68y3RO BbK/pZKsW5mscHpNz/jhxraDmx1IyeZPErllGnlJNJO99fUJZDIG01OCBA7AtlvXr2QZ tjXA4+oBey2Rie2dE8OW4bp/7ySNDizbDQGMfpcvuPSTBoblsldgyu8UYC0i/IncGdLQ N4ZuaojlXmmT5uNLUBr+NSJObiaW0CQ1NEu7yjMk7bToXSoQocoD0SAiNt7tFRgy3Zjt 73B1duMYfMdMKFMX36MZn7wGnh/osd/8fYOdi2jqhKZyca30g8842xjxn5NY0WfkiXn0 AMEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xJQ5OTdh+fc+ccMNlHyYjb+fYbFIfXaQUDxSd+sy4Ac=; b=uI9UgWEEYDd498mJUK1/1p/UiItV1HSUYoUDdSHdhEvX5nyJpJPIWxGy8+EYKAXki+ R+DPxZGJKf43C87N7k4kyMoVKcYvvpc2dvKrnFWvUy/mGF0DY/IgF0HnC+oxI7oRqhRD 9CIG5Ue+s5TKdqeuPhmH3mpWYrbX4bH0PTjFzSC7UfAO1CIYlf3Iy2Pww7wqT14bDs9K MukzuwCEB2EfoYCL1hohJwP7JwsdKtiVdNFZl2dLy4iumTm/bU4/JxIJeRaKikUQbCPj sa4dp2gRGnsGBAdpxu0RzPBjx6v6AR6sTygkBSbrakjj66y9Nbyqbm3rOeYV+pqVItf1 DrrA== X-Gm-Message-State: AO0yUKVs04UCweTH2lN18hVvMhUtoLLf+MsiKVN8rK9q7+Z3V6nfy7dK +CrK3sfdPQwaT9qsNs/10v0= X-Received: by 2002:a05:6a20:4408:b0:bc:ae32:4d6e with SMTP id ce8-20020a056a20440800b000bcae324d6emr10770844pzb.54.1675109926167; Mon, 30 Jan 2023 12:18:46 -0800 (PST) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::a8cd]) by smtp.googlemail.com with ESMTPSA id g9-20020a056a000b8900b0058d9730ede0sm113262pfj.210.2023.01.30.12.18.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 12:18:45 -0800 (PST) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH mm-unstable v4 5/6] mm/mempolicy: convert queue_pages_required() to queue_folio_required() Date: Mon, 30 Jan 2023 12:18:32 -0800 Message-Id: <20230130201833.27042-6-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230130201833.27042-1-vishal.moola@gmail.com> References: <20230130201833.27042-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756480319816946324?= X-GMAIL-MSGID: =?utf-8?q?1756480319816946324?= Replace queue_pages_required() with queue_folio_required(). queue_folio_required() does the same as queue_pages_required(), except takes in a folio instead of a page. Signed-off-by: Vishal Moola (Oracle) --- mm/mempolicy.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 668392493500..6a68dbce3b70 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -427,15 +427,15 @@ struct queue_pages { }; /* - * Check if the page's nid is in qp->nmask. + * Check if the folio's nid is in qp->nmask. * * If MPOL_MF_INVERT is set in qp->flags, check if the nid is * in the invert of qp->nmask. */ -static inline bool queue_pages_required(struct page *page, +static inline bool queue_folio_required(struct folio *folio, struct queue_pages *qp) { - int nid = page_to_nid(page); + int nid = folio_nid(folio); unsigned long flags = qp->flags; return node_isset(nid, *qp->nmask) == !(flags & MPOL_MF_INVERT); @@ -469,7 +469,7 @@ static int queue_folios_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr, walk->action = ACTION_CONTINUE; goto unlock; } - if (!queue_pages_required(&folio->page, qp)) + if (!queue_folio_required(folio, qp)) goto unlock; flags = qp->flags; @@ -530,7 +530,7 @@ static int queue_folios_pte_range(pmd_t *pmd, unsigned long addr, */ if (folio_test_reserved(folio)) continue; - if (!queue_pages_required(&folio->page, qp)) + if (!queue_folio_required(folio, qp)) continue; if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) { /* MPOL_MF_STRICT must be specified if we get here */ @@ -575,7 +575,7 @@ static int queue_folios_hugetlb(pte_t *pte, unsigned long hmask, if (!pte_present(entry)) goto unlock; folio = pfn_folio(pte_pfn(entry)); - if (!queue_pages_required(&folio->page, qp)) + if (!queue_folio_required(folio, qp)) goto unlock; if (flags == MPOL_MF_STRICT) {