From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 B8934C433DB for ; Tue, 12 Jan 2021 13:22:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 729E322E03 for ; Tue, 12 Jan 2021 13:22:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732884AbhALNV6 (ORCPT ); Tue, 12 Jan 2021 08:21:58 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:61838 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729303AbhALNV5 (ORCPT ); Tue, 12 Jan 2021 08:21:57 -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 10CD47a4041718; Tue, 12 Jan 2021 08:21:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=pp1; bh=xjPHb99+v4kpLUPmD56iw4IatI498gPaEZA7zh4MTmw=; b=DERbYKmIuNToFSmzyh11AmuJddonJK6AgIv1FMXN4I40sHEsOiDVmS2cXR1GuDMU6R2B a8kZh8YtrZEg/ZVlKYu3KFh0phD6/zR89D7pF+6K0K/L7UE5rstG5txNjFOe1jS5bqwS xR/eKqBFlA6mwdMBqIgEPWpcvOuqlJYQAx32zo0sZq723muLNVHrUcfjrCI8DBfdNwDT XVrbXorBB2MPoQGJ4/FIVPCWEnPs9ApRtX3u4I0YB45YH1B61Vi1LAOh/io86+DmSwUy CiMgSQ5POAqavBSZtn/4zlphedSqeNwWXhsGVfAHXD56PQbW5uFka6bnYmxH5XGvbw5R Cw== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 361b8htt4g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Jan 2021 08:21:16 -0500 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 10CD4PiZ043003; Tue, 12 Jan 2021 08:21:16 -0500 Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com with ESMTP id 361b8htt3d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Jan 2021 08:21:16 -0500 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 10CDI946024084; Tue, 12 Jan 2021 13:21:14 GMT Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by ppma06ams.nl.ibm.com with ESMTP id 35ydrdb8vv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 12 Jan 2021 13:21:13 +0000 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 10CDLBET41157112 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 12 Jan 2021 13:21:11 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 256544C058; Tue, 12 Jan 2021 13:21:11 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5E4144C046; Tue, 12 Jan 2021 13:21:10 +0000 (GMT) Received: from linux01.pok.stglabs.ibm.com (unknown [9.114.17.81]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 12 Jan 2021 13:21:10 +0000 (GMT) From: Janosch Frank To: kvm@vger.kernel.org Cc: thuth@redhat.com, david@redhat.com, borntraeger@de.ibm.com, imbrenda@linux.ibm.com, cohuck@redhat.com, linux-s390@vger.kernel.org Subject: [kvm-unit-tests PATCH v4 2/9] s390x: Consolidate sclp read info Date: Tue, 12 Jan 2021 08:20:47 -0500 Message-Id: <20210112132054.49756-3-frankja@linux.ibm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210112132054.49756-1-frankja@linux.ibm.com> References: <20210112132054.49756-1-frankja@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343,18.0.737 definitions=2021-01-12_07:2021-01-12,2021-01-12 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 bulkscore=0 mlxscore=0 phishscore=0 adultscore=0 malwarescore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 impostorscore=0 mlxlogscore=999 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101120073 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Let's only read the information once and pass a pointer to it instead of calling sclp multiple times. Signed-off-by: Janosch Frank Reviewed-by: Cornelia Huck Acked-by: Thomas Huth --- lib/s390x/io.c | 1 + lib/s390x/sclp.c | 31 +++++++++++++++++++++++++------ lib/s390x/sclp.h | 3 +++ lib/s390x/smp.c | 27 +++++++++++---------------- 4 files changed, 40 insertions(+), 22 deletions(-) diff --git a/lib/s390x/io.c b/lib/s390x/io.c index 1ff0589..6a1da63 100644 --- a/lib/s390x/io.c +++ b/lib/s390x/io.c @@ -34,6 +34,7 @@ void setup(void) { setup_args_progname(ipl_args); setup_facilities(); + sclp_read_info(); sclp_console_setup(); sclp_memory_setup(); smp_setup(); diff --git a/lib/s390x/sclp.c b/lib/s390x/sclp.c index 08a4813..12916f5 100644 --- a/lib/s390x/sclp.c +++ b/lib/s390x/sclp.c @@ -23,6 +23,8 @@ extern unsigned long stacktop; static uint64_t storage_increment_size; static uint64_t max_ram_size; static uint64_t ram_size; +char _read_info[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); +static ReadInfo *read_info; char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); static volatile bool sclp_busy; @@ -108,6 +110,24 @@ static void sclp_read_scp_info(ReadInfo *ri, int length) report_abort("READ_SCP_INFO failed"); } +void sclp_read_info(void) +{ + sclp_read_scp_info((void *)_read_info, SCCB_SIZE); + read_info = (ReadInfo *)_read_info; +} + +int sclp_get_cpu_num(void) +{ + assert(read_info); + return read_info->entries_cpu; +} + +CPUEntry *sclp_get_cpu_entries(void) +{ + assert(read_info); + return (CPUEntry *)(_read_info + read_info->offset_cpu); +} + /* Perform service call. Return 0 on success, non-zero otherwise. */ int sclp_service_call(unsigned int command, void *sccb) { @@ -125,23 +145,22 @@ int sclp_service_call(unsigned int command, void *sccb) void sclp_memory_setup(void) { - ReadInfo *ri = (void *)_sccb; uint64_t rnmax, rnsize; int cc; - sclp_read_scp_info(ri, SCCB_SIZE); + assert(read_info); /* calculate the storage increment size */ - rnsize = ri->rnsize; + rnsize = read_info->rnsize; if (!rnsize) { - rnsize = ri->rnsize2; + rnsize = read_info->rnsize2; } storage_increment_size = rnsize << 20; /* calculate the maximum memory size */ - rnmax = ri->rnmax; + rnmax = read_info->rnmax; if (!rnmax) { - rnmax = ri->rnmax2; + rnmax = read_info->rnmax2; } max_ram_size = rnmax * storage_increment_size; diff --git a/lib/s390x/sclp.h b/lib/s390x/sclp.h index 9a6aad0..acd86d5 100644 --- a/lib/s390x/sclp.h +++ b/lib/s390x/sclp.h @@ -268,6 +268,9 @@ void sclp_wait_busy(void); void sclp_mark_busy(void); void sclp_console_setup(void); void sclp_print(const char *str); +void sclp_read_info(void); +int sclp_get_cpu_num(void); +CPUEntry *sclp_get_cpu_entries(void); int sclp_service_call(unsigned int command, void *sccb); void sclp_memory_setup(void); uint64_t get_ram_size(void); diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c index c4f02dc..dfcfd28 100644 --- a/lib/s390x/smp.c +++ b/lib/s390x/smp.c @@ -23,7 +23,6 @@ #include "smp.h" #include "sclp.h" -static char cpu_info_buffer[PAGE_SIZE] __attribute__((__aligned__(4096))); static struct cpu *cpus; static struct cpu *cpu0; static struct spinlock lock; @@ -32,8 +31,7 @@ extern void smp_cpu_setup_state(void); int smp_query_num_cpus(void) { - struct ReadCpuInfo *info = (void *)cpu_info_buffer; - return info->nr_configured; + return sclp_get_cpu_num(); } struct cpu *smp_cpu_from_addr(uint16_t addr) @@ -226,10 +224,10 @@ void smp_teardown(void) { int i = 0; uint16_t this_cpu = stap(); - struct ReadCpuInfo *info = (void *)cpu_info_buffer; + int num = smp_query_num_cpus(); spin_lock(&lock); - for (; i < info->nr_configured; i++) { + for (; i < num; i++) { if (cpus[i].active && cpus[i].addr != this_cpu) { sigp_retry(cpus[i].addr, SIGP_STOP, 0, NULL); @@ -243,22 +241,19 @@ extern uint64_t *stackptr; void smp_setup(void) { int i = 0; + int num = smp_query_num_cpus(); unsigned short cpu0_addr = stap(); - struct ReadCpuInfo *info = (void *)cpu_info_buffer; + struct CPUEntry *entry = sclp_get_cpu_entries(); spin_lock(&lock); - sclp_mark_busy(); - info->h.length = PAGE_SIZE; - sclp_service_call(SCLP_READ_CPU_INFO, cpu_info_buffer); + if (num > 1) + printf("SMP: Initializing, found %d cpus\n", num); - if (smp_query_num_cpus() > 1) - printf("SMP: Initializing, found %d cpus\n", info->nr_configured); - - cpus = calloc(info->nr_configured, sizeof(cpus)); - for (i = 0; i < info->nr_configured; i++) { - cpus[i].addr = info->entries[i].address; + cpus = calloc(num, sizeof(cpus)); + for (i = 0; i < num; i++) { + cpus[i].addr = entry[i].address; cpus[i].active = false; - if (info->entries[i].address == cpu0_addr) { + if (entry[i].address == cpu0_addr) { cpu0 = &cpus[i]; cpu0->stack = stackptr; cpu0->lowcore = (void *)0; -- 2.25.1