From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id F0C2A3890418 for ; Mon, 26 Apr 2021 19:27:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F0C2A3890418 Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 13QJ3j5R083644; Mon, 26 Apr 2021 15:27:48 -0400 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 3860yjcngv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Apr 2021 15:27:48 -0400 Received: from m0098417.ppops.net (m0098417.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.43/8.16.0.43) with SMTP id 13QJ4M5p085352; Mon, 26 Apr 2021 15:27:47 -0400 Received: from ppma01wdc.us.ibm.com (fd.55.37a9.ip4.static.sl-reverse.com [169.55.85.253]) by mx0a-001b2d01.pphosted.com with ESMTP id 3860yjcngm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Apr 2021 15:27:47 -0400 Received: from pps.filterd (ppma01wdc.us.ibm.com [127.0.0.1]) by ppma01wdc.us.ibm.com (8.16.0.43/8.16.0.43) with SMTP id 13QJC5cW022302; Mon, 26 Apr 2021 19:27:47 GMT Received: from b03cxnp07027.gho.boulder.ibm.com (b03cxnp07027.gho.boulder.ibm.com [9.17.130.14]) by ppma01wdc.us.ibm.com with ESMTP id 384ay98eg7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 26 Apr 2021 19:27:47 +0000 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp07027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 13QJRkkK35324164 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 26 Apr 2021 19:27:46 GMT Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1627E136055; Mon, 26 Apr 2021 19:27:46 +0000 (GMT) Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CFCEA13604F; Mon, 26 Apr 2021 19:27:45 +0000 (GMT) Received: from Bills-MacBook-Pro.local (unknown [9.211.99.167]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP; Mon, 26 Apr 2021 19:27:45 +0000 (GMT) Reply-To: wschmidt@linux.ibm.com Subject: Re: [PATCH 4/4] rs6000: Add ROP tests To: will schmidt , gcc-patches@gcc.gnu.org Cc: dje.gcc@gmail.com, segher@kernel.crashing.org References: <4adcb20b3d2d578fe6f34a9b5cd400f9999b54f5.1619400506.git.wschmidt@linux.ibm.com> <7118acced8c2c6a60d86cceff306ac55dfcdb115.camel@vnet.ibm.com> From: Bill Schmidt Message-ID: <32475e36-6494-10ec-3ebb-4c43d7f9cea8@linux.ibm.com> Date: Mon, 26 Apr 2021 14:27:45 -0500 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <7118acced8c2c6a60d86cceff306ac55dfcdb115.camel@vnet.ibm.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-GB X-TM-AS-GCONF: 00 X-Proofpoint-GUID: JGwzDfU7VxjsVrfoM9qg_DCgBrKU7mzL X-Proofpoint-ORIG-GUID: C7i0nnF5y4lDs0UNN8FwGXv_iab7RnTe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.391, 18.0.761 definitions=2021-04-26_09:2021-04-26, 2021-04-26 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 phishscore=0 clxscore=1015 suspectscore=0 mlxscore=0 malwarescore=0 lowpriorityscore=0 spamscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104060000 definitions=main-2104260147 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2021 19:27:50 -0000 On 4/26/21 11:04 AM, will schmidt wrote: > On Sun, 2021-04-25 at 20:50 -0500, Bill Schmidt via Gcc-patches wrote: >> 2021-03-25 Bill Schmidt >> >> gcc/testsuite/ >> * gcc.target/powerpc/rop-1.c: New. >> * gcc.target/powerpc/rop-2.c: New. >> * gcc.target/powerpc/rop-3.c: New. >> * gcc.target/powerpc/rop-4.c: New. >> * gcc.target/powerpc/rop-5.c: New. > ok > >> --- >> gcc/testsuite/gcc.target/powerpc/rop-1.c | 16 ++++++++++++++++ >> gcc/testsuite/gcc.target/powerpc/rop-2.c | 16 ++++++++++++++++ >> gcc/testsuite/gcc.target/powerpc/rop-3.c | 19 +++++++++++++++++++ >> gcc/testsuite/gcc.target/powerpc/rop-4.c | 14 ++++++++++++++ >> gcc/testsuite/gcc.target/powerpc/rop-5.c | 17 +++++++++++++++++ >> 5 files changed, 82 insertions(+) >> create mode 100644 gcc/testsuite/gcc.target/powerpc/rop-1.c >> create mode 100644 gcc/testsuite/gcc.target/powerpc/rop-2.c >> create mode 100644 gcc/testsuite/gcc.target/powerpc/rop-3.c >> create mode 100644 gcc/testsuite/gcc.target/powerpc/rop-4.c >> create mode 100644 gcc/testsuite/gcc.target/powerpc/rop-5.c >> >> diff --git a/gcc/testsuite/gcc.target/powerpc/rop-1.c b/gcc/testsuite/gcc.target/powerpc/rop-1.c >> new file mode 100644 >> index 00000000000..cf8e2b01dda >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/rop-1.c >> @@ -0,0 +1,16 @@ >> +/* { dg-do compile } */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power10 -mrop-protect" } */ >> + >> +/* Verify that ROP-protect instructions are inserted when a >> + call is present. */ >> + >> +extern void foo (void); >> + >> +int bar () >> +{ >> + foo (); >> + return 5; >> +} >> + >> +/* { dg-final { scan-assembler {\mhashst\M} } } */ >> +/* { dg-final { scan-assembler {\mhashchk\M} } } */ > ok > > >> diff --git a/gcc/testsuite/gcc.target/powerpc/rop-2.c b/gcc/testsuite/gcc.target/powerpc/rop-2.c >> new file mode 100644 >> index 00000000000..dde403b0ef5 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/rop-2.c >> @@ -0,0 +1,16 @@ >> +/* { dg-do compile } */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power10 -mrop-protect -mprivileged" } */ >> + >> +/* Verify that privileged ROP-protect instructions are inserted when a >> + call is present. */ >> + >> +extern void foo (void); >> + >> +int bar () >> +{ >> + foo (); >> + return 5; >> +} >> + >> +/* { dg-final { scan-assembler {\mhashstp\M} } } */ >> +/* { dg-final { scan-assembler {\mhashchkp\M} } } */ > ok > > >> diff --git a/gcc/testsuite/gcc.target/powerpc/rop-3.c b/gcc/testsuite/gcc.target/powerpc/rop-3.c >> new file mode 100644 >> index 00000000000..054f94fda99 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/rop-3.c >> @@ -0,0 +1,19 @@ >> +/* { dg-do run { target { power10_hw } } } */ >> +/* { dg-require-effective-target power10_ok } */ >> +/* { dg-require-effective-target powerpc_elfv2 } */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power10 -mrop-protect" } */ >> + >> +/* Verify that ROP-protect instructions execute correctly when a >> + call is present. */ >> + >> +void __attribute__((noinline)) foo () >> +{ >> + asm (""); >> +} >> + >> +int main () >> +{ >> + foo (); >> + return 0; >> +} >> + > ok > > >> diff --git a/gcc/testsuite/gcc.target/powerpc/rop-4.c b/gcc/testsuite/gcc.target/powerpc/rop-4.c >> new file mode 100644 >> index 00000000000..e2be8b2c035 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/rop-4.c >> @@ -0,0 +1,14 @@ >> +/* { dg-do compile } */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power10 -mrop-protect" } */ >> + >> +/* Verify that no ROP-protect instructions are inserted when no >> + call is present. */ >> + >> + >> +int bar () >> +{ >> + return 5; >> +} >> + >> +/* { dg-final { scan-assembler-not {\mhashst\M} } } */ >> +/* { dg-final { scan-assembler-not {\mhashchk\M} } } */ > > ok > >> diff --git a/gcc/testsuite/gcc.target/powerpc/rop-5.c b/gcc/testsuite/gcc.target/powerpc/rop-5.c >> new file mode 100644 >> index 00000000000..b759fa59979 >> --- /dev/null >> +++ b/gcc/testsuite/gcc.target/powerpc/rop-5.c >> @@ -0,0 +1,17 @@ >> +/* { dg-do run { target { power10_hw } } } */ >> +/* { dg-require-effective-target power10_ok } */ >> +/* { dg-require-effective-target powerpc_elfv2 } */ >> +/* { dg-options "-O2 -mdejagnu-cpu=power10 -mrop-protect" } */ >> + >> +/* Verify that __ROP_PROTECT__ is predefined for -mrop-protect. */ >> + >> +extern void abort (void); >> + >> +int main () >> +{ >> +#ifndef __ROP_PROTECT__ >> + abort (); >> +#endif >> + return 0; >> +} >> + > ok. > > > Does there need to be another test to verify if -mrop-protect is on by > default without specifying -mrop-protect? (or is it?) Question on > 0/4. It's off by default (see the Init(0) in patch 1/4). Bill > with that noted, > lgtm, > thanks, > -will > > >