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 C270A431E6B for ; Wed, 1 Jul 2026 22:25:43 +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=1782944745; cv=none; b=rNplbtWb+1MINyL+M3PYsri2hE2CJCglDwKJA1jq0PMsN+GQaMvmj7zBW6QNp9/of3BvyTHix6OQ+lawml5RrbsaN1Kq3QChWUJyHOdBnLRASbj0RsPslqzOanPRCxdGB1n0ab+KbFsDAlnCSs4IXD8rQlEGRc+jYsE9jqjsY2Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782944745; c=relaxed/simple; bh=rj5chXeNTnTtlrLd2J698XZN4adcm6x6olVe/wISy20=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S4IiW+j5Wtso7hhqKOdUjIahZO64ACJ+ldCCpz4ykZVrFHbm/rPo8VAwYSzqVJ/gGj0aXdquuRW/BZa6++Cm0PCvJsfKUh7AMbJETaMA7//VfJ7oACmY4PTHnWceiU3SYFWmMZuI0ZpI+YNLQeqXJAqsMRBK8iIrmYEuCwh6HYA= 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=qsaynJ7N; 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="qsaynJ7N" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 661LnGUU1970843; Wed, 1 Jul 2026 22:25:30 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=9e2BMwE6DpQShEYRW ZYTBqwxewMByDrG89qSxiebla4=; b=qsaynJ7No82owIfzEZFv7G7QfZPI9zaUf RgFgfSqNHT7xrH2LtNiiLts/uUXgGKE9Xjk+X1h5d/Bxj/jUqJUEpR3xzG9/Nd6O iJcATCaEWOVKTl1H18Kb89Laa1vRLKmYWMl32rdpk0RSwUZRncJaZNnO+nkwKm5g yLcF2NZhtTcVEIf4fdV7AzE8z+M/SD9v22u3scc2pBkadhQGM03Kjdd4dzA59vdd Zdzvhmj/JofpLx0qproxzJhEpXUE173ILxOv0Ef2kcl23wJQ1jqimpLsi9sb3RZ4 G0aSoRANQCPB9CRKx9cbd3ls0dmV8eNWqx/Nt56rxrQEkVKJd070Q== 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 4f26qa6kn2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Jul 2026 22:25:29 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 661MOFjt026117; Wed, 1 Jul 2026 22:25:24 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4f2ruqhk92-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 01 Jul 2026 22:25:24 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 661MPND810420946 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 1 Jul 2026 22:25:24 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9592758059; Wed, 1 Jul 2026 22:25:23 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 125EE5804B; Wed, 1 Jul 2026 22:25:22 +0000 (GMT) Received: from localhost.localdomain (unknown [9.61.150.53]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 1 Jul 2026 22:25:21 +0000 (GMT) From: Mingming Cao To: netdev@vger.kernel.org Cc: horms@kernel.org, bjking1@linux.ibm.com, haren@linux.ibm.com, ricklind@linux.ibm.com, mmc@linux.ibm.com, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, linuxppc-dev@lists.ozlabs.org, maddy@linux.ibm.com, mpe@ellerman.id.au, Dave Marquardt Subject: [PATCH net-next v2 03/15] ibmveth: Refactor RX interrupt control for MQ RX queues Date: Wed, 1 Jul 2026 15:23:15 -0700 Message-Id: <20260701222327.61325-4-mmc@linux.ibm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20260701222327.61325-1-mmc@linux.ibm.com> References: <20260701222327.61325-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-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzAxMDIzOSBTYWx0ZWRfX/eWJNgH6hEQ/ +4lrKg95q33NT0ryIt5fI0MVJxoKI4WSnOLwfgwA6YSVRgkjv4b7+AWCSpev6CX7WXHjENPQ2lH /Qot97KP4pvDc/fx/01SaR/xaMs6R8rBAruSYftQPxROsr7lSnLRkvFBSbNVHZq7b/h0acMmyw3 uGSqBqYRbKr5KqhebxoPxwvd+kKFMaF8vAYqziCOJJ3pj6Hnl0EnpYaTguRwxBtcaarV7FKSgnn kngGwwSh6B0PU1AoO9aTEB3hdFWfl4PwpiSo4HyjVoKb823nJ6Zkjj3AJQ/9hWS0jkiRByKqa+C hJ1koidEhqfpIIqJU1c0d80bmTHchS+J8rPtUYYs5/dq6cb5NHEWc1TSvnDLKI7CC2RViEB4hsZ 2yAP6trTmI80KKJ18C/4jW9B7wPSO8EgJDcuQy0ArnH8K+eLhsfM1geZp0VtegWL6Jtkzn6rbYL eYGTHxAMXh7g3lad3xw== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzAxMDIzOSBTYWx0ZWRfX5UCM0YfMmK4v Fl69NDVwvuz6UCY6Tyvnl/liL3rQQxvzR9IFKSJfCY+Cj9u13oAXfcPgCVhAtWti4tFClsGP4UG 6FGiRzSvcYcVpM+QtDCku28eHfeZU6Y= X-Proofpoint-GUID: U65wuFSVnOOU7b-GvpmKss4lBVDU0McJ X-Proofpoint-ORIG-GUID: 28vG3YY23pSwsqrABIwlfL0asiruL0n6 X-Authority-Analysis: v=2.4 cv=WZ88rUhX c=1 sm=1 tr=0 ts=6a4593da cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=bI_WLspq9mz1f7g1iukA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-07-01_05,2026-06-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 adultscore=0 phishscore=0 clxscore=1015 bulkscore=0 impostorscore=0 priorityscore=1501 lowpriorityscore=0 suspectscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607010239 Queue 0 and subordinate RX queues use different interrupt control interfaces in PHYP: - queue 0: h_vio_signal() after h_register_logical_lan() - queue N: H_VIOCTL against the queue handle/hwirq mapping The current code is single-queue oriented and cannot safely scale to multiple RX queues in poll completion and open/close IRQ setup. Introduce queue-indexed interrupt helpers: ibmveth_enable_irq(adapter, queue_index) ibmveth_disable_irq(adapter, queue_index) ibmveth_setup_rx_interrupts() ibmveth_cleanup_rx_interrupts() These helpers centralize queue0-vs-subordinate dispatch and make IRQ lifecycle symmetric across open/close and future resize paths. request_irq() is wired with &adapter->napi[i] as dev_id per queue, so interrupt ownership follows the NAPI instance that services that RX queue. Signed-off-by: Mingming Cao Reviewed-by: Dave Marquardt --- drivers/net/ethernet/ibm/ibmveth.c | 160 +++++++++++++++++++++++++++++ 1 file changed, 160 insertions(+) diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 95068fb20dba..b5ae979c1f82 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -315,6 +315,166 @@ static void __maybe_unused ibmveth_cleanup_rx_resources(struct ibmveth_adapter * } } +/** + * ibmveth_toggle_irq - Common helper to enable/disable queue interrupts + * @adapter: ibmveth adapter structure + * @queue_index: Index of the queue (0 for primary, 1+ for subordinate) + * @enable: true to enable, false to disable + * + * For queue 0 (primary), uses h_vio_signal() as it's registered via + * h_register_logical_lan(). For subordinate queues (1+), uses H_VIOCTL + * with H_ENABLE/DISABLE_VIO_INTERRUPT for per-queue interrupt control. + * + * Return: 0 on success, error code otherwise + */ +static int +ibmveth_toggle_irq(struct ibmveth_adapter *adapter, int queue_index, bool enable) +{ + unsigned long rc; + unsigned long irq = adapter->queue_irq[queue_index]; + const char *action = enable ? "enable" : "disable"; + + if (queue_index == 0) { + /* Primary queue: use h_vio_signal() */ + rc = h_vio_signal(adapter->vdev->unit_address, + enable ? VIO_IRQ_ENABLE : VIO_IRQ_DISABLE); + } else { + /* Subordinate queues: use H_VIOCTL with hardware IRQ */ + struct irq_data *irq_data = irq_get_irq_data(irq); + irq_hw_number_t hwirq; + u64 vioctl_cmd = enable ? H_ENABLE_VIO_INTERRUPT : H_DISABLE_VIO_INTERRUPT; + + if (!irq_data) { + netdev_err(adapter->netdev, + "Failed to get IRQ data for queue %d (virq=%lu)\n", + queue_index, irq); + return -EINVAL; + } + + hwirq = irqd_to_hwirq(irq_data); + rc = plpar_hcall_norets(H_VIOCTL, + adapter->vdev->unit_address, + vioctl_cmd, + hwirq, 0, 0); + + if (rc == H_PARAMETER) { + /* H_PARAMETER is non-fatal when IRQ is already in the requested state. */ + netdev_warn_once(adapter->netdev, + "H_VIOCTL %s IRQ returned H_PARAMETER for queue %d (hwirq=%lu)\n", + action, queue_index, hwirq); + return 0; + } + } + + if (rc) + netdev_err(adapter->netdev, + "Failed to %s IRQ for queue %d, rc=%ld\n", + action, queue_index, rc); + return rc; +} + +/** + * ibmveth_disable_irq - Disable interrupt for a specific queue + * @adapter: ibmveth adapter structure + * @queue_index: Index of the queue (0 for primary, 1+ for subordinate) + * + * Return: 0 on success, error code otherwise + */ +static int +ibmveth_disable_irq(struct ibmveth_adapter *adapter, int queue_index) +{ + return ibmveth_toggle_irq(adapter, queue_index, false); +} + +/** + * ibmveth_enable_irq - Enable interrupt for a specific queue + * @adapter: ibmveth adapter structure + * @queue_index: Index of the queue (0 for primary, 1+ for subordinate) + * + * Return: 0 on success, error code otherwise + */ +static int +ibmveth_enable_irq(struct ibmveth_adapter *adapter, int queue_index) +{ + return ibmveth_toggle_irq(adapter, queue_index, true); +} + +/** + * ibmveth_setup_rx_interrupts - Register IRQs and enable NAPI + * @adapter: ibmveth adapter structure + * + * Registers interrupt handlers for all RX queues and enables NAPI polling. + * On error, cleans up any successfully registered IRQs before returning. + * + * Return: 0 on success, negative error code on failure + */ +static int __maybe_unused +ibmveth_setup_rx_interrupts(struct ibmveth_adapter *adapter) +{ + struct net_device *netdev = adapter->netdev; + int i, rc; + + for (i = 0; i < adapter->num_rx_queues; i++) { + if (!adapter->queue_irq[i]) { + netdev_err(netdev, "queue %d has invalid IRQ (0)\n", i); + rc = -EINVAL; + goto err_free_irqs; + } + + rc = request_irq(adapter->queue_irq[i], ibmveth_interrupt, + 0, netdev->name, &adapter->napi[i]); + if (rc) { + netdev_err(netdev, + "request_irq() failed for irq 0x%x queue %d: %d\n", + adapter->queue_irq[i], i, rc); + goto err_free_irqs; + } + } + + for (i = 0; i < adapter->num_rx_queues; i++) + napi_enable(&adapter->napi[i]); + + return 0; + +err_free_irqs: + while (--i >= 0) + free_irq(adapter->queue_irq[i], &adapter->napi[i]); + return rc; +} + +/** + * ibmveth_cleanup_rx_interrupts - Disable NAPI and free IRQs + * @adapter: ibmveth adapter structure + * + * Disables NAPI polling and frees interrupt handlers for all RX queues. + */ +static void +ibmveth_cleanup_rx_interrupts(struct ibmveth_adapter *adapter) +{ + int i; + + for (i = 0; i < adapter->num_rx_queues; i++) + napi_disable(&adapter->napi[i]); + + for (i = 0; i < adapter->num_rx_queues; i++) { + if (adapter->queue_irq[i]) + free_irq(adapter->queue_irq[i], &adapter->napi[i]); + } + + /* Dispose IRQ mappings for subordinate queues (1-15). + * Queue 0 uses netdev->irq from device tree, not irq_create_mapping(). + */ + for (i = 1; i < adapter->num_rx_queues; i++) { + if (adapter->queue_irq[i]) { + irq_dispose_mapping(adapter->queue_irq[i]); + adapter->queue_irq[i] = 0; + } + } + + /* Clear queue 0 IRQ number */ + adapter->queue_irq[0] = 0; +} + /* setup the initial settings for a buffer pool */ static void ibmveth_init_buffer_pool(struct ibmveth_buff_pool *pool, u32 pool_index, u32 pool_size, -- 2.39.3 (Apple Git-146)