From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 B7896418363 for ; Fri, 14 Aug 2026 07:38:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786693096; cv=none; b=WDdG2MojRADlewsOgadhTzKBEXXaWfdSBltEc+IgIN2P9q9YPky/Iaf9IcCHpSb9dsTxNO5Wi70g1kRC04/aXy/aHO39070hd4ol0OOBMYTAsIOTobugyPVjfCSFKAuNKVrb4MKvcryJRZxtqpO6zgiua/Wy7NnTeq9wVFjcbJM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786693096; c=relaxed/simple; bh=odNe8gWzAqu0nL7jfROg5lH0WGsbnLYNFhtaJ4B3Nj0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rHxXQEdrUVDqJbMV7T+iaELgOpKhUeAbmojYSDTJIhhwLkdz5wCa6kgl5DOu6f86SCJ5IdxVf2238xu+e/8w92cJVjmSwEkQrD6uKmR7PowRTXPtyyPFJmoi5mmtSQxAyO0VicmTc0XvgNyF+Y3yS4jzSU7TDDoHoxI+kkoeL4w= 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=NwLXGcSR; arc=none smtp.client-ip=148.163.158.5 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="NwLXGcSR" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 67E4Wi4X3238680; Fri, 14 Aug 2026 07:37:47 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=gtFkXqgUil61fRzhV gOPUi9X1kfKnozm3YmxDW+FiwQ=; b=NwLXGcSRJ7N0VC9E+lq3dwI91FpQTydKK WfrOMQpbBvfzjLnpMfoV6Khjcsq+3aTHIa51WWSdsq+XYAviroglx241PUIstZ7A Rck0flQw7JaO14XvEcaZ2cC3OV9BCahRJudoTmflsCNrBhZvBcGfqJWXudOIGZOh +YE6kZqMzsZxrLIRkqQ3+4nMu7PV6uvVlWm85fbvDC0hX0mPJTtAKNmmBa7kjamr 7UxTq3ehHdHRg9HyiJDJ1ovTbenAL1LyLlh0Al805x9+L6Lw76unCwDX0Y1o9ezS JDbHCuRlVu+fmIbCj7nv5nlLsQ4JNHOfm+VBcIRoxi4nSzVGUP2Ug== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fyb244021-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Aug 2026 07:37:46 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 67E7QP5d016998; Fri, 14 Aug 2026 07:37:45 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxh0gp9du-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 14 Aug 2026 07:37:45 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67E7b3qM27853318 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Aug 2026 07:37:04 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3859358061; Fri, 14 Aug 2026 07:37:42 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2F10458057; Fri, 14 Aug 2026 07:37:40 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.89.186]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 14 Aug 2026 07:37:40 +0000 (GMT) From: Mingming Cao To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@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 v5 01/15] ibmveth: Add MQ RX hypercall wrappers and call definitions Date: Fri, 14 Aug 2026 00:36:28 -0700 Message-Id: <20260814073642.24630-2-mmc@linux.ibm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20260814073642.24630-1-mmc@linux.ibm.com> References: <20260814073642.24630-1-mmc@linux.ibm.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a7ec5cb cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=tlvLCL_K2IF-bX31sEYA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODE0MDA1OCBTYWx0ZWRfX1/9KlKTw5NMO vgRbhJ8CWb6kp/Eh4FJwE2oe77cV8DeP/CP7Wr5o2GXIhW4ZSdYCNXzHchVj3GudUlxfr/tV9AY pTt/K4s4PwxbKjXhwcsLstOp8cDxN7Ttj/JO+SIixP+ijfRyoTKnFiWDMGRQE0kATDM6vVWHi4e 1Cd5tOkGFndUXqKOrNl9RXxmA5MMkjAzzjlwXq8SBb2wHMwjFr7ab34/S30NtiqIQaO3WhABsEL 7X/DVEFT11FMYc59hOIO4exx7EU55aInL6KNb5cFPK+SyNG1D938E5M363RD+xQGGPYRGuwe0eM BnLArLENtz+3j3Wl3mgG55tPihplXOYGogVUROrA5wFXIy1xue/OsDTpjcMoFBrvqn46JR/tbOx N5Kamkd/d7jarIKSnf0WG7fabRhQ+hNYq01MVWf8IDbSjpW+Q1WLlPHASsvabh/ViSJ9bpxNdBj r7Q3bRCy04uWLTnpjVQ== X-Proofpoint-ORIG-GUID: X9qDpMnvurdYANjJOZnNKIa5cm5tvSs9 X-Proofpoint-GUID: sdx34ihqMeWvZdPJa9nmvwKw13BJJf-o X-Proofpoint-Spam-Info: AW1haW4tMjYwODE0MDA1OCBTYWx0ZWRfX/a4IHFrSEUxM JaaDKAvgbBdNnk7uUVIFMgHz+slXbJgSNTcUOJbHr2xJX06ylDq/yKr9pmc9p7G05O7DH86v/YS zB14SEcqslR46LRBBO/JnkhvHzE34EI= 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-08-14_02,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608140058 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 accepted by KVM_CAP_PPC_ENABLE_HCALL. 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 handle out-params use unsigned long *. 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 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 | 136 +++++++++++++++++++++++++++++ 2 files changed, 141 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..c0ef03cad9b9 100644 --- a/drivers/net/ethernet/ibm/ibmveth.h +++ b/drivers/net/ethernet/ibm/ibmveth.h @@ -66,6 +66,142 @@ 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 + * + * 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_HCALL9_BUFSIZE]; + long rc; + + rc = plpar_hcall9(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() + * @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 + */ +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() + * + * 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 + */ +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_HCALL9_BUFSIZE]; + long rc; + + rc = plpar_hcall9(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) */ -- 2.50.1 (Apple Git-155)