From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 436931C3F29 for ; Tue, 27 Aug 2024 14:14:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724768077; cv=none; b=SrWviPW2BfOfgZ7OliS2wlGao3Jz6ofmKwYEFIAxRoX5afv+P4Jb1R3QYiyKY+Dt2BkorMxNpY58k9EWxndxF1xbc9iICtb5sAG/BjnSa1wUKuFQDkjKmvPRJTReHDnBGa9J1EChffNmrygqbT+scA8n1AVZtg00PxsVaeI7qnM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724768077; c=relaxed/simple; bh=FtCsYyTEhnOhFMjLlmPWyHGrYzTAOvTZcY/AeK14cfU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=iFiC3y2vC0E2LTkmBnOWELN3414PojlwLNk865S4KoETCknhDO/ptXlB82t4w4zKUTL+jVJlXTwlouU5tNIWGSh2xlUjplk4vlyxH4WrgjSkHR3HKL01r/sctlDt5wGpkxwM2uJWJ4+Vv61iy/V2T+WtUQSjm6G54LNHveQZ93w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=tz3WpFzH; arc=none smtp.client-ip=209.85.210.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="tz3WpFzH" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-714226888dfso4994328b3a.1 for ; Tue, 27 Aug 2024 07:14:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724768074; x=1725372874; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=o+3+2r1N550PeKLOTnfGm8K3KcAqOLonmiMQjmp4lxY=; b=tz3WpFzHhWNbE+idgznff6a2eExtLst1Qnicih8G6muaIOb4OMeuH4uMDDMbS1c3er hU4ZX06PjgCuD5/ordzGKHouCow+I9w1IGwPOZ2GO3CJd01yWktUdpz7P4k9w861ZhyX aZdmzh+pf0ZA3UgKStQdrrDKhYkIgfC0kNKCCAbblKcB1ZJHn5Bq21F9F2pFbJsCoKGM 3oCYE9qpXpJAEDtQUkgzeM6XcDBu/Y5yEl83Nwot/ERkkKd34CLumNxHqa/dKTV7cVYs gGPdhoOF4fe1mVpmq0EdpM1w9tvFVoJue8S9W89Q3gQU2isPow0qajEXNtspUNN07e7r VLDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724768074; x=1725372874; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=o+3+2r1N550PeKLOTnfGm8K3KcAqOLonmiMQjmp4lxY=; b=Zdht6bXDyKIkwPSuHdQ+X0YrlKaS/hmY6/CKhoXYzVmckBtAjzRYLHD1ufGdFOD9Fj GYJDX6KMpw4ttkHbHkHpoE77CLT6lYBHnAK9icNgWfJnaN6JZ3BwmTMpU69w63cLtg/Y cTNZsSk9WhGPW9Y939ZFvErzC4B3ji02624Tl2xsFQnnMWBRwH4nmt00TE97KGX9F/4C BZ0oxoBrHxNO4RmYc0UNE/H2gkUERunLBs8pdBnHH2UdPyMlk8hws9bXeG3fYFGoix4q gKFGq23Q+m3XFYIdGnOEecR9Wkf7gVh7njmFtmTfkzCZ+3flpkZYwB+JV0QU8pM0RbGk DjuA== X-Forwarded-Encrypted: i=1; AJvYcCUunuAbeG2fdaQ8OQCMviiu9EcHwhyiJPJw89q+5YflFa7ToZAOX0hqyOfQTaNRtn+AhGwdPpbmO5LA12s=@vger.kernel.org X-Gm-Message-State: AOJu0Yy4JjiChn41QaseWwvFqFkebuOy/7j306V3FeRUl658EwWUqZjd dFrEjWAQbaXwgquxFnIxqK9pDQrueHn8rxh9PhGfl2KBxdPc0dxqXOx5XVPjHfA= X-Google-Smtp-Source: AGHT+IEmFMevE61JIIhxjfqXIXzmFTxoOXP+TrZSJsfekpW7RtNiIWAOkgeLlYYE+hQ/hbBgC3aQNw== X-Received: by 2002:a05:6a00:98d:b0:70d:2c8d:bed0 with SMTP id d2e1a72fcca58-714458adb88mr17055436b3a.24.1724768074398; Tue, 27 Aug 2024 07:14:34 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c3:4c2c:7d73:fa05:8bad:32cb? ([2804:1b3:a7c3:4c2c:7d73:fa05:8bad:32cb]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-714342e10b4sm8583973b3a.113.2024.08.27.07.14.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Aug 2024 07:14:33 -0700 (PDT) Message-ID: <84975137-de73-4ac9-a691-d87d9c0a5b75@linaro.org> Date: Tue, 27 Aug 2024 11:14:27 -0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] aarch64: vdso: Wire up getrandom() vDSO implementation To: Christophe Leroy , "Jason A. Donenfeld" Cc: Theodore Ts'o , linux-kernel@vger.kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, Catalin Marinas , Will Deacon , Thomas Gleixner , Eric Biggers References: <20240826181059.111536-1-adhemerval.zanella@linaro.org> <907e86f6-c9e8-41b1-9538-b1bb13d481ae@linaro.org> <4d966dc6-655e-4700-bc59-e03693d874cb@csgroup.eu> <8631deef-c2f0-4499-8e30-8bc48001ef5a@csgroup.eu> Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <8631deef-c2f0-4499-8e30-8bc48001ef5a@csgroup.eu> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 27/08/24 11:10, Christophe Leroy wrote: > > > Le 27/08/2024 à 16:01, Adhemerval Zanella Netto a écrit : >> [Vous ne recevez pas souvent de courriers de adhemerval.zanella@linaro.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] >> >> On 27/08/24 11:00, Christophe Leroy wrote: >>> >>> >>> Le 27/08/2024 à 15:39, Adhemerval Zanella Netto a écrit : >>>> [Vous ne recevez pas souvent de courriers de adhemerval.zanella@linaro.org. Découvrez pourquoi ceci est important à https://aka.ms/LearnAboutSenderIdentification ] >>>> >>>> On 27/08/24 10:34, Jason A. Donenfeld wrote: >>>>> On Tue, Aug 27, 2024 at 10:17:18AM -0300, Adhemerval Zanella Netto wrote: >>>>>> >>>>>> >>>>>> On 26/08/24 17:27, Jason A. Donenfeld wrote: >>>>>>> Hi Adhemerval, >>>>>>> >>>>>>> Thanks for posting this! Exciting to have it here. >>>>>>> >>>>>>> Just some small nits for now: >>>>>>> >>>>>>> On Mon, Aug 26, 2024 at 06:10:40PM +0000, Adhemerval Zanella wrote: >>>>>>>> +static __always_inline ssize_t getrandom_syscall(void *buffer, size_t len, unsigned int flags) >>>>>>>> +{ >>>>>>>> +  register long int x8 asm ("x8") = __NR_getrandom; >>>>>>>> +  register long int x0 asm ("x0") = (long int) buffer; >>>>>>>> +  register long int x1 asm ("x1") = (long int) len; >>>>>>>> +  register long int x2 asm ("x2") = (long int) flags; >>>>>>> >>>>>>> Usually it's written just as `long` or `unsigned long`, and likewise >>>>>>> with the cast. Also, no space after the cast. >>>>>> >>>>>> Ack. >>>>>> >>>>>>> >>>>>>>> +#define __VDSO_RND_DATA_OFFSET  480 >>>>>>> >>>>>>> This is the size of the data currently there? >>>>>> >>>>>> Yes, I used the same strategy x86 did. >>>>>> >>>>>>> >>>>>>>>    #include >>>>>>>>    #include >>>>>>>>    #include >>>>>>>> +#include >>>>>>>> +#include >>>>>>> >>>>>>> Possible to keep the asm/ together? >>>>>> >>>>>> Ack. >>>>>> >>>>>>> >>>>>>>> + * ARM64 ChaCha20 implementation meant for vDSO.  Produces a given positive >>>>>>>> + * number of blocks of output with nonnce 0, taking an input key and 8-bytes >>>>>>> >>>>>>> nonnce -> nonce >>>>>> >>>>>> Ack. >>>>>> >>>>>>> >>>>>>>> -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) >>>>>>>> +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/ -e s/aarch64.*/arm64/) >>>>>>>>    SODIUM := $(shell pkg-config --libs libsodium 2>/dev/null) >>>>>>>> >>>>>>>>    TEST_GEN_PROGS := vdso_test_gettimeofday >>>>>>>> @@ -11,7 +11,7 @@ ifeq ($(ARCH),$(filter $(ARCH),x86 x86_64)) >>>>>>>>    TEST_GEN_PROGS += vdso_standalone_test_x86 >>>>>>>>    endif >>>>>>>>    TEST_GEN_PROGS += vdso_test_correctness >>>>>>>> -ifeq ($(uname_M),x86_64) >>>>>>>> +ifeq ($(uname_M), $(filter x86_64 aarch64, $(uname_M))) >>>>>>>>    TEST_GEN_PROGS += vdso_test_getrandom >>>>>>>>    ifneq ($(SODIUM),) >>>>>>>>    TEST_GEN_PROGS += vdso_test_chacha >>>>>>> >>>>>>> You'll need to add the symlink to get the chacha selftest running: >>>>>>> >>>>>>>     $ ln -s ../../../arch/arm64/kernel/vdso tools/arch/arm64/vdso >>>>>>>     $ git add tools/arch/arm64/vdso >>>>>>> >>>>>>> Also, can you confirm that the chacha selftest runs and works? >>>>>> >>>>>> Yes, last time I has to built it manually since the Makefile machinery seem >>>>>> to be broken even on x86_64.  In a Ubuntu vm I have: >>>>>> >>>>>> tools/testing/selftests/vDSO$ make >>>>>>     CC       vdso_test_gettimeofday >>>>>>     CC       vdso_test_getcpu >>>>>>     CC       vdso_test_abi >>>>>>     CC       vdso_test_clock_getres >>>>>>     CC       vdso_standalone_test_x86 >>>>>>     CC       vdso_test_correctness >>>>>>     CC       vdso_test_getrandom >>>>>>     CC       vdso_test_chacha >>>>>> In file included from /home/azanella/Projects/linux/linux-git/include/linux/limits.h:7, >>>>>>                    from /usr/include/x86_64-linux-gnu/bits/local_lim.h:38, >>>>>>                    from /usr/include/x86_64-linux-gnu/bits/posix1_lim.h:161, >>>>>>                    from /usr/include/limits.h:195, >>>>>>                    from /usr/lib/gcc/x86_64-linux-gnu/13/include/limits.h:205, >>>>>>                    from /usr/lib/gcc/x86_64-linux-gnu/13/include/syslimits.h:7, >>>>>>                    from /usr/lib/gcc/x86_64-linux-gnu/13/include/limits.h:34, >>>>>>                    from /usr/include/sodium/export.h:7, >>>>>>                    from /usr/include/sodium/crypto_stream_chacha20.h:14, >>>>>>                    from vdso_test_chacha.c:6: >>>>>> /usr/include/x86_64-linux-gnu/bits/xopen_lim.h:99:6: error: missing binary operator before token "(" >>>>>>      99 | # if INT_MAX == 32767 >>>>>>         |      ^~~~~~~ >>>>>> /usr/include/x86_64-linux-gnu/bits/xopen_lim.h:102:7: error: missing binary operator before token "(" >>>>>>     102 | #  if INT_MAX == 2147483647 >>>>>>         |       ^~~~~~~ >>>>>> /usr/include/x86_64-linux-gnu/bits/xopen_lim.h:126:6: error: missing binary operator before token "(" >>>>>>     126 | # if LONG_MAX == 2147483647 >>>>>>         |      ^~~~~~~~ >>>>>> make: *** [../lib.mk:222: /home/azanella/Projects/linux/linux-git/tools/testing/selftests/vDSO/vdso_test_chacha] Error 1 >>>>> >>>>> You get that even with the latest random.git? I thought Christophe's >>>>> patch fixed that, but maybe not and I should just remove the dependency >>>>> on the sodium header instead. >>>> >>>> On x86_64 I tested with Linux master.  With random.git it is a different issue: >>>> >>>> linux-git/tools/testing/selftests/vDSO$ make >>>>     CC       vdso_test_gettimeofday >>>>     CC       vdso_test_getcpu >>>>     CC       vdso_test_abi >>>>     CC       vdso_test_clock_getres >>>>     CC       vdso_standalone_test_x86 >>>>     CC       vdso_test_correctness >>>>     CC       vdso_test_getrandom >>>>     CC       vdso_test_chacha >>>> /usr/bin/ld: /tmp/ccKpjnSM.o: in function `main': >>>> vdso_test_chacha.c:(.text+0x276): undefined reference to `crypto_stream_chacha20' >>>> collect2: error: ld returned 1 exit status >>>> >>>> If I move -lsodium to the end of the compiler command it works. >>>> >>>> >>> >>> Try a "make clean" maybe ? >>> >>> I have Fedora 38 and no build problem with latest random tree: >>> >>> $ make V=1 >>> gcc -std=gnu99 -D_GNU_SOURCE=    vdso_test_gettimeofday.c parse_vdso.c -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_gettimeofday >>> gcc -std=gnu99 -D_GNU_SOURCE=    vdso_test_getcpu.c parse_vdso.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_getcpu >>> gcc -std=gnu99 -D_GNU_SOURCE=    vdso_test_abi.c parse_vdso.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_abi >>> gcc -std=gnu99 -D_GNU_SOURCE=    vdso_test_clock_getres.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_clock_getres >>> gcc -std=gnu99 -D_GNU_SOURCE= -nostdlib -fno-asynchronous-unwind-tables -fno-stack-protector    vdso_standalone_test_x86.c parse_vdso.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_standalone_test_x86 >>> gcc -std=gnu99 -D_GNU_SOURCE=  -ldl  vdso_test_correctness.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_correctness >>> gcc -std=gnu99 -D_GNU_SOURCE= -isystem /home/chleroy/linux-powerpc/tools/testing/selftests/../../../tools/include -isystem /home/chleroy/linux-powerpc/tools/testing/selftests/../../../include/uapi    vdso_test_getrandom.c parse_vdso.c  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_getrandom >>> gcc -std=gnu99 -D_GNU_SOURCE= -idirafter /home/chleroy/linux-powerpc/tools/testing/selftests/../../../tools/include -idirafter /home/chleroy/linux-powerpc/tools/testing/selftests/../../../arch/x86/include -idirafter /home/chleroy/linux-powerpc/tools/testing/selftests/../../../include -D__ASSEMBLY__ -DBULID_VDSO -DCONFIG_FUNCTION_ALIGNMENT=0 -Wa,--noexecstack -lsodium     vdso_test_chacha.c /home/chleroy/linux-powerpc/tools/testing/selftests/../../../tools/arch/x86/vdso/vgetrandom-chacha.S  -o /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO/vdso_test_chacha >>> $ >> >> It is a clean tree (git clean -dfx), and I take there is no need to build a kernel >> prior hand. > > I meeant 'make clean' > > > Right, I have not built any x86 kernel at the moment. > > Just : > $ pwd > /home/chleroy/linux-powerpc/tools/testing/selftests/vDSO > > $ make clean > > then > > $ make V=1 The issue is Ubuntu linker is configure to use --as-needed by default, this patch fixes the issue: diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index 10ffdda3f2fa..151baf650e4c 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -45,4 +45,4 @@ $(OUTPUT)/vdso_test_chacha: CFLAGS += -idirafter $(top_srcdir)/tools/include \ -idirafter $(top_srcdir)/arch/$(ARCH)/include \ -idirafter $(top_srcdir)/include \ -D__ASSEMBLY__ -DBULID_VDSO -DCONFIG_FUNCTION_ALIGNMENT=0 \ - -Wa,--noexecstack $(SODIUM) + -Wa,--noexecstack -Wl,-no-as-needed $(SODIUM)