From patchwork Tue Feb 4 07:13:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 11364117 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 7CA2013A4 for ; Tue, 4 Feb 2020 07:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50A2F21775 for ; Tue, 4 Feb 2020 07:13:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="W+JnyaHi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726378AbgBDHNs (ORCPT ); Tue, 4 Feb 2020 02:13:48 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:20592 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726053AbgBDHNs (ORCPT ); Tue, 4 Feb 2020 02:13:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580800427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=uYQgQSLkVmftwYeud7Lp3Fio62OSlQzGpPE26l50Te0=; b=W+JnyaHi5c3tsZMUhBOXs3gtqWOVEW/0lF2ixORJEQp2D/EMkiRWM8MI0pvEeOh+q0cSUl 1+wsQ28Je7wj2pCQuTwJ65ooJnHrYB5q9A+uxx2RsbAAYguTuaGmB7QdcqznmOQ24Ysqhs mBE/AfqLhuJcIyXMFyUOsx1RrSFELPo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-179-F9MBVDcYO0OIxrbFqOzQJA-1; Tue, 04 Feb 2020 02:13:45 -0500 X-MC-Unique: F9MBVDcYO0OIxrbFqOzQJA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 366F01090785; Tue, 4 Feb 2020 07:13:44 +0000 (UTC) Received: from thuth.com (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id D33E45C1D8; Tue, 4 Feb 2020 07:13:42 +0000 (UTC) From: Thomas Huth To: kvm@vger.kernel.org, Paolo Bonzini Cc: david@redhat.com, Janosch Frank Subject: [kvm-unit-tests PULL 1/9] s390x: smp: Cleanup smp.c Date: Tue, 4 Feb 2020 08:13:27 +0100 Message-Id: <20200204071335.18180-2-thuth@redhat.com> In-Reply-To: <20200204071335.18180-1-thuth@redhat.com> References: <20200204071335.18180-1-thuth@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Janosch Frank Let's remove a lot of badly formatted code by introducing the wait_for_flag() and set_flag functions. Also let's remove some stray spaces and always set the testflag before using it. Signed-off-by: Janosch Frank Reviewed-by: Thomas Huth Reviewed-by: Cornelia Huck Reviewed-by: David Hildenbrand Message-Id: <20200201152851.82867-2-frankja@linux.ibm.com> Signed-off-by: Thomas Huth --- s390x/smp.c | 55 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/s390x/smp.c b/s390x/smp.c index ab7e46c..e37eb56 100644 --- a/s390x/smp.c +++ b/s390x/smp.c @@ -22,6 +22,19 @@ static int testflag = 0; +static void wait_for_flag(void) +{ + while (!testflag) + mb(); +} + +static void set_flag(int val) +{ + mb(); + testflag = val; + mb(); +} + static void cpu_loop(void) { for (;;) {} @@ -29,21 +42,19 @@ static void cpu_loop(void) static void test_func(void) { - testflag = 1; - mb(); + set_flag(1); cpu_loop(); } static void test_start(void) { struct psw psw; - psw.mask = extract_psw_mask(); + psw.mask = extract_psw_mask(); psw.addr = (unsigned long)test_func; + set_flag(0); smp_cpu_setup(1, psw); - while (!testflag) { - mb(); - } + wait_for_flag(); report(1, "start"); } @@ -112,27 +123,27 @@ static void ecall(void) mask = extract_psw_mask(); mask |= PSW_MASK_EXT; load_psw_mask(mask); - testflag = 1; + set_flag(1); while (lc->ext_int_code != 0x1202) { mb(); } report(1, "ecall"); - testflag= 1; + set_flag(1); } static void test_ecall(void) { struct psw psw; - psw.mask = extract_psw_mask(); + psw.mask = extract_psw_mask(); psw.addr = (unsigned long)ecall; report_prefix_push("ecall"); - testflag= 0; + set_flag(0); smp_cpu_destroy(1); smp_cpu_setup(1, psw); - while (!testflag) { mb(); } - testflag= 0; + wait_for_flag(); + set_flag(0); sigp(1, SIGP_EXTERNAL_CALL, 0, NULL); - while(!testflag) {mb();} + wait_for_flag(); smp_cpu_stop(1); report_prefix_pop(); } @@ -147,27 +158,27 @@ static void emcall(void) mask = extract_psw_mask(); mask |= PSW_MASK_EXT; load_psw_mask(mask); - testflag= 1; + set_flag(1); while (lc->ext_int_code != 0x1201) { mb(); } report(1, "ecall"); - testflag = 1; + set_flag(1); } static void test_emcall(void) { struct psw psw; - psw.mask = extract_psw_mask(); + psw.mask = extract_psw_mask(); psw.addr = (unsigned long)emcall; report_prefix_push("emcall"); - testflag= 0; + set_flag(0); smp_cpu_destroy(1); smp_cpu_setup(1, psw); - while (!testflag) { mb(); } - testflag= 0; + wait_for_flag(); + set_flag(0); sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL); - while(!testflag) { mb(); } + wait_for_flag(); smp_cpu_stop(1); report_prefix_pop(); } @@ -177,7 +188,7 @@ static void test_reset_initial(void) struct cpu_status *status = alloc_pages(0); struct psw psw; - psw.mask = extract_psw_mask(); + psw.mask = extract_psw_mask(); psw.addr = (unsigned long)test_func; report_prefix_push("reset initial"); @@ -208,7 +219,7 @@ static void test_reset(void) { struct psw psw; - psw.mask = extract_psw_mask(); + psw.mask = extract_psw_mask(); psw.addr = (unsigned long)test_func; report_prefix_push("cpu reset");