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 E008DC77B60 for ; Fri, 31 Mar 2023 09:41:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C89C6B0072; Fri, 31 Mar 2023 05:41:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DA5B6B0074; Fri, 31 Mar 2023 05:41:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 22D3C6B0075; Fri, 31 Mar 2023 05:41:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 146D76B0072 for ; Fri, 31 Mar 2023 05:41:57 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A5AA18020A for ; Fri, 31 Mar 2023 09:41:56 +0000 (UTC) X-FDA: 80628701832.06.05E4BED Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf06.hostedemail.com (Postfix) with ESMTP id 3C18918000D for ; Fri, 31 Mar 2023 09:41:53 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680255714; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7+RH9TcIYYo1sM7Vbhyc7P+DtGtLtOcBhUXSJ4uLsFY=; b=5iZ+PHmn9d8eAziUDBPefnBt6KASKVHlmjJARuktSpbJ8fFRElV2y/WW0ydCiubcgk04t8 bXlM84hMH6249isjAH/FGdY7P/1IY+FgSWgjcItwbXhH7B+aeUnhIaircIuUagwjmpdQ3F bju3XFgXaoGJkkjOhBLJ9a8r184obsM= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf06.hostedemail.com: domain of zhangpeng362@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=zhangpeng362@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680255714; a=rsa-sha256; cv=none; b=CsvlKb+6F2G4p6I2iAZTEsd0UqdM9z+9kevZ07HnZYCI0+Y+tUf/Gcr4cQ2aWW9bfksbb/ 8FN86NPgqr8LJ/2Qof7OFb6j3UYL78DcL0eJUgVFEG1BK4f4lCLQNF44/ZtJaV7VJEE4j5 PR2HsjlEsEQeGJ6PSOKjXzAv7oXu2EY= Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4PnwKB5zpyzKpll; Fri, 31 Mar 2023 17:41:18 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Fri, 31 Mar 2023 17:41:49 +0800 From: Peng Zhang To: , , , , , CC: , , , , ZhangPeng Subject: [PATCH v5 2/6] userfaultfd: use kmap_local_page() in copy_huge_page_from_user() Date: Fri, 31 Mar 2023 17:39:33 +0800 Message-ID: <20230331093937.945725-3-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230331093937.945725-1-zhangpeng362@huawei.com> References: <20230331093937.945725-1-zhangpeng362@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 3C18918000D X-Rspam-User: X-Stat-Signature: p6o8p78es6856ocbhbppssxsyshgcyrr X-HE-Tag: 1680255713-501520 X-HE-Meta: U2FsdGVkX19wXVsHOl1BfgT6eINbQxWZyVM6GjQ/zhx5JespYksUKhaRh8NkOMkWTpgeq464EmaLgvccQbSo/UxXyhbArfRbRbQVcwXP6ur1ZbwtMawOwl14tTt6GqHtuLAVBH1VBQMKd+M1dfLIqgfYSBfq3gxVzDYFHHlVBHMiaz82frLRo9oukW9G/z81SY/+rIz0NIPw+F79L9LfKgq6nSQenOXdJCwQzbpbRbk7GDtfZvXMETc5t0mgIGg8VSb7fu+Czh9FUuwjx5rBLL4XHsczQOxP8doYLAB7JHxRKt8XeP8nz5NdS1ayE3ivel/G1o7gQy5a9pCAXxy9Vb/fm3FPm3gd1bXLbbSfezATywgg5W2rF8acXogqGTWOV50UExWWUo/wjflOcJ6weNu7nPn88t2Q6rAPYy72giDkcoVi02HC85w6afboVeFlEZ6D1xKeKYHS2pwh0P5iu+FCa78GACA8+ZFpB7A5Wp21Lc0mfG3F39iA/3zwigEHbYfr3rjc0xy+v7ESSFplW3B757tfi/B3F3dEPSEPcMgtXdyqeIPlA5hkM+ciQSo7fL/powfE4z3cGQJh5sWqzIcDel9fPHM1EG79qrTo6z+kaHoTdgL0Jmn3L5UcD3i7qO5YmcSctCAm0d0rBmmaVmxSu8zpY4iJmstLjmH47h/9EQLTOnttZ+KFPp42Re1CGtSdACDaadPPdFgtFUKMOrV4nu6hy1cI63tvp2dUQ3KNWnxtfI+KRtt7uBLZCoQ8x8XMKiYl8vxBfz+Tc8JyP3SHarQ+rdxVykyLouMM5vsmODVzlHpIH6vfa8mkqvTeaF6WkHv3b461ilWh2M18vQvpyfYQMZkwhTIlwqO9UOD2ipqW99VtfgkMY4DPyvNSbcQ3l/mA0tDvkM1IrqWa2z1Rjed5zxc8j84H0f6NXTCNh/WU8SNUO05B1lp5fVXiyTbJSIQJVrGAAJVDboD pqcy32hI ZNYErfEfR3gkvmlzqIdCiQc8EX+6NatnuUSuxMF1ZZs04gFV5enE3WhVT+nIJXhf1F9fshPfL7U1TSzt5+UErOW4X1BZakwGy/7e7kM8cyUp+N16aXWu6FN6ZWhSWfLJwXa3ioR8k/RETpf8x4m/eVjsjpygbWAQX1xVmpE4dECmiK7RkNwzf9lzI3K/bg9D7L2sUmJzj29Mj7OeXpb4yDbjEuufDROsAUQUSRisq6aRGPsW3hqKXJdfaCkIehHmCtJbat7sW8JPAJk6/SyXj6w/xNxG2tIk52Gkx/z2o2uBH/sCNnZbv9IdjM4zQTXkchXahMDEopHV7IvciZZiVcklNNDbjhaZPfTlSyN/GNnxucyE= 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: ZhangPeng kmap() and kmap_atomic() are being deprecated in favor of kmap_local_page() which is appropriate for any thread local context.[1] Let's replace the kmap() and kmap_atomic() with kmap_local_page() in copy_huge_page_from_user(). When allow_pagefault is false, disable page faults to prevent potential deadlock.[2] [1] https://lore.kernel.org/all/20220813220034.806698-1-ira.weiny@intel.com/ [2] https://lkml.kernel.org/r/20221025220136.2366143-1-ira.weiny@intel.com Signed-off-by: ZhangPeng --- mm/memory.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 387226d6094d..808f354bce65 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5880,16 +5880,14 @@ long copy_huge_page_from_user(struct page *dst_page, for (i = 0; i < pages_per_huge_page; i++) { subpage = nth_page(dst_page, i); - if (allow_pagefault) - page_kaddr = kmap(subpage); - else - page_kaddr = kmap_atomic(subpage); + page_kaddr = kmap_local_page(subpage); + if (!allow_pagefault) + pagefault_disable(); rc = copy_from_user(page_kaddr, usr_src + i * PAGE_SIZE, PAGE_SIZE); - if (allow_pagefault) - kunmap(subpage); - else - kunmap_atomic(page_kaddr); + if (!allow_pagefault) + pagefault_enable(); + kunmap_local(page_kaddr); ret_val -= (PAGE_SIZE - rc); if (rc) -- 2.25.1