From nobody Tue Dec 2 02:04:18 2025 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82A38371A22; Thu, 20 Nov 2025 17:16:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763659007; cv=none; b=O3n9CW6/Gv21esJEfi+UUmX1c0K/OBwSi9FMEmn1Lw8GWc3IPLBq33Y5sTcR+DPj+bj5pEqh6HHyDCIIn8qGyAbQY/aGeOd+KHCAu5K4adz2j9xdYjfwKc0wizXfdMyEhZl6dYD9ulXCyP3uljGy3lpMBvlkHSfUsHyi66bbmxk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763659007; c=relaxed/simple; bh=4CKFDj0hIhd8M0Kkg3C6sDxhR4ruHQPfY+uymnjUbIY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jr2drGRp69sD6rBYiGO2k/l/hQJBaOQ3G7AHSXeo7isLgpjVpTPpWjIj/q1yOZUrgExy+KmiDJv+p9mSbICMWNiforP8PjnR9F1PLwLTHeMhd8TbKaCHAkL8FTF2z+y8EtMnjP7r2W/UgAqbk536tFzTXai9ZVQA8DLrBlhTmj0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=FIhtWoLL; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="FIhtWoLL" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5AKBbR4c027926; Thu, 20 Nov 2025 17:16:43 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=JBtmXcIba2fi4czF9 3NATfwa4x8dAL704MEsd0327Tg=; b=FIhtWoLLQwSAibSqDmN8868HXM6pLjx/B G1Y1w2nn3eENAh7k9tKU9ve2aoa3WAE5M92g/mcpfFbZIC38f0ZotnaJkSFRmFAe 3qWjy1n1HRA7LWfVwszzqoQh4cXwoDDpjQrX7lIowquNpjGbiTqGSWdMWLrjivf9 pwO0QJLbuALKqXeE0eu0G9GOlFdaiK2IzOfNHnBF615AJUREIgfXuVzLrGuT4wET I5on+E0anbU45a3Shc/dt7XqMlDAzAksfjyWt5aVltetLUnE9vYX4sFY/7RG+cRL R49M8SRcRPLANkOsM8o52x4pBUIAkDDMiyThGoAjEKSuxL+jg47TQ== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4aejka7n1w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 17:16:42 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 5AKGqd2u010392; Thu, 20 Nov 2025 17:16:36 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4af3usfsht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 20 Nov 2025 17:16:36 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 5AKHGXKa40239588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 20 Nov 2025 17:16:33 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1C4CA2004B; Thu, 20 Nov 2025 17:16:33 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 087E920040; Thu, 20 Nov 2025 17:16:31 +0000 (GMT) Received: from p-imbrenda.ibmuc.com (unknown [9.111.12.33]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 20 Nov 2025 17:16:30 +0000 (GMT) From: Claudio Imbrenda To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, nsg@linux.ibm.com, nrb@linux.ibm.com, seiden@linux.ibm.com, gra@linux.ibm.com, schlameuss@linux.ibm.com, hca@linux.ibm.com, svens@linux.ibm.com, agordeev@linux.ibm.com, gor@linux.ibm.com, david@redhat.com, gerald.schaefer@linux.ibm.com Subject: [PATCH v4 23/23] KVM: s390: Storage key manipulation IOCTL Date: Thu, 20 Nov 2025 18:15:44 +0100 Message-ID: <20251120171544.96841-24-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251120171544.96841-1-imbrenda@linux.ibm.com> References: <20251120171544.96841-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-GUID: 7nheCIlC5-cEjh_hXfX5oPVkYVX56mQT X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMTE1MDAzMiBTYWx0ZWRfX19cd4yieA3qI mSF+r5eszTy/g+Lfa2YEWYjQLX6bjeFlOSA8NKg1L9bHlHY5pQZae1DmqZw5CLc3YlpOS/AFpXl SNNolliVZPrs5UqEo8q9cX3HvHV3Z36swkUu0RdR99qopKl8daIyUB/vCGrxJ6uEwNQWZqngsuu lSmpQSJeYigGgbWloQ5laQPOM8MiHZ9j62JXmvRQ3JioHofxbCfQ/+V+95olEvO0gEDuakXJwQq fYgwkTRCD1GRKKrifPsPGsp61GoFcOTv/FQQC9SFDTs/NGqglFWwJbtCKoNoEPFaRrn/CirgAa+ WNrd+bsujUdjU246FiCC1CJ0kWkzZPQW0+/FqByFc4hPFuglvmHWSPAIcASkxA2IiXZ60sKF3h6 TSX1tU/qga+YRWe5XG0XqTqu9BtUyA== X-Proofpoint-ORIG-GUID: 7nheCIlC5-cEjh_hXfX5oPVkYVX56mQT X-Authority-Analysis: v=2.4 cv=XtL3+FF9 c=1 sm=1 tr=0 ts=691f4cfa cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6UeiqGixMTsA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=TEVnKxO-3nxHHAUriJcA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-11-20_06,2025-11-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 bulkscore=0 priorityscore=1501 impostorscore=0 adultscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2510240000 definitions=main-2511150032 Content-Type: text/plain; charset="utf-8" Add a new IOCTL to allow userspace to manipulate storage keys directly. This will make it easier to write selftests related to storage keys. Signed-off-by: Claudio Imbrenda --- arch/s390/kvm/kvm-s390.c | 57 ++++++++++++++++++++++++++++++++++++++++ include/uapi/linux/kvm.h | 10 +++++++ 2 files changed, 67 insertions(+) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index b7dc1d601fb8..e8e3c8cf75fa 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -555,6 +555,37 @@ static void __kvm_s390_exit(void) debug_unregister(kvm_s390_dbf_uv); } =20 +static int kvm_s390_keyop(struct kvm_s390_mmu_cache *mc, struct kvm *kvm, = int op, + unsigned long addr, union skey skey) +{ + union asce asce =3D kvm->arch.gmap->asce; + gfn_t gfn =3D gpa_to_gfn(addr); + int r; + + guard(read_lock)(&kvm->mmu_lock); + + switch (op) { + case KVM_S390_KEYOP_SSKE: + r =3D dat_cond_set_storage_key(mc, asce, gfn, skey, &skey, 0, 0, 0); + if (r >=3D 0) + return skey.skey; + break; + case KVM_S390_KEYOP_ISKE: + r =3D dat_get_storage_key(asce, gfn, &skey); + if (!r) + return skey.skey; + break; + case KVM_S390_KEYOP_RRBE: + r =3D dat_reset_reference_bit(asce, gfn); + if (r > 0) + return r << 1; + break; + default: + return -EINVAL; + } + return r; +} + /* Section: device related */ long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) @@ -2930,6 +2961,32 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned in= t ioctl, unsigned long arg) r =3D -EFAULT; break; } + case KVM_S390_KEYOP: { + struct kvm_s390_mmu_cache *mc; + struct kvm_s390_keyop kop; + union skey skey; + + if (copy_from_user(&kop, argp, sizeof(kop))) { + r =3D -EFAULT; + break; + } + skey.skey =3D kop.key; + + mc =3D kvm_s390_new_mmu_cache(); + if (!mc) + return -ENOMEM; + + r =3D kvm_s390_keyop(mc, kvm, kop.operation, kop.user_addr, skey); + kvm_s390_free_mmu_cache(mc); + if (r < 0) + break; + + kop.key =3D r; + r =3D 0; + if (copy_to_user(argp, &kop, sizeof(kop))) + r =3D -EFAULT; + break; + } case KVM_S390_ZPCI_OP: { struct kvm_s390_zpci_op args; =20 diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 52f6000ab020..402098d20134 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1208,6 +1208,15 @@ struct kvm_vfio_spapr_tce { __s32 tablefd; }; =20 +#define KVM_S390_KEYOP_SSKE 0x01 +#define KVM_S390_KEYOP_ISKE 0x02 +#define KVM_S390_KEYOP_RRBE 0x03 +struct kvm_s390_keyop { + __u64 user_addr; + __u8 key; + __u8 operation; +}; + /* * KVM_CREATE_VCPU receives as a parameter the vcpu slot, and returns * a vcpu fd. @@ -1227,6 +1236,7 @@ struct kvm_vfio_spapr_tce { #define KVM_S390_UCAS_MAP _IOW(KVMIO, 0x50, struct kvm_s390_ucas_ma= pping) #define KVM_S390_UCAS_UNMAP _IOW(KVMIO, 0x51, struct kvm_s390_ucas_ma= pping) #define KVM_S390_VCPU_FAULT _IOW(KVMIO, 0x52, unsigned long) +#define KVM_S390_KEYOP _IOWR(KVMIO, 0x53, struct kvm_s390_keyop) =20 /* Device model IOC */ #define KVM_CREATE_IRQCHIP _IO(KVMIO, 0x60) --=20 2.51.1