From patchwork Mon Jan 20 18:42:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Claudio Imbrenda X-Patchwork-Id: 11342737 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B16741398 for ; Mon, 20 Jan 2020 18:43:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 991DC2253D for ; Mon, 20 Jan 2020 18:43:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726935AbgATSnH (ORCPT ); Mon, 20 Jan 2020 13:43:07 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:54784 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726954AbgATSnG (ORCPT ); Mon, 20 Jan 2020 13:43:06 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00KIcu35145263 for ; Mon, 20 Jan 2020 13:43:06 -0500 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xmgcnkm0e-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 20 Jan 2020 13:43:05 -0500 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 20 Jan 2020 18:43:03 -0000 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 20 Jan 2020 18:43:00 -0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 00KIg8Ye46072192 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 20 Jan 2020 18:42:08 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 67AED4C05A; Mon, 20 Jan 2020 18:42:58 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 348334C04A; Mon, 20 Jan 2020 18:42:58 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.108]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 20 Jan 2020 18:42:58 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org, thuth@redhat.com, david@redhat.com, borntraeger@de.ibm.com, frankja@linux.ibm.com Subject: [kvm-unit-tests PATCH v8 4/6] s390x: lib: add SPX and STPX instruction wrapper Date: Mon, 20 Jan 2020 19:42:54 +0100 X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200120184256.188698-1-imbrenda@linux.ibm.com> References: <20200120184256.188698-1-imbrenda@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 20012018-0016-0000-0000-000002DF2710 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 20012018-0017-0000-0000-00003341CC1C Message-Id: <20200120184256.188698-5-imbrenda@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138,18.0.572 definitions=2020-01-20_08:2020-01-20,2020-01-20 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=983 mlxscore=0 phishscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 adultscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1910280000 definitions=main-2001200156 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a wrapper for the SET PREFIX and STORE PREFIX instructions, and use it instead of using inline assembly. Signed-off-by: Claudio Imbrenda Reviewed-by: Thomas Huth Reviewed-by: Janosch Frank --- lib/s390x/asm/arch_def.h | 13 +++++++++++++ s390x/intercept.c | 24 +++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h index 1a5e3c6..15a4d49 100644 --- a/lib/s390x/asm/arch_def.h +++ b/lib/s390x/asm/arch_def.h @@ -284,4 +284,17 @@ static inline int servc(uint32_t command, unsigned long sccb) return cc; } +static inline void set_prefix(uint32_t new_prefix) +{ + asm volatile(" spx %0" : : "Q" (new_prefix) : "memory"); +} + +static inline uint32_t get_prefix(void) +{ + uint32_t current_prefix; + + asm volatile(" stpx %0" : "=Q" (current_prefix)); + return current_prefix; +} + #endif diff --git a/s390x/intercept.c b/s390x/intercept.c index 3696e33..5f46b82 100644 --- a/s390x/intercept.c +++ b/s390x/intercept.c @@ -13,6 +13,7 @@ #include #include #include +#include static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2))); @@ -26,13 +27,10 @@ static void test_stpx(void) uint32_t new_prefix = (uint32_t)(intptr_t)pagebuf; /* Can we successfully change the prefix? */ - asm volatile ( - " stpx %0\n" - " spx %2\n" - " stpx %1\n" - " spx %0\n" - : "+Q"(old_prefix), "+Q"(tst_prefix) - : "Q"(new_prefix)); + old_prefix = get_prefix(); + set_prefix(new_prefix); + tst_prefix = get_prefix(); + set_prefix(old_prefix); report(old_prefix == 0 && tst_prefix == new_prefix, "store prefix"); expect_pgm_int(); @@ -63,14 +61,10 @@ static void test_spx(void) * some facility bits there ... at least some of them should be * set in our buffer afterwards. */ - asm volatile ( - " stpx %0\n" - " spx %1\n" - " stfl 0\n" - " spx %0\n" - : "+Q"(old_prefix) - : "Q"(new_prefix) - : "memory"); + old_prefix = get_prefix(); + set_prefix(new_prefix); + stfl(); + set_prefix(old_prefix); report(pagebuf[GEN_LC_STFL] != 0, "stfl to new prefix"); expect_pgm_int();