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 6E59FC64EC4 for ; Wed, 8 Mar 2023 09:41:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0A7DA6B007E; Wed, 8 Mar 2023 04:41:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 058996B0080; Wed, 8 Mar 2023 04:41:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E898C6B0081; Wed, 8 Mar 2023 04:41:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DBBF06B007E for ; Wed, 8 Mar 2023 04:41:45 -0500 (EST) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5481880F3F for ; Wed, 8 Mar 2023 09:41:45 +0000 (UTC) X-FDA: 80545238970.16.76FF078 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf05.hostedemail.com (Postfix) with ESMTP id A9A8810000A for ; Wed, 8 Mar 2023 09:41:43 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=leVKbWeo; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678268503; a=rsa-sha256; cv=none; b=wtEFty8AIsBsSRgM7073GVdJTxdMh1h7lepbMY+5eRkSyUNLLWU/OvlcynGri1Psd91T7L Gqkg6eGZkS4Aw2Y1ppAT/YG1lXGPKeaQlbHmAYRjAnV7YClNSzqSB9BKWxkwticbMpoKoN 4R8zQ1inAQ/WCRXeLCG2d3FZxgZOUUA= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=leVKbWeo; spf=pass (imf05.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678268503; 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=gMbdMo/pBqYIxP3tjUm5UhHWCZe8JSSf6Iu/9RrXzi8=; b=wdM93gXwK2m37nkQvfOnaqurSs2ZuOJ/6lENV0TDkNZ0+MgIDbwOB+YsbjnZWwB5arqEyf lh9rsdqK8q5sFRSd6aQsS8A4fQ0bVsHHMOZBWJT41R7dgdt76CTkvmraSHrOfJ6A60hcv+ 8H4sZtDuVBVLQJlqoyBQQnBMURkXA4I= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 955DE61721; Wed, 8 Mar 2023 09:41:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80E84C433D2; Wed, 8 Mar 2023 09:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678268500; bh=FOZyjqFesuEnEwpUW1WYq+F0fxn2qMQwF+XDs3hZBQk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=leVKbWeo/7qOftIstG5B9Wgf9MRXnwDGvaQUihQL6sWuanLYUQozOUwMx4mEYxlep SK+6GKBux58RzySSLw+ASPQ2LI0d6QdcBWHG4l2uuE9FqQyRWANesgRaYuCvprRtL2 994aEBWZuA/D8wD0+MLrSqO/8JSauc/E8A48GBC4UFCF0Mteg/IOFl9IH+v5CGnkmX 78RxsHHsDeqbtilOWnIuJihopZEwO+M4DIWXi6/YmWDg7iUB7fVn9xfYNiaJ5WWZ4p tvTaCpCyYZdmV2vKLa1pPMyu6s3qL5dgi4J4Ywy5j0orqUR0qA92pNM5IFhFjn/keq 6l9vE6tUdD9qw== From: Mike Rapoport To: linux-mm@kvack.org Cc: Andrew Morton , Dave Hansen , Mike Rapoport , Peter Zijlstra , Rick Edgecombe , Song Liu , Thomas Gleixner , Vlastimil Babka , linux-kernel@vger.kernel.org, x86@kernel.org Subject: [RFC PATCH 5/5] EXPERIMENTAL: mm/secretmem: use __GFP_UNMAPPED Date: Wed, 8 Mar 2023 11:41:06 +0200 Message-Id: <20230308094106.227365-6-rppt@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230308094106.227365-1-rppt@kernel.org> References: <20230308094106.227365-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: A9A8810000A X-Rspamd-Server: rspam01 X-Stat-Signature: rh84i5cjtsjdde6iwot9b1mpas3u7x9b X-HE-Tag: 1678268503-979268 X-HE-Meta: U2FsdGVkX18L6rLkHulcp/Y0MeZJNil2Yp38vfXvAI7P/QFx92Pe6AS5V6IfbJN5NmC9izO56whXRKzQcDd/gZvUen3uY6rOK5ksfZC4dI0yOdU4MsZRlysHgRKB2Hdyyn8veq0eMvfCB8PsxU7ZuZ5mp7J4ZTe7vK0/30FbQF/12SPwP/rZxdRQ19ZFGniVeurKDwXVdvQmHbcFWex+1f9Mlnntp7G8DxZ1f+JGmDV2rf8Ixjqd4HAM6tWh3t7p8pZ0S2mOJDH+xJFaHlvHiPGvpRaz4heHQnFHWtgSXBs7Gf9geCIXy/XMfIC9Htwe/l4gsJfEnRLJ9N54UgmD+ph62BmrjHA97PtiKGnwxA2S8l0ar72Uo6+xANVW5vugVr2Fn70xL9qZ+MGs68vmRSsv5CpORvo4F2GR9ebP+jSi6B8Qo9WTeOuwxzLlxiJV2aCuzep6Gabs2HVT50scOMSmH5my09uyL6nbU+wRwuJbklI2Gf64t22R5nTfhQd4cl/4Q+k1ihU39NHcWXb5TBNhafWUUPWIC6tZP7xWBZQknwfsphSvMXhOGr/LL46LkhUFZb6NpJROHwhxVCgNbWgIOPK4lzl2iPxjTvyKlOlQ9hrmPXPztBuZFcT7oEyDIW8Hb/RMXNtH5dqh+68G7kSA0hiuahm4OAik2rYmRBQzARQgqRiwQCCaweLqGQmdShTxFLgKduFiXp4CvbGiGDjM5Nc32zyjG1SIBHq6rUea6pkOQTAQ+wyFs2xBsHdUNqP7AsH9w5B/hNsLIzhqLxo7mv91BdPDdvx1w8IlV6zDR39BtubTpCoLkqazFuPqjbB9c5kfinkJvr/C24t4wEd4OUkvbiHznTGm0rtJVsADeLQagP6EvEP/kHVOh1qFXXChWD82ZxXssMYyVs7sdAnWLMAZ397NGbvquVSYrDsyBvOU1jcMzPiKJdgelrkgKiz8W99Y7+M50hPNFUR /zQaBdO9 sE/SJK4X5W+4cYyyNSr4wJM4zVgy1AqNGgw7IpWyG+qmOP2J20ZPw/Esj6AtFcg9vhFFyPTzulb13yXLsPhaprACMx7bwqKPWbdx5XL4oUp5iw4BvzlSmk8g9XileZ3gtVil+FiA9VUREdU9h577tkEmN43vLadTWc0YOZp26jTXu4t6Kv/mh7vyjn7GlE3FidEDC0CA3TLsmDRXHm5e0HXAWkAkVwYrBqTXELN6qef8z1rGMsq8f9U4M2YYLHLt9ftpMMnng/jZUaCaDdXdD2dpunzeT+UU4T0OsD+SxAHQ8XsdbFWb42w+VOy+haOhCtCjxZXvojnfCDPR7sWR5dC6Dipy4OkE6ps6IdugVcltrYDYGKS2fXm53oqHmBDRfKVMeVtLX7iwFPdi5HsH1YayQpg== 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: From: "Mike Rapoport (IBM)" Signed-off-by: Mike Rapoport (IBM) --- mm/secretmem.c | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/mm/secretmem.c b/mm/secretmem.c index 0b502625cd30..f66dfd16a0c3 100644 --- a/mm/secretmem.c +++ b/mm/secretmem.c @@ -53,7 +53,6 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) struct inode *inode = file_inode(vmf->vma->vm_file); pgoff_t offset = vmf->pgoff; gfp_t gfp = vmf->gfp_mask; - unsigned long addr; struct page *page; vm_fault_t ret; int err; @@ -66,38 +65,22 @@ static vm_fault_t secretmem_fault(struct vm_fault *vmf) retry: page = find_lock_page(mapping, offset); if (!page) { - page = alloc_page(gfp | __GFP_ZERO); + page = alloc_page(gfp | __GFP_ZERO | __GFP_UNMAPPED); if (!page) { ret = VM_FAULT_OOM; goto out; } - err = set_direct_map_invalid_noflush(page); - if (err) { - put_page(page); - ret = vmf_error(err); - goto out; - } - __SetPageUptodate(page); err = add_to_page_cache_lru(page, mapping, offset, gfp); if (unlikely(err)) { put_page(page); - /* - * If a split of large page was required, it - * already happened when we marked the page invalid - * which guarantees that this call won't fail - */ - set_direct_map_default_noflush(page); if (err == -EEXIST) goto retry; ret = vmf_error(err); goto out; } - - addr = (unsigned long)page_address(page); - flush_tlb_kernel_range(addr, addr + PAGE_SIZE); } vmf->page = page; @@ -150,15 +133,8 @@ static int secretmem_migrate_folio(struct address_space *mapping, return -EBUSY; } -static void secretmem_free_folio(struct folio *folio) -{ - set_direct_map_default_noflush(&folio->page); - folio_zero_segment(folio, 0, folio_size(folio)); -} - const struct address_space_operations secretmem_aops = { .dirty_folio = noop_dirty_folio, - .free_folio = secretmem_free_folio, .migrate_folio = secretmem_migrate_folio, }; -- 2.35.1