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 020003B5F50 for ; Fri, 25 Sep 2026 18:39:23 +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=1790361565; cv=none; b=s3bNDr/3wfy4o2cQpG18DqkZU15Ss8CbJ+nLvKeQH5pCXB3fRr4etB8kUN0PhQFUfLLzOALYt+LabJjImru+bKGeKblUKoowG19UlSKl1hPM3rORE5mOwZIQ5es3CvtNHAIypG6O8oqXJZ/YiOacJTF+1YPl3W/1jAXRq1co1xA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790361565; c=relaxed/simple; bh=tgnH6c3L5kPv+jLe8/jq0DdEltLykeUo6yEU3xn8bC8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=fj9iFtVoz9Tz5MmJpbQ0W+m+f3gz7DVUhx2hHVZ8PJhxBuZ7BRv1htYRaEegzaaznjl1vLrvb0LKq0R2asDbRrFXeL6g/LnfoDWJJg4in2VR4I22sJ2+3aF8ewVgQJFYrYzF4QCoDPoPu7Gi8xICW5lLKGP7uwHrYXgobzjejfs= 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=paVFWXzf; 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="paVFWXzf" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 68PG5OjC1529488; Fri, 25 Sep 2026 18:39:08 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=hqMC9M OiHO36wjAR48JonUH9Hk/AZEBGAN/NjtYi4W0=; b=paVFWXzfRJL9+Hrec/VRtW 5Q2h1O0KgUBxG6hqLZs/6G0E6LWhO3aNuA82aVSoYy4V9xH+DIJS2SKV8wdYFLAF 4ApMKGmE6AOyYciLzcCME/nP/auk9LKKywpfToFsdMERByeRCXZJtF2cn5W01te6 6vbzazwMaYQplIQSkyzZDcaSUQalMaPkuwff2YPC1Ec7PPzB5d+N3pV4+7bxmfE0 /y2PxlmkpFcsIL4tgMxDuFQkS5wWlb607vO+aQ6dxsFUyfiRPCb3oyx2z5vGZrc/ wac8IND0pNwNmY0u1LyKRRm9zr5AazUJMwG/k5DXlz8unoPWVKfyQBpA6W+ke1rA == 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 4gskg30rtu-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Fri, 25 Sep 2026 18:39:08 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 68PG34jM4191783; Fri, 25 Sep 2026 18:39:07 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4gvb8k3kp4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 25 Sep 2026 18:39:07 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 68PId3tp12321410 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 25 Sep 2026 18:39:03 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F332D58063; Fri, 25 Sep 2026 18:39:02 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 566615804B; Fri, 25 Sep 2026 18:39:00 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.6.174]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Fri, 25 Sep 2026 18:39:00 +0000 (GMT) From: Mingming Cao To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, horms@kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, nnac123@linux.ibm.com, maddy@linux.ibm.com, mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org, haren@linux.ibm.com, ricklind@linux.ibm.com, davemarq@linux.ibm.com, bjking1@linux.ibm.com, shaik.abdulla1@ibm.com, Mingming Cao Subject: [PATCH net-next v7 01/15] ibmveth: Add MQ RX hypercall wrappers and call definitions Date: Fri, 25 Sep 2026 11:38:36 -0700 Message-Id: <0dc92cdb439b680ad3c1f77d38ad6255859866be.1790319558.git.mmc@linux.ibm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: References: Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=true Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: xXlXvegPTmWNAl3fRXvVbxLGNqU_kHsR X-Authority-Analysis: v=2.4 cv=I43w19gg c=1 sm=1 tr=0 ts=6ab6bfcc cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=9GrW9DZCARAA:10 a=VdqzKS8jKosA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=VcrCuZX2KMs9Y6AvvMMA:9 a=3ZKOabzyN94A:10 a=47kamO7So9gA:10 a=O8hF6Hzn-FEA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTI1MDA3NCBTYWx0ZWRfX3VSl8h/kPUzi R02P/p5OZQCJKH0WtFmzzMCxmZmgFC+M1CQyiDjmIoGjJZGgvL/UWtAld3+SFK4vM5WWjMUkdvr LkaHjBFF2RjlU57rcYWRPhyBeoS8wXfWQAHmRPtYzEj2998Ietr5LkK/OgeqFW57x+jStP6Y/jF H/deMH00uou+o3qkgzmL/W5/Wi+fgcIed3xMIMjgDzjz11LFJt+RVxAG0ZZ7lHH3RT5Cwo7lT0W xG1kFq4tOo2OZb06KfIe1Nl4WjtsiEDB0vItR/blBjUgM8VQbFOpobSS0ruCeJ03ekE4VcjJgAJ 2a+zg4boz/WXyDMaQ2KBZXT7w8YLtWVVW/sLurcUq8FmqBqPoMNkdwo4+P1K37Z8M8iQQcLHWXC YcCtI9Bg9LQJdqVTJO7W2BYELw/BysoK8/z0mdQHiL/7uHWfoo6AghBTkZjX0CmrUY4vDNtN29w U30HKJFmMhtUh/sfatg== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTI1MDA3NCBTYWx0ZWRfX1RlyxSmG/35v Bfb2/MBSpzvHoNhrfPOohny+qGKlLTixMSj1lthtaZ0UIKlUCj8RxSlood7DCyOnQEHbj5HPxhY QcewNRd55PAGiK/OivD6Tca1rbJvOdE= X-Proofpoint-GUID: 39h5ZqlLsbMoo2w92h6ZjVvjc3Y0mE8j X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-25_03,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 priorityscore=1501 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609250074 Single-queue ibmveth only needs h_register_logical_lan() plus legacy buffer add/free calls. MQ RX uses per-queue handles, so the driver must also be able to register/deregister subordinate queues and post buffers against a specific queue handle. Add the PHYP call IDs for: H_REG_LOGICAL_LAN_QUEUE (0x49C) H_ADD_LOGICAL_LAN_BUFFERS_QUEUE (0x4A0) H_FREE_LOGICAL_LAN_QUEUE (0x4A8) as defined in PAPR 11.20.00. The gaps at 0x498 (reserved) and 0x4A4 (reserved for H_FREE_LOGICAL_LAN_BUFFER_QUEUE) are intentional; this series tears queues down with H_FREE_LOGICAL_LAN_QUEUE and does not add the buffer-queue free hcall. Raising MAX_HCALL_OPCODE for these IDs also widens KVM's kvm_arch.enabled_hcalls bitmap and the range KVM_CAP_PPC_ENABLE_HCALL accepts. Neither is user-visible: KVM implements none of the three, so the ioctl still rejects them, and the bitmap rounds to the same five unsigned longs, so struct kvm_arch does not change size. Add ibmveth.h wrapper helpers (h_register_logical_lan_queue(), h_add_logical_lan_buffers_queue(), h_free_logical_lan_queue()) with argument ordering and return semantics matching the existing ibmveth hcall wrappers. h_free_logical_lan_queue() uses plpar_hcall_norets() like h_free_logical_lan(). Also add h_register_logical_lan_with_handle() so queue 0 can capture the PHYP queue handle in MQ mode. Both new registration wrappers use plpar_hcall() rather than plpar_hcall9(), so they do not read unwritten stack slots. This patch is intentionally plumbing only: no runtime behavior change yet. Legacy firmware keeps H_REGISTER_LOGICAL_LAN and the existing buffer hcalls. The new wrappers are used only when a later commit sets multi_queue from H_ILLAN_ATTRIBUTES. Signed-off-by: Mingming Cao Reviewed-by: Dave Marquardt Tested-by: Shaik Abdulla --- Changes in v7: - Drop the duplicated "Both new registration wrappers use plpar_hcall()…" sentence - Register and free-queue Return: also H_FUNCTION. Add-buffers already had it in v6; all three PAPR 11.20.00 opcodes return that status on older firmware - h_register_logical_lan_queue Return: also H_BUSY / H_LONG_BUSY_*; the caller retries those, and free-queue already documented them - tools/perf powerpc-hcalls.py: name 0x49C / 0x4A0 / 0x4A8. 0x498 and 0x4A4 stay unnamed (reserved holes) Changes in v6: - both new registration wrappers use plpar_hcall() instead of plpar_hcall9(). They do not need nine args, and plpar_hcall9() was reading three unwritten stack slots - Widen add-buffers-queue and free-queue @queue_handle kdoc: handle may come from h_register_logical_lan_queue() or h_register_logical_lan_with_handle() (queue 0) - add-buffers-queue Return: also H_FUNCTION (MQ firmware missing that hcall) Changes in v5: - Cite PAPR 11.20.00 for MQ hcall IDs 0x49C / 0x4A0 / 0x4A8 (v4 named the opcodes only) - Call out reserved gaps at 0x498 and 0x4A4 (0x4A4 = H_FREE_LOGICAL_LAN_BUFFER_QUEUE); decision: do not add that hcall - queue teardown uses H_FREE_LOGICAL_LAN_QUEUE - Note MAX_HCALL_OPCODE raise also widens KVM enabled_hcalls / KVM_CAP_PPC_ENABLE_HCALL accepted range (cross-subsystem) - Rename h_reg_logical_lan_queue() -> h_register_logical_lan_queue() to match h_register_logical_lan() / h_free_logical_lan() - Unify queue_handle out-params as unsigned long * on both h_register_logical_lan_queue() and h_register_logical_lan_with_handle() (v4 used u64 * on with_handle) - h_free_logical_lan_queue() uses plpar_hcall_norets() like h_free_logical_lan() (v4 used plpar_hcall9 with unused retbuf) Changes in v4: - Document @queue_handle and @irq in h_reg_logical_lan_queue() kdoc. - Wrap h_register_logical_lan_with_handle() prototype for readability / checkpatch. - Drop unused H_FREE_LOGICAL_LAN_BUFFER_QUEUE wrapper/opcode (no caller; buffer return is local harvest + queue free). arch/powerpc/include/asm/hvcall.h | 6 +- drivers/net/ethernet/ibm/ibmveth.h | 142 ++++++++++++++++++++ tools/perf/scripts/python/powerpc-hcalls.py | 4 + 3 files changed, 151 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/hvcall.h b/arch/powerpc/include/asm/hvcall.h index dff90a7d7f70..cb0ea53491e6 100644 --- a/arch/powerpc/include/asm/hvcall.h +++ b/arch/powerpc/include/asm/hvcall.h @@ -362,7 +362,11 @@ #define H_GUEST_DELETE 0x488 #define H_PKS_WRAP_OBJECT 0x490 #define H_PKS_UNWRAP_OBJECT 0x494 -#define MAX_HCALL_OPCODE H_PKS_UNWRAP_OBJECT +/* 0x498 reserved; 0x4A4 = H_FREE_LOGICAL_LAN_BUFFER_QUEUE (unused here) */ +#define H_REG_LOGICAL_LAN_QUEUE 0x49C +#define H_ADD_LOGICAL_LAN_BUFFERS_QUEUE 0x4A0 +#define H_FREE_LOGICAL_LAN_QUEUE 0x4A8 +#define MAX_HCALL_OPCODE H_FREE_LOGICAL_LAN_QUEUE /* Scope args for H_SCM_UNBIND_ALL */ #define H_UNBIND_SCOPE_ALL (0x1) diff --git a/drivers/net/ethernet/ibm/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h index d87713668ed3..5c0b9f61eec9 100644 --- a/drivers/net/ethernet/ibm/ibmveth.h +++ b/drivers/net/ethernet/ibm/ibmveth.h @@ -66,6 +66,148 @@ static inline long h_add_logical_lan_buffers(unsigned long unit_address, desc5, desc6, desc7, desc8); } +/** + * h_register_logical_lan_queue - Register a subordinate receive queue + * @unit_address: Device unit address + * @buffer_list: DMA address of 4KB page for tracking registered buffers + * @rec_queue: Buffer descriptor of receive queue + * @queue_handle: Output queue handle on success (may be NULL) + * @irq: Output hypervisor IRQ number on success (may be NULL) + * + * Registers a subordinate receive queue with the hypervisor. + * + * Return: + * H_SUCCESS (0) on success + * H_PARAMETER if parameters are invalid + * H_BUSY / H_LONG_BUSY_* if the resource is busy; retry + * H_FUNCTION if firmware does not support this hcall + * + * On success, hypervisor returns: + * R3: H_SUCCESS + * R4: Queue handle + * R5: IRQ number for this queue + */ +static inline long +h_register_logical_lan_queue(unsigned long unit_address, + unsigned long buffer_list, + unsigned long rec_queue, + unsigned long *queue_handle, + unsigned long *irq) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + rc = plpar_hcall(H_REG_LOGICAL_LAN_QUEUE, + retbuf, unit_address, + buffer_list, rec_queue); + + if (rc == H_SUCCESS) { + if (queue_handle) + *queue_handle = retbuf[0]; + if (irq) + *irq = retbuf[1]; + } + + return rc; +} + +/** + * h_add_logical_lan_buffers_queue - Add buffers to subordinate queue + * @unit_address: Device unit address + * @queue_handle: Queue handle from h_register_logical_lan_queue() or + * h_register_logical_lan_with_handle() (queue 0) + * @buffersznum: Buffer size (upper 32 bits) | count (lower 32 bits) + * @ioba12: Buffer addresses 1 and 2 packed ((addr1 << 32) | addr2) + * @ioba34: Buffer addresses 3 and 4 packed + * @ioba56: Buffer addresses 5 and 6 packed + * @ioba78: Buffer addresses 7 and 8 packed + * @ioba910: Buffer addresses 9 and 10 packed + * @ioba1112: Buffer addresses 11 and 12 packed + * + * Return: + * H_SUCCESS - All buffers added successfully + * H_PARAMETER - Invalid parameters + * H_HARDWARE - Hardware error + * H_FUNCTION - Firmware does not support this hcall + */ +static inline long h_add_logical_lan_buffers_queue(unsigned long unit_address, + unsigned long queue_handle, + unsigned long buffersznum, + unsigned long ioba12, + unsigned long ioba34, + unsigned long ioba56, + unsigned long ioba78, + unsigned long ioba910, + unsigned long ioba1112) +{ + unsigned long retbuf[PLPAR_HCALL9_BUFSIZE]; + + return plpar_hcall9(H_ADD_LOGICAL_LAN_BUFFERS_QUEUE, + retbuf, unit_address, + queue_handle, buffersznum, + ioba12, ioba34, ioba56, + ioba78, ioba910, ioba1112); +} + +/** + * h_free_logical_lan_queue - Deregister subordinate receive queue + * @unit_address: Device unit address + * @queue_handle: Queue handle from h_register_logical_lan_queue() or + * h_register_logical_lan_with_handle() (queue 0) + * + * Deregisters and frees all structures associated with the subordinate queue. + * + * Return: + * H_SUCCESS - Queue freed successfully + * H_PARAMETER - Invalid parameters + * H_HARDWARE - Hardware error + * H_STATE - VIOA not in valid state + * H_BUSY / H_LONG_BUSY_* - Resource busy, retry + * H_FUNCTION - Firmware does not support this hcall + */ +static inline long h_free_logical_lan_queue(unsigned long unit_address, + unsigned long queue_handle) +{ + return plpar_hcall_norets(H_FREE_LOGICAL_LAN_QUEUE, + unit_address, queue_handle); +} + +/** + * h_register_logical_lan_with_handle - Register primary queue and get handle + * @unit_address: Device unit address + * @buffer_list: DMA address of buffer list + * @rec_queue: Buffer descriptor of receive queue + * @filter_list: DMA address of filter list + * @mac_address: MAC address + * @queue_handle: Output parameter for queue handle (may be NULL) + * + * Registers the primary receive queue (queue 0) with the hypervisor and + * returns the queue handle. This is needed in multi-queue mode to use + * h_add_logical_lan_buffers_queue() for all queues including queue 0. + * + * Return: H_SUCCESS (0) on success, error code otherwise + */ +static inline long +h_register_logical_lan_with_handle(unsigned long unit_address, + unsigned long buffer_list, + unsigned long rec_queue, + unsigned long filter_list, + unsigned long mac_address, + unsigned long *queue_handle) +{ + unsigned long retbuf[PLPAR_HCALL_BUFSIZE]; + long rc; + + rc = plpar_hcall(H_REGISTER_LOGICAL_LAN, retbuf, + unit_address, buffer_list, rec_queue, + filter_list, mac_address); + + if (rc == H_SUCCESS && queue_handle) + *queue_handle = retbuf[0]; + + return rc; +} + /* FW allows us to send 6 descriptors but we only use one so mark * the other 5 as unused (0) */ diff --git a/tools/perf/scripts/python/powerpc-hcalls.py b/tools/perf/scripts/python/powerpc-hcalls.py index fedce1b68cad..afc354583b7b 100644 --- a/tools/perf/scripts/python/powerpc-hcalls.py +++ b/tools/perf/scripts/python/powerpc-hcalls.py @@ -217,6 +217,10 @@ hcall_table = { # Key wrapping hcalls 1168: 'H_PKS_WRAP_OBJECT', 1172: 'H_PKS_UNWRAP_OBJECT', + # Logical LAN multi-queue RX (PAPR 11.20.00) + 1180: 'H_REG_LOGICAL_LAN_QUEUE', + 1184: 'H_ADD_LOGICAL_LAN_BUFFERS_QUEUE', + 1192: 'H_FREE_LOGICAL_LAN_QUEUE', # Platform-specific hcalls used by the Ultravisor 61184: 'H_SVM_PAGE_IN', 61188: 'H_SVM_PAGE_OUT', -- 2.50.1 (Apple Git-155)