Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
Message-ID: <cb729887-13ba-4fe4-8824-3062aeb1ef8e@siemens.com>
Date:   Thu, 2 Nov 2023 08:58:07 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 1/2] tee: optee: Fix supplicant based device
 enumeration
Content-Language: en-US
To:     Sumit Garg <sumit.garg@linaro.org>
Cc:     Jerome Forissier <jerome.forissier@linaro.org>,
        jens.wiklander@linaro.org, op-tee@lists.trustedfirmware.org,
        arnd@linaro.org, ardb@kernel.org, ilias.apalodimas@linaro.org,
        masahisa.kojima@linaro.org, maxim.uvarov@linaro.org,
        jarkko.sakkinen@linux.intel.com, linux-kernel@vger.kernel.org,
        diogo.ivo@siemens.com
References: <20231030155901.80673-1-sumit.garg@linaro.org>
 <20231030155901.80673-2-sumit.garg@linaro.org>
 <a54b6109-5a38-4d72-a197-00fee0162860@linaro.org>
 <1418e74e-175f-4b04-90d7-8bec2987c207@siemens.com>
 <CAFA6WYNe+pt2meP-KDtG2duYqWXHHwTCnHnm97PeNsbi+PJ5ng@mail.gmail.com>
From:   Jan Kiszka <jan.kiszka@siemens.com>
In-Reply-To: <CAFA6WYNe+pt2meP-KDtG2duYqWXHHwTCnHnm97PeNsbi+PJ5ng@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c0YvVWtzYTY1ZWpLWkk0S0FQdVdEdk9SSkV6QXhkYmxuVFRUbmtWZXVsSHY3?=
 =?utf-8?B?VFEwQXc5TENLblpNcmR6V2E3KzlXSGIwaDQ0RkkzMk5ocDNtQUtwTXhvU2hx?=
 =?utf-8?B?QTJEM3IvLy8rZ21kSGJ2amNkUThseXRyQ2VieWtFOU1lUFRiTWhZU3NpYkFY?=
 =?utf-8?B?KzdsUjJuVjhCR1VlWXRxZE5IRCs4czhCOE04RWhyQlFmOEhEdWkwaWJlbGJz?=
 =?utf-8?B?bWoxRzRLZkU1djJjc3E3UDArWEt1Ui9VblUyRXZkNmFBVlZobDFQdDBYYmtW?=
 =?utf-8?B?cGdRZktaWGZVWUMxd0VrSFhvUmpIVXd3U3lOSjNwOVAzRTVNSzYwdzlkRnRJ?=
 =?utf-8?B?Slc3ek5JUUF4RWExQm5HbzRFd0VaSVE0cUlJYm5uQnFyaHNaV1dOSi84RUd4?=
 =?utf-8?B?clJoYk1kT3NET29JMzVUUk03WUkrazhTL2RqTDU1d05nWHlyaUQvTnFlVW5D?=
 =?utf-8?B?REIzc1pzOXJERHFKbFoxVm0yd3dlQUdBNkN1TnhoOXI2dXRnd1VpTFFBME91?=
 =?utf-8?B?Z0VrUmxZSUJnN3diOGgzdGpRbk1CV3hwcWJPSGFrUHNtYjdoWDR1c3krM09L?=
 =?utf-8?B?S1hyU2VoY0w5MjIwRjFPd2ZlTEhTQlE2ZWJQN1JBZnN3MzNvSi9tL2trbi9k?=
 =?utf-8?B?Rjc4TnBKS1lCaGJYaU9DeHM3WlZSL0RBblBuOEtTbk5XWlhWNTRrVlNMR05Z?=
 =?utf-8?B?dXpQU21PUGFHZ2UrUkNvMGxKY01RZmxlODhUMVNsT3VhVnBSQ2ZCSGgyTVBL?=
 =?utf-8?B?TmVaaHJCVnQ0UWhRUmdGZkoxd0MzMldraDNlRGZzR2dKNlNBd2F3YmFWWExI?=
 =?utf-8?B?Z0h0d3R5d2MvYVlKMTR4NXErZGtsSzl5TElnNkVYSi82KzU0QnZ5K05UYkRw?=
 =?utf-8?B?RG9GRlFpcFBncC9SMnNocVhtUVdncjdxb1FtNmw4TVJEWEl2L2pBNTR0WGVl?=
 =?utf-8?B?UmZRVHJaVXFjb3lDVU8zTGlkczZ2MnhpUXUzUFJYQzlNbnFvV2pXZDlNVHNZ?=
 =?utf-8?B?QjhuOUVnRW1yVDhrQm1tcnlZSU54ak1ldlBneG5nemlFRVlQM2gxUzhLbnNu?=
 =?utf-8?B?V1N0aFdENzhyazNQU3FWYzNLeVVSdzBvZ21XcFRtd2p1TlB6WXlBQno2TlpB?=
 =?utf-8?B?alFmcDR3QmNtY0tZVW1JVnJGY2FKdVU5eC9kNVVXYldyenkvaHkwL1JVK05T?=
 =?utf-8?B?SDlmdkFpZVU2Z016Qk84dTB4L3c5TXhOWGFjU3JvNTJUcjlsTkMxRERmZzhI?=
 =?utf-8?B?Z0t2MzNFWFc0RG9ycS9wb0t5M1NrZjhHVFBkRitRSG5nNmNKQm94dGx1TEZ4?=
 =?utf-8?B?blRHeVFyQWFzeFJMaWJzY1BHTndEclVObUE0ZE5lTHdaYW5CcjFIVFZoQU1O?=
 =?utf-8?B?V3BPRmxMNSs0emd1ZGJVOElxOUg5TU40bkxPOVFLL1p2MnVsZGx5UUVFYUdV?=
 =?utf-8?B?NVNlRGhERnNTQ2drQ1duUmszbHVMdXd1ZkhjT0pWUWVZMWgyRzl1ZW5XbmlF?=
 =?utf-8?B?dDA5MENjSit4TC9zNEczSGppU2JkMTFwY2EvLzVXOFZGcm9GaGpWRWdyc213?=
 =?utf-8?B?alYwS2tEakphbnFPZ3hENjRSbWRpNEh2Sys5dkRZOTdYajd3SnR3QW96U0Nl?=
 =?utf-8?B?eGppQVFvdTJRZ3BZaEVqRHZOdVpGbU85K0VYTE11d2xFRlFNaGVKb0RZTTlB?=
 =?utf-8?B?R1daT3ZnNWhsdUFVS3hMQTlqdFhJKzZXYlZJcURTaFYrUXVVNVRZTHJyb21n?=
 =?utf-8?B?T0U4SEgwaDBwTHA2QWowWUdybUFkWStNVHpydXp3U21HWkhub1NCUzVTL3NZ?=
 =?utf-8?B?Y29WTkZaL2RRRkFOTVMxdTZ6ZVlJNDU5U3QrRWFGN3pneEdRNWsya1dyU0Vp?=
 =?utf-8?B?T3R0b1VXWVhES2RWVUFZcmNQR1MvcWdEL05nWVU5RjU1ZXdjSitrajk5eGpR?=
 =?utf-8?B?M1RqOVpibnkycHN5Vlh6L294cVQrS0dHYkNUbDcvb1lTc3dBQm9ydWVkRXRG?=
 =?utf-8?B?VFY0c29CYlNlMWlXNkNUenRBM1BDNytscEZLYVZkejBEdE1xZU8vRm8wdEpB?=
 =?utf-8?B?UnZxazRIWmM0V1c1WkdiaXR1QUF0OHZ3dGxCR2xGZWZjMkV5RXhBSDVDT244?=
 =?utf-8?B?UFArcjl6dHZGOFRxam45Z0xCcm9ndHVIUU55dTlERGNIK2VQcE4yamxyZ1pJ?=
 =?utf-8?B?TEE9PQ==?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 819fa0d3-d712-4875-e750-08dbdb7974d4
X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2023 07:58:10.1993
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: yJHVA+bEvByMShXYWG7jvIFm8GMpxI7Cbx8V6OmDfbQ3A7nXX8G97wfgZRgLT9nC2JBG/yPNhCTzPn2Z4UCR8A==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5798
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,
	URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 02 Nov 2023 00:58:48 -0700 (PDT)

On 02.11.23 08:37, Sumit Garg wrote:
> On Tue, 31 Oct 2023 at 17:14, Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>
>> On 31.10.23 12:04, Jerome Forissier wrote:
>>>
>>>
>>> On 10/30/23 16:59, Sumit Garg wrote:
>>>> Currently supplicant dependent optee device enumeration only registers
>>>> devices whenever tee-supplicant is invoked for the first time. But it
>>>> forgets to remove devices when tee-supplicant daemon stops running and
>>>> closes its context gracefully. This leads to following error for fTPM
>>>> driver during reboot/shutdown:
>>>>
>>>> [   73.466791] tpm tpm0: ftpm_tee_tpm_op_send: SUBMIT_COMMAND invoke error: 0xffff3024
>>>>
>>>> Fix this by separating supplicant dependent devices so that the
>>>> user-space service can detach supplicant devices before closing the
>>>> supplicant.
>>>>
>>>> Reported-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>> Link: https://github.com/OP-TEE/optee_os/issues/6094
>>>> Fixes: 5f178bb71e3a ("optee: enable support for multi-stage bus enumeration")
>>>> Tested-by: Jan Kiszka <jan.kiszka@siemens.com>
>>>> Tested-by: Masahisa Kojima <masahisa.kojima@linaro.org>
>>>> Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
>>>> ---
>>>>  drivers/tee/optee/device.c | 13 ++++++++++---
>>>>  1 file changed, 10 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
>>>> index 64f0e047c23d..78fc0a15c463 100644
>>>> --- a/drivers/tee/optee/device.c
>>>> +++ b/drivers/tee/optee/device.c
>>>> @@ -60,9 +60,10 @@ static void optee_release_device(struct device *dev)
>>>>      kfree(optee_device);
>>>>  }
>>>>
>>>> -static int optee_register_device(const uuid_t *device_uuid)
>>>> +static int optee_register_device(const uuid_t *device_uuid, u32 func)
>>>>  {
>>>>      struct tee_client_device *optee_device = NULL;
>>>> +    const char *dev_name_fmt = NULL;
>>>>      int rc;
>>>>
>>>>      optee_device = kzalloc(sizeof(*optee_device), GFP_KERNEL);
>>>> @@ -71,7 +72,13 @@ static int optee_register_device(const uuid_t *device_uuid)
>>>>
>>>>      optee_device->dev.bus = &tee_bus_type;
>>>>      optee_device->dev.release = optee_release_device;
>>>> -    if (dev_set_name(&optee_device->dev, "optee-ta-%pUb", device_uuid)) {
>>>> +
>>>> +    if (func == PTA_CMD_GET_DEVICES_SUPP)
>>>> +            dev_name_fmt = "optee-ta-supp-%pUb";
>>>> +    else
>>>> +            dev_name_fmt = "optee-ta-%pUb";
>>>
>>> That's an ABI change, isn't it?
>>
> 
> Indeed it is an ABI break although we would like this to be backported
> but don't want to break existing users. So I brainstormed on it and
> came up with an alternative fix via device attribute in v4. Please
> have a look.
> 
>> Oh, here did this come from! Yes, I recently had to adjust some systemd
>> service due to carrying this patch but looking for the change only in
>> upstream:
>>
>> https://github.com/ilbers/isar/commit/83644ddf694e51f11793e6107e4aaf68dc0043a5
>>
> 
> You don't need to unbind all of the optee devices. v4 would help you
> to maintain backwards compatibility, can you retest it?

How do I know from tee-supplicant perspective which devices I need to
unbind? There could be one in the future that will also use storage and
will therefore also fail once the supplicant is gone.

Jan

-- 
Siemens AG, Technology
Linux Expert Center