From patchwork Tue Dec 19 13:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chenguanxi11234@163.com X-Patchwork-Id: 180933 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1921705dyi; Tue, 19 Dec 2023 05:07:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IGdmwXFYVB7ZiCTVm+WokWldXq1iluqPjoF6udgOBLrWxcbi1IjpAo7MN5hDf0M5wUc8XRU X-Received: by 2002:a05:6870:ef0e:b0:1ea:2e2c:e9e7 with SMTP id qq14-20020a056870ef0e00b001ea2e2ce9e7mr20194173oab.59.1702991234523; Tue, 19 Dec 2023 05:07:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702991234; cv=none; d=google.com; s=arc-20160816; b=eavCoUSa6WHwhcIta8vlWCXJaPQ6VIFZ0dLpUUTanOg1EwpG4tR0uHBqQ/brikB8t8 eV7cD09J0GPGULrHgE6+/4N2UravwMiqIvR9mxRMKNzYej5wG1quO163nX/DTLpIH3cE /Iw5nO7AZXbbQCNJvgTUv3O5fdTOUU3ihc6qwQQZem7sznCyU+FR1Nz9yA/jDBH/BbIk CBo1JK0sEcB1TA88O85JgnOZrd1SHcHQ5qbtIspXWRvhSq/n7LQ8s8Zkdqb7o68CEC+h 2GBiHiSzcD7Az38S/acGn9wMtnNOED0rqvzq9tMyY7HqnZ2IRK5yce/HMKa3biUkNeaN mzew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=/n2XJIfcbrULIis+G3+HtQ6D4FhSo/cN2GijjyoaIW4=; fh=bcDNLVFdwnfj9qY9F4QC9+oyfjoSk0I/nPpZNRtq9MA=; b=vCI0usIMmjJOfL9tvKPPmSZP9Fud1BeIKJTPVnUZNad73J9oHKrCz542XqB0Lo0wTj +Utmd/x2wsU7DVRNWYI+IS/8xW4/qKppY8ySO5Q4p4gaHHwzOdZAgD5cxRabcAyW9w0q aiKkf1Q+83ZomOqvTeIoKjwQpwYm+UXX77Bz2L4xC8MwyzeJdUF6U5oCW/7Ri1YFfSqG P93+edfPDbfxePKMGuuV9wWzOtWpbmNeX/0LopvAKE82ae/9E4zC2fdUBPLfkY6HnLra 1O9D2iUhtdXa230ammkrxy76eFo5SwI3WnTwFZPZGvqU6wsinC6wcH8Tyk20PC9iLgDC YLWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=BfHuZel9; spf=pass (google.com: domain of linux-kernel+bounces-5231-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5231-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id t65-20020a1fc344000000b004b2ccee14f3si4472656vkf.236.2023.12.19.05.07.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 05:07:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5231-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=BfHuZel9; spf=pass (google.com: domain of linux-kernel+bounces-5231-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5231-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 3F9581C22963 for ; Tue, 19 Dec 2023 13:07:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3FB3618E34; Tue, 19 Dec 2023 13:07:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="BfHuZel9" X-Original-To: linux-kernel@vger.kernel.org Received: from m15.mail.163.com (m15.mail.163.com [45.254.50.220]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8279818B04; Tue, 19 Dec 2023 13:06:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=/n2XJ IfcbrULIis+G3+HtQ6D4FhSo/cN2GijjyoaIW4=; b=BfHuZel9uSjVEsxqIKnJS 6DTf6qRV7W0rWdkzkmasVYH8yQ1+SiOImVyVUJgyVV7mxcffF56Y+4xEGxnWwuHz fUP+eONWdoh/jCe2nCjcCJvTLp36RyrWiEfxNqjIgpXHSEK6zX5T7SDwywk5eol8 Ho6m9rWbXZ4Op7c8d8zv+U= Received: from ubuntu22.localdomain (unknown [117.176.219.50]) by zwqz-smtp-mta-g0-1 (Coremail) with SMTP id _____wC3PxBUlYFljtpaEA--.10184S2; Tue, 19 Dec 2023 21:06:29 +0800 (CST) From: chenguanxi11234@163.com To: rafael@kernel.org Cc: len.brown@intel.com, pavel@ucw.cz, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Chen Haonan Subject: [PATCH linux-next v2] kernel/power: Use kmap_local_page() in snapshot.c Date: Tue, 19 Dec 2023 21:06:25 +0800 Message-Id: <19e305896a2357d305f955fa14cc379e40e512bd.1702977429.git.chen.haonan2@zte.com.cn> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-CM-TRANSID: _____wC3PxBUlYFljtpaEA--.10184S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7ur1fKFWkZF18tF1fCr43GFg_yoW8WFy8pF 4UAFyDG3yYva48t34IqF1vkry3WwnxA3yrJFW3A3WfZrnIgwnFvr1Iqa18t3W3trWxJFWr ArZrtayvkFs5KwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jJiSdUUUUU= X-CM-SenderInfo: xfkh0wxxdq5xirrsjki6rwjhhfrp/1tbiQABL+mVOAjMcXAABsq X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785715358062981778 X-GMAIL-MSGID: 1785715736377668242 From: Chen Haonan kmap_atomic() has been deprecated in favor of kmap_local_page(). kmap_atomic() disables page-faults and preemption (the latter only for !PREEMPT_RT kernels).The code between the mapping and un-mapping in this patch does not depend on the above-mentioned side effects.So simply replaced kmap_atomic() with kmap_local_page(). Signed-off-by: Chen Haonan --- kernel/power/snapshot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index e3e8f1c6e75f..5c96ff067c64 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -1487,11 +1487,11 @@ static bool copy_data_page(unsigned long dst_pfn, unsigned long src_pfn) s_page = pfn_to_page(src_pfn); d_page = pfn_to_page(dst_pfn); if (PageHighMem(s_page)) { - src = kmap_atomic(s_page); - dst = kmap_atomic(d_page); + src = kmap_local_page(s_page); + dst = kmap_local_page(d_page); zeros_only = do_copy_page(dst, src); - kunmap_atomic(dst); - kunmap_atomic(src); + kunmap_local(dst); + kunmap_local(src); } else { if (PageHighMem(d_page)) { /* @@ -1499,9 +1499,9 @@ static bool copy_data_page(unsigned long dst_pfn, unsigned long src_pfn) * data modified by kmap_atomic() */ zeros_only = safe_copy_page(buffer, s_page); - dst = kmap_atomic(d_page); + dst = kmap_local_page(d_page); copy_page(dst, buffer); - kunmap_atomic(dst); + kunmap_local(dst); } else { zeros_only = safe_copy_page(page_address(d_page), s_page); }