From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2435C43381 for ; Wed, 3 Feb 2021 01:10:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 882E964F5F for ; Wed, 3 Feb 2021 01:10:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229976AbhBCBKW (ORCPT ); Tue, 2 Feb 2021 20:10:22 -0500 Received: from novek.ru ([213.148.174.62]:48410 "EHLO novek.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229931AbhBCBKO (ORCPT ); Tue, 2 Feb 2021 20:10:14 -0500 Received: from [192.168.0.18] (unknown [37.228.234.253]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by novek.ru (Postfix) with ESMTPSA id C48AE500731; Wed, 3 Feb 2021 04:09:29 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 novek.ru C48AE500731 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=novek.ru; s=mail; t=1612314571; bh=CnzD86pyLLXKawvOpGpYbocP4aOcKhVs8w3Pb2xz9P0=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=0q8v2GbHlb5T389GbN7Ae7a2X/c9c1pY9t8MX/NxaKZwzh1vTen5IqmsvNzf7AZpB oo3sxWVlGljV3YIjb1qTp5Ua4w7xDR8bZtrjzsnq/5kobVNPILDmbACaqOV3W6yuOT rDsshkFat40iPFBd1lcxmSzt8IWD+8Sq9vgtgEg4= Subject: Re: [PATCH] selftests/tls: fix compile errors after adding CHACHA20-POLY1305 To: Rong Chen , Jakub Kicinski , Boris Pismenny , Aviad Yehezkel Cc: netdev@vger.kernel.org, kernel test robot References: <20210202094500.679761-1-rong.a.chen@intel.com> <157e79ea-e184-ea67-d1cf-39fa069624ec@novek.ru> <32232647-99f0-4f42-d1a2-66b5c75cb943@intel.com> From: Vadim Fedorenko Message-ID: <6cf8217d-1336-1778-6a2c-61ffdf0ae00a@novek.ru> Date: Wed, 3 Feb 2021 01:09:28 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <32232647-99f0-4f42-d1a2-66b5c75cb943@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 03.02.2021 00:58, Rong Chen wrote: > > > On 2/2/21 6:11 PM, Vadim Fedorenko wrote: >> On 02.02.2021 09:45, Rong Chen wrote: >>> The kernel test robot reported the following errors: >>> >>> tls.c: In function ‘tls_setup’: >>> tls.c:136:27: error: storage size of ‘tls12’ isn’t known >>>    union tls_crypto_context tls12; >>>                             ^~~~~ >>> tls.c:150:21: error: ‘tls12_crypto_info_chacha20_poly1305’ undeclared (first >>> use in this function) >>>     tls12_sz = sizeof(tls12_crypto_info_chacha20_poly1305); >>>                       ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ >>> tls.c:150:21: note: each undeclared identifier is reported only once for each >>> function it appears in >>> tls.c:153:21: error: ‘tls12_crypto_info_aes_gcm_128’ undeclared (first use in >>> this function) >>>     tls12_sz = sizeof(tls12_crypto_info_aes_gcm_128); >>> >>> Fixes: 4f336e88a870 ("selftests/tls: add CHACHA20-POLY1305 to tls selftests") >>> Reported-by: kernel test robot >>> Link: https://lore.kernel.org/lkml/20210108064141.GB3437@xsang-OptiPlex-9020/ >>> Signed-off-by: Rong Chen >>> --- >>>   include/net/tls.h                 | 9 --------- >>>   include/uapi/linux/tls.h          | 9 +++++++++ >>>   tools/testing/selftests/net/tls.c | 4 ++-- >>>   3 files changed, 11 insertions(+), 11 deletions(-) >>> >>> diff --git a/include/net/tls.h b/include/net/tls.h >>> index 3eccb525e8f7..54f7863ad915 100644 >>> --- a/include/net/tls.h >>> +++ b/include/net/tls.h >>> @@ -212,15 +212,6 @@ struct cipher_context { >>>       char *rec_seq; >>>   }; >>>   -union tls_crypto_context { >>> -    struct tls_crypto_info info; >>> -    union { >>> -        struct tls12_crypto_info_aes_gcm_128 aes_gcm_128; >>> -        struct tls12_crypto_info_aes_gcm_256 aes_gcm_256; >>> -        struct tls12_crypto_info_chacha20_poly1305 chacha20_poly1305; >>> -    }; >>> -}; >>> - >>>   struct tls_prot_info { >>>       u16 version; >>>       u16 cipher_type; >>> diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h >>> index 0d54baea1d8d..9933dd425571 100644 >>> --- a/include/uapi/linux/tls.h >>> +++ b/include/uapi/linux/tls.h >>> @@ -124,6 +124,15 @@ struct tls12_crypto_info_chacha20_poly1305 { >>>       unsigned char rec_seq[TLS_CIPHER_CHACHA20_POLY1305_REC_SEQ_SIZE]; >>>   }; >>>   +union tls_crypto_context { >>> +    struct tls_crypto_info info; >>> +    union { >>> +        struct tls12_crypto_info_aes_gcm_128 aes_gcm_128; >>> +        struct tls12_crypto_info_aes_gcm_256 aes_gcm_256; >>> +        struct tls12_crypto_info_chacha20_poly1305 chacha20_poly1305; >>> +    }; >>> +}; >>> + >>>   enum { >>>       TLS_INFO_UNSPEC, >>>       TLS_INFO_VERSION, >>> diff --git a/tools/testing/selftests/net/tls.c >>> b/tools/testing/selftests/net/tls.c >>> index e0088c2d38a5..6951c8524a27 100644 >>> --- a/tools/testing/selftests/net/tls.c >>> +++ b/tools/testing/selftests/net/tls.c >>> @@ -147,10 +147,10 @@ FIXTURE_SETUP(tls) >>>       tls12.info.cipher_type = variant->cipher_type; >>>       switch (variant->cipher_type) { >>>       case TLS_CIPHER_CHACHA20_POLY1305: >>> -        tls12_sz = sizeof(tls12_crypto_info_chacha20_poly1305); >>> +        tls12_sz = sizeof(struct tls12_crypto_info_chacha20_poly1305); >>>           break; >>>       case TLS_CIPHER_AES_GCM_128: >>> -        tls12_sz = sizeof(tls12_crypto_info_aes_gcm_128); >>> +        tls12_sz = sizeof(struct tls12_crypto_info_aes_gcm_128); >>>           break; >>>       default: >>>           tls12_sz = 0; >>> >> >> I'm not sure that it's a good idea to move tls_crypto_context to uapi as it's >> an internal union. Previous patches assumes that user-space uses different >> structures for different cipher configurations. > > Hi Vadim, > > Sorry i don't have the background, could you help to fix these build errors? > > Best Regards, > Rong Chen > Yes, sure, no problem. I will prepare new patch tomorrow.