From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.lore.kernel.org (Postfix) with ESMTPS id A3E34C76195
	for <linuxppc-dev@archiver.kernel.org>; Mon, 27 Mar 2023 05:40:08 +0000 (UTC)
Received: from boromir.ozlabs.org (localhost [IPv6:::1])
	by lists.ozlabs.org (Postfix) with ESMTP id 4PlM8l00Kjz3cdn
	for <linuxppc-dev@archiver.kernel.org>; Mon, 27 Mar 2023 16:40:06 +1100 (AEDT)
Authentication-Results: lists.ozlabs.org;
	dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lS3ZQ0h8;
	dkim-atps=neutral
Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::102d; helo=mail-pj1-x102d.google.com; envelope-from=npiggin@gmail.com; receiver=<UNKNOWN>)
Authentication-Results: lists.ozlabs.org;
	dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=lS3ZQ0h8;
	dkim-atps=neutral
Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
	(No client certificate requested)
	by lists.ozlabs.org (Postfix) with ESMTPS id 4PlM7k0vRqz3cDT
	for <linuxppc-dev@lists.ozlabs.org>; Mon, 27 Mar 2023 16:39:14 +1100 (AEDT)
Received: by mail-pj1-x102d.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so7469862pjz.1
        for <linuxppc-dev@lists.ozlabs.org>; Sun, 26 Mar 2023 22:39:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20210112; t=1679895551;
        h=in-reply-to:references:to:from:subject:cc:message-id:date
         :content-transfer-encoding:mime-version:from:to:cc:subject:date
         :message-id:reply-to;
        bh=u6RQjB5AQU67VhsjUHIEE77so4M91TfQuFLRA4PW0yk=;
        b=lS3ZQ0h8ZFGpvKXr2Ja5VCoFYF+tri8nncZ2njg/TckYYTyfj7mjp/T6O7xr2lUmDs
         dra8EyIJSkYGErjN9MmcQ8fXGSyGD6G02jEVHsc871M+kDATnWcm8O/MSwK/SQ2PTxoY
         QZmLVBb7exCaq8oSTyvZoantl58x6voAeJHid0a2mMYWd4fkW1+IOIj+39dUppZkGBOp
         FFvbF2fU7PFghPAR2C9hb8g3/Sys8L2RnizAkQJ8qayzwJGgZcJqwKaEDoMUTDTreODz
         f5falHjY1R5RaPvTmOohL6oGP1Q2piB95zPDP/EYOqvh3b8iIUr8wzv5gLmzKY5VuuZx
         0RlA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20210112; t=1679895551;
        h=in-reply-to:references:to:from:subject:cc:message-id:date
         :content-transfer-encoding:mime-version:x-gm-message-state:from:to
         :cc:subject:date:message-id:reply-to;
        bh=u6RQjB5AQU67VhsjUHIEE77so4M91TfQuFLRA4PW0yk=;
        b=4KcVP64aMLbrDiwCp43PJjfC1Ad9S6evOVt4aosFcY4CddCmlUNnSePUJ7hUhM0JLl
         g3p8I3YaeNt0qb94LpkTdGqQ4RYKgRlOxtIhvgNHHPubC/iiXmlx+gczfB1UllD6ZK9o
         JTWfEj9gz0W0NTm3qTiQvCq7R/FHF8P47a+66oxBmymLqUrbIHeCHRDqTVi+5/0GwdPo
         Q69IcNMuMj7hkacVGyX+bUDof1gAO7dj1/JXmFNB3+9P9t1WRkhRV+sLCYkEoVqhmTvY
         FDF9LIcNhOwnPTPcVfji9QXlk6W6JJeyA+1TsZaCVppUV2YZmOEJISXaaDZk7EsY7QZV
         jvkg==
X-Gm-Message-State: AO0yUKXq/tdchDwSnf4TJBz35ErwYnPJjQcHFzM2YL7R2nx3xsOBaRi5
	zQ9KWsYOIVO+MVWGOr7KgBo=
X-Google-Smtp-Source: AK7set96Mple3307x12nOAs4ZV9sKCWYqBvaAlJNNetHDhAKMT3lYyDC1cWXzzkKC3+5vIL7ca0M2w==
X-Received: by 2002:a05:6a20:1221:b0:d9:5a7c:b1c5 with SMTP id v33-20020a056a20122100b000d95a7cb1c5mr9849309pzf.11.1679895551023;
        Sun, 26 Mar 2023 22:39:11 -0700 (PDT)
Received: from localhost ([203.221.180.225])
        by smtp.gmail.com with ESMTPSA id u20-20020aa78494000000b005d296facfa3sm18048021pfn.36.2023.03.26.22.39.08
        (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
        Sun, 26 Mar 2023 22:39:10 -0700 (PDT)
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Mon, 27 Mar 2023 15:39:06 +1000
Message-Id: <CRGX9S9AO7V0.3LM275UZQB6CZ@bobo>
Subject: Re: [kvm-unit-tests v2 03/10] powerpc: abstract H_CEDE calls into a
 sleep functions
From: "Nicholas Piggin" <npiggin@gmail.com>
To: "Thomas Huth" <thuth@redhat.com>, <kvm@vger.kernel.org>
X-Mailer: aerc 0.13.0
References: <20230320070339.915172-1-npiggin@gmail.com>
 <20230320070339.915172-4-npiggin@gmail.com>
 <de36dbe8-de4a-ba05-12f7-2b8a37ef552a@redhat.com>
In-Reply-To: <de36dbe8-de4a-ba05-12f7-2b8a37ef552a@redhat.com>
X-BeenThere: linuxppc-dev@lists.ozlabs.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/linuxppc-dev/>
List-Post: <mailto:linuxppc-dev@lists.ozlabs.org>
List-Help: <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/linuxppc-dev>,
 <mailto:linuxppc-dev-request@lists.ozlabs.org?subject=subscribe>
Cc: Laurent Vivier <lvivier@redhat.com>, linuxppc-dev@lists.ozlabs.org
Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org
Sender: "Linuxppc-dev" <linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org>

On Thu Mar 23, 2023 at 10:12 PM AEST, Thomas Huth wrote:
> On 20/03/2023 08.03, Nicholas Piggin wrote:
> > This consolidates several implementations, and it no longer leaves
> > MSR[EE] enabled after the decrementer interrupt is handled, but
> > rather disables it on return.
> >=20
> > The handler no longer allows a continuous ticking, but rather dec
> > has to be re-armed and EE re-enabled (e.g., via H_CEDE hcall) each
> > time.
> >=20
> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> > ---
> >   lib/powerpc/asm/handlers.h  |  2 +-
> >   lib/powerpc/asm/ppc_asm.h   |  1 +
> >   lib/powerpc/asm/processor.h |  7 +++++++
> >   lib/powerpc/handlers.c      | 10 ++++-----
> >   lib/powerpc/processor.c     | 42 ++++++++++++++++++++++++++++++++++++=
+
> >   powerpc/sprs.c              |  6 +-----
> >   powerpc/tm.c                | 20 +-----------------
> >   7 files changed, 57 insertions(+), 31 deletions(-)
> >=20
> > diff --git a/lib/powerpc/asm/handlers.h b/lib/powerpc/asm/handlers.h
> > index 64ba727..e4a0cd4 100644
> > --- a/lib/powerpc/asm/handlers.h
> > +++ b/lib/powerpc/asm/handlers.h
> > @@ -3,6 +3,6 @@
> >  =20
> >   #include <asm/ptrace.h>
> >  =20
> > -void dec_except_handler(struct pt_regs *regs, void *data);
> > +void dec_handler_oneshot(struct pt_regs *regs, void *data);
> >  =20
> >   #endif /* _ASMPOWERPC_HANDLERS_H_ */
> > diff --git a/lib/powerpc/asm/ppc_asm.h b/lib/powerpc/asm/ppc_asm.h
> > index 1b85f6b..6299ff5 100644
> > --- a/lib/powerpc/asm/ppc_asm.h
> > +++ b/lib/powerpc/asm/ppc_asm.h
> > @@ -36,6 +36,7 @@
> >   #endif /* __BYTE_ORDER__ */
> >  =20
> >   /* Machine State Register definitions: */
> > +#define MSR_EE_BIT	15			/* External Interrupts Enable */
> >   #define MSR_SF_BIT	63			/* 64-bit mode */
> >  =20
> >   #endif /* _ASMPOWERPC_PPC_ASM_H */
> > diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h
> > index ac001e1..ebfeff2 100644
> > --- a/lib/powerpc/asm/processor.h
> > +++ b/lib/powerpc/asm/processor.h
> > @@ -20,6 +20,8 @@ static inline uint64_t get_tb(void)
> >  =20
> >   extern void delay(uint64_t cycles);
> >   extern void udelay(uint64_t us);
> > +extern void sleep_tb(uint64_t cycles);
> > +extern void usleep(uint64_t us);
> >  =20
> >   static inline void mdelay(uint64_t ms)
> >   {
> > @@ -27,4 +29,9 @@ static inline void mdelay(uint64_t ms)
> >   		udelay(1000);
> >   }
> >  =20
> > +static inline void msleep(uint64_t ms)
> > +{
> > +	usleep(ms * 1000);
> > +}
> > +
> >   #endif /* _ASMPOWERPC_PROCESSOR_H_ */
> > diff --git a/lib/powerpc/handlers.c b/lib/powerpc/handlers.c
> > index c8721e0..296f14f 100644
> > --- a/lib/powerpc/handlers.c
> > +++ b/lib/powerpc/handlers.c
> > @@ -9,15 +9,13 @@
> >   #include <libcflat.h>
> >   #include <asm/handlers.h>
> >   #include <asm/ptrace.h>
> > +#include <asm/ppc_asm.h>
> >  =20
> >   /*
> >    * Generic handler for decrementer exceptions (0x900)
> > - * Just reset the decrementer back to the value specified when registe=
ring the
> > - * handler
> > + * Return with MSR[EE] disabled.
> >    */
> > -void dec_except_handler(struct pt_regs *regs __unused, void *data)
> > +void dec_handler_oneshot(struct pt_regs *regs, void *data)
> >   {
> > -	uint64_t dec =3D *((uint64_t *) data);
> > -
> > -	asm volatile ("mtdec %0" : : "r" (dec));
> > +	regs->msr &=3D ~(1UL << MSR_EE_BIT);
> >   }
> > diff --git a/lib/powerpc/processor.c b/lib/powerpc/processor.c
> > index ec85b9d..e77a240 100644
> > --- a/lib/powerpc/processor.c
> > +++ b/lib/powerpc/processor.c
> > @@ -10,6 +10,8 @@
> >   #include <asm/ptrace.h>
> >   #include <asm/setup.h>
> >   #include <asm/barrier.h>
> > +#include <asm/hcall.h>
> > +#include <asm/handlers.h>
> >  =20
> >   static struct {
> >   	void (*func)(struct pt_regs *, void *data);
> > @@ -54,3 +56,43 @@ void udelay(uint64_t us)
> >   {
> >   	delay((us * tb_hz) / 1000000);
> >   }
> > +
> > +void sleep_tb(uint64_t cycles)
> > +{
> > +	uint64_t start, end, now;
> > +
> > +	start =3D now =3D get_tb();
> > +	end =3D start + cycles;
> > +
> > +	while (end > now) {
> > +		uint64_t left =3D end - now;
> > +
> > +		/* Could support large decrementer */
> > +		if (left > 0x7fffffff)
> > +			left =3D 0x7fffffff;
> > +
> > +		asm volatile ("mtdec %0" : : "r" (left));
> > +		handle_exception(0x900, &dec_handler_oneshot, NULL);
>
> Wouldn't it be better to first call handle_exception() before moving=20
> something into the decrementer?

It shouldn't really matter, the drecrementer could be anything here
(probably it's already -ve here if it starts at zero). It only matters
when MSR[EE]=3D1 or we make the H_CEDE call.

I'll add a comment at least.

Thanks,
Nick