Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Feedback-ID: i56a14606:Fastmail
User-Agent: Cyrus-JMAP/3.9.0-alpha0-1048-g9229b632c5-fm-20231019.001-g9229b632
MIME-Version: 1.0
Message-Id: <d89d139e-744f-4bf2-bdd7-5bfaab1cc7fb@app.fastmail.com>
In-Reply-To: <60b7f4c3-c5e8-4fab-bf31-d576fff7a016@suse.de>
References: <20231020205521.3577821-1-arnd@kernel.org>
 <60b7f4c3-c5e8-4fab-bf31-d576fff7a016@suse.de>
Date:   Wed, 25 Oct 2023 09:36:23 +0200
From:   "Arnd Bergmann" <arnd@arndb.de>
To:     "Hannes Reinecke" <hare@suse.de>,
        "Arnd Bergmann" <arnd@kernel.org>,
        "Keith Busch" <kbusch@kernel.org>, "Jens Axboe" <axboe@kernel.dk>,
        "Christoph Hellwig" <hch@lst.de>,
        "Sagi Grimberg" <sagi@grimberg.me>,
        "Chaitanya Kulkarni" <kch@nvidia.com>
Cc:     linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] [v2] nvme: keyring: fix conditional compilation
Content-Type: text/plain
Precedence: bulk

On Wed, Oct 25, 2023, at 09:02, Hannes Reinecke wrote:
> On 10/20/23 22:54, Arnd Bergmann wrote:
oid)
>> +
>> +static inline key_serial_t nvme_target_keyring_id(void)
>>   {
>> +	if (IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS))
>> +		return nvme_keyring_id();
>> +
>>   	return 0;
>>   }
>> -static inline int nvme_keyring_init(void)
>> +
>> +static inline int nvme_target_keyring_init(void)
>>   {
>> +	if (IS_ENABLED(CONFIG_NVME_TCP_TLS))
>> +		return nvme_keyring_init();
>> +
>>   	return 0;
>>   }
>> -static inline void nvme_keyring_exit(void) {}
>>   
>> -#endif /* !CONFIG_NVME_KEYRING */
>> +static inline void nvme_target_keyring_exit(void)
>> +{
>> +	if (IS_ENABLED(CONFIG_NVME_TARGET_TCP_TLS))
>> +		nvme_keyring_exit();
>> +}
>> +
>>   #endif /* _NVME_KEYRING_H */
>
> I guess the right way is to make 'keyring' a 'real' module, and move 
> 'nvme_keyring_init()' and 'nvme_keyring_exit()' as the modules init/exit 
> functions. I'll prepare a patch.

That's probably a good idea, but you still need to address
the link failure for nvme_keyring_id() and nvme_tls_psk_default()
when the caller is built-in and the definition is in a loadable
module.

     Arnd