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 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 Content-Transfer-Encoding: 8bit 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) -- 2.37.2