Re: [PATCH v5 4/5] powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO32

public inbox for linuxppc-dev@ozlabs.org 
 help / color / mirror / Atom feed

From: "Jason A. Donenfeld" <Jason@zx2c4•com>
To: Christophe Leroy <christophe.leroy@csgroup•eu>
Cc: Andrew Morton <akpm@linux-foundation•org>,
	Steven Rostedt <rostedt@goodmis•org>,
	Masami Hiramatsu <mhiramat@kernel•org>,
	Mathieu Desnoyers <mathieu.desnoyers@efficios•com>,
	Michael Ellerman <mpe@ellerman•id.au>,
	Nicholas Piggin <npiggin@gmail•com>,
	Naveen N Rao <naveen@kernel•org>,
	Nathan Chancellor <nathan@kernel•org>,
	Nick Desaulniers <ndesaulniers@google•com>,
	Bill Wendling <morbo@google•com>,
	Justin Stitt <justinstitt@google•com>,
	Shuah Khan <shuah@kernel•org>,
	linux-kernel@vger•kernel.org, linuxppc-dev@lists•ozlabs.org,
	linux-kselftest@vger•kernel.org, llvm@lists•linux.dev,
	linux-fsdevel@vger•kernel.org, linux-mm@kvack•org,
	linux-trace-kernel@vger•kernel.org,
	Adhemerval Zanella <adhemerval.zanella@linaro•org>,
	Xi Ruoyao <xry111@xry111•site>
Subject: Re: [PATCH v5 4/5] powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO32
Date: Thu, 5 Sep 2024 22:41:40 +0200	[thread overview]
Message-ID: <ZtoXhGYflBNR74g0@zx2c4.com> (raw)
In-Reply-To: <ZtnYqZI-nrsNslwy@zx2c4.com>

On Thu, Sep 05, 2024 at 06:13:29PM +0200, Jason A. Donenfeld wrote:
> > +/*
> > + * The macro sets two stack frames, one for the caller and one for the callee
> > + * because there are no requirement for the caller to set a stack frame when
> > + * calling VDSO so it may have omitted to set one, especially on PPC64
> > + */
> > +
> > +.macro cvdso_call funct
> > +  .cfi_startproc
> > +	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
> > +  .cfi_adjust_cfa_offset PPC_MIN_STKFRM
> > +	mflr		r0
> > +	PPC_STLU	r1, -PPC_MIN_STKFRM(r1)
> > +  .cfi_adjust_cfa_offset PPC_MIN_STKFRM
> > +	PPC_STL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
> > +  .cfi_rel_offset lr, PPC_MIN_STKFRM + PPC_LR_STKOFF
> > +	get_datapage	r8
> > +	addi		r8, r8, VDSO_RNG_DATA_OFFSET
> > +	bl		CFUNC(DOTSYM(\funct))
> > +	PPC_LL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
> > +	cmpwi		r3, 0
> > +	mtlr		r0
> > +	addi		r1, r1, 2 * PPC_MIN_STKFRM
> > +  .cfi_restore lr
> > +  .cfi_def_cfa_offset 0
> > +	crclr		so
> > +	bgelr+
> > +	crset		so
> > +	neg		r3, r3
> > +	blr
> > +  .cfi_endproc
> > +.endm
> 
> Can you figure out what's going on and send a fix, which I'll squash
> into this commit?

This doesn't work, but I wonder if something like it is what we want. I
need to head out for the day, but here's what I've got. It's all wrong
but might be of interest.

diff --git a/arch/powerpc/include/asm/vdso/getrandom.h b/arch/powerpc/include/asm/vdso/getrandom.h
index 501d6bb14e8a..acb271709d30 100644
--- a/arch/powerpc/include/asm/vdso/getrandom.h
+++ b/arch/powerpc/include/asm/vdso/getrandom.h
@@ -47,7 +47,8 @@ static __always_inline struct vdso_rng_data *__arch_get_vdso_rng_data(void)
 }

 ssize_t __c_kernel_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state,
-			     size_t opaque_len, const struct vdso_rng_data *vd);
+			     size_t opaque_len, const struct vdso_data *vd,
+			     const struct vdso_rng_data *vrd);

 #endif /* !__ASSEMBLY__ */

diff --git a/arch/powerpc/kernel/vdso/getrandom.S b/arch/powerpc/kernel/vdso/getrandom.S
index a957cd2b2b03..bc49eb87cfd1 100644
--- a/arch/powerpc/kernel/vdso/getrandom.S
+++ b/arch/powerpc/kernel/vdso/getrandom.S
@@ -32,7 +32,7 @@
   .cfi_rel_offset r2, PPC_MIN_STKFRM + STK_GOT
 #endif
 	get_datapage	r8
-	addi		r8, r8, VDSO_RNG_DATA_OFFSET
+	addi		r9, r8, VDSO_RNG_DATA_OFFSET
 	bl		CFUNC(DOTSYM(\funct))
 	PPC_LL		r0, PPC_MIN_STKFRM + PPC_LR_STKOFF(r1)
 #ifdef __powerpc64__
diff --git a/arch/powerpc/kernel/vdso/vgetrandom.c b/arch/powerpc/kernel/vdso/vgetrandom.c
index 5f855d45fb7b..408c76036868 100644
--- a/arch/powerpc/kernel/vdso/vgetrandom.c
+++ b/arch/powerpc/kernel/vdso/vgetrandom.c
@@ -8,7 +8,10 @@
 #include <linux/types.h>

 ssize_t __c_kernel_getrandom(void *buffer, size_t len, unsigned int flags, void *opaque_state,
-			     size_t opaque_len, const struct vdso_rng_data *vd)
+			     size_t opaque_len, const struct vdso_data *vd,
+			     const struct vdso_rng_data *vrd)
 {
-	return __cvdso_getrandom_data(vd, buffer, len, flags, opaque_state, opaque_len);
+	if (IS_ENABLED(CONFIG_TIME_NS) && vd->clock_mode == VDSO_CLOCKMODE_TIMENS)
+		vrd = (void *)vrd + (1UL << CONFIG_PAGE_SHIFT);
+	return __cvdso_getrandom_data(vrd, buffer, len, flags, opaque_state, opaque_len);
 }

next prev parent reply	other threads:[~2024-09-05 20:41 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-02 19:17 [PATCH v5 0/5] Wire up getrandom() vDSO implementation on powerpc Christophe Leroy
2024-09-02 19:17 ` [PATCH v5 1/5] mm: Define VM_DROPPABLE for powerpc/32 Christophe Leroy
2024-09-02 19:17 ` [PATCH v5 2/5] powerpc/vdso32: Add crtsavres Christophe Leroy
2024-09-02 19:17 ` [PATCH v5 3/5] powerpc/vdso: Refactor CFLAGS for CVDSO build Christophe Leroy
2024-09-02 19:17 ` [PATCH v5 4/5] powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO32 Christophe Leroy
2024-09-05 16:13   ` Jason A. Donenfeld
2024-09-05 16:25     ` Jason A. Donenfeld
2024-09-05 16:55     ` Christophe Leroy
2024-09-05 17:01       ` Xi Ruoyao
2024-09-05 17:03       ` Jason A. Donenfeld
2024-09-05 17:16         ` Jason A. Donenfeld
2024-09-05 20:41     ` Jason A. Donenfeld [this message]
2024-09-06  2:48       ` Jason A. Donenfeld
2024-09-06  3:24         ` Jason A. Donenfeld
2024-09-06  4:53           ` Christophe Leroy
2024-09-02 19:17 ` [PATCH v5 5/5] powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO64 Christophe Leroy
2024-09-04 11:46   ` Madhavan Srinivasan
2024-09-04 14:16 ` [PATCH v5 0/5] Wire up getrandom() vDSO implementation on powerpc Jason A. Donenfeld
2024-09-04 14:36   ` Christophe Leroy
2024-09-05 12:18   ` Michael Ellerman
2024-09-05 12:56     ` Jason A. Donenfeld

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:501d6bb14e8 dfblob:acb271709d3 dfblob:a957cd2b2b0
dfblob:bc49eb87cfd dfblob:5f855d45fb7 dfblob:408c7603686 )
 OR (
bs:"Re: [PATCH v5 4/5] powerpc/vdso: Wire up getrandom() vDSO implementation on VDSO32" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZtoXhGYflBNR74g0@zx2c4.com \
    --to=jason@zx2c4$(echo .)com \
    --cc=adhemerval.zanella@linaro$(echo .)org \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=christophe.leroy@csgroup$(echo .)eu \
    --cc=justinstitt@google$(echo .)com \
    --cc=linux-fsdevel@vger$(echo .)kernel.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-kselftest@vger$(echo .)kernel.org \
    --cc=linux-mm@kvack$(echo .)org \
    --cc=linux-trace-kernel@vger$(echo .)kernel.org \
    --cc=linuxppc-dev@lists$(echo .)ozlabs.org \
    --cc=llvm@lists$(echo .)linux.dev \
    --cc=mathieu.desnoyers@efficios$(echo .)com \
    --cc=mhiramat@kernel$(echo .)org \
    --cc=morbo@google$(echo .)com \
    --cc=mpe@ellerman$(echo .)id.au \
    --cc=nathan@kernel$(echo .)org \
    --cc=naveen@kernel$(echo .)org \
    --cc=ndesaulniers@google$(echo .)com \
    --cc=npiggin@gmail$(echo .)com \
    --cc=rostedt@goodmis$(echo .)org \
    --cc=shuah@kernel$(echo .)org \
    --cc=xry111@xry111$(echo .)site \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox