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 19F59C07CB1 for ; Mon, 27 Nov 2023 15:46:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 97A5C6B02C1; Mon, 27 Nov 2023 10:46:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 92A426B02CF; Mon, 27 Nov 2023 10:46:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8196D6B02D0; Mon, 27 Nov 2023 10:46:52 -0500 (EST) 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 715BB6B02C1 for ; Mon, 27 Nov 2023 10:46:52 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 41D5A1603C0 for ; Mon, 27 Nov 2023 15:46:52 +0000 (UTC) X-FDA: 81504162264.21.E540923 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by imf02.hostedemail.com (Postfix) with ESMTP id 71C0780018 for ; Mon, 27 Nov 2023 15:46:46 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="K/zA7fUU"; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf02.hostedemail.com: domain of fabio.maria.de.francesco@linux.intel.com has no SPF policy when checking 192.55.52.120) smtp.mailfrom=fabio.maria.de.francesco@linux.intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701100006; 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:references:dkim-signature; bh=U95WQ0BiqH0aF4xB0EQgckkp7wC7gXmK+q/G7/jYCFE=; b=pEBnFbzDqa9xcktlB3c0JKdQT25/Vx3nJsM8dNt99jMFDAOtJhCOuiBLth/RofHdveWCcs Tk3gitErTJOVZrv2+OiSetS1gGbWmnKbniHKhxdPzlkMzUIEZI/+wd/Yhcu9tPblDkHVMK 8mpjZ7KLcHPEABtk5/NMiPCe6p3kx20= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b="K/zA7fUU"; dmarc=pass (policy=none) header.from=intel.com; spf=none (imf02.hostedemail.com: domain of fabio.maria.de.francesco@linux.intel.com has no SPF policy when checking 192.55.52.120) smtp.mailfrom=fabio.maria.de.francesco@linux.intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701100006; a=rsa-sha256; cv=none; b=JJnCCX65EPwKVF8bhCuXeGe2yQokFEzRS+0pRSBm+OoD+EdHGQSysP7OKAqFnsTC0FDNeR omN9BYmgxhWsqultp6EG8m7AsEbzBTpcatvXDZuOeueC908NRg2f5U/NaC6aimqMuex7wm Iq48PftNE41v1v+hmaPiR/XrQ7cTCxI= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701100006; x=1732636006; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3PycNio2q3WHt02gcTkjVKQ1sS+xOmYyGc+KlaCy/BA=; b=K/zA7fUULmxu1XzkcTmAuBu93xTPUjyQ90xBjtSRWC98/dGoPUzAl/Ju g1kRx9wt690q4eOx8f0T0Gp9KORBMQTIdPBLsOYM+en79laz2lzSw5zvG 6zDQeYqC3wxyyJp7LjfNdeh3Hx66zUPHSS4NxM0Q58NUOmKdkFu0T72y6 /6a+NfIFSFOlVJIKGUKRClRnpsRVqDUVTaf/Nxs8cpp/4eaFmjIoA6uwf T1jEQSJWZAcW6KIP43cfenNGPGqqNim6CH7k+20BZAdJCB44n60N5bWd9 iRGyhuSUj2lvqMGme1md2hga3Bp8amWAEUWFMvuu3vZYpUNVWC37J5Nh+ Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="391606944" X-IronPort-AV: E=Sophos;i="6.04,231,1695711600"; d="scan'208";a="391606944" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 07:46:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10907"; a="1099820767" X-IronPort-AV: E=Sophos;i="6.04,231,1695711600"; d="scan'208";a="1099820767" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.Hitronhub.home) ([10.213.15.40]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Nov 2023 07:46:41 -0800 From: "Fabio M. De Francesco" To: Seth Jennings , Dan Streetman , Vitaly Wool , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: "Fabio M. De Francesco" , Ira Weiny Subject: [PATCH 1007/1007] mm/zswap: Replace kmap_atomic() with kmap_local_page() Date: Mon, 27 Nov 2023 16:46:22 +0100 Message-ID: <20231127154636.585898-1-fabio.maria.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 71C0780018 X-Stat-Signature: oahptfiuu5xa6kcrj4s8ig7xizqkadpx X-Rspam-User: X-HE-Tag: 1701100006-129186 X-HE-Meta: U2FsdGVkX1+8mzcpj8ASQSOEDpmui7BBXkVkmCFzJ0gSC4sUS41tQyK9uoiNAgxMEV/TTUHN3XG5u0d7d4+vzPF1VWepgmh1qc6z3jK3GhMbfCaxJHxobm9+Pc5W9J9Mq4a3tKDuHw/axy3VVvbLUd4fzpL6JYK5H72+UHRMKn8fgtl9j78amcvk/mp3tXRiZ2Ea7cDMI7Of9BuWEWADrLtItdsFNy0OkYV/f4bT6Ad1ZISzs4lKNkwFFTLjx0++3UJIVCH405CdCt8Ap2cO75IvL3WkUDo7iHHA3v784MxHDxgfrrS+V69ipFiJxcfZPrQjd5LSRzERhg7vWuBch/JoMUdGvAJUa1DoRelRzRcyisBLOhZ/cXhrm5E8vqKnRfel7mAFzpnOejeFuiBzRw67e6Myg3y0StImZsl1Zk3lKbCLyR7mn3cQoe6ct7mgKIsj5bWrCBHywkSEc8YSSBx8owssXEIOH7s6iDKE78UB2pu97wQyha2EFK3dr1Jp17DishU8NPg4db58FE+cL2e3cQeUaArvPTyt5gwLkI9qvil4oEiGooopyiBPdIZHCqfy3YDrzSE8iWCHi1wER/z8LvQRaIEp7hJhRreTJrm4cjhwv6WlcQHW7UEhmjRNqxa274L42SiNbcWx6SBSbcyrczPARCXre6lBKsvPtFXCl78osJvOBOY8WaDrTYmGy+qb75n1O09mhv7tPwUTbOnE8uajPR/QydLPZshVqoehuac/A039Hl1j4myE7uSgYFJHn7k75At2GecW0nnYfr9TMAUOuTVsJbRxaxoMCCt6nnJa+dH+e4NMGNhSERUaUnPyQKZ0jJ54uXVN5tV4eINY4qQEaVjDwrB+fybnIzbOdwcEJp+CRnNOCY4ycLjjHm9RAsR8378gfrai48f1mKw6BZ4mMrFxxpBPz+AkSMDcPPatyTxZdL8s89giyFD6DnH065uE0k8CNgFwgZp VL90G8/j BbsdivanTVtVGRN/p9n5npXmJk1GUH8UNeA/Ebml4jV6EZrY769DxB2s4cDrZM9znXnI0O6+jLmLWLTbpJiN3zcdivClIZ9uSAJMADLbVIS9yZGSyOhM//1FZzaPo/iqyJqD8USBoAajcKxrE26MPvqIJVcVMQCO6R6QGoz95mm18cPMcazmpm+1l2g== 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: List-Subscribe: List-Unsubscribe: kmap_atomic() has been deprecated in favor of kmap_local_page(). Therefore, replace kmap_atomic() with kmap_local_page() in zswap.c. kmap_atomic() is implemented like a kmap_local_page() which also disables page-faults and preemption (the latter only in !PREEMPT_RT kernels). The kernel virtual addresses returned by these two API are only valid in the context of the callers (i.e., they cannot be handed to other threads). With kmap_local_page() the mappings are per thread and CPU local like in kmap_atomic(); however, they can handle page-faults and can be called from any context (including interrupts). The tasks that call kmap_local_page() can be preempted and, when they are scheduled to run again, the kernel virtual addresses are restored and are still valid. In mm/zswap.c, the blocks of code between the mappings and un-mappings do not depend on the above-mentioned side effects of kmap_aatomic(), so that the mere replacements of the old API with the new one is all that is required (i.e., there is no need to explicitly call pagefault_disable() and/or preempt_disable()). Cc: Ira Weiny Signed-off-by: Fabio M. De Francesco --- mm/zswap.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/zswap.c b/mm/zswap.c index 74411dfdad92..699c6ee11222 100644 --- a/mm/zswap.c +++ b/mm/zswap.c @@ -1267,16 +1267,16 @@ bool zswap_store(struct folio *folio) } if (zswap_same_filled_pages_enabled) { - src = kmap_atomic(page); + src = kmap_local_page(page); if (zswap_is_page_same_filled(src, &value)) { - kunmap_atomic(src); + kunmap_local(src); entry->swpentry = swp_entry(type, offset); entry->length = 0; entry->value = value; atomic_inc(&zswap_same_filled_pages); goto insert_entry; } - kunmap_atomic(src); + kunmap_local(src); } if (!zswap_non_same_filled_pages_enabled) @@ -1422,9 +1422,9 @@ bool zswap_load(struct folio *folio) spin_unlock(&tree->lock); if (!entry->length) { - dst = kmap_atomic(page); + dst = kmap_local_page(page); zswap_fill_page(dst, entry->value); - kunmap_atomic(dst); + kunmap_local(dst); ret = true; goto stats; } -- 2.42.0