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 70C6BC636CC for ; Mon, 13 Feb 2023 15:55:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 183BE6B0072; Mon, 13 Feb 2023 10:55:06 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1339C6B0073; Mon, 13 Feb 2023 10:55:06 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3E446B0075; Mon, 13 Feb 2023 10:55:05 -0500 (EST) 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 E409A6B0072 for ; Mon, 13 Feb 2023 10:55:05 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B8EC5C07F9 for ; Mon, 13 Feb 2023 15:55:05 +0000 (UTC) X-FDA: 80462717370.11.401D043 Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by imf28.hostedemail.com (Postfix) with ESMTP id DD7FDC0013 for ; Mon, 13 Feb 2023 15:55:03 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=GCtIup5A; spf=pass (imf28.hostedemail.com: domain of jens.wiklander@linaro.org designates 209.85.218.45 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676303704; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Pb12TVHhTBmQoUBWGqJrq866wTmloiZUeGlXVcoFPk4=; b=735vz0GAVBTBKH/JnzFc6eIuSTwKPOk0xa9mBKZYhcuDJni314YO79XIH7BGRmp1Dt3qnh XklNx1r8uWjv/8izxHAjR+oJFvQcmpounyC2VKd06Ucpyu0Z8xeOL7e1Zt+b2aWAPWun3p ra6tK5/TKYdEI3rpInSNwpFnDaKyGsk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=linaro.org header.s=google header.b=GCtIup5A; spf=pass (imf28.hostedemail.com: domain of jens.wiklander@linaro.org designates 209.85.218.45 as permitted sender) smtp.mailfrom=jens.wiklander@linaro.org; dmarc=pass (policy=none) header.from=linaro.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676303704; a=rsa-sha256; cv=none; b=Ix4KUHhzmeQyKpUyMs488LswI0HVzqfMCNQdlQQgWfPjAzJM9NKGX2K8uqhIrMBBQvq8BH 9jpFtI4A6IpCPl/knEdogLWltrCFM0OC2X7+NjRTVjmuegOO03o4gJ5+GfOC0NiWF9wBqE brVUho5okV+HQghhoEDojZ8m/3JtCvk= Received: by mail-ej1-f45.google.com with SMTP id qw12so33049719ejc.2 for ; Mon, 13 Feb 2023 07:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=Pb12TVHhTBmQoUBWGqJrq866wTmloiZUeGlXVcoFPk4=; b=GCtIup5AQnFv/SJXGOtGB8g2XjK12qz683Tl5tUsyWknO+lQ1jPtoOEc7FBGL498tk HUJceFDqTi7COx6559CFbmd25618Y747+qBhqrWDcFmVVknD2n3VGfLj/ltzfnYA/QYu T6E6kfOUkXUid2wyA8EQSsLIZT00JnUWI5mgO3Mp/15+NsI98XL+dR+sG4u2WbMJ3+/k YNRVfYoH1VuvVZkS3QMb1tap1/QYr98liEho6NLSuO51MB/hFG522psYLMU6e+SsWYUn elLIL5csZK5DUdzK6rLE8r+zYPURwSISQLx37DY4eEvjUztIIB9WIT/W53cVUd3ZhlEL VFcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Pb12TVHhTBmQoUBWGqJrq866wTmloiZUeGlXVcoFPk4=; b=3lqfpAeDeXjIEzae6h9MVXTc8+7Ni7ENKJTreEvujV+fpgqZaRu2S2X4dV50t8jwYx DtLupWIrVnMkYEB83Z8ZBwEcx5MvXPXUybLYPBCR49pKAKeX1JlMbkF0YszTbVYcWb8Q M9rcaBp8rbj+ZcoChfBznDHfnoinNZODfvU1ILfeLdbP50xle1Ovm06RZid0K9tYFdgD nml3IO9s/RHnD8owvS+bbefxqLr2VHQ8Dj0+/kHIQGl0TO74PFEEQqvGCj/AUtpv3MKA xqgqvzl71b6/JICy2GjqyXKxYpkiU5Z084jw8tQdmZ0TJr13w/dTnAi/v3DAmGZ2ud1c gSzA== X-Gm-Message-State: AO0yUKVBxMxi0d/cN0OJRQtCBmWfRIDlfZZqnupSJP6eOxuog/DOlx7e xFxMSAKRUQrhqRBn799Tmy/CPw== X-Google-Smtp-Source: AK7set+0pq6n0aTwl+Oavu3dvKR0wuGItIJ5scypKS6u3+HcvuhdauDs4BFr4vfBpMMpApk1TYxJSg== X-Received: by 2002:a17:907:7e9d:b0:8af:2a9f:31e9 with SMTP id qb29-20020a1709077e9d00b008af2a9f31e9mr19844019ejc.31.1676303702508; Mon, 13 Feb 2023 07:55:02 -0800 (PST) Received: from jade (h-46-59-78-111.A175.priv.bahnhof.se. [46.59.78.111]) by smtp.gmail.com with ESMTPSA id u9-20020a1709060ec900b008aac35b1c2esm7057298eji.173.2023.02.13.07.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Feb 2023 07:55:02 -0800 (PST) Date: Mon, 13 Feb 2023 16:55:00 +0100 From: Jens Wiklander To: Ira Weiny Cc: Sumit Garg , Andrew Morton , Al Viro , Christoph Hellwig , linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org, linux-mm@kvack.org, "Fabio M. De Francesco" , John Hubbard , Linus Torvalds Subject: Re: [PATCH v2 3/4] tee: Remove call to get_kernel_pages() Message-ID: References: <20230203-get_kernel_pages-v2-0-f1dc4af273f1@intel.com> <20230203-get_kernel_pages-v2-3-f1dc4af273f1@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230203-get_kernel_pages-v2-3-f1dc4af273f1@intel.com> X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: 88do74ri1fttxqjqjwd8fg4khyhobtc6 X-Rspamd-Queue-Id: DD7FDC0013 X-HE-Tag: 1676303703-722285 X-HE-Meta: U2FsdGVkX1+cNoX/fIdFIYC0XISH8Z7F49o9i2Qpgs6y/UdRr6zKXz3oZtbJ7WhWE/4d7yq47ZhbX+9mzOzgHVOPxdo98RpLoiLL01IPUzrJBRq+bLaSrB4izsEwdIOa9ViVtPhrF0D3NYKmH8TPSewMR3H9F5v+2DHmW5RjSJOh4KPWWN0jZXsaW6uWTArjcjXVA5qvcUknCHNHDsZRqJ1Tud2Apfer3FN4xuj1kG1vaFMXnxx/CBU4sIsFmb39etjdAzyFoKOXDHlsJRDYyuXUESbgvh0DY48cAiudZ9OOWkCypTRF8vYaLs1RJmvkT2pp0Nbq80roml2zsDFzlWiiEGQWila25emfEZoXFdXO/67YGCQpIjtTwRmzi0d3lRDX+toV49Ei6WpwH3ZMJzopEoS8VsNvaJu4l/xoEAlvWVWld851MvRJY3ExC2doiPuHZq/ossExEyNAXbJAfQ0d4FehfRtYGaREEfXEHnCZUJiLY4pTbT0g9CNZgxfYhEmJIeuMmgOvwCe362/tmdd5T2EOVs2lWfroEtLlHwqjLeOcbxzpymiZtZg3pyJw6iLxMh0n7KGDsaiDGdj9sz4KGlXAXAOEMZgrhpW/OeV92TS4Z1EGDHuphAkgqfooi429C7AaUW9YqfaPRjbH0XUECxNoV2Sbx2xWPUDrpunWxvu+MBKWt1pUFBRBHyOdy2x7deYSOayL5M3nHzJvbr8o47vlJdm3QcDGbobLjKZ+2bQZ97+RsdALM0ea7dKXmQMDKdDOXtjLIB7+zuNjxE5W1PXS8Guj8t0yucGr3wyqVgbhZvWv2hUG+1SNN2WV0F1vHRTou73GLC81s9uMSPOAhGgs4NIAJmJII2CXChTDcNtIQd4dFrupwi70wZyf8eiEt1bMALiJiJ1925Sa72qF2BaqE4WelOWuJ9BQIre3eI9KZ1vpsfkYmqI8N6m3u/XJfIbFQdtfs6OEprc 9d9xLYl+ p26x2vofk1qN7Ztuvk0I3FfDg7IdwRFhdzOv9BxG660UNCkEvFdbGchok0TbXJTss1WVGUmq8trZB8FAPuAUVdOJo3NetZVb/aAw/NRyZvj9O6pkgpLN+/dYhnM+Cc9L4utO+z9Qlaa1PhgUDQV8QFLL56PDE6QwPe3vi8TYKbCE9rDsnnKGOoaQVs1y9Lb4Le6zoNo8W0p9jCXhW9MxFRwkSPmzXFldFF45jmWFIMh2Pd1iY1Ynu/wTWAav5Y3fCWXABZhndwKJxR+HJZLpMlK+RQeATkCn9ic9u4AHQUftB7aIuFrNO8RKNV/v92R410G3jn3OTJbVQx4b9A2hH1SGE1V+WK1zgiLv/Z068/01LMsNx1L/f6d1k46NybW893JotBILdL5eEOSXryB0n+TeN598SeEtZS+VxzAExD3AMMgQr2wZU8Ha6l7AITbYmCPIk2IJaB7Wj07J9lDKDfz78R/r1BoZo7iGrhH4xXIEwibEJ6V2cGjYFtWvDUROE9B9X3f170yjKbd9qY40qnJiO+460GjooIpS7hENOZPnq+bckRzzSD1g/FLJYqloTi2zIwQKEez+jdV/rakvldnvqsihim9dEUWPF4Np10Qbpina6hhhIGdGSbrVMTXeMdZ1D 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: On Fri, Feb 03, 2023 at 08:06:34PM -0800, Ira Weiny wrote: > 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 highmem page does slip through warn on once for a kmap'ed > address. > > Cc: Jens Wiklander > Cc: Al Viro > Cc: "Fabio M. De Francesco" > Cc: Christoph Hellwig > Cc: Linus Torvalds > Signed-off-by: Ira Weiny > > --- > Changes from v1: > Al/Christoph: Remove kiov altogether > --- > drivers/tee/tee_shm.c | 21 ++++++++------------- > 1 file changed, 8 insertions(+), 13 deletions(-) Added to https://git.linaro.org/people/jens.wiklander/linux-tee.git/log/?h=get_kernel_pages-for-v6.4 Thanks, Jens > > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c > index 527a6eabc03e..b1c6231defad 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) > @@ -24,26 +25,20 @@ 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; > + struct page *page; > 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); > - if (!kiov) > - return -ENOMEM; > - > + page = virt_to_page(start); > for (n = 0; n < page_count; n++) { > - kiov[n].iov_base = (void *)(start + n * PAGE_SIZE); > - kiov[n].iov_len = PAGE_SIZE; > + pages[n] = page + n; > + 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.39.1