From patchwork Fri Apr 5 11:53:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Wiklander X-Patchwork-Id: 786791 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C16C96CDB7 for ; Fri, 5 Apr 2024 11:53:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712318005; cv=none; b=A5s5z31Q0hBg7vdTP+i2vV6Ah2gq1jPQ+R44SZcqLFJ956uNKbStjPcx+111QRaCEuYlarN2Hk/FjBP+xcLQaFVeM04IASDZcdpaKJvKlwSHHFKQJkvQmAVHSlWT/3HImnPo2yH2kRFBer8IWRryeEET4sFgbaX70WvBbzijpjs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712318005; c=relaxed/simple; bh=st6OGHtxua14WQRUu0pJaCaRr2YUP9IkUxcxswjQDqg=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=d3IQ/RWlgDHxzEexYql0nUhBkU0ynHqMXusKh2xqqdClH02D1matgm7qN//g8N9ycAyznJOQMyCZk72tqbIUHj+3x45Lj5aQQ2eR6qrwKYExhGCUG4r2GE/5C9oVkW8NSmkD30W+3K9Ald3d9DhXJtneZCSG03X3Zj9DNQ9EkwI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=eD8Gax3R; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eD8Gax3R" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-56c404da0ebso3133446a12.0 for ; Fri, 05 Apr 2024 04:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712318002; x=1712922802; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NxgTRf+rsWotmZhPs/Y2RjBlRvY4MoVTEYNh1q0yibI=; b=eD8Gax3R7F/4E9Tfmp5u2ap8yVMrO9yc3LP4R08tMyyeJMpzWTqMY/mwIe6LSAEhQk bwF7RdhvmeIAIWgXssbStaYHIONpc0HtWJVcf7m/q4NDhcbN4zFDC+ZVgZCjNOW5cm5C UXNAOEE4Z+tjxSlpncGhEnLYNE0b2xlyJ7Dqjr/1BauORKgQtLB/Vjz2onTnNviVjOc+ 4KssLG/gEqPSeoqi7QewnTaxRSpLzi1G6teC4oRJtThsGNznLGR28Ru+Y1i7s6yfXa0u vY4ddZslCIBCXU4xWhaZ7FguYNEAa0/5DTS0gjYTEjQDGip4GmGAHSDIcpA84eL/D5BR e+8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712318002; x=1712922802; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NxgTRf+rsWotmZhPs/Y2RjBlRvY4MoVTEYNh1q0yibI=; b=c5fG68ERiFRgIji9ZwToiEb//MQDtdIpBBPkoxmF2EDpHMhSh53lVxWnp/iqdM/nsi 9KmlI/9ZSpgdTxtCznelsJ4cBEN4tu+NJyk3yq2wGEMzSF6Oyq81eBJhTTh91wUQ/Cfw B6oQIyVH/xlw4VcViWZ/+CCL0EnpisYydsP5qmRXKP0TI3PeQ3Th6u3CGc9rC+a8UreG HM2Uv+0FRWRGzoYsSeKvBLAbh0E0msRSYVWM+fT0/RBoY+UTYjV1vWK5gqwgZGEt///L EJnqNkmbemIiA3JPZvBKN6nduKq7jFk6rrhGASoGLJsCwyo12nzZIZO3T7l/ciaHQxqT 6UtQ== X-Forwarded-Encrypted: i=1; AJvYcCW8qdSu2pPXpA0EkU+cswxp8JFJMlCmGHd92jupbJTGW4KoNaq3Ij4pesy9JQ7nKmZCOZudRV2PMX4OJwCnLHHCKfvNMb1vr6Rp X-Gm-Message-State: AOJu0YyxHizSjFQKf2mQ/1Ub58bfmAtkc/+N3bb7mp2L7dRWf/wwocaP /esIaPUW5HB450QLm0rRgkQPPkMqE0VwqhYIIeDgHcWs7XbNmTH84jwzWEJATEjR/Cj1XeMEtIP L X-Google-Smtp-Source: AGHT+IFuyIIJdxAcZ3kDoqKzoQhBqH5pqOAR9G73Q8FOkpOaft25EAZH2ghEo76vrwy52vA2jOjluA== X-Received: by 2002:a17:906:f6c3:b0:a51:a213:77df with SMTP id jo3-20020a170906f6c300b00a51a21377dfmr1124521ejb.7.1712318001955; Fri, 05 Apr 2024 04:53:21 -0700 (PDT) Received: from rayden.urgonet (h-217-31-164-171.A175.priv.bahnhof.se. [217.31.164.171]) by smtp.gmail.com with ESMTPSA id hx12-20020a170906846c00b00a51a9eccf2asm396198ejc.125.2024.04.05.04.53.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Apr 2024 04:53:21 -0700 (PDT) From: Jens Wiklander To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, op-tee@lists.trustedfirmware.org Cc: Shyam Saini , Ulf Hansson , Linus Walleij , Jerome Forissier , Sumit Garg , Ilias Apalodimas , Bart Van Assche , Randy Dunlap , Ard Biesheuvel , Arnd Bergmann , Greg Kroah-Hartman , Jens Wiklander Subject: [PATCH v4 0/3] Replay Protected Memory Block (RPMB) subsystem Date: Fri, 5 Apr 2024 13:53:15 +0200 Message-Id: <20240405115318.904143-1-jens.wiklander@linaro.org> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-mmc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi, This patch set introduces a new RPMB subsystem, based on patches from [1], [2], and [3]. The RPMB subsystem aims at providing access to RPMB partitions to other kernel drivers, in particular the OP-TEE driver. A new user space ABI isn't needed, we can instead continue using the already present ABI when writing the RPMB key during production. I've added and removed things to keep only what is needed by the OP-TEE driver. Since the posting of [3], there has been major changes in the MMC subsystem so "mmc: block: register RPMB partition with the RPMB subsystem" is in practice completely rewritten. With this OP-TEE can access RPMB during early boot instead of having to wait for user space to become available as in the current design [4]. This will benefit the efi variables [5] since we wont rely on userspace as well as some TPM issues [6] that were solved. The OP-TEE driver finds the correct RPMB device to interact with by iterating over available devices until one is found with a programmed authentication matching the one OP-TEE is using. This enables coexisting users of other RPMBs since the owner can be determined by who knows the authentication key. The corresponding secure world OP-TEE patches are available at [7]. I've put myself as a maintainer for the RPMB subsystem as I have an interest in the OP-TEE driver to keep this in good shape. However, if you'd rather see someone else taking the maintainership that's fine too. I'll help keep the subsystem updated regardless. [1] https://lore.kernel.org/lkml/20230722014037.42647-1-shyamsaini@linux.microsoft.com/ [2] https://lore.kernel.org/lkml/20220405093759.1126835-2-alex.bennee@linaro.org/ [3] https://lore.kernel.org/linux-mmc/1478548394-8184-2-git-send-email-tomas.winkler@intel.com/ [4] https://optee.readthedocs.io/en/latest/architecture/secure_storage.html#rpmb-secure-storage [5] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c44b6be62e8dd4ee0a308c36a70620613e6fc55f [6] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7269cba53d906cf257c139d3b3a53ad272176bca [7] https://github.com/jenswi-linaro/optee_os/tree/rpmb_probe Thanks, Jens Changes since v3: * Move struct rpmb_frame into the MMC driver since the format of the RPMB frames depend on the implementation, one format for eMMC, another for UFS, and so on * "rpmb: add Replay Protected Memory Block (RPMB) subsystem" - Adding Reviewed-by: Linus Walleij - Adding more description of the API functions - Removing the set_dev_info() op from struct rpmb_ops, the needed information is supplied in the arguments to rpmb_dev_register() instead. - Getting rid of struct rpmb_ops since only the route_frames() op was remaining, store that op directly in struct rpmb_dev - Changed rpmb_interface_register() and rpmb_interface_unregister() to use notifier_block instead of implementing the same thing ourselves * "mmc: block: register RPMB partition with the RPMB subsystem" - Moving the call to rpmb_dev_register() to be done at the end of mmc_blk_probe() when the device is fully available * "optee: probe RPMB device using RPMB subsystem" - Use IS_REACHABLE(CONFIG_RPMB) to determine if the RPMB subsystem is available - Translate TEE_ERROR_STORAGE_NOT_AVAILABLE if encountered in get_devices() to recognize the error in optee_rpmb_scan() - Simplified optee_rpmb_scan() and optee_rpmb_intf_rdev() Changes since v2: * "rpmb: add Replay Protected Memory Block (RPMB) subsystem" - Fixing documentation issues - Adding a "depends on MMC" in the Kconfig - Removed the class-device and the embedded device, struct rpmb_dev now relies on the parent device for reference counting as requested - Removed the now unneeded rpmb_ops get_resources() and put_resources() since references are already taken in mmc_blk_alloc_rpmb_part() before rpmb_dev_register() is called - Added rpmb_interface_{,un}register() now that class_interface_{,un}register() can't be used ay longer * "mmc: block: register RPMB partition with the RPMB subsystem" - Adding the missing error cleanup in alloc_idata() - Taking the needed reference to md->disk in mmc_blk_alloc_rpmb_part() instead of in mmc_rpmb_chrdev_open() and rpmb_op_mmc_get_resources() * "optee: probe RPMB device using RPMB subsystem" - Registering to get a notification when an RPMB device comes online - Probes for RPMB devices each time an RPMB device comes online, until a usable device is found - When a usable RPMB device is found, call optee_enumerate_devices(PTA_CMD_GET_DEVICES_RPMB) - Pass type of rpmb in return value from OPTEE_RPC_CMD_RPMB_PROBE_NEXT Changes since Shyam's RFC: * Removed the remaining leftover rpmb_cdev_*() function calls * Refactored the struct rpmb_ops with all the previous ops replaced, in some sense closer to [3] with the route_frames() op * Added rpmb_route_frames() * Added struct rpmb_frame, enum rpmb_op_result, and enum rpmb_type from [3] * Removed all functions not needed in the OP-TEE use case * Added "mmc: block: register RPMB partition with the RPMB subsystem", based on the commit with the same name in [3] * Added "optee: probe RPMB device using RPMB subsystem" for integration with OP-TEE * Moved the RPMB driver into drivers/misc/rpmb-core.c * Added my name to MODULE_AUTHOR() in rpmb-core.c * Added an rpmb_mutex to serialize access to the IDA * Removed the target parameter from all rpmb_*() functions since it's currently unused Jens Wiklander (3): rpmb: add Replay Protected Memory Block (RPMB) subsystem mmc: block: register RPMB partition with the RPMB subsystem optee: probe RPMB device using RPMB subsystem MAINTAINERS | 7 + drivers/misc/Kconfig | 10 ++ drivers/misc/Makefile | 1 + drivers/misc/rpmb-core.c | 232 +++++++++++++++++++++++++++++ drivers/mmc/core/block.c | 230 ++++++++++++++++++++++++++++- drivers/tee/optee/core.c | 30 ++++ drivers/tee/optee/device.c | 7 + drivers/tee/optee/ffa_abi.c | 8 + drivers/tee/optee/optee_private.h | 21 ++- drivers/tee/optee/optee_rpc_cmd.h | 35 +++++ drivers/tee/optee/rpc.c | 233 ++++++++++++++++++++++++++++++ drivers/tee/optee/smc_abi.c | 7 + include/linux/rpmb.h | 136 +++++++++++++++++ 13 files changed, 954 insertions(+), 3 deletions(-) create mode 100644 drivers/misc/rpmb-core.c create mode 100644 include/linux/rpmb.h