From mboxrd@z Thu Jan 1 00:00:00 1970 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 9D7BE3EFFCE; Mon, 27 Jul 2026 09:57:43 +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=1785146264; cv=none; b=BMCgNZx/9QztfYRo8oBoHQoWlKspicxXCJRZT+stEDrT7i6r5qS0aAcdBxUXKsj/NnJQR5Mhae4CasTGLE7ZIY0Ou0MDc0aQod6bQQG42uON7I4Tf43EpCRYWfdpMB++YK0hOOfX9V018Mug5MEj69zBt0PCI08g7c8HqUQAUaQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785146264; c=relaxed/simple; bh=q+TiPdD15L70HcMkQFvH7Ov6eK52rOaM7js+T2ZtlM0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mLbwSnV7d83H7juLBlVecDz8VDUVywV1QuJq/cswiAHs3T8E8S3YaZs331QL7mes/ZSu64D1Ee5yX+IhqX8XwUX5CERV+VFCF3lApcv5p99I0DHkf1CbbgD5dKajS3eFjx60eBNlua1ilNMqnOt6QFYxa8J52rOQ0s2cBsRIJFI= 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=ADq2gtXM; 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="ADq2gtXM" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66R9UdM51855338; Mon, 27 Jul 2026 09:57:41 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=t/RE/e2Nxc1zsRVqB /563M3jy9J/I/8OvkFXViureaw=; b=ADq2gtXM2c+XiPP1ujs5QVA6BRxGOdAcq WMfu4+29aluv+CtXbV5Zi/mUneP1hKk4M0Azeb6XiJLClSi93oz+dPT1vvw35dqa XqwUk5aFSH/dkFwaperqsT8sdYCQQzZGumnDFk0u2xNeD4IeXPnKziEDw4FtpZaG aW5MLZ65ep/WedjzwhWp0HwmXQIl5YKQtT9loOe7G38OHjjqCi2tnClYIhl8usm8 xxqQzI7Dvvb09bORO5yK1OlE9jhKKf+ys/bu3NRH8H741AxTwWmO4ho55Fw608yb P6sFSb2jisrT0RSkIzZ4/ADWaP4YmFyDrlIY7V4IBv+hvMmVbtNMQ== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fmv0xfc27-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 09:57:40 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66R9uDWh013629; Mon, 27 Jul 2026 09:57:40 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fna5xvjvm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 27 Jul 2026 09:57:40 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66R9vdXk33227410 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 27 Jul 2026 09:57:39 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 27A015805C; Mon, 27 Jul 2026 09:57:39 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D18CC58051; Mon, 27 Jul 2026 09:57:36 +0000 (GMT) Received: from b35lp69.lnxne.boe (unknown [9.87.84.240]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Mon, 27 Jul 2026 09:57:36 +0000 (GMT) From: Christian Borntraeger To: Paolo Bonzini Cc: KVM , Janosch Frank , Claudio Imbrenda , David Hildenbrand , linux-s390 , Christian Borntraeger , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Matthew Rosato , Jaehoon Kim , Douglas Freimuth , Farhan Ali Subject: [GIT PULL 6/7] KVM: s390: pci: Validate AIBV and AISB before pinning guest pages Date: Mon, 27 Jul 2026 11:57:19 +0200 Message-ID: <20260727095720.9150-7-borntraeger@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260727095720.9150-1-borntraeger@linux.ibm.com> References: <20260727095720.9150-1-borntraeger@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: ugbyp0y9uc-9Oju1DgSxrhPedEELj7FA X-Proofpoint-ORIG-GUID: ugbyp0y9uc-9Oju1DgSxrhPedEELj7FA X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI3MDA5NiBTYWx0ZWRfX/8/bD2czZw93 yJqIS7z1gBvVR7CZ5oZ6+f/tEtW7uL5dkp7cM4fvZZ08e3V6rQcpEMG7zDg4DbJ790VCbPnmh1H c0wE6+OoCGwtYTOfCmeGU/RdAz/gssA= X-Authority-Analysis: v=2.4 cv=dYuwG3Xe c=1 sm=1 tr=0 ts=6a672b94 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=VwQbUJbxAAAA:8 a=i8wI3NWYBEf5A6oN4S0A:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI3MDA5NiBTYWx0ZWRfX3I88iWOaKKpE uFzaXIcEGSP4L0oekaYv6ZO8zuYEMnjyNaTW+reKBZb1WJS0mMjuvsO9GLBKNi9LwdnJ9w24p0K /RoGuT1FvUJehFqZYkk8EnorLJdpGBDd0DQf8I9FAzser81zSn5Bs/ze4CH1Bh6iBs2seR/6OtA mZnj5AIGX+iaVbTF9D8tEI2KpbbzQosc2YGfX90HCBrq8/XvfXuA0BCKGoPurFTdfROh6XnE79M +JtdIWP0NRQNmZRVJalPY9X/IaIyMqfwOXSLUecWWxRYcF/BvstF3J0L2HBL6NWXuPRG+FqxFNo lWNqn/fwstLU+sV5YCEdBePwe5GNjxItU7oJnbxZj0dnfaLvvxTPyVZNvypbMbNGFnGn7MOc6Dw apJAQWb5WpC9EML1WaIyDrRn+zR1wk0zWk3DvohiG2S2jtSe4bXhiNvA4oMY1m8x4Yw6uS9Rnsl TbGyGabSa/lw7NnJsUA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-27_02,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 clxscore=1015 phishscore=0 malwarescore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607270096 From: Farhan Ali The AIBV holds one bit per MSI-X vector for a given function. The size of the bit vector is derived from the NOI and the AIBVO. If the size of the AIBV exceeds a single page boundary, then reject the request as we cannot safely pin the guest AIBV. Similarly reject the request if the AISB address is not 8-byte aligned as the architecture requires doubleword alignment for the summary bit address. Since the AISBO can address up to 64 bits, the size of the AISB can only be 8 bytes for the function. This also ensures the AISB doesn't exceed a single page boundary. Fixes: 3c5a1b6f0a18 ("KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding") Cc: stable@vger.kernel.org Reviewed-by: Christian Borntraeger Reviewed-by: Matthew Rosato Signed-off-by: Farhan Ali Tested-by: Matthew Rosato Signed-off-by: Christian Borntraeger --- arch/s390/kvm/pci.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index 50f495bc8303..50f5ec79600e 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -244,7 +244,7 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, bool assist) { struct page *pages[1], *aibv_page, *aisb_page = NULL; - unsigned int msi_vecs, idx; + unsigned int msi_vecs, idx, size; struct zpci_gaite *gaite; unsigned long hva, bit; struct kvm *kvm; @@ -271,6 +271,14 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, return gisc; /* Replace AIBV address */ + size = BITS_TO_LONGS(msi_vecs + fib->fmt0.aibvo) * sizeof(unsigned long); + npages = DIV_ROUND_UP((fib->fmt0.aibv & ~PAGE_MASK) + size, PAGE_SIZE); + /* AIBV cannot span more than 1 page */ + if (npages > 1) { + rc = -EINVAL; + goto out; + } + idx = srcu_read_lock(&kvm->srcu); hva = gfn_to_hva(kvm, gpa_to_gfn((gpa_t)fib->fmt0.aibv)); npages = pin_user_pages_fast(hva, 1, FOLL_WRITE | FOLL_LONGTERM, pages); @@ -286,6 +294,12 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, /* Pin the guest AISB if one was specified */ if (fib->fmt0.sum == 1) { + /* AISB must be dword aligned */ + if (fib->fmt0.aisb & 0x7) { + rc = -EINVAL; + goto unpin1; + } + idx = srcu_read_lock(&kvm->srcu); hva = gfn_to_hva(kvm, gpa_to_gfn((gpa_t)fib->fmt0.aisb)); npages = pin_user_pages_fast(hva, 1, FOLL_WRITE | FOLL_LONGTERM, -- 2.53.0