From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F1DA6D1B9 for ; Fri, 1 Mar 2024 11:50:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709293820; cv=none; b=tDdydg3dz+njVXFPuptpEpTgbu/46SxzFRz5b5ZtA2/BWvVnDjsqGvgOpoE0bq3FFg4KeS4ncB4XMwfjsg3cxmdRtKCGk8EMg86V2enX41yHRM34HtKCCMjxl6kuOAl6lFCtQWFysEao12Jv45PmmKXUK/N8dmV1qUKoVhpg92c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709293820; c=relaxed/simple; bh=9daxpXWWrofNhfc/8tGx2qT9mDgS2L2omsbmQJrVzOA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=fyHWActzp8ljHvt94wsK970vKLJHu7W+4hhM0fJytyRio1B8ULMXLNnYib9EUI9Fqb+uAInMw2lJoyaJt/juZ+LZvTe3ia8vCP6qmI7WPX2ZdJ8EofIJkC/CCEGpniXMmkLkVhCOJeTo2LWeevu6Z+VH5pf96kbmKraj/cvRGWQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=KFSPsmPk; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="KFSPsmPk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709293817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=sbxmYCmx7KEXKZU1W11M9tIsGjyOf9fGQFP2JCkJplU=; b=KFSPsmPkFewkGQcoH2wiR+8bFA9FYSy0BqbWuD8OdrDh1IhLiivWVBBYbYkJajU9FKqQ2l LFuR8BfmK95Vkv3I0LyQQbmDE1n0KBPlIXrbjXku04/VTM6DtL9mIuKoFiNXVckhI6S3kZ 7yJ/JDsUHSguL2yZMCXdRAzFHGKZNww= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-yC-T8TvlP7K2m-HM9H0nKg-1; Fri, 01 Mar 2024 06:50:16 -0500 X-MC-Unique: yC-T8TvlP7K2m-HM9H0nKg-1 Received: by mail-qk1-f197.google.com with SMTP id af79cd13be357-787988f273dso214082885a.3 for ; Fri, 01 Mar 2024 03:50:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709293816; x=1709898616; h=content-transfer-encoding:in-reply-to:autocrypt:from:references:cc :to:content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sbxmYCmx7KEXKZU1W11M9tIsGjyOf9fGQFP2JCkJplU=; b=VOFi/yQ6TRChw1x72AcHNHCVeQyDVRkflsJXqjnZbMm7WHaW9aL2t1ChdY/JqYAHkt PnTogvXeV5YPfNKqM7nB5s3L2Y7scAa+/G3Za6x0sLDKPqqv/2Sl2oII4BGmiSrZRFN9 lqTX72QuZisgSSQIkDoDzHw8a2u/jOLFTzP5wlag4tQNH8XulNjJPmi9j9bW2L59msr+ gfjf148qL7Gy5GE+2BI47Jbf3UKLZ18mPQBFwqbYpc/mMEWzmmla73vrG5X62YBOkmLY jIwI+xj9Z4M0PjDe8R0hEidTGDiyWBZLYSCXAuE//e1FcekNbUKMZgkQvMLr4LSvizz+ i9SQ== X-Forwarded-Encrypted: i=1; AJvYcCUEG/ZSm7RsRadLw+5bhBkCA2behoFo0Vukc9USaZ0LERpeN5mgvyUxoUOqn3d3+pw7kZA0TEw+iouLIm3nDAfw5NcG X-Gm-Message-State: AOJu0Yyv6OO4eaLcS3b+hPm1TdmtdlQu8KR+BWxN9ZdRGMrRIHpfdW5L 29Oc0+sMF5RPf2FHaYgpY9hsPrylnqpPBafmqe+dzJGAjnjaBEFXXKbSvw2Yw2ftzr0Q9h+u50V JP0fQWalCZYbJYol8a/0uUuc2vHbgROE4ENSDHZg1AjKZ2KgD3A== X-Received: by 2002:a05:620a:1643:b0:787:ec02:92f6 with SMTP id c3-20020a05620a164300b00787ec0292f6mr1238267qko.73.1709293815745; Fri, 01 Mar 2024 03:50:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiDwPYWVHkDqooggwtDzoTfzET85vE65+rQl/isQu55HmdcDVvr5OWdGkWeT82LeVW5FmW+A== X-Received: by 2002:a05:620a:1643:b0:787:ec02:92f6 with SMTP id c3-20020a05620a164300b00787ec0292f6mr1238253qko.73.1709293815465; Fri, 01 Mar 2024 03:50:15 -0800 (PST) Received: from [192.168.0.9] (ip-109-43-178-133.web.vodafone.de. [109.43.178.133]) by smtp.gmail.com with ESMTPSA id br37-20020a05620a462500b007872d50caf5sm1570063qkb.19.2024.03.01.03.50.13 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Mar 2024 03:50:15 -0800 (PST) Message-ID: Date: Fri, 1 Mar 2024 12:50:10 +0100 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [kvm-unit-tests PATCH 12/32] powerpc: Fix emulator illegal instruction test for powernv Content-Language: en-US To: Nicholas Piggin Cc: Laurent Vivier , Andrew Jones , Paolo Bonzini , Joel Stanley , linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org References: <20240226101218.1472843-1-npiggin@gmail.com> <20240226101218.1472843-13-npiggin@gmail.com> From: Thomas Huth Autocrypt: addr=thuth@redhat.com; keydata= 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 In-Reply-To: <20240226101218.1472843-13-npiggin@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 26/02/2024 11.11, Nicholas Piggin wrote: > Illegal instructions cause 0xe40 (HEAI) interrupts rather > than program interrupts. > > Acked-by: Thomas Huth > Signed-off-by: Nicholas Piggin > --- > lib/powerpc/asm/processor.h | 1 + > lib/powerpc/setup.c | 13 +++++++++++++ > powerpc/emulator.c | 21 ++++++++++++++++++++- > 3 files changed, 34 insertions(+), 1 deletion(-) > > diff --git a/lib/powerpc/asm/processor.h b/lib/powerpc/asm/processor.h > index 9d8061962..cf1b9d8ff 100644 > --- a/lib/powerpc/asm/processor.h > +++ b/lib/powerpc/asm/processor.h > @@ -11,6 +11,7 @@ void do_handle_exception(struct pt_regs *regs); > #endif /* __ASSEMBLY__ */ > > extern bool cpu_has_hv; > +extern bool cpu_has_heai; > > static inline uint64_t mfspr(int nr) > { > diff --git a/lib/powerpc/setup.c b/lib/powerpc/setup.c > index 89e5157f2..3c81aee9e 100644 > --- a/lib/powerpc/setup.c > +++ b/lib/powerpc/setup.c > @@ -87,6 +87,7 @@ static void cpu_set(int fdtnode, u64 regval, void *info) > } > > bool cpu_has_hv; > +bool cpu_has_heai; > > static void cpu_init(void) > { > @@ -108,6 +109,18 @@ static void cpu_init(void) > hcall(H_SET_MODE, 0, 4, 0, 0); > #endif > } > + > + switch (mfspr(SPR_PVR) & PVR_VERSION_MASK) { > + case PVR_VER_POWER10: > + case PVR_VER_POWER9: > + case PVR_VER_POWER8E: > + case PVR_VER_POWER8NVL: > + case PVR_VER_POWER8: > + cpu_has_heai = true; > + break; > + default: > + break; > + } > } > > static void mem_init(phys_addr_t freemem_start) > diff --git a/powerpc/emulator.c b/powerpc/emulator.c > index 39dd59645..c9b17f742 100644 > --- a/powerpc/emulator.c > +++ b/powerpc/emulator.c > @@ -31,6 +31,20 @@ static void program_check_handler(struct pt_regs *regs, void *opaque) > regs->nip += 4; > } > > +static void heai_handler(struct pt_regs *regs, void *opaque) > +{ > + int *data = opaque; > + > + if (verbose) { > + printf("Detected invalid instruction %#018lx: %08x\n", > + regs->nip, *(uint32_t*)regs->nip); > + } > + > + *data = 8; /* Illegal instruction */ > + > + regs->nip += 4; > +} > + > static void alignment_handler(struct pt_regs *regs, void *opaque) > { > int *data = opaque; > @@ -362,7 +376,12 @@ int main(int argc, char **argv) > { > int i; > > - handle_exception(0x700, program_check_handler, (void *)&is_invalid); > + if (cpu_has_heai) { > + handle_exception(0xe40, heai_handler, (void *)&is_invalid); > + handle_exception(0x700, program_check_handler, (void *)&is_invalid); > + } else { > + handle_exception(0x700, program_check_handler, (void *)&is_invalid); The 0x700 line looks identical to the other part of the if-statement ... I'd suggest to leave it outside of the if-statement, drop the else-part and just set 0xe40 if cpu_has_heai. Thomas > + } > handle_exception(0x600, alignment_handler, (void *)&alignment); > > for (i = 1; i < argc; i++) {