From nobody Thu Oct 9 04:46:22 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 57D5D298247 for ; Fri, 20 Jun 2025 13:08:53 +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=1750424935; cv=none; b=Jg/JHjBepujAR4UL7JdMUbq/HBn2qR87aUB22wL3DEgn0pkyx3ObUsr/eSsUg1myLIVjDFZa544XqaygINfgxluByyikL0nLWHaDKONCN3rmv9uR+WS7PvOgalGjaEB69hv3sGt4SxNuDHF9NEnOs/ksyWHVKvaooaSLyxyFSUU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750424935; c=relaxed/simple; bh=upRLbOWOTskpWJQ5/croZAO1F99vBYZo3efafwHLVVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P+SfOLHjwXheTQjTfXoW9pIU35udJtkNaih0OHEWHnyaPK3tJqX8NPl87+bu4iTFIrY75ZVZi+CtLeCg63cKtIOTmCY8ZvWBpjTFY4bKISK1T52Rc+XlQqQnoPMgJi7Q3uJlekbWfvd0vMUeyA2EBHLuUVbbpp840p9t6xPpR2k= 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=LPZi3w+N; 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="LPZi3w+N" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750424932; 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=3VsEn91YkrzZR4A/Mgdq4+jTVTrvyIrxkItYrsxgKtg=; b=LPZi3w+NrGXt3j6d1vGC6r5avU3eAGyKTsrh7m9EIeFzU6JiCoXPOq5BDvxr4GMpW75mmM 3Fby8yUc2gExa3SVohkg+Nkql18bg/t+PjURvTHMOB2D+Z0d7VOjVW5xXnHIJqW1GJwZ91 qOaCPEd9jD2AXKPn+yV/ROUryLWd1MI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-221-CvaYzrAsPKysNVrPz3MCgA-1; Fri, 20 Jun 2025 09:08:51 -0400 X-MC-Unique: CvaYzrAsPKysNVrPz3MCgA-1 X-Mimecast-MFC-AGG-ID: CvaYzrAsPKysNVrPz3MCgA_1750424930 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3a58939191eso891462f8f.0 for ; Fri, 20 Jun 2025 06:08:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750424930; x=1751029730; 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=3VsEn91YkrzZR4A/Mgdq4+jTVTrvyIrxkItYrsxgKtg=; b=hfULtNaUZ3g3XTJDlkROkTxE4tWPBVExblE8n5tbupuNe2JuoBmLncGAhAQCCJZxmE v9RsHr2ZCeqOSinc80gIQqDJELcbiU1xLLy9qWHkGknh6RNeBm3gpslc7LUvAmlaMT4R Z0nuKXFwnajhJ4BayVdbh0OvVAR1P/r4tQtucWHn2TfxVBROEzUMtoHlK5VnZfCS/D8m QncTY1ecN9T6QQMCNNjfCC0fDcOfeK5h6VwVbYprREpJOlN73KbRTzFoFaXWhadBiU06 8e4g9BCZeXanLvmt874NyQRdwkGupJidiYfwE6XZHvcCmz+sTgzOs0104aQsQXNf9wcC Bd4Q== X-Gm-Message-State: AOJu0YxVP0atTtFHzZQFJ5Tjs0cv4KenpX3qTO615qdFwNBrQZti2h6b hgPSWGDszHF1P/I/zx+rRkFKzh3enV3lj2GXGzx5J3zKnT2lKmoux+fLuoDTW7IpPCs1LkyaORI 1q8121jpE5olYGz4C7rgTZKuOQeNXyJwQAZlNMIEVCLkuGuoeOKZzmq2spu828d40+6MIB7f2xA == X-Gm-Gg: ASbGnctpHT1s8moqzXlXOuCyNmXMo3YLzDMEneV/1fY39/r7Bm2dIt2yKhV5b+cNAFv x0nOES0pfrq3gAKLKwSWelDtWEn0YuTBE1H022UlwHr7nY88T/juX6H4+NmyBf/fWUchaC8zG/X BFsLTstvOdKJ/c01U8BwcZShqgU4dHuRgvzcDQ/ZJe5wyyZeu4aJCrhuS3FSLaNKzoYlXSjKJFA GKzpdnNq6cpXtZiSd/2b1fBkUYcAPP7c959r+ys8I0O39ZzaYzUhSTxJ4EGqmkdowJZofr8t9oo hJbc6N02Z89k50+mWnI14s23imRw5QXPIWQ= X-Received: by 2002:a05:6000:2484:b0:3a4:ddde:13e4 with SMTP id ffacd0b85a97d-3a6d12eb394mr2179364f8f.58.1750424929552; Fri, 20 Jun 2025 06:08:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF6J1XzXAkrwIk+wJqXhYpgZ7P5H+/wRdPeseCTHYPIt8eTkRipb+nkvNVEX6eFh42F8eJ+sA== X-Received: by 2002:a05:6000:2484:b0:3a4:ddde:13e4 with SMTP id ffacd0b85a97d-3a6d12eb394mr2179299f8f.58.1750424928851; Fri, 20 Jun 2025 06:08:48 -0700 (PDT) Received: from localhost.localdomain ([193.207.146.57]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a6d11909f4sm2017336f8f.88.2025.06.20.06.08.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jun 2025 06:08:48 -0700 (PDT) From: Stefano Garzarella To: Jarkko Sakkinen Cc: linux-kernel@vger.kernel.org, Nicolas Ferre , Naveen N Rao , Sumit Garg , linux-integrity@vger.kernel.org, Peter Huewe , Jens Wiklander , James Bottomley , linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Christophe Leroy , Nicholas Piggin , Jason Gunthorpe , Michael Ellerman , Alexandre Belloni , Claudiu Beznea , Madhavan Srinivasan , Stefano Garzarella , Sumit Garg Subject: [PATCH v6 3/4] tpm/tpm_ftpm_tee: support TPM_CHIP_FLAG_SYNC Date: Fri, 20 Jun 2025 15:08:09 +0200 Message-ID: <20250620130810.99069-4-sgarzare@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250620130810.99069-1-sgarzare@redhat.com> References: <20250620130810.99069-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 Reviewed-by: Jarkko Sakkinen --- v5: - changed order and parameter names to match tpm_try_transmit() [Jarkko] 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 dbad83bf798e..4e63c30aeaf1 100644 --- a/drivers/char/tpm/tpm_ftpm_tee.c +++ b/drivers/char/tpm/tpm_ftpm_tee.c @@ -31,47 +31,19 @@ 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. + * @buf: the buffer to send and to store the response. * @bufsiz: the size of the buffer. - * @len: the number of bytes to send. + * @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 buf= siz, - size_t len) + size_t cmd_len) { struct ftpm_tee_private *pvt_data =3D dev_get_drvdata(chip->dev.parent); size_t resp_len; @@ -82,16 +54,15 @@ static int ftpm_tee_tpm_op_send(struct tpm_chip *chip, = u8 *buf, size_t bufsiz, 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 bufsiz, .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 bufsiz, 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 bufsiz, __func__, resp_len); return -EIO; } + if (resp_len > bufsiz) { + dev_err(&chip->dev, + "%s: resp_len=3D%zd exceeds bufsiz=3D%zd\n", + __func__, resp_len, bufsiz); + 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