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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22006C43334 for ; Wed, 13 Jul 2022 08:39:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9BB13940111; Wed, 13 Jul 2022 04:39:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 96AE39400E5; Wed, 13 Jul 2022 04:39:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 832A3940111; Wed, 13 Jul 2022 04:39:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 705039400E5 for ; Wed, 13 Jul 2022 04:39:57 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay12.hostedemail.com (Postfix) with ESMTP id 459CA12051D for ; Wed, 13 Jul 2022 08:39:57 +0000 (UTC) X-FDA: 79681428834.05.13D3465 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf02.hostedemail.com (Postfix) with ESMTP id AEEF280031 for ; Wed, 13 Jul 2022 08:39:56 +0000 (UTC) Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26D8aowm006521; Wed, 13 Jul 2022 08:39:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=message-id : date : mime-version : subject : to : cc : references : from : in-reply-to : content-type : content-transfer-encoding; s=pp1; bh=TizzkofkPLYM5cfAMGlOfFOMezl4jD6xmSbVX7fi9YU=; b=YHeQ7VoFeaMtu13RvDV+1/JKhSTQcFXFQzFJYrhgQGlIUzoBR43zkfvzO5VOcyhktNFx ZfEcKxaI8CuEmuSxTDPGUwnn1ypgv+ax12Tn6TUGW9zVCUU3MeJmCYcaBIyR/2C4fp/F pEc6Z1cmxMH1s4E6nvdV5ZSnJa/bZo7mtxq+lWKWTFNIt5lcNWWIyI3emmRM0R1Ur50w JSSimNl1/6s/ISUbPJwmnk0x1sV5v2nv/Mbjiue4JSKF/3svSgFllfWHhPKh83UdbmkR 2hmyMCJvex+PAn5elrAC0bfJ/uST0l4BVeElPhE7I9uvcMtLgEWKfkAfBJC+rkurs8PJ 7Q== Received: from ppma05fra.de.ibm.com (6c.4a.5195.ip4.static.sl-reverse.com [149.81.74.108]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3h9t2qh01t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Jul 2022 08:39:53 +0000 Received: from pps.filterd (ppma05fra.de.ibm.com [127.0.0.1]) by ppma05fra.de.ibm.com (8.16.1.2/8.16.1.2) with SMTP id 26D8LZsV012148; Wed, 13 Jul 2022 08:39:51 GMT Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by ppma05fra.de.ibm.com with ESMTP id 3h71a8v1hr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Jul 2022 08:39:50 +0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 26D8dlgU17367388 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Jul 2022 08:39:47 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D83FC4203F; Wed, 13 Jul 2022 08:39:47 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7BD5942045; Wed, 13 Jul 2022 08:39:47 +0000 (GMT) Received: from [9.152.224.153] (unknown [9.152.224.153]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Wed, 13 Jul 2022 08:39:47 +0000 (GMT) Message-ID: <02b6537d-97e6-c27b-7621-c5b116995a00@linux.ibm.com> Date: Wed, 13 Jul 2022 10:39:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH 3/3] s390/uvdevice: autoload module based on CPU facility Content-Language: en-US To: Claudio Imbrenda Cc: Heiko Carstens , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Vasily Gorbik , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, nrb@linux.ibm.com References: <20220712105220.325010-1-seiden@linux.ibm.com> <20220712105220.325010-4-seiden@linux.ibm.com> <20220712184924.0d80c474@p-imbrenda> From: Steffen Eiden Organization: IBM In-Reply-To: <20220712184924.0d80c474@p-imbrenda> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: Bm1QkXzouI91UwL-R4sSteIHhti0ChGY X-Proofpoint-ORIG-GUID: Bm1QkXzouI91UwL-R4sSteIHhti0ChGY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-12_14,2022-07-13_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 impostorscore=0 mlxlogscore=999 spamscore=0 mlxscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 phishscore=0 malwarescore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207130035 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1657701596; a=rsa-sha256; cv=none; b=ZLt/afLcRJXPaMkYYq9iTHXXjERvDOy3oIrRmTfKbIIijj7IuSjSvi9ZKYtNJEMXK/TDlP 6UNGH4zNPyEumSChPS1cX+BmxxqzT35ymo3IPExpNuWfR294xx8oAHJ+Lye7lbxmFDG+PS BpuYADZ7AViRR0eIp/unJxv7RKJCsH0= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=YHeQ7VoF; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf02.hostedemail.com: domain of seiden@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=seiden@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1657701596; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=TizzkofkPLYM5cfAMGlOfFOMezl4jD6xmSbVX7fi9YU=; b=K8/bagDmUQj0RSGapoV+7vcu3bxFOIRycb/IwLv2F6GsoADjRbOIV+Sjy3bV+Yjkdx4/rk sA8OU5nL2pUL2gt78bzdtWrVgMbtQDXZBLKelx4Ab9zPrP4uWy1GrLOih2YN2L13UDxP1E tGvL2+UHjllDiIf+ziEYNTMyRcMashg= X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AEEF280031 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=YHeQ7VoF; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf02.hostedemail.com: domain of seiden@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=seiden@linux.ibm.com X-Stat-Signature: kypa1e51oudx45r5jcdrrttu3phm59eb X-Rspam-User: X-HE-Tag: 1657701596-301578 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On 7/12/22 18:49, Claudio Imbrenda wrote: > On Tue, 12 Jul 2022 12:52:20 +0200 > Steffen Eiden wrote: > >> Make sure the uvdevice driver will be automatically loaded when >> facility 158 is available. >> >> Signed-off-by: Steffen Eiden >> --- >> arch/s390/include/asm/cpufeature.h | 1 + >> arch/s390/kernel/cpufeature.c | 1 + >> drivers/s390/char/uvdevice.c | 5 ++--- >> 3 files changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/arch/s390/include/asm/cpufeature.h b/arch/s390/include/asm/cpufeature.h >> index aa8081dad411..4b17f876ab54 100644 >> --- a/arch/s390/include/asm/cpufeature.h >> +++ b/arch/s390/include/asm/cpufeature.h >> @@ -33,6 +33,7 @@ enum { >> S390_CPU_FEATURE_NNPA, >> S390_CPU_FEATURE_PCI_MIO, >> S390_CPU_FEATURE_SIE, >> + S390_CPU_FEATURE_UV, >> MAX_CPU_FEATURES >> }; >> >> diff --git a/arch/s390/kernel/cpufeature.c b/arch/s390/kernel/cpufeature.c >> index e70b29804db4..0b854d37edcb 100644 >> --- a/arch/s390/kernel/cpufeature.c >> +++ b/arch/s390/kernel/cpufeature.c >> @@ -42,6 +42,7 @@ static struct s390_cpu_feature s390_cpu_features[MAX_CPU_FEATURES] = { >> [S390_CPU_FEATURE_NNPA] = {.type = TYPE_HWCAP, .num = HWCAP_NR_NNPA}, >> [S390_CPU_FEATURE_PCI_MIO] = {.type = TYPE_HWCAP, .num = HWCAP_NR_PCI_MIO}, >> [S390_CPU_FEATURE_SIE] = {.type = TYPE_HWCAP, .num = HWCAP_NR_SIE}, >> + [S390_CPU_FEATURE_UV] = {.type = TYPE_FACILITY, .num = 158}, >> }; >> >> /* >> diff --git a/drivers/s390/char/uvdevice.c b/drivers/s390/char/uvdevice.c >> index 66505d7166a6..1d40457c7b10 100644 >> --- a/drivers/s390/char/uvdevice.c >> +++ b/drivers/s390/char/uvdevice.c >> @@ -27,6 +27,7 @@ >> #include >> #include >> #include >> +#include >> >> #include >> #include >> @@ -244,12 +245,10 @@ static void __exit uvio_dev_exit(void) >> >> static int __init uvio_dev_init(void) >> { >> - if (!test_facility(158)) >> - return -ENXIO; >> return misc_register(&uvio_dev_miscdev); >> } >> >> -module_init(uvio_dev_init); >> +module_cpu_feature_match(S390_CPU_FEATURE_UV, uvio_dev_init); > > does this still prevent manual loading when the feature is not present? yes. Have a look at the macro definition at 'include/linux/cpufeature.h': Use module_cpu_feature_match(feature, module_init_function) to declare that [snip] b) the module must not be loaded if CPU feature 'feature' is not present (not even by manual insmod). The test 'facility(158)' just moved to cpu_have_feature() in '/arch/s390/kernel/cpufeature.c'. > >> module_exit(uvio_dev_exit); >> >> MODULE_AUTHOR("IBM Corporation"); >