From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 058C01C1731 for ; Tue, 27 Aug 2024 14:30:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724769030; cv=none; b=hVSbwdjpI0mxindrUZ13k9MCWOjNtlp6rtDjdYnsKkDbM9nnZZDMvQbz9aenod7/bOk+9wtbdNUiu6NkjCaOLHKU1mWYsX5mdvqHturO7W00rqPF505Yg5RmONw5igKEUPriGQCmQZvXedw/qucKE/g5IUuWqU68OEXgPe9i/Rw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724769030; c=relaxed/simple; bh=9g2RA3GRxxLTB2R1xVwA9egtWHbQ3EnyUhXjClhFAfU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Z3nmjXL+gckStlOzWOCwhr8I2V0bAp/Ai5P0z146jd8UESPA0G0H2iVQQmV8bAd5IIiXwId96Lo+9DJCGedrU68H5Ee08aeKdzvIoJ6yVgJT8nkv53MvhLMRvS89As5gRwLoIRNnCAIvhvrlHAqZ8D4ySgT0FvMw5vjTCo+oVq0= 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=aeYk23CC; arc=none smtp.client-ip=209.85.214.176 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="aeYk23CC" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2021537a8e6so50162465ad.2 for ; Tue, 27 Aug 2024 07:30:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724769025; x=1725373825; 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=nHV3+IEXr1Vk+Gf9Z5h/Zajy8h6zEGOOhNSv5B2ABPk=; b=aeYk23CCMF+INEilaWep+Suun9DyZMGHy8oly9bUEjCXQQYuJgKaGtiqE1azs9EWBr KR/dxZ03QdgiWY288XV/E+dfAOlpNzIpt/P89mglaOypK2MGM+odQBe2OSRT58VvSre/ 55QOl2/WGHIR2qUCeUE0VF9Z7/+Ni2pUyXVHu9KENDmuZYFc83O0zphznBEn0QEj7QW5 pN3Ky6jI9nKc6cxYsJopOrISEAAsrLwXLeE4v2t1iJjfDL6BWzkAw2IT7fRahP9Eaun3 HyrFIm7VJRwHUbr5MBXYJUQQPGDrnJk4Uxoa0npm2Ia4vVrnbYX7uHgRNSK1U1WDlFhy uLjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724769025; x=1725373825; 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=nHV3+IEXr1Vk+Gf9Z5h/Zajy8h6zEGOOhNSv5B2ABPk=; b=VIPzYKW3rfll+3jqcLuEqlMntgR7j+nOjkMdre/SBD1U6B3Z0XhYV1luJH5Z0aMyJV /eVbQxFBafyu2QJJHhtSPEdeM1Ah5mN1AbZ7YWnkUiqhGzSV2uGg9WYScmU1wMS7J1xQ N5MnOQsHXK/s466TjfX4krH71CawssK5S1n2SLR/aUE0NtWWgoqapK1mb+6Vf7RQSscg 4O7E49HBvEgCpIhjZHNsilCyhFwavGDCxLwJZTfAmuJoQ8Sv2VbsherRgU9Hz5lJqJ2A rrS1YgiHWX4rifI8I4bXaOogaiMAWhKCJJ4im0T3YDgIkDDCHo9Cejm0FJc1P7D/HUuz EPgw== X-Forwarded-Encrypted: i=1; AJvYcCX8m9pgcr1bi8VXSdHyOn3mUY38edIaxyQmDWcVWsH3Ji4iR4Zs8kJFeiPYhFAvOoFj+IAMmD8PRF/i@vger.kernel.org X-Gm-Message-State: AOJu0Yy+nm0qW9dSPJssW4WtuKisiuyBSl5d5z49NbuQV50bm5HH5Ph8 5ZHckzxySzMRhyrSrAmFNsrySQVBb5aAYZxvaQ5vVx85dYxzsY4GoGjNOTswPyw= X-Google-Smtp-Source: AGHT+IFDhS7+ZZGLEaypzmhWuJoAda0C07oK3zdMIJ3+iBkQVe6eB0pi9tF8FOZOi2AD5xvbnZh9PA== X-Received: by 2002:a17:902:f543:b0:202:162c:1f29 with SMTP id d9443c01a7336-2039e4f21f1mr171023565ad.47.1724769024985; Tue, 27 Aug 2024 07:30:24 -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 d9443c01a7336-203855dd2d7sm84593515ad.169.2024.08.27.07.30.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 27 Aug 2024 07:30:23 -0700 (PDT) Message-ID: <9666ada7-5f34-4085-8e4d-10eb197da3f5@linaro.org> Date: Tue, 27 Aug 2024 11:30:19 -0300 Precedence: bulk X-Mailing-List: linux-arch@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: "Jason A. Donenfeld" Cc: Christophe Leroy , 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> <84975137-de73-4ac9-a691-d87d9c0a5b75@linaro.org> Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 27/08/24 11:28, Jason A. Donenfeld wrote: > On Tue, Aug 27, 2024 at 11:14:27AM -0300, Adhemerval Zanella Netto wrote: >> >> >> 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) > > Oh, it's an as-needed thing. In that case, does this fix it for you? > > diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile > index 10ffdda3f2fa..834aa862ba2c 100644 > --- a/tools/testing/selftests/vDSO/Makefile > +++ b/tools/testing/selftests/vDSO/Makefile > @@ -1,7 +1,8 @@ > # SPDX-License-Identifier: GPL-2.0 > uname_M := $(shell uname -m 2>/dev/null || echo not) > ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > -SODIUM := $(shell pkg-config --libs libsodium 2>/dev/null) > +SODIUM_LIBS := $(shell pkg-config --libs libsodium 2>/dev/null) > +SODIUM_CFLAGS := $(shell pkg-config --cflags libsodium 2>/dev/null) > > TEST_GEN_PROGS := vdso_test_gettimeofday > TEST_GEN_PROGS += vdso_test_getcpu > @@ -13,7 +14,7 @@ endif > TEST_GEN_PROGS += vdso_test_correctness > ifeq ($(uname_M),x86_64) > TEST_GEN_PROGS += vdso_test_getrandom > -ifneq ($(SODIUM),) > +ifneq ($(SODIUM_LIBS),) > TEST_GEN_PROGS += vdso_test_chacha > endif > endif > @@ -41,8 +42,9 @@ $(OUTPUT)/vdso_test_getrandom: CFLAGS += -isystem $(top_srcdir)/tools/include \ > -isystem $(top_srcdir)/include/uapi > > $(OUTPUT)/vdso_test_chacha: $(top_srcdir)/tools/arch/$(ARCH)/vdso/vgetrandom-chacha.S > +$(OUTPUT)/vdso_test_chacha: LDLIBS += $(SODIUM_LIBS) > $(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 $(SODIUM_CFLAGS) > Nops, 'pkg-config --cflags libsodium' is empty. The -Wl,-no-as-needed is simpler I think.