From patchwork Sun Oct 2 00:23:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12996704 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 D7E61C4332F for ; Sun, 2 Oct 2022 00:23:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D5DF6B0073; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6AD978D0003; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4FE236B0075; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 421096B0073 for ; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id F0F06C038A for ; Sun, 2 Oct 2022 00:23:32 +0000 (UTC) X-FDA: 79974110664.27.2C9CE1B Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf19.hostedemail.com (Postfix) with ESMTP id 4FCDE1A000D for ; Sun, 2 Oct 2022 00:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664670212; x=1696206212; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LtFIt5FTKyNGfjeUxeseV6vRVd/REofNRZov49L9ZaM=; b=kif2ZEiKGs7rUmcqLpIMiWE0DvB0S31ASgUrYjvhfj4S64fW6m28lty9 8D/UtccRlsMAna/aiBM8xB3HAHVZ5GdoGNwSa7L8dix9tpnlP3zGgQy/e EgixPefzQw7K8zULBgjeGNhQd0LFWxpleFRCWtCvZIUr0MxTJD5r2tsbN QGnZ5anhCAGqukpcPb2XW+x2tX/wZRmsOIHCfrIvE9U5BOz6FmF6qpM/W FwJyO7cxyDZC9NfTef/2ACma0rykrlqC4GXXk2tz3OXmX/GkteZEX8BEh rMoWEiz3Uw1lepoBA+jrm7eSUm1a05HWGACZGI/TxLJ897V3+rqZzuXd0 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="303336307" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="303336307" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:30 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="656347031" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="656347031" Received: from iweiny-desk3.amr.corp.intel.com (HELO localhost) ([10.213.181.73]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:30 -0700 From: ira.weiny@intel.com To: Jens Wiklander , Sumit Garg , Andrew Morton Cc: Ira Weiny , Matthew Wilcox , Al Viro , "Fabio M. De Francesco" , Thomas Gleixner , Christoph Hellwig , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/4] highmem: Enhance is_kmap_addr() to check kmap_local_page() mappings Date: Sat, 1 Oct 2022 17:23:23 -0700 Message-Id: <20221002002326.946620-2-ira.weiny@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com> References: <20221002002326.946620-1-ira.weiny@intel.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664670212; 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=Xj6V+c3LASn12cdkhFeN+XK3j+6kzYSw+TcgxWQJNMA=; b=hJCQ3nss4cpugX3YTE/O1IwQ+ZZVJSEp+e1b4VfpoObIBsZ1kTCaKggEKk7ob9MDSezT1m jjIh5UAjTm1RavIasbGG2NJvbwBaZISZ21bct4V9SWkvB4WuDN1kZJzjlLWFwfIfHh/2sP L72Q10pDr5KMUf31EhoVZhJCAQKD+Y8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=kif2ZEiK; spf=pass (imf19.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664670212; a=rsa-sha256; cv=none; b=gjGSp5m80kpNgrAsnK5IV9m3WflIPC15n7+MCuWRnzXiixiPtxqWk0PNE2rLWA6DDFzmpI +/ycRyfhSieD8t5+d/Z4g+EYcwyWbXblko6nOP91x/iFMVVjrGttGgAWJZRhvhodNDafv+ gNwtLfSfUbj72weOHQDPRt4DBu5VHuA= X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 4FCDE1A000D Authentication-Results: imf19.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=kif2ZEiK; spf=pass (imf19.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Stat-Signature: 1ntmp71fo3w8dgnwkjzt4wk5cdggczk4 X-HE-Tag: 1664670212-958820 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: Ira Weiny is_kmap_addr() is only looking at the kmap() address range which may cause check_heap_object() to miss checking an overflow on a kmap_local_page() page. Add a check for the kmap_local_page() address range to is_kmap_addr(). Cc: Matthew Wilcox Cc: Al Viro Cc: "Fabio M. De Francesco" Cc: Thomas Gleixner Cc: Christoph Hellwig Cc: Andrew Morton Signed-off-by: Ira Weiny --- include/linux/highmem-internal.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/highmem-internal.h b/include/linux/highmem-internal.h index 034b1106d022..5fd5cb58f109 100644 --- a/include/linux/highmem-internal.h +++ b/include/linux/highmem-internal.h @@ -152,7 +152,10 @@ static inline void totalhigh_pages_add(long count) static inline bool is_kmap_addr(const void *x) { unsigned long addr = (unsigned long)x; - return addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP); + + return (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) || + (addr >= __fix_to_virt(FIX_KMAP_END) && + addr < __fix_to_virt(FIX_KMAP_BEGIN)); } #else /* CONFIG_HIGHMEM */ From patchwork Sun Oct 2 00:23:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12996705 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 784F7C43217 for ; Sun, 2 Oct 2022 00:23:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BE00C8D0002; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B8E8B6B0075; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A585E8D0002; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 7764C6B0074 for ; Sat, 1 Oct 2022 20:23:33 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4DEB2140121 for ; Sun, 2 Oct 2022 00:23:33 +0000 (UTC) X-FDA: 79974110706.30.A223B1C Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf03.hostedemail.com (Postfix) with ESMTP id C67B120002 for ; Sun, 2 Oct 2022 00:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664670212; x=1696206212; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=eSTT9RCqaAKsDAKHEpxgRwFsvLUWOLIZHfpn9oZ87V8=; b=PKkmlvFvARDlMFc1wqs+EBfozyiCC3NJ746ywLwREZBjdnIn4w0xl9JB QL4GIE/nuCwMdoQaZLFl5mBmf8hqTzKcTxIAvX5NA+S6wPScD2F6gRQDC mnnHNEnPPrEBG03UzujovnPjcJeL+R+SM3RcyXld8xaTylfd2chVXjivi 9TzMBPpRCBxov/i5gZGqGseD2gzUs9/ICjOUYJY4fcrOKBSIMET0DRWnA iMa0C/xjpRYZ6GaVbbd+TM1G7WEFwYvJJBeS8wAxSbltuvRtHj93bTV8h mJmWibPiJR5fzu/0VgzZdXCOttPDD7pyrWpemHw/X2Q31mSQtfkA/H+Ac g==; X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="303336308" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="303336308" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:32 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="656347038" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="656347038" Received: from iweiny-desk3.amr.corp.intel.com (HELO localhost) ([10.213.181.73]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:31 -0700 From: ira.weiny@intel.com To: Jens Wiklander , Sumit Garg , Andrew Morton Cc: Ira Weiny , Al Viro , "Fabio M. De Francesco" , Christoph Hellwig , Linus Torvalds , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/4] tee: Remove vmalloc page support Date: Sat, 1 Oct 2022 17:23:24 -0700 Message-Id: <20221002002326.946620-3-ira.weiny@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com> References: <20221002002326.946620-1-ira.weiny@intel.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664670213; 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=6M8BnQwKiAh4H7hkE7Tr1T+bve46bp7bpKlNRsJ+3VU=; b=ziBJWAXHLO3NgXYMviolWgRxplmiogWJl/HUaDJ5ccYmHH9ISqNysSoXLmVBZynoQFL63f Ol4hTPV51n5MFmsmoKIHEhRjreHV2Pt6K5omrQ7FDQDyIXFkaHQu5hGOUssXsdl+srSfu9 R3Du9gs3DG8e9mP8N98q7xoSmPWyGZM= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=PKkmlvFv; spf=pass (imf03.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664670213; a=rsa-sha256; cv=none; b=bl355UKuwzGnHs5xTPbYAwXIL0ByME6dlTQ+NCDGUiFgpv3bXUfJK6NHBehWHnKPOJMusf LIw0vZJritD+k3UsP+0zZV6MdcnY4+blIdfoSWxIElXTa/PMc4hqfIPiFkXuOLL3Pqt7xg pIaJ8cREPB5EAyHJ+uPgHGNEVaE9TSw= X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: C67B120002 Authentication-Results: imf03.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=PKkmlvFv; spf=pass (imf03.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com; dmarc=pass (policy=none) header.from=intel.com X-Stat-Signature: xpcknbp571tppp8pdieqmdo88abxj3ch X-HE-Tag: 1664670212-266300 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: Ira Weiny The kernel pages used by shm_get_kernel_pages() are allocated using GFP_KERNEL through the following call stack: trusted_instantiate() trusted_payload_alloc() -> GFP_KERNEL tee_shm_register_kernel_buf() register_shm_helper() shm_get_kernel_pages() Where is one of: trusted_key_unseal() trusted_key_get_random() trusted_key_seal() Remove the vmalloc page support from shm_get_kernel_pages(). Replace with a warn on once. Cc: Jens Wiklander Cc: Al Viro Cc: "Fabio M. De Francesco" Cc: Christoph Hellwig Cc: Linus Torvalds Signed-off-by: Ira Weiny Reviewed-by: Jens Wiklander --- Jens I went with the suggestion from Linus and Christoph and rejected vmalloc addresses. I did not hear back from you regarding Linus' question if the vmalloc page support was required by an up coming patch set or not. So I assumed it was something out of tree. --- drivers/tee/tee_shm.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 27295bda3e0b..527a6eabc03e 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -24,37 +24,25 @@ static void shm_put_kernel_pages(struct page **pages, size_t page_count) static int shm_get_kernel_pages(unsigned long start, size_t page_count, struct page **pages) { + struct kvec *kiov; size_t n; int rc; - if (is_vmalloc_addr((void *)start)) { - struct page *page; - - for (n = 0; n < page_count; n++) { - page = vmalloc_to_page((void *)(start + PAGE_SIZE * n)); - if (!page) - return -ENOMEM; - - get_page(page); - pages[n] = page; - } - rc = page_count; - } else { - struct kvec *kiov; - - kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); - if (!kiov) - return -ENOMEM; + if (WARN_ON_ONCE(is_vmalloc_addr((void *)start))) + return -EINVAL; - for (n = 0; n < page_count; n++) { - kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); - kiov[n].iov_len = PAGE_SIZE; - } + kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); + if (!kiov) + return -ENOMEM; - rc = get_kernel_pages(kiov, page_count, 0, pages); - kfree(kiov); + for (n = 0; n < page_count; n++) { + kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); + kiov[n].iov_len = PAGE_SIZE; } + rc = get_kernel_pages(kiov, page_count, 0, pages); + kfree(kiov); + return rc; } From patchwork Sun Oct 2 00:23:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12996706 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 74186C4332F for ; Sun, 2 Oct 2022 00:23:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9E5286B007B; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9935D6B0075; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 810468D0003; Sat, 1 Oct 2022 20:23:35 -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 E50CF6B0074 for ; Sat, 1 Oct 2022 20:23:34 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BCF02AAE86 for ; Sun, 2 Oct 2022 00:23:34 +0000 (UTC) X-FDA: 79974110748.17.9A52B56 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf10.hostedemail.com (Postfix) with ESMTP id 4AB2CC000C for ; Sun, 2 Oct 2022 00:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664670214; x=1696206214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rnaezL/AbXrdYNjWPYKIXI3BC43DB1DUbdzw9KizDgQ=; b=oJBdKOCMB3iPCXkp004cYPKMrqdm2EcVzH0yEoPpGmDraP45aTEx2fYW rdQofLKztpNq8jcWgpN3VPuUJyhvZJ0n4/yUrA1M0tV5KBqzvWngPijXd xf1H49fdb2Yo4nykv2fq0/n7+EQFxGTva1pWixwLqsrjgA+jbA2VcQNap /KqsKX6AlIiDlPI+Uxss8hr9cRkdj11H+rmGhZMKu11bLMN1gV00Urqmn C5n67OHCjEvLy5B3JtMJvjHWOu50fXRXc1EfMRsJqSazZHV2dnJnlrYqp Wn/eayPCYxT4mNdBlOicSaEevNPc2fXs92gC/96rP54lQ0DKrrZizEgxY g==; X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="303336309" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="303336309" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:33 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="656347042" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="656347042" Received: from iweiny-desk3.amr.corp.intel.com (HELO localhost) ([10.213.181.73]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:32 -0700 From: ira.weiny@intel.com To: Jens Wiklander , Sumit Garg , Andrew Morton Cc: Ira Weiny , Al Viro , "Fabio M. De Francesco" , Christoph Hellwig , Linus Torvalds , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/4] tee: Remove call to get_kernel_pages() Date: Sat, 1 Oct 2022 17:23:25 -0700 Message-Id: <20221002002326.946620-4-ira.weiny@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com> References: <20221002002326.946620-1-ira.weiny@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664670214; a=rsa-sha256; cv=none; b=uMlWAoOghvJ4hAjhulqKl8ZKjBtzRVquo7WBp09z6yIUzJ+HXnGpUuyUyaSqej74oBO4Sx Cb0CG3YvDRabPg+qo8ke5wJkNa+5+bWo0OMUOi4fRl0SGbLg7H1fvWeEXcRxQfxh/7+BYq kYu/m6zmFJxnff2Zsbj6lDgnI1GWEik= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=oJBdKOCM; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664670214; 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=LOfIDy9MSFQjSDIrL0UkxDVym15aIM2xqJjgOVeVF+I=; b=3tPgTY9M8v7mrKTrqWSVJCvQ6TVGr870S0J0NxOqKUARSdfX1aSMKoSFPiddZbG5PBNzm8 XWQ+lQHe7zj6H9ImxufYFC7lDFXGoGZur5MsLechILUVXCl4I4+VE0Y7CHNFkKG3/S/Vwf iPSWMO7/Hz4wpFWYBC/9lVQBixL1iRw= X-Rspamd-Queue-Id: 4AB2CC000C X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=oJBdKOCM; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com X-Rspamd-Server: rspam03 X-Stat-Signature: uwt13egwbotci5k7cyczncgm6noc98bi X-HE-Tag: 1664670214-666021 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: Ira Weiny The kernel pages used by shm_get_kernel_pages() are allocated using GFP_KERNEL through the following call stack: trusted_instantiate() trusted_payload_alloc() -> GFP_KERNEL tee_shm_register_kernel_buf() register_shm_helper() shm_get_kernel_pages() Where is one of: trusted_key_unseal() trusted_key_get_random() trusted_key_seal() Because the pages can't be from highmem get_kernel_pages() boils down to a get_page() call. Remove the get_kernel_pages() call and open code the get_page(). In case a kmap page does slip through warn on once for a kmap address. Cc: Jens Wiklander Cc: Al Viro Cc: "Fabio M. De Francesco" Cc: Christoph Hellwig Cc: Linus Torvalds Signed-off-by: Ira Weiny --- drivers/tee/tee_shm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c index 527a6eabc03e..45e6ff1a452e 100644 --- a/drivers/tee/tee_shm.c +++ b/drivers/tee/tee_shm.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "tee_private.h" static void shm_put_kernel_pages(struct page **pages, size_t page_count) @@ -26,9 +27,9 @@ static int shm_get_kernel_pages(unsigned long start, size_t page_count, { struct kvec *kiov; size_t n; - int rc; - if (WARN_ON_ONCE(is_vmalloc_addr((void *)start))) + if (WARN_ON_ONCE(is_vmalloc_addr((void *)start) || + is_kmap_addr((void *)start))) return -EINVAL; kiov = kcalloc(page_count, sizeof(*kiov), GFP_KERNEL); @@ -38,12 +39,12 @@ static int shm_get_kernel_pages(unsigned long start, size_t page_count, for (n = 0; n < page_count; n++) { kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); kiov[n].iov_len = PAGE_SIZE; + pages[n] = virt_to_page(kiov[n].iov_base); + get_page(pages[n]); } - - rc = get_kernel_pages(kiov, page_count, 0, pages); kfree(kiov); - return rc; + return page_count; } static void release_registered_pages(struct tee_shm *shm) From patchwork Sun Oct 2 00:23:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 12996707 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 3F1C3C433F5 for ; Sun, 2 Oct 2022 00:23:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7B716B0074; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C29338D0001; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9E4106B0074; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) 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 7142A8D0001 for ; Sat, 1 Oct 2022 20:23:35 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3FDC3AAC84 for ; Sun, 2 Oct 2022 00:23:35 +0000 (UTC) X-FDA: 79974110790.13.ACD98DF Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf10.hostedemail.com (Postfix) with ESMTP id C99D7C000B for ; Sun, 2 Oct 2022 00:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1664670214; x=1696206214; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CCJ9DvVnhSMgehlzBf8ksWsMMNT3cd5lyxVwLoYRSKQ=; b=lA9NuNnPPl70q6h+v+8Y95Pts7Ag9V5ob11eSsbInw9J9aPTduw5dcB9 C+gcER2WXKVkGJGBZdfsIk2KJeRNFPHcPKcPl6mqLMUGuWwLKc4ZS74Km /F6zaBvf//85wqelyVkGnr6ECfQmOOmAq4zTtqZiBozPW0q+KQfejppRS o61YhMq63+XIR8YfcxwpdEmYm/S3EzlLZ0zsQssRJqZyTO0B12CaVAiQi Evfc9nph4WRONJnPRRwWA0L+28HLRXcF6cXLgAq4zD2YI+2wvBf7o90mY cpRIEuAwWVPhhKxIF4wxvoiRBJ0MTDnckDgWIxfsTi65u9nUTIP7YxA6Z g==; X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="303336312" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="303336312" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:34 -0700 X-IronPort-AV: E=McAfee;i="6500,9779,10487"; a="656347047" X-IronPort-AV: E=Sophos;i="5.93,361,1654585200"; d="scan'208";a="656347047" Received: from iweiny-desk3.amr.corp.intel.com (HELO localhost) ([10.213.181.73]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2022 17:23:33 -0700 From: ira.weiny@intel.com To: Jens Wiklander , Sumit Garg , Andrew Morton Cc: Ira Weiny , Mel Gorman , Al Viro , "Fabio M. De Francesco" , Christoph Hellwig , op-tee@lists.trustedfirmware.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm: Remove get_kernel_pages() Date: Sat, 1 Oct 2022 17:23:26 -0700 Message-Id: <20221002002326.946620-5-ira.weiny@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221002002326.946620-1-ira.weiny@intel.com> References: <20221002002326.946620-1-ira.weiny@intel.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664670215; a=rsa-sha256; cv=none; b=ZCcKQWkGA1NGeBiTHEiTvG33rHiU+0CB+DlGl89kWU4LPmxba4TNW3XzW5MdnqUvUC3kgp 6G7EydwAA43JR+JXXXjAOYxhX42yt0sP2mY0WLfkgNxhvrH/Zn+aQnXKqarWJbShCm9VE4 fDi44AfNXb0hwXcDlzz4geBg0v00ldw= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=lA9NuNnP; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664670215; 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=cXIu/0O2T1sMOIhjSWPecHQ1A43hKrebsK5MyvzrS+Y=; b=Wm01hpr6l1BSF0JSZCBK3crTDjBs8gvjpRxTPQ9/0gp6eivbQWhk82BHawjNUfOpPcmKp+ fBJ8B1XawuSvDJXVOgw/rcBihxsK41UoAKUiikqUhESOneMRdmZUOAV9uhETKk6m89pOVY mw7YpDm6t1U/6DhBGWjudCzQgVTRyHg= X-Rspamd-Queue-Id: C99D7C000B X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=none ("invalid DKIM record") header.d=intel.com header.s=Intel header.b=lA9NuNnP; dmarc=pass (policy=none) header.from=intel.com; spf=pass (imf10.hostedemail.com: domain of ira.weiny@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ira.weiny@intel.com X-Rspamd-Server: rspam03 X-Stat-Signature: ycfhkdsg9ts4875f5schfjwk4z6419xe X-HE-Tag: 1664670214-503014 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: Ira Weiny The only caller to get_kernel_pages() [shm_get_kernel_pages()] has been updated to not need it. Remove get_kernel_pages(). Cc: Mel Gorman Cc: Al Viro Cc: "Fabio M. De Francesco" Cc: Christoph Hellwig Cc: Andrew Morton Signed-off-by: Ira Weiny Acked-by: John Hubbard --- include/linux/mm.h | 2 -- mm/swap.c | 30 ------------------------------ 2 files changed, 32 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 8bbcccbc5565..9a06df4f057c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1969,8 +1969,6 @@ int __account_locked_vm(struct mm_struct *mm, unsigned long pages, bool inc, struct task_struct *task, bool bypass_rlim); struct kvec; -int get_kernel_pages(const struct kvec *iov, int nr_pages, int write, - struct page **pages); struct page *get_dump_page(unsigned long addr); bool folio_mark_dirty(struct folio *folio); diff --git a/mm/swap.c b/mm/swap.c index 955930f41d20..a9aa648eb0d0 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -157,36 +157,6 @@ void put_pages_list(struct list_head *pages) } EXPORT_SYMBOL(put_pages_list); -/* - * get_kernel_pages() - pin kernel pages in memory - * @kiov: An array of struct kvec structures - * @nr_segs: number of segments to pin - * @write: pinning for read/write, currently ignored - * @pages: array that receives pointers to the pages pinned. - * Should be at least nr_segs long. - * - * Returns number of pages pinned. This may be fewer than the number requested. - * If nr_segs is 0 or negative, returns 0. If no pages were pinned, returns 0. - * Each page returned must be released with a put_page() call when it is - * finished with. - */ -int get_kernel_pages(const struct kvec *kiov, int nr_segs, int write, - struct page **pages) -{ - int seg; - - for (seg = 0; seg < nr_segs; seg++) { - if (WARN_ON(kiov[seg].iov_len != PAGE_SIZE)) - return seg; - - pages[seg] = kmap_to_page(kiov[seg].iov_base); - get_page(pages[seg]); - } - - return seg; -} -EXPORT_SYMBOL_GPL(get_kernel_pages); - typedef void (*move_fn_t)(struct lruvec *lruvec, struct folio *folio); static void lru_add_fn(struct lruvec *lruvec, struct folio *folio)