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 3BD7A47D47A; Thu, 23 Jul 2026 18:34:51 +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=1784831696; cv=none; b=Cm3fF6Jq/U39bDbiZkRp2w+B4Vz9oHOXTKTI/CVkarE3tXpOSRyYW6aZ7PThKEIMXHLXIM1Qz/Tyq6nCX3GY65edoaFItOee1jkpJGcN8T1pfUyq0m+v0urr3xBwf61hNpOCtqql3xqSN3JKGeDZ0KQFPxvYxilIXA3zbfTF51Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784831696; c=relaxed/simple; bh=54L5Mof65KkksepWM7MEAnPtHmro77V/d/+8oEU5T2A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZoL/hW+my5LEhulTD7f7406l7n5kdDJLAE1v3uFmHIwBLDl01oeaFw8VL7fF8E14ZA0VMhBK9/10W74LdE/MG5c3osLojMiSUGqRRcCDKdOC/rMgX9nKsKC7ZDhuKJtvYD5mmUlhibnx2F7oc+JdWcwJ65dJBlkYLS+a/4Roq6U= 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=VggVgJyH; 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="VggVgJyH" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66NHg1dh1805084; Thu, 23 Jul 2026 18:34:50 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=zbHB3DYzLJg4dV11j yjVCJdhGA4HE7gLLt/5IfMGfVw=; b=VggVgJyH8ioqNmK3VqDqB4dMLJk2ELqSq LG4SzGXQ9ktNaMohlZQqHJxv/QAowCpuFUNUqBeSrJa63AuPZz9Zy871e9TRoH8u d/4cv1RcEhG6AzGg8NOkGKoOVGFtIrqdz5IkyYhjXPjhvLBzDFKiPElbuLfmvWw5 i086kk09e0PyffAlHgH+TSKnSjZjxsB6Y756hydzIMeIQNT0aqCMD2Svg6KAUTFO wRv8hSHP0cFb/7QwSMfT+l3YqRriLD6NKYs5lfLqpVI5E+76SF9aQOLtokE5dWim HZdwsUoaoLisK5qXH1krKlbcxnRfzlu+YCRxUL2k6qhE9ptNjzAPw== 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 4fg77as2u0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Jul 2026 18:34:49 +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 66NIYi7P006987; Thu, 23 Jul 2026 18:34:49 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fgpgyn8rs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 Jul 2026 18:34:48 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (smtpav04.wdc07v.mail.ibm.com [10.39.53.231]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66NIYl1j20972054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 23 Jul 2026 18:34:47 GMT Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 62C1158052; Thu, 23 Jul 2026 18:34:47 +0000 (GMT) Received: from smtpav04.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 91DF958050; Thu, 23 Jul 2026 18:34:46 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.254.118]) by smtpav04.wdc07v.mail.ibm.com (Postfix) with ESMTP; Thu, 23 Jul 2026 18:34:46 +0000 (GMT) From: Farhan Ali To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, kvm@vger.kernel.org Cc: alifm@linux.ibm.com, mjrosato@linux.ibm.com, borntraeger@linux.ibm.com, stable@vger.kernel.org Subject: [PATCH v5 6/6] KVM: s390: pci: Validate AIBV and AISB before pinning guest pages Date: Thu, 23 Jul 2026 11:34:40 -0700 Message-ID: <20260723183440.3271-7-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260723183440.3271-1-alifm@linux.ibm.com> References: <20260723183440.3271-1-alifm@linux.ibm.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: z5ICz-o9QfjrKqmoHh9AVT_wkjqtNs5C X-Proofpoint-Spam-Info: AW1haW4tMjYwNzIzMDE3OCBTYWx0ZWRfX8RiCRFD5KstZ HEq/VntFqL0Ou5uLD3Qffhl/358N8dCZTSeKr/Y2ZGnQJmlGugLJ6z2GHlBy9OZc4czhfHud225 SDAGHOjG/6r+kQXhBBKxo9Ue9MvvZTo= X-Proofpoint-GUID: z5ICz-o9QfjrKqmoHh9AVT_wkjqtNs5C X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzIzMDE3OCBTYWx0ZWRfX5O3XZNNF6Drq B+ZeSV2Q4DXA9nD9cqX1E1dHh45LZQalMlcRyYWXrVyYq/0vjsk6Ei2QAziQl7I2DQ6Fjjs0G3R tQ1khJISzVe5U+xTW3kFJg9IEHR4iz5UUMc/e+1tre7lLmNwv+NSyyAgSjOVt/vl6TJZTuj56TP 7oBXvLRuJO/Mwb5bS7CpaQDpPZdEbDwCZCB+N7LjxwraHeHtJxR3wAsNTaCJkQmrhXTo0mMQYSB JP4F8pRluYjL4xwP6wvMuYO2B0vJYO+SO+XTbr+NhPXg+/QpsHy0TbfY+v3SMATMVkQmU0uvBsR QMEuejjAe6fXgboHnJtJRGX4tA3FgC8pqjkeDkohvMCIx3YMMNbrvKLAWW8YFOjpaizSPu1E8Rf Zwffa0SxaG5ASmwt6TQOFwkH5gRsRBtM2YGRE+OBN2IpoO1sgS+Wglwi8/mZFCOO5SmTEfI3sx/ tzGj+VUTA0Gdv/bhWbQ== X-Authority-Analysis: v=2.4 cv=K7AS2SWI c=1 sm=1 tr=0 ts=6a625ec9 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=i8wI3NWYBEf5A6oN4S0A:9 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-23_05,2026-07-22_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 spamscore=0 phishscore=0 malwarescore=0 adultscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607230178 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 --- arch/s390/kvm/pci.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index ca8ef76bcf6b..25185d04ca28 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,15 @@ 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) * sizeof(unsigned long); + size += (fib->fmt0.aibvo / 8); + 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 +295,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.43.0