From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <SRS0=ZeYp=6T=lists.ozlabs.org=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED,
	DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
	HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
	SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no
	version=3.4.0
Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
	by smtp.lore.kernel.org (Postfix) with ESMTP id 28401C47254
	for <linuxppc-dev@archiver.kernel.org>; Tue,  5 May 2020 08:25:20 +0000 (UTC)
Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by mail.kernel.org (Postfix) with ESMTPS id C50DD2068E
	for <linuxppc-dev@archiver.kernel.org>; Tue,  5 May 2020 08:25:19 +0000 (UTC)
Authentication-Results: mail.kernel.org;
	dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iXeWbvyD"
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C50DD2068E
Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com
Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org
Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])
	by lists.ozlabs.org (Postfix) with ESMTP id 49GXpj5G0jzDqQt
	for <linuxppc-dev@archiver.kernel.org>; Tue,  5 May 2020 18:25:17 +1000 (AEST)
Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized)
 smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::c41;
 helo=mail-oo1-xc41.google.com; envelope-from=jniethe5@gmail.com;
 receiver=<UNKNOWN>)
Authentication-Results: lists.ozlabs.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com
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=20161025 header.b=iXeWbvyD; dkim-atps=neutral
Received: from mail-oo1-xc41.google.com (mail-oo1-xc41.google.com
 [IPv6:2607:f8b0:4864:20::c41])
 (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 49GWhY3zwczDq9S
 for <linuxppc-dev@lists.ozlabs.org>; Tue,  5 May 2020 17:34:53 +1000 (AEST)
Received: by mail-oo1-xc41.google.com with SMTP id q204so343511ooq.1
 for <linuxppc-dev@lists.ozlabs.org>; Tue, 05 May 2020 00:34:53 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=mime-version:references:in-reply-to:from:date:message-id:subject:to
 :cc; bh=Dd2T2zTUtM1dM306Cr32HSfUSM6NOMlzBCI8n3W4B28=;
 b=iXeWbvyDZ4TMMR38DjrtbkcA7ZfcWU/gJ0A2B18CA8VPIR7etBhsOgrMJQudSG9aLh
 20V0EbmJfxOTByVsaBN+Ce1RSflFvKMQOKrjfuDqWEZe9fx+5pGByqrnCZ/ay3JvK0HD
 ICpKjZPZFJueuRXAt1dbTi4KOx//f1n79a3whm7PrmMS1O/1CR/O9HkEK0dVDoGLaAUW
 xmWM4QqockgV2ddKKzvt/0hZrM0FqiZCKmdUFh3w4c/reN+9obayYPUjZyG36tNXvWIn
 Vx5uNpHdMpNHuYGB7hhXUPnn1RXf/GeFKsP6ycU7a/n05KC9z07OBrpBePsrHNb80G3z
 WCXQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:mime-version:references:in-reply-to:from:date
 :message-id:subject:to:cc;
 bh=Dd2T2zTUtM1dM306Cr32HSfUSM6NOMlzBCI8n3W4B28=;
 b=GSl60ZOY/usCmMxgwFiILPrE9JgWQA69/fGJph0XFMiiUiMTLfBLDqiHvOUUVr5CYJ
 FYs0TONNKjkIj3Wo//n1hFI/327Vu5958WvnqJEfscDKhovOOqiDFCED6JMywRG64lFr
 LjsS8Af+CsOEfxowaSHpVEgs0h0JEDYsDHfTod+3Pd3JVqLSDL1mrrZOyCqBda4CDNIr
 MBFmkeQimrJ7Xb21+yKms+6smUv0naJu2fq/IlKyC64YgqLlSikbCtANlPIoe96QIMC2
 7jAA9zC9n7IGoENuYUWACLT7iztwOhwjKMRgm1JO4W5LK72+h1JyLRBW8h6ZJS4P8blH
 uzXg==
X-Gm-Message-State: AGi0PuZ+TRidO+b+GyN8YwAFhwbnS3L1s67zvJQCVojCT6U8uwsYG9Ea
 Q0uYq7Gj+JGUoJ9/h89Dhg3FXB7xmhe6gWI+ajs=
X-Google-Smtp-Source: APiQypLH2zpjJNJfY1Ws/U12gczFeTqrSPBrHtszsw6GJuES8KOoepqCaqvzdl2kor7SGya+hlGLV0dYPpfHr6QBPlA=
X-Received: by 2002:a4a:a98b:: with SMTP id w11mr1801011oom.80.1588664089735; 
 Tue, 05 May 2020 00:34:49 -0700 (PDT)
MIME-Version: 1.0
References: <20200501034220.8982-1-jniethe5@gmail.com>
 <20200501034220.8982-26-jniethe5@gmail.com>
 <5803808.3aLiq0rt1P@townsend>
In-Reply-To: <5803808.3aLiq0rt1P@townsend>
From: Jordan Niethe <jniethe5@gmail.com>
Date: Tue, 5 May 2020 17:34:37 +1000
Message-ID: <CACzsE9rvE0ZNtkkCGOnMkgJWesyfUTPXF1L9KZhuxjqUSLz9Mw@mail.gmail.com>
Subject: Re: [PATCH v7 25/28] powerpc: Test prefixed instructions in feature
 fixups
To: Alistair Popple <alistair@popple.id.au>
Content-Type: text/plain; charset="UTF-8"
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: Nicholas Piggin <npiggin@gmail.com>, Balamuruhan S <bala24@linux.ibm.com>,
 naveen.n.rao@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org,
 Daniel Axtens <dja@axtens.net>
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 Tue, May 5, 2020 at 5:15 PM Alistair Popple <alistair@popple.id.au> wrote:
>
> Hmm, I was hoping to add a tested by but I'm seeing the following failure in
> Mambo:
>
> [    1.475459] feature-fixups: test failed at line 730
>
> Based on the name of the test it looks like you probably made a copy/paste
> error in ftr_fixup_prefix2_expected. I suspect you probably meant to use the alt
> fixup:
>
> globl(ftr_fixup_prefix2_expected)
>         or      1,1,1
>         .long 0x7000000
>         .long 0x0000001
>         or      2,2,2
Thanks, I changed from using 0x7000000 to 1 << 26 but missed here.
Changing that fixes this.
>
> Also for some reason these tests (and one of the code-patching tests) aren't
> passing on big endian.
Okay, will fix that.
>
> - Alistair
>
> On Friday, 1 May 2020 1:42:17 PM AEST Jordan Niethe wrote:
> > Expand the feature-fixups self-tests to includes tests for prefixed
> > instructions.
> >
> > Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
> > ---
> > v6: New to series
> > ---
> >  arch/powerpc/lib/feature-fixups-test.S | 68 +++++++++++++++++++++++
> >  arch/powerpc/lib/feature-fixups.c      | 74 ++++++++++++++++++++++++++
> >  2 files changed, 142 insertions(+)
> >
> > diff --git a/arch/powerpc/lib/feature-fixups-test.S
> > b/arch/powerpc/lib/feature-fixups-test.S index b12168c2447a..6e2da9123a9b
> > 100644
> > --- a/arch/powerpc/lib/feature-fixups-test.S
> > +++ b/arch/powerpc/lib/feature-fixups-test.S
> > @@ -791,3 +791,71 @@ globl(lwsync_fixup_test_expected_SYNC)
> >  1:   or      1,1,1
> >       sync
> >
> > +globl(ftr_fixup_prefix1)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +globl(end_ftr_fixup_prefix1)
> > +
> > +globl(ftr_fixup_prefix1_orig)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +
> > +globl(ftr_fixup_prefix1_expected)
> > +     or      1,1,1
> > +     nop
> > +     nop
> > +     or      2,2,2
> > +
> > +globl(ftr_fixup_prefix2)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +globl(end_ftr_fixup_prefix2)
> > +
> > +globl(ftr_fixup_prefix2_orig)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +
> > +globl(ftr_fixup_prefix2_alt)
> > +     .long 0x7000000
> > +     .long 0x0000001
> > +
> > +globl(ftr_fixup_prefix2_expected)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000001
> > +     or      2,2,2
> > +
> > +globl(ftr_fixup_prefix3)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +     or      3,3,3
> > +globl(end_ftr_fixup_prefix3)
> > +
> > +globl(ftr_fixup_prefix3_orig)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000000
> > +     or      2,2,2
> > +     or      3,3,3
> > +
> > +globl(ftr_fixup_prefix3_alt)
> > +     .long 1 << 26
> > +     .long 0x0000001
> > +     nop
> > +
> > +globl(ftr_fixup_prefix3_expected)
> > +     or      1,1,1
> > +     .long 1 << 26
> > +     .long 0x0000001
> > +     nop
> > +     or      3,3,3
> > diff --git a/arch/powerpc/lib/feature-fixups.c
> > b/arch/powerpc/lib/feature-fixups.c index 243011f85287..6fc499b1d63e 100644
> > --- a/arch/powerpc/lib/feature-fixups.c
> > +++ b/arch/powerpc/lib/feature-fixups.c
> > @@ -687,6 +687,75 @@ static void test_lwsync_macros(void)
> >       }
> >  }
> >
> > +#ifdef __powerpc64__
> > +static void __init test_prefix_patching(void)
> > +{
> > +     extern unsigned int ftr_fixup_prefix1[];
> > +     extern unsigned int end_ftr_fixup_prefix1[];
> > +     extern unsigned int ftr_fixup_prefix1_orig[];
> > +     extern unsigned int ftr_fixup_prefix1_expected[];
> > +     int size = sizeof(unsigned int) * (end_ftr_fixup_prefix1 -
> > ftr_fixup_prefix1); +
> > +     fixup.value = fixup.mask = 8;
> > +     fixup.start_off = calc_offset(&fixup, ftr_fixup_prefix1 + 1);
> > +     fixup.end_off = calc_offset(&fixup, ftr_fixup_prefix1 + 3);
> > +     fixup.alt_start_off = fixup.alt_end_off = 0;
> > +
> > +     /* Sanity check */
> > +     check(memcmp(ftr_fixup_prefix1, ftr_fixup_prefix1_orig, size) == 0);
> > +
> > +     patch_feature_section(0, &fixup);
> > +     check(memcmp(ftr_fixup_prefix1, ftr_fixup_prefix1_expected, size) == 0);
> > +     check(memcmp(ftr_fixup_prefix1, ftr_fixup_prefix1_orig, size) != 0);
> > +}
> > +
> > +static void __init test_prefix_alt_patching(void)
> > +{
> > +     extern unsigned int ftr_fixup_prefix2[];
> > +     extern unsigned int end_ftr_fixup_prefix2[];
> > +     extern unsigned int ftr_fixup_prefix2_orig[];
> > +     extern unsigned int ftr_fixup_prefix2_expected[];
> > +     extern unsigned int ftr_fixup_prefix2_alt[];
> > +     int size = sizeof(unsigned int) * (end_ftr_fixup_prefix2 -
> > ftr_fixup_prefix2); +
> > +     fixup.value = fixup.mask = 8;
> > +     fixup.start_off = calc_offset(&fixup, ftr_fixup_prefix2 + 1);
> > +     fixup.end_off = calc_offset(&fixup, ftr_fixup_prefix2 + 3);
> > +     fixup.alt_start_off = calc_offset(&fixup, ftr_fixup_prefix2_alt);
> > +     fixup.alt_end_off = calc_offset(&fixup, ftr_fixup_prefix2_alt + 2);
> > +     /* Sanity check */
> > +     check(memcmp(ftr_fixup_prefix2, ftr_fixup_prefix2_orig, size) == 0);
> > +
> > +     patch_feature_section(0, &fixup);
> > +     check(memcmp(ftr_fixup_prefix2, ftr_fixup_prefix2_expected, size) == 0);
> > +     patch_feature_section(0, &fixup);
> > +     check(memcmp(ftr_fixup_prefix2, ftr_fixup_prefix2_orig, size) != 0);
> > +}
> > +
> > +static void __init test_prefix_word_alt_patching(void)
> > +{
> > +     extern unsigned int ftr_fixup_prefix3[];
> > +     extern unsigned int end_ftr_fixup_prefix3[];
> > +     extern unsigned int ftr_fixup_prefix3_orig[];
> > +     extern unsigned int ftr_fixup_prefix3_expected[];
> > +     extern unsigned int ftr_fixup_prefix3_alt[];
> > +     int size = sizeof(unsigned int) * (end_ftr_fixup_prefix3 -
> > ftr_fixup_prefix3); +
> > +     fixup.value = fixup.mask = 8;
> > +     fixup.start_off = calc_offset(&fixup, ftr_fixup_prefix3 + 1);
> > +     fixup.end_off = calc_offset(&fixup, ftr_fixup_prefix3 + 4);
> > +     fixup.alt_start_off = calc_offset(&fixup, ftr_fixup_prefix3_alt);
> > +     fixup.alt_end_off = calc_offset(&fixup, ftr_fixup_prefix3_alt + 3);
> > +     /* Sanity check */
> > +     check(memcmp(ftr_fixup_prefix3, ftr_fixup_prefix3_orig, size) == 0);
> > +
> > +     patch_feature_section(0, &fixup);
> > +     check(memcmp(ftr_fixup_prefix3, ftr_fixup_prefix3_expected, size) == 0);
> > +     patch_feature_section(0, &fixup);
> > +     check(memcmp(ftr_fixup_prefix3, ftr_fixup_prefix3_orig, size) != 0);
> > +}
> > +#endif /* __powerpc64__ */
> > +
> >  static int __init test_feature_fixups(void)
> >  {
> >       printk(KERN_DEBUG "Running feature fixup self-tests ...\n");
> > @@ -701,6 +770,11 @@ static int __init test_feature_fixups(void)
> >       test_cpu_macros();
> >       test_fw_macros();
> >       test_lwsync_macros();
> > +#ifdef __powerpc64__
> > +     test_prefix_patching();
> > +     test_prefix_alt_patching();
> > +     test_prefix_word_alt_patching();
> > +#endif
> >
> >       return 0;
> >  }
>
>
>
>