From mboxrd@z Thu Jan 1 00:00:00 1970 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 B0C61C43217 for ; Tue, 1 Nov 2022 17:53:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BED9B6B0075; Tue, 1 Nov 2022 13:53:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B755D6B0078; Tue, 1 Nov 2022 13:53:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9EF8F6B007B; Tue, 1 Nov 2022 13:53:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 908916B0075 for ; Tue, 1 Nov 2022 13:53:57 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 6F0EA1C6769 for ; Tue, 1 Nov 2022 17:53:57 +0000 (UTC) X-FDA: 80085621714.04.50A5C60 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by imf20.hostedemail.com (Postfix) with ESMTP id 224851C0017 for ; Tue, 1 Nov 2022 17:53:56 +0000 (UTC) Received: by mail-pj1-f52.google.com with SMTP id gw22so994399pjb.3 for ; Tue, 01 Nov 2022 10:53:56 -0700 (PDT) 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=8mi0cqN3i/1HTIqi69x1uNrDe0uDt2K2zNDb9Z1HfPw=; b=RBxiYbfjpDwRWt/D6+w2v3Jo18Lh+RXCLXAOGnov4hDYGZVFU+xSvqhrVh7fhuJeq2 kN7vs3xuzmdU41BaE57uYw1KeMK7Brdl1q/LIisxF2YTer9d9gb01l5P9mg6ztt8ZlHJ FxT8H+EhTW+FcC62q64HDNZDSjsy0hsnR6EfWlTMhFK9ol8LYlk6AkNUJ1EQyw/O1AQy 6AGz2HBSGHbYmqEIG++A+uA2wSymWLBgrnpHUEAdMXxAzxaGTCmGSiKk49vZ+JGWUytd J6Qnxgq7ulgG+7lrvlSLx+XWUFiLqkZm41cvpDeTzB+Bm139Arc1de4J38auPaIICKEy Gujg== 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=8mi0cqN3i/1HTIqi69x1uNrDe0uDt2K2zNDb9Z1HfPw=; b=ILZFTr6471wrqEEEQQ1r8w0TFpueHujpEUCktE3NBHszbxsqSkh52Rsg9ATSfBoyyL ahjLoLbjpfpRJEZ2rQNcgqK8hdYrgxAFgazYHr3gFMlnUJ1B7lowBtaccBlMiMhuo/VX jd/1L+hfifdrjVmuMlIio/FM4/gbX08QwHdWj8Bh7cWSA58ThvBhYwmocbqi832IvNhR Pync92+XAHh7eTzxIeScVZTpc/NBIDhcWOOsPyWkPQx9lgwS3XYl463YIquAEEiNHK9F XvFhLys3R0Z5IkonNBe+mv3hsnsaoyHLsW7B4KMG4Lmu7pIcrzVvWTtVvMSTrrwDaIQ3 Td6w== X-Gm-Message-State: ACrzQf1NV0c+STYXm3fzeXYSOnytIy5/9pI6ZustZ+pXI3I8nD4WTgYT cnG4uqKQF0H0L7tV2QhIMM3CPgADVQ3wDQ== X-Google-Smtp-Source: AMsMyM7/EQi6vdSoH4+shOGY8XE1Z+NZy/JCQ0R8kX0/zqHOOQtYC7myzSBOz691gq6Q7sVSEU8Gxg== X-Received: by 2002:a17:902:ed53:b0:186:6ad3:c155 with SMTP id y19-20020a170902ed5300b001866ad3c155mr20007129plb.43.1667325235913; Tue, 01 Nov 2022 10:53:55 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:8002:1c20::8080]) by smtp.googlemail.com with ESMTPSA id e26-20020a056a0000da00b0056b9124d441sm6797987pfj.218.2022.11.01.10.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 10:53:55 -0700 (PDT) From: "Vishal Moola (Oracle)" To: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org, willy@infradead.org, miklos@szeredi.hu, "Vishal Moola (Oracle)" Subject: [PATCH 3/5] userfualtfd: Replace lru_cache functions with folio_add functions Date: Tue, 1 Nov 2022 10:53:24 -0700 Message-Id: <20221101175326.13265-4-vishal.moola@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221101175326.13265-1-vishal.moola@gmail.com> References: <20221101175326.13265-1-vishal.moola@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1667325237; a=rsa-sha256; cv=none; b=3pdzRGFxCyH3rEP0nBZXudl/GxiwU+nz3tXEywQbYIOTmD/6/WMZXbINgNxEwe+BkJuebc tyhPgh0m7slyHv4nKjsDbkhPfs2qdCgtg/BQlEMxIJJ22L4Zv+PBdMqLTIT4O7uDzIg8xk BPs+M5VDm5tSxaxDBkXDUPmuTlfJ1KA= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RBxiYbfj; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.52 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=1667325237; 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=8mi0cqN3i/1HTIqi69x1uNrDe0uDt2K2zNDb9Z1HfPw=; b=GsB6cOD/GqEYDshYRNPUbN7BLj0zDOxFyHmyrr/oV1iV2231QKpYeHCBmzkqDr744LsSVM XMKLJV/WnaHcSseooqjac/dDRl0XjZAEI/wxJuRx8gSppKOs0CvZ9vDUTGf74vSJfBBkDq zKTBWl/AbXV/51rnlAFhw5Dh5S+OB/4= X-Stat-Signature: payfsyawsj8kkbp8gapbw4wozyqge8sx X-Rspamd-Server: rspam09 X-Rspam-User: X-Rspamd-Queue-Id: 224851C0017 Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=RBxiYbfj; spf=pass (imf20.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.216.52 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1667325236-424969 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: Replaces lru_cache_add() and lru_cache_add_inactive_or_unevictable() with folio_add_lru() and folio_add_lru_vma(). This is in preparation for the removal of lru_cache_add(). Signed-off-by: Vishal Moola (Oracle) --- mm/userfaultfd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index e24e8a47ce8a..2560973b00d8 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -66,6 +66,7 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, bool vm_shared = dst_vma->vm_flags & VM_SHARED; bool page_in_cache = page->mapping; spinlock_t *ptl; + struct folio *folio; struct inode *inode; pgoff_t offset, max_off; @@ -113,14 +114,15 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, if (!pte_none_mostly(*dst_pte)) goto out_unlock; + folio = page_folio(page); if (page_in_cache) { /* Usually, cache pages are already added to LRU */ if (newly_allocated) - lru_cache_add(page); + folio_add_lru(folio); page_add_file_rmap(page, dst_vma, false); } else { page_add_new_anon_rmap(page, dst_vma, dst_addr); - lru_cache_add_inactive_or_unevictable(page, dst_vma); + folio_add_lru_vma(folio, dst_vma); } /* -- 2.38.1