From patchwork Tue Mar 11 10:01:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Garzarella X-Patchwork-Id: 14011429 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF1C0231A24 for ; Tue, 11 Mar 2025 10:01:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741687314; cv=none; b=nJuPEwyUSsadpf94auCB9zpARCzuoIHkjZEGDIhp29izvkk8kGR7xOAVdO412RP+tNf0LkeGmai+lI0uZzJyBC9MJa88XI2a9bg4j1RfjZ7v0pNlXjX2+E43U5Fsozrdaey7FyUvPJ07VCEKRW0cg4k/4KyjQCH31E1jIHqPHvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741687314; c=relaxed/simple; bh=Jm2/ux1vKHax2qopOtD5cqQYVayOaqNeh+rZVk6cOwM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MX1HE5xWA3E0aKaWU9wgNuX2Fuzgpbz72ikqBrnuKNUNzpH27zYt5ZwTFi5dHRqam96PqhLZaIl5oyMzqZKDm9SqYWE/umV53OQuK3yxjWQYLU1RYQ29xwWRsUFz6kT13YHCp40osW7EQOy0f6ERbXGNRCvZLgV4q03lPZ6Qsxc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GZ6wp+tB; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GZ6wp+tB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741687312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KPPKTGvTQZd77Cs+WjdLnlEj4HAhCixTZCeAE7Dlt2w=; b=GZ6wp+tBjnV7bd4i6Q4NEZ1cRfKUNZP4YaDUJ2/1v9r1/ViJi15xOLUhVGlkQRHTsArWwb 1EeDX5zdpUzFo6o1fTDRLZFf54cFaOZZz/hw+ltFYBLjWNbYhJ70syVKspO/wXG9vU2fgR uoG+hHoVVusdQZiUZ5TOAnbm9ttrfdA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-672-JQLKiP5jOh6SvwSr00XTgA-1; Tue, 11 Mar 2025 06:01:50 -0400 X-MC-Unique: JQLKiP5jOh6SvwSr00XTgA-1 X-Mimecast-MFC-AGG-ID: JQLKiP5jOh6SvwSr00XTgA_1741687309 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ac297c7a0c2so175327366b.3 for ; Tue, 11 Mar 2025 03:01:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741687309; x=1742292109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KPPKTGvTQZd77Cs+WjdLnlEj4HAhCixTZCeAE7Dlt2w=; b=HF1v5TtA5NsuuR4RE8JMaggAOveHPtnKy0jPKLHl3kxz7eHH3ndD9rqj7PTlHOx6nL 8pnNVWStDuVvRHlZPMUH2bJW7jz5O5Xrhxmwkv3LU6qOf8jjix4aHI0+ACqa0f51RCio Xw29+Fl48a/uoMffgYigFxnILL4ptnO1sMEaUnWeyM5dCzXnTCmiu2uG8kvaFl5aKtKf +Ip/zs0w6zoOi14BiF+0+a3ji0l2GBAMGICxwxcE1lPzrR6SP4Fmns8B68TPZv+bxTjK 00Omu/v8Cqy+PJXmZcwWAZwNv1Hc9Yc724w3Eh7CILgNWh2ShGg7QeQNYQoQ4EsadpOR vdHA== X-Gm-Message-State: AOJu0YykNZBNXLttyvpTsIvuTKvFGDWR3KaD+nCQhtqNrLtzc3qu5jwP 2R0J86u8a7klRPHaYJbR7HRNpwYUOAHtA/ETnwIw3Sqq7iTjBQJ4FaMsWqObKucNCidQu/w8IjD 9f52TYk2Y/+WXDA8f3XzAfJ8oAkUEtY8xzKJWg5VRYYewmED5+w3ma8pAEbhBKNxYJw== X-Gm-Gg: ASbGnctdKEBArANkQbVr52vVKkvXpA8oyZCkVKTH0eo6GqlM9y8Vd2gDtRYfQHvCJaa Zj3P3sjS5VKlgiqr3NnMjjnMAtuaUXGx61ovJVHyt0DyNUUbelN6oc9i3uWMSU2w36/tywTioQA DxFF5BMch5HnAUlYkNzrxoMOpXz28GRiwoS9BWQ7VQ3OLLx2AtVoNczVixW07XMhEibbKIeuQmh 6zJOIg1jScA+GAeBtxYcVZ/Dxqz15gtK7mcf3iMx/WRd7z0PcNYRA93wPh8fXbqoUovcGZw4VmQ 4ephEoC2cWM8BPM8FN3QX3Zfhe1JdGnY6vVo8t17XnkA5HFT43C+ss8wkQ7ukB3P9TuIE+u8 X-Received: by 2002:a17:907:7213:b0:abf:6f87:c732 with SMTP id a640c23a62f3a-ac2b9de96d4mr330695166b.20.1741687309277; Tue, 11 Mar 2025 03:01:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEbKu5HMA42qiS6MJ30Na3MKSdLChwgJ/VZYOOUxT/L4wbU6L/bdxGQ/p9i7lzsXp61vSa7QA== X-Received: by 2002:a17:907:7213:b0:abf:6f87:c732 with SMTP id a640c23a62f3a-ac2b9de96d4mr330685666b.20.1741687308530; Tue, 11 Mar 2025 03:01:48 -0700 (PDT) Received: from localhost.localdomain (host-79-46-200-29.retail.telecomitalia.it. [79.46.200.29]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac296527b70sm382964466b.58.2025.03.11.03.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Mar 2025 03:01:47 -0700 (PDT) From: Stefano Garzarella To: Jarkko Sakkinen Cc: linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, James Bottomley , Peter Huewe , Jason Gunthorpe , Stefano Garzarella Subject: [RFC PATCH 2/3] tpm/tpm_ftpm_tee: use send_recv() op Date: Tue, 11 Mar 2025 11:01:29 +0100 Message-ID: <20250311100130.42169-3-sgarzare@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250311100130.42169-1-sgarzare@redhat.com> References: <20250311100130.42169-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This driver does not support interrupts, and receiving the response is synchronous with sending the command. It used an internal buffer to cache the response when .send() is called, and then return it when .recv() is called. Let's simplify the driver by implementing the new send_recv() op, so that we can also remove the 4KB internal buffer used to cache the response. Signed-off-by: Stefano Garzarella Tested-by: Jens Wiklander --- Note: I don't know how to test this driver, so I just build it. If someone can test it, or tell me how to do, it will be great! --- drivers/char/tpm/tpm_ftpm_tee.h | 4 -- drivers/char/tpm/tpm_ftpm_tee.c | 86 ++++++++------------------------- 2 files changed, 21 insertions(+), 69 deletions(-) diff --git a/drivers/char/tpm/tpm_ftpm_tee.h b/drivers/char/tpm/tpm_ftpm_tee.h index f98daa7bf68c..72b2f5c41274 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.h +++ b/drivers/char/tpm/tpm_ftpm_tee.h @@ -23,16 +23,12 @@ * @chip: struct tpm_chip instance registered with tpm framework. * @state: internal state * @session: fTPM TA session identifier. - * @resp_len: cached response buffer length. - * @resp_buf: cached response buffer. * @ctx: TEE context handler. * @shm: Memory pool shared with fTPM TA in TEE. */ struct ftpm_tee_private { struct tpm_chip *chip; u32 session; - size_t resp_len; - u8 resp_buf[MAX_RESPONSE_SIZE]; struct tee_context *ctx; struct tee_shm *shm; }; diff --git a/drivers/char/tpm/tpm_ftpm_tee.c b/drivers/char/tpm/tpm_ftpm_tee.c index 139556b21cc6..f0393d843780 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.c +++ b/drivers/char/tpm/tpm_ftpm_tee.c @@ -31,45 +31,19 @@ static const uuid_t ftpm_ta_uuid = 0x82, 0xCB, 0x34, 0x3F, 0xB7, 0xF3, 0x78, 0x96); /** - * ftpm_tee_tpm_op_recv() - retrieve fTPM response. - * @chip: the tpm_chip description as specified in driver/char/tpm/tpm.h. - * @buf: the buffer to store data. - * @count: the number of bytes to read. - * - * Return: - * In case of success the number of bytes received. - * On failure, -errno. - */ -static int ftpm_tee_tpm_op_recv(struct tpm_chip *chip, u8 *buf, size_t count) -{ - struct ftpm_tee_private *pvt_data = dev_get_drvdata(chip->dev.parent); - size_t len; - - len = pvt_data->resp_len; - if (count < len) { - dev_err(&chip->dev, - "%s: Invalid size in recv: count=%zd, resp_len=%zd\n", - __func__, count, len); - return -EIO; - } - - memcpy(buf, pvt_data->resp_buf, len); - pvt_data->resp_len = 0; - - return len; -} - -/** - * ftpm_tee_tpm_op_send() - send TPM commands through the TEE shared memory. + * ftpm_tee_tpm_op_send_recv() - send TPM commands through the TEE shared memory + * and retrieve the response. * @chip: the tpm_chip description as specified in driver/char/tpm/tpm.h - * @buf: the buffer to send. - * @len: the number of bytes to send. + * @buf: the buffer to send and to store the response. + * @buf_len: the size of the buffer. + * @cmd_len: the number of bytes to send. * * Return: - * In case of success, returns 0. + * In case of success, returns the number of bytes received. * On failure, -errno */ -static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len) +static int ftpm_tee_tpm_op_send_recv(struct tpm_chip *chip, u8 *buf, + size_t buf_len, size_t cmd_len) { struct ftpm_tee_private *pvt_data = dev_get_drvdata(chip->dev.parent); size_t resp_len; @@ -80,16 +54,15 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len) struct tee_param command_params[4]; struct tee_shm *shm = pvt_data->shm; - if (len > MAX_COMMAND_SIZE) { + if (cmd_len > MAX_COMMAND_SIZE) { dev_err(&chip->dev, "%s: len=%zd exceeds MAX_COMMAND_SIZE supported by fTPM TA\n", - __func__, len); + __func__, cmd_len); return -EIO; } memset(&transceive_args, 0, sizeof(transceive_args)); memset(command_params, 0, sizeof(command_params)); - pvt_data->resp_len = 0; /* Invoke FTPM_OPTEE_TA_SUBMIT_COMMAND function of fTPM TA */ transceive_args = (struct tee_ioctl_invoke_arg) { @@ -103,7 +76,7 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len) .attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT, .u.memref = { .shm = shm, - .size = len, + .size = cmd_len, .shm_offs = 0, }, }; @@ -115,7 +88,7 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len) return PTR_ERR(temp_buf); } memset(temp_buf, 0, (MAX_COMMAND_SIZE + MAX_RESPONSE_SIZE)); - memcpy(temp_buf, buf, len); + memcpy(temp_buf, buf, cmd_len); command_params[1] = (struct tee_param) { .attr = TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT, @@ -156,38 +129,21 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t len) __func__, resp_len); return -EIO; } + if (resp_len > buf_len) { + dev_err(&chip->dev, + "%s: Invalid size in recv: buf_len=%zd, resp_len=%zd\n", + __func__, buf_len, resp_len); + return -EIO; + } - /* sanity checks look good, cache the response */ - memcpy(pvt_data->resp_buf, temp_buf, resp_len); - pvt_data->resp_len = resp_len; - - return 0; -} - -static void ftpm_tee_tpm_op_cancel(struct tpm_chip *chip) -{ - /* not supported */ -} - -static u8 ftpm_tee_tpm_op_status(struct tpm_chip *chip) -{ - return 0; -} + memcpy(buf, temp_buf, resp_len); -static bool ftpm_tee_tpm_req_canceled(struct tpm_chip *chip, u8 status) -{ - return false; + return resp_len; } static const struct tpm_class_ops ftpm_tee_tpm_ops = { .flags = TPM_OPS_AUTO_STARTUP, - .recv = ftpm_tee_tpm_op_recv, - .send = ftpm_tee_tpm_op_send, - .cancel = ftpm_tee_tpm_op_cancel, - .status = ftpm_tee_tpm_op_status, - .req_complete_mask = 0, - .req_complete_val = 0, - .req_canceled = ftpm_tee_tpm_req_canceled, + .send_recv = ftpm_tee_tpm_op_send_recv, }; /*