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: 13121759 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06F64C636D6 for ; Mon, 30 Jan 2023 20:18:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48E6D6B007B; Mon, 30 Jan 2023 15:18:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F0516B007D; Mon, 30 Jan 2023 15:18:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 241976B007E; Mon, 30 Jan 2023 15:18:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 175136B007B for ; Mon, 30 Jan 2023 15:18:50 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A98961209F8 for ; Mon, 30 Jan 2023 20:18:49 +0000 (UTC) X-FDA: 80412578778.10.CC9F279 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by imf08.hostedemail.com (Postfix) with ESMTP id 8C69A160015 for ; Mon, 30 Jan 2023 20:18:47 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PEUIZrC+; spf=pass (imf08.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675109927; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=xJQ5OTdh+fc+ccMNlHyYjb+fYbFIfXaQUDxSd+sy4Ac=; b=fM7rzPYWEjVFaN9mu7ubpIAD19mJSXoCSGsFFtQtJ6FIvhMH6BX1WnZkr09hMdQV8FxSM1 +8vbzTmTH2U6joE2zoyanTITh7SYthSM13HBrnnum6W+XU2cumpfuzjajV/AWORYgSIXfU j3FxJXfdBOOxTz+wXR/oRECl3Isfr1o= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=PEUIZrC+; spf=pass (imf08.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.214.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675109927; a=rsa-sha256; cv=none; b=Y727xvo4GMraAnnBux4zvPZdMOgw9u3ma0ldvAYH5r+3Z0u0lZyn5IBw70MaXWlKRnuHTZ Ai6NrndyYvTlfnKsc9pj/KLO1JghH0IydRtFot8IGHj+N+M+8LTA85kY6TGu0qg6IxOqCe Z3bPICrk+PdSBgu9b71tsNv/qyyhmLQ= Received: by mail-pl1-f176.google.com with SMTP id d3so12844512plr.10 for ; Mon, 30 Jan 2023 12:18:47 -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=KgXCfkWRJ5JQDOOr8x5KXZkkte8v5P7cIppicuh6hwDWEkjQ/A30zzwNJQ8SrVrqFl kK4/jEPXkjJ727HLiWSBzxN2Q3IIERsGe6F510bGn/Pt3sVeiXYknmG+q9YuZKmDkxsP quByNZV+TEdKBKZR3Ogv9TcRJEq5AsSyAcK099zzhj1cFpeN8IgTEkbY+kR5weLbQg1p lxVYlJyHkWy1zeop1ybhhD1k5w0EI7kEklDOGmzwQEogPVDD+Y71adzQxZyNoch1EqK9 6rpYzh9sktY24/ayJ4WrUqBxU7/GYx/UNlBxNd+u3Tpa2LuNdI0BRpfKEaHzU2jph/bv 1JhQ== X-Gm-Message-State: AO0yUKUcOvmitxHMaOew0P+4WEB+IcIXAyFVtH88gpKpv6KGPrIc1V15 inz7D2/ZN0lIDEbV5/mJqzg6rNGhBfk= X-Google-Smtp-Source: AK7set/3xtBWdaXl/BxR1DUewvgNkf3u0eTu5c7YIlED/AQZjc6fr+VgNbYD76m5b1zy5IDlpUgKzg== 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-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 4ozmhsi4gr7fc3n6t5m74yf9kupzsx55 X-Rspamd-Queue-Id: 8C69A160015 X-HE-Tag: 1675109927-341967 X-HE-Meta: U2FsdGVkX188QJo43W6aJ0PAdsk6m+m2d7wVN2NPkdlPA9HQmBALxnsQraMciqkjuACzd30+CpnqBBjbN1xzekdm/ZakitzQKBDBnZSiJ6TKycekPrUkS2Zn4wKKHn3eF20J8Zl+ByneHmcinfgXSekCL+HXWDVapCpgDL2mvJWmCCm940hrVqmjsqcKpy7uCEW/GBwuMMpLsaoPf4D06IU+ZIG2nbO4v/aZG2WOwijr33tlXiaSCr60NXyP2qbO3DvqwxGZuHQMIVSzUhkpMS/LeOichbvvOqdEleFnFqKhtLVzQIiRIWRBtGBR7aTL77iGIeYFL9RCHUVhjP7ZQcRvtwXvWazpWK0vwT5QJJtufA2jlZBcTjtLK3QUPNgsAs6jjB40YCpJQ5hHLsBsoRPEuy5Gs/LGhpTHRR0cjysV5lv6wJt0vWjcawYp8bn+0H5lC+lMGdKWcZMrMRZ+ZzPdUr8N8165wx7S+XGI5Ofwqozb0fvBhRBIOP74a1QY7dLRFKAS8FLjzwGgYHJNinlLI0Eati9Hn+u1iGpJg5OTiKO9sVeQwf5TysMJzYDOKH29CTE8vbgA8GwmPuPrXEOr7reBz5n/sJEDoLmHt1CRV45PWqV40mbkGvsFUAVtfGhCgRGE6tUH/uN/ii9qXpJu91VDc4D2Ktzyx/3m+z59mhSS1UWxdsNyVh3+uiJug8e/aFeOicRKec0h+VNq253gddb/P80ufUuCk6w3XqQEb/T9/ldHyd5jpxmzqs5PgjgFmWgiu1knm2OuB1q8guDyYbOFM/TVKkdfMkXkxoyU+Mu+QgMlqe9x2qNR4FN8N7MsenhH4aOpyXIUCe5887lax3SQfMCGjtZwwYGeZ5/vYurlienUYKpazKDOaHIbEm7qqot4uqjqBC7yVEZ6BCzIGWBWxQIGhTwfoLszxebn3EKtlKvOufR11zxsju4MI6samE2zzbPhZCn1MUq BHg2brYI 2Ag/4v32H9CH8VA26Vm0QFOqBQ4CqluCdY7cdlqVs0JYd3+ziECt+yIua+XKMrB9XOTe+22TsHFVcfCqN1T/K/rt946A7/TG8AeS0k4YbiLSdtBJ1m+NADtu6K4fuUBiS62P5hi+b9VmDN794J2oRbCZwn79NfZ3JGuqgSFz7YEQZGaXD+TvHobDu/gjmMjgHxhHjnASFjD7r69Smo5JLxva9iuAgPAwHaOn9KO4iMcy5p20V8ceC3U467R4OnGBjKwQ5DycSJdegGNvbpoo3q0Rgx7LFqcXXuo3XUOdeUiRHBA8GLgqByp8k0XIBy2RLq/kzKLvogrd1IOPKl1alGKNL0kLedlexkwgt5OczN2oQkFH/1sV0jwVnIUwR2Z0V56CV0fpJ70qak7a64tTarQHwO0+ADuzAgn2NUTl3qjc6DOmB2/0qsFh5z04ZwiiJj8wKVPLQ5ChmUUfJie0QZEL4ZZiQ55UDm7ivrhGLGYu+a54MVjHgFgfgHZEoyB3UkQKq/1EbIRHVq1C0nw0MVVi/gs7329NA+mqWSYlgvXEEjuARtCAbSy3mG/my36vHzSw3CHuMDKj3Uaa11xuWA+6Qd0BgfBugTLksl8kQMp2rdIetRiojQku1jS02Te2xwVYZYXJrnHdwbduuBUynQ6w0u0kA+v/L2Bwh4tKJ2h5nLGY= 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: 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) {