From patchwork Tue Jan 3 19:02:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fabio M. De Francesco" X-Patchwork-Id: 38602 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4775871wrt; Tue, 3 Jan 2023 11:11:58 -0800 (PST) X-Google-Smtp-Source: AMrXdXvQSvjJJgkckNjViH+jMWUENS98t32zUC2BO8DoKy9xQ4hM/zYXxgLVHQ0B5+AVbTZn3LBp X-Received: by 2002:a17:902:a40a:b0:192:8d51:e4df with SMTP id p10-20020a170902a40a00b001928d51e4dfmr26448810plq.61.1672773118339; Tue, 03 Jan 2023 11:11:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672773118; cv=none; d=google.com; s=arc-20160816; b=zAItzVNvQsIS3sM5hD1XlNADY77j4IN9o/uGB/MTM2QDM4KOwDyMAz9Paa68xOxMUd GGva/1bWNvOxqZzkW+S67EI4Ah4uEKauxgvzHfO1CuxB6UdLdKs09ofIt/wWUJzhBMFW EMFLgy+7oorKcG7+LCYr08D9MYqlOf4WRu//eJDALvSDxPe/wkZQ3YPTeVOTNmaMTpfQ KViT38VOeF2865qGOwecfXeGl25fOyFb/VgWEWRQVoCf36ANEss10/F0Gkq/bnFFeCEc 3zBG++l25tGZrbG/aTi4z4M1FmMwEUqSPxk7UJI2XvTM41BUEhdG71rEjemMglDdmtTW tk0g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=dAiqidS71pJ1PpHC3qaeiwc7XXSwdkyY1rJdxC3sdNo=; b=dpnbysQ+YTgRyITMdgd0bjU0Si1El+ztVtZ5QSHmyWZOtl4pBwf3ZWJDM3qAbVdKNR ypNlpOw0eSKJQl4RyYDF+36sl+QGv9F+7NQpEJRjuVkPtw3sc7SQeTXPl7UE51WibKUs 9x2JV7EyvdqSml2kqY7cRspnDikTnwcJosHGXVMGF0PdwPqIpfX71T4vE2SFnvepeMUw nuopvMBF/i+Ws8NXvFwcBXyha6zQWYn5kgaQE3NicR2pjcY+qOJsLQSm66ag+PacNuCE 82Rb1i2bYY6twHXzQj0BgZLTqNjVh/k506NFAmBeBOEXzRoboetJXWsti34727G3aJ78 LoqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=OcUJGFAX; 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 h14-20020a170902ac8e00b00188ef2314acsi32573139plr.527.2023.01.03.11.11.46; Tue, 03 Jan 2023 11:11:58 -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=OcUJGFAX; 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 S238556AbjACTDL (ORCPT + 99 others); Tue, 3 Jan 2023 14:03:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238481AbjACTDG (ORCPT ); Tue, 3 Jan 2023 14:03:06 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F95A13D2B; Tue, 3 Jan 2023 11:03:05 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso14057298wmq.1; Tue, 03 Jan 2023 11:03:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dAiqidS71pJ1PpHC3qaeiwc7XXSwdkyY1rJdxC3sdNo=; b=OcUJGFAXnpz0EkpWWzeEIqPQuYA7Qc6fwxZdmwvCO4Fcle/tdimP2DJpb0xboB1RnZ PDCzLu1k27WuaXiLG2xsc0Q7SfrYippStl4wae/mLaKgZ7Cyri88QXLMF26l7D/SG3Om cWcVa8aoGxOpZHzzcGF2kCJ1LEvdrLeghuGAgpIN27A7LwDEi6NG4wweKFc8pM3YLO1l 0CopLYMIGuzeHYC5/7UJ1hDuUVk4dCnN0IXOK1QQZJDif4mzY+xP1dKRAphKL4Y2unqP FUi30PH3K0HPNXVqIqitXkmYcnG08fNM3nrq07Xq+odLoe9iLqbCM3GMpPPPQ0Hv6i6r hVwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dAiqidS71pJ1PpHC3qaeiwc7XXSwdkyY1rJdxC3sdNo=; b=n7wZbof0H3gqfAYSkUjISPuT8rpoQOcPqL5maZBNPcb4MkeeWJ0v1IdfogsqaVHYDn 1u47eG2GOQFGn3niammOvK4lP6hkx2lKNxR9rmy7N3yp44KunIp5eEd42msE/Z8t6nCB POcxzz98HsNvU3ynEdh/bursaUA7o5i9b3DNJigaUlNUZHCMK7MyLgc8WJs0/GXjhGtp 4bPDP3kQ0bkmWUw9AA0EC5/3kKX2Jl4OmoDhHuzIzV50BGfFYnC2zeqR09yCZwbHC53q tk6T9t8BA2h949jXOs+VNyXX1t1S22I0ywv6AIIO5QuW0oxsbHekS17mty1uN+QDozKe j0sQ== X-Gm-Message-State: AFqh2koUEAwXd0TFa/LjcXWXdSJh3kLq6j4YZaGj6s7cXsMWlUHee6IK LXiGYnrNiTOjK44au76LmrAX0ORhd3g= X-Received: by 2002:a05:600c:21cc:b0:3d5:79bb:d7da with SMTP id x12-20020a05600c21cc00b003d579bbd7damr31957033wmj.18.1672772584014; Tue, 03 Jan 2023 11:03:04 -0800 (PST) Received: from localhost.localdomain (host-79-56-217-20.retail.telecomitalia.it. [79.56.217.20]) by smtp.gmail.com with ESMTPSA id iv7-20020a05600c548700b003d35c09d4b9sm54517168wmb.40.2023.01.03.11.03.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jan 2023 11:03:03 -0800 (PST) From: "Fabio M. De Francesco" To: Tyler Hicks , "Matthew Wilcox (Oracle)" , Christian Brauner , Damien Le Moal , "Fabio M. De Francesco" , Al Viro , Muchun Song , ecryptfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ira Weiny Subject: [PATCH] fs/ecryptfs: Replace kmap_atomic() with kmap_local_page() Date: Tue, 3 Jan 2023 20:02:59 +0100 Message-Id: <20230103190259.30944-1-fmdefrancesco@gmail.com> X-Mailer: git-send-email 2.39.0 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?1754029745098616879?= X-GMAIL-MSGID: =?utf-8?q?1754029745098616879?= kmap_atomic() is deprecated in favor of kmap_local_page(). Therefore, replace kmap_atomic() with kmap_local_page() in ecryptfs_write(). kmap_atomic() is implemented like a kmap_local_page() which also disables page-faults and preemption (the latter only for !PREEMPT_RT kernels). The code within the mapping/un-mapping in ecryptfs_write() does not depend on the above-mentioned side effects. Therefore, a mere replacement of the old API with the new one is all that is required (i.e., there is no need to explicitly add any calls to pagefault_disable() and/or preempt_disable()). Suggested-by: Ira Weiny Signed-off-by: Fabio M. De Francesco Reviewed-by: Ira Weiny --- fs/ecryptfs/read_write.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ecryptfs/read_write.c b/fs/ecryptfs/read_write.c index 5edf027c8359..3458f153a588 100644 --- a/fs/ecryptfs/read_write.c +++ b/fs/ecryptfs/read_write.c @@ -140,7 +140,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, ecryptfs_page_idx, rc); goto out; } - ecryptfs_page_virt = kmap_atomic(ecryptfs_page); + ecryptfs_page_virt = kmap_local_page(ecryptfs_page); /* * pos: where we're now writing, offset: where the request was @@ -163,7 +163,7 @@ int ecryptfs_write(struct inode *ecryptfs_inode, char *data, loff_t offset, (data + data_offset), num_bytes); data_offset += num_bytes; } - kunmap_atomic(ecryptfs_page_virt); + kunmap_local(ecryptfs_page_virt); flush_dcache_page(ecryptfs_page); SetPageUptodate(ecryptfs_page); unlock_page(ecryptfs_page);