From nobody Wed Dec 17 10:46:05 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 6C0B427603F for ; Fri, 9 May 2025 08:57:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746781068; cv=none; b=nTafRTBpAeQukJjERhBX5PEJXWIQ5LEprK7CiTBWuZECc9WO1TJk5kgGS29n4MOmPTClilIUT2TYMK/gOuA8frG0AWHSFDyQPWNJSlBp6cK4V4HS+p8k816rQJqV/N/tz7SPUOjB3U8Xn8PeOQbbMiBmDu6JwU924tI+UiI0dK4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746781068; c=relaxed/simple; bh=TyLjAheVKcgcjzsc1fya4qSms/wCVBF3bmwgWgzQa9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CCdxAdWWFk8/2aWLBKvkCxuRwF6IXvhApqw9GfSTdYk/1rODssEjWZ/ywvy2+IPVusWPqh0Loh/A10WxXrRXzIA/7zxqXOPS3igWGBT8lbS0cxPPNHwpkS7xlkaR+aUJSy+S36/dh3WvzFZfHtVsH6pWEXbWhrw9BMalfELW/gc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=STmd3E+I; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="STmd3E+I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1746781065; 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=W3ofDnttG+IcV97+q22PXfMYawWC2pHrgGwgSXYdvb8=; b=STmd3E+IOIVTpbiDq+qAItEz1Koe6fLX3pm1U+6XoIt+7mpEbbrxqsTb7EE50y5WjjSpmR IxQqufFadietGJY7jelmC8JLXxU78OAA2VVCmn6y4diMLlhn+1DOnbb3rbdrr9b4mFnsXf CjiLj1Cyepl3cEbO6aBk2db+ZzEK8oY= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-377-ZSiQMv2kNpmBwcSl2dXtAQ-1; Fri, 09 May 2025 04:57:44 -0400 X-MC-Unique: ZSiQMv2kNpmBwcSl2dXtAQ-1 X-Mimecast-MFC-AGG-ID: ZSiQMv2kNpmBwcSl2dXtAQ_1746781063 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ad212166df4so86969866b.0 for ; Fri, 09 May 2025 01:57:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746781063; x=1747385863; 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=W3ofDnttG+IcV97+q22PXfMYawWC2pHrgGwgSXYdvb8=; b=Ia/FzbFd5ALP/B7Sn2gG3+H/igXfmFI2Nggk2b9E1BPbIjhtrKHUel7zoUoCQpgTIJ 5n5mHRoILvAZrxv8jL2ehupiG6984/IoJbPymOpk2ninE2t/2n6JQUvX6j2gP73TmNko DnMnViqxFLfglw2FPs38p1hLn0j0GYl6/oJaqNzw2V7YdUlgwtOdYkUEt87h2EZfrwrS lMp1LaKb60u4gbEbX3Jhtr3rUh/MB9k/k6h4fkCmqmOW5Ve6+/hDiD13nRueEjQsTNdk SpfRuEeauTr193eYtQ5gWSWpcio3dXtAufV5XA4FVE52B/KzJmrWqcZvmEmpN9DjAL/0 Gtiw== X-Forwarded-Encrypted: i=1; AJvYcCXkd1PxSoPmCl/mHs+GZN0Z7Fr3OiPDgV5nBbmON8p0DlzZQl3qlULt+78Mpf3lpZtWTrn8ZEt80xRGKvo=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0OR9X8CH92q90qByP0yFiaWdz05F+Bt3mbJBtm3IhO8Mn7e0B bMVlTwMdDtnndqs33+bmNJa3L070gw2P6fI9xQOiXAapOd/1FEURqVwxfznZHMmNhTR8UYV+tX5 b2bV67QzOd4gHfqbX/kNGIypUZ26PgNlBWEmdO8XrrS2cJh/APQnqrx3XVLVbUw== X-Gm-Gg: ASbGncvVTfnGNZOlscgUvO6AHKl/Sco4ZWCw9pl3kNxDM1/eCo0VTEGv7b+bwAz1Y2Y geKlmBN7ebcUs7YxC3LhgE4Ejy9PHPzfwbucFHElJc25AuyGhlYdCnGHQNVMrhTgehM6fnZcR+i WIpQ9M6LQj41909Vnb29Gvkz4fzUw3oRb9jdgX7MLeOs1AC7M4etjMDThKdDokCburMkICvf11V RMdQpg9jUA/hS6tMyU++BDLRppxWCXnrNHZY/SZmdVJeZcbYc5KLDFWoijr6nZaelHvPBcy3HTk 2SfbLdeyyIEyIp7gSCvbM/YXgQ== X-Received: by 2002:a17:907:2d11:b0:acf:6bab:5c4f with SMTP id a640c23a62f3a-ad218f8e98fmr216764466b.23.1746781063057; Fri, 09 May 2025 01:57:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFMGDwphiNHE/m9JZeYBlYKoN+B4ckHTHfGrZRId6SN32nOHj4ub3aTES86oLCxIEj3HJmHFA== X-Received: by 2002:a17:907:2d11:b0:acf:6bab:5c4f with SMTP id a640c23a62f3a-ad218f8e98fmr216761866b.23.1746781062467; Fri, 09 May 2025 01:57:42 -0700 (PDT) Received: from localhost.localdomain ([193.207.182.136]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad2192c81bfsm120144666b.33.2025.05.09.01.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 01:57:41 -0700 (PDT) From: Stefano Garzarella To: Jarkko Sakkinen Cc: linux-arm-kernel@lists.infradead.org, Peter Huewe , Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, James Bottomley , Jason Gunthorpe , Alexandre Belloni , Madhavan Srinivasan , Naveen N Rao , Jens Wiklander , Nicolas Ferre , linux-integrity@vger.kernel.org, Michael Ellerman , Claudiu Beznea , Nicholas Piggin , Sumit Garg , Stefano Garzarella , Sumit Garg Subject: [PATCH v4 3/4] tpm/tpm_ftpm_tee: support TPM_CHIP_FLAG_SYNC Date: Fri, 9 May 2025 10:57:12 +0200 Message-ID: <20250509085713.76851-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250509085713.76851-1-sgarzare@redhat.com> References: <20250509085713.76851-1-sgarzare@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella This driver does not support interrupts, and receiving the response is synchronous with sending the command. Enable synchronous send() with TPM_CHIP_FLAG_SYNC, which implies that ->send() already fills the provided buffer with a response, and ->recv() is not implemented. Reviewed-by: Sumit Garg Signed-off-by: Stefano Garzarella --- v4: - added Sumit's R-b - reworked commit description [Jarkko] v2: - set TPM_CHIP_FLAG_SYNC and support it in the new send() - removed Jens' T-b v1: - added Jens' T-b --- drivers/char/tpm/tpm_ftpm_tee.h | 4 --- drivers/char/tpm/tpm_ftpm_tee.c | 64 ++++++++++----------------------- 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/drivers/char/tpm/tpm_ftpm_tee.h b/drivers/char/tpm/tpm_ftpm_te= e.h index e39903b7ea07..8d5c3f0d2879 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.h +++ b/drivers/char/tpm/tpm_ftpm_tee.h @@ -22,16 +22,12 @@ * struct ftpm_tee_private - fTPM's private data * @chip: struct tpm_chip instance registered with tpm framework. * @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_te= e.c index 637cc8b6599e..b9adc040ca6d 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.c +++ b/drivers/char/tpm/tpm_ftpm_tee.c @@ -31,46 +31,18 @@ static const uuid_t ftpm_ta_uuid =3D 0x82, 0xCB, 0x34, 0x3F, 0xB7, 0xF3, 0x78, 0x96); =20 /** - * 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 cou= nt) -{ - struct ftpm_tee_private *pvt_data =3D dev_get_drvdata(chip->dev.parent); - size_t len; - - len =3D pvt_data->resp_len; - if (count < len) { - dev_err(&chip->dev, - "%s: Invalid size in recv: count=3D%zd, resp_len=3D%zd\n", - __func__, count, len); - return -EIO; - } - - memcpy(buf, pvt_data->resp_buf, len); - pvt_data->resp_len =3D 0; - - return len; -} - -/** - * ftpm_tee_tpm_op_send() - send TPM commands through the TEE shared memor= y. + * ftpm_tee_tpm_op_send() - 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. + * @cmd_len: the number of bytes to send. * @buf_size: the size of the buffer. * * 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(struct tpm_chip *chip, u8 *buf, size_t cmd= _len, size_t buf_size) { struct ftpm_tee_private *pvt_data =3D dev_get_drvdata(chip->dev.parent); @@ -82,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 =3D pvt_data->shm; =20 - if (len > MAX_COMMAND_SIZE) { + if (cmd_len > MAX_COMMAND_SIZE) { dev_err(&chip->dev, "%s: len=3D%zd exceeds MAX_COMMAND_SIZE supported by fTPM TA\n", - __func__, len); + __func__, cmd_len); return -EIO; } =20 memset(&transceive_args, 0, sizeof(transceive_args)); memset(command_params, 0, sizeof(command_params)); - pvt_data->resp_len =3D 0; =20 /* Invoke FTPM_OPTEE_TA_SUBMIT_COMMAND function of fTPM TA */ transceive_args =3D (struct tee_ioctl_invoke_arg) { @@ -105,7 +76,7 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u= 8 *buf, size_t len, .attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT, .u.memref =3D { .shm =3D shm, - .size =3D len, + .size =3D cmd_len, .shm_offs =3D 0, }, }; @@ -117,7 +88,7 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, u= 8 *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); =20 command_params[1] =3D (struct tee_param) { .attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT, @@ -158,17 +129,20 @@ 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_size) { + dev_err(&chip->dev, + "%s: resp_len=3D%zd exceeds buf_size=3D%zd\n", + __func__, resp_len, buf_size); + return -EIO; + } =20 - /* sanity checks look good, cache the response */ - memcpy(pvt_data->resp_buf, temp_buf, resp_len); - pvt_data->resp_len =3D resp_len; + memcpy(buf, temp_buf, resp_len); =20 - return 0; + return resp_len; } =20 static const struct tpm_class_ops ftpm_tee_tpm_ops =3D { .flags =3D TPM_OPS_AUTO_STARTUP, - .recv =3D ftpm_tee_tpm_op_recv, .send =3D ftpm_tee_tpm_op_send, }; =20 @@ -253,7 +227,7 @@ static int ftpm_tee_probe(struct device *dev) } =20 pvt_data->chip =3D chip; - pvt_data->chip->flags |=3D TPM_CHIP_FLAG_TPM2; + pvt_data->chip->flags |=3D TPM_CHIP_FLAG_TPM2 | TPM_CHIP_FLAG_SYNC; =20 /* Create a character device for the fTPM */ rc =3D tpm_chip_register(pvt_data->chip); --=20 2.49.0