From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=148.163.156.1 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795046860; b=eD10WxiQhacyr7PEjx8DljOt+ME7lq5J0p60D/M2wzwEKO42xkCrnFrROQCwvekpM9PY IhA8im/SUAtNDY1EoWi6n4JszAznAXvGnykE1TLIxQHUCgF+GrysiDTSb8kZKMDjbkWBE W36rIYo7SQAV+Pr63aE2gO0qgnWM9Z/ZwE54ap4iaKdyaxPV688eOKwTxDYEBuI6eLpSi YXljhhfrrOhzqynTbZgq3q/ukpVINWjJw9/I2HJnoOmwDbfXCfl/z90NB1G2MjPsurc9F FaCkd3LkzUl9TwgekjJtXTPttWMMntF631bgSX1CrWWLSPPgdJ4e3NGd3MPJ0aXPorQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795046860; h=DMARC-Filter:Received:DKIM-Signature:Received:Received:Received: Received:Received:Received:Received:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-TM-AS-GCONF:X-Proofpoint-Reinject: X-Proofpoint-GUID:X-Authority-Analysis:X-Proofpoint-Spam-Info: X-Proofpoint-ORIG-GUID:X-Proofpoint-Spam-Details-Enc: X-Proofpoint-Virus-Version:X-Proofpoint-Spam-Details; bh=ESUPOKacI7anyGiA+eZ2KK/+QOirYNIVbPQMD2dn5hU=; b=ZAJqsU/LQqSVejyAieWvRAceKvzZ/9pHAwTcze32DtXaG7B5S70LQv/ihV4Bdg8H15I2 ArhW74frC1zEUVSzUjjh5xn7/Piaz6QMue3WEgqLd4C/wsm3XdpnhFbPYcW60fXYe0QQM 6H+j+Pz2tAUyHJuoQzlNZATUs/cqyyf1hLkRQ9UGzXIDmA6GOPSw9erSwr0bTC5vb7Ll0 KsXNK3toWi2RipnmI1bF6+2a94c0qTqP7w1h6Xs1lAoSvPZXVlfDdFund94dfTFac6bcw 8xIeDRnzeBL4mp9yC0Xs6yO/NOx1Bk5xKfZuamoYcWpYXR/CCCLpCk9BK0Txebu5c0w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=gmq3qkGG; arc=none smtp.remote-ip=148.163.156.1 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C54AF606A31C for ; Thu, 19 Nov 2026 00:07:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C54AF606A31C 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.a=rsa-sha256 header.s=pp1 header.b=gmq3qkGG 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 6AILQiwl583801; Thu, 19 Nov 2026 00:07:23 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=ESUPOKacI7anyGiA+ eZ2KK/+QOirYNIVbPQMD2dn5hU=; b=gmq3qkGGDcUXhPTSsA2fGxqXYD1cQBZ5B hAAVHsHEC+3NFsGoaKlT9AFlBgdr9eTefACgzwEwlNO1aiccpBxO8hUzzvCULx91 yxzIQt94jtfph316tMRR+TIWt5sWhwsAvciZ3vOn4ZUMcfQ7VtIp7fo9oG+uEGG2 ISdmhLa+It2ApiPI+K6F2WlzKDjs0nFGYGAvAEwJpfaoGHGY7gHFcUwr9mxkwkVt KGWyvcpL2HQqDqgKOoVnj3W3XUfLk3TIYRPFxTsIvQh/Io8ySeLoFEU0y2dXSZs3 y/saJTkGwDUZ0knV3FuvMa8wP2pfFZ4p3W8gwf2+x/rNx9OQ+g8BA== 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 4j105rn9mb-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Thu, 19 Nov 2026 00:07:22 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 6AILK8QP1490560; Thu, 19 Nov 2026 00:07:22 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4j067nj17b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Nov 2026 00:07:22 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 6AJ07KCY27460270 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 19 Nov 2026 00:07:20 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88A385805F; Thu, 19 Nov 2026 00:07:20 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DAB855805C; Thu, 19 Nov 2026 00:07:17 +0000 (GMT) Received: from localhost.localdomain (unknown [9.67.93.165]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 19 Nov 2026 00:07:17 +0000 (GMT) From: Mingming Cao To: netdev@vger.kernel.org Cc: Mingming Cao , maddy@linux.ibm.com, mpe@ellerman.id.au, npiggin@gmail.com, chleroy@kernel.org, ritesh.list@gmail.com, sshegde@linux.ibm.com, nnac123@linux.ibm.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@kernel.org, kuba@kernel.org, pabeni@redhat.com, linuxppc-dev@lists.ozlabs.org, horms@kernel.org, davemarq@linux.ibm.com, haren@linux.ibm.com, ricklind@linux.ibm.com, bjking1@linux.ibm.com, shaik.abdulla1@ibm.com Subject: [PATCH net-next 1/8] ibmveth: Prepare MQ RX adapter data structures Date: Wed, 18 Nov 2026 16:07:04 -0800 Message-Id: <20261119000711.18093-2-mmc@linux.ibm.com> X-Mailer: git-send-email 2.39.3 (Apple Git-146) In-Reply-To: <20261119000711.18093-1-mmc@linux.ibm.com> References: <20261119000711.18093-1-mmc@linux.ibm.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-GUID: u5e9BAO2Sx91vUq5azrgDqfNHKDp_dID X-Authority-Analysis: v=2.4 cv=e8uT2qp/ c=1 sm=1 tr=0 ts=6afe3dbb cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=zJRp6_cAMcgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=4oXV8Q7rR_0RdnPLF9UA:9 X-Proofpoint-Spam-Info: AW1haW4tMjYxMTE4MDA4OCBTYWx0ZWRfXw212R+KNKk5c HzC2DaGQN/QwHMkDH7nhxgYS0NEgro+OT9xcqFTQciNUwrhJvIHmnh1Fpf64iXJQH37H5D0saVZ S9uwZ8M9CgTEqAxjr9GYatQHD6pB/uE= X-Proofpoint-ORIG-GUID: jP92ep7o7dHkrv9JGOUjEX1NS4tm1oGd X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMTE4MDA4OCBTYWx0ZWRfX8xebf8w0j+lr E6IKJip+GG+36JB2je5DERfO1K46dLwwRxp/y1cHGdT39WT/mn5vssYN8QZ0ZQSQStzkBO6hv2S DXKzzx0NkmxuqGbQFuTbQUkKCCfunZmfioznXXpkJJUqD3jxjoaYesA7/MlQ/MAdxPoHWRG9hZD 1/jpaEKrfSbRpUxqc1r1DBo9asJVa0u7+O8GvI6QTuv5Vus9dmlT5y01CMQgh6mwAZUzCjBxAed 7LvBXAjGzlJaJztviBp1Ksm2a1cVpnhrv0+Bps6GTLAsnK/X4yMdhooP7qRYP0WUlDdfe8N7DW7 ZQeayiBWBfvUKNGzRQJmbFVItaFNRl8OZWi3ml+33JWvMxU0yXaaSghIOr9x5+10Lwis4JpV20B BTKC9rnsm7pUcKsS2uhkngBZKaewF4WpvPMueUw0BTu1nD4Zg6EMr2oJD/rXvBYAhEdB3dE9iRm BLrAidusbyFd8Zw7u9A== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.138,FMLib:17.12.100.49 definitions=2026-11-18_07,2026-11-16_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 lowpriorityscore=0 adultscore=0 spamscore=0 bulkscore=0 malwarescore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2611040001 definitions=main-2611180088 The RX path keeps one NAPI, one RX queue, one buffer list and one set of buffer pools. Turn those into arrays indexed by queue so the rest of this series can pass a queue index without a layout rewrite. IBMVETH_MAX_RX_QUEUES is 1 and every user is switched to index 0, so there is no behavior change. num_rx_queues (set to 1 at probe) is added for the later patches. Signed-off-by: Mingming Cao --- drivers/net/ethernet/ibm/ibmveth.c | 238 +++++++++++++++-------------- drivers/net/ethernet/ibm/ibmveth.h | 14 +- 2 files changed, 136 insertions(+), 116 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c index 05d6b60cd187..fc50036d5d26 100644 --- a/drivers/net/ethernet/ibm/ibmveth.c +++ b/drivers/net/ethernet/ibm/ibmveth.c @@ -101,7 +101,9 @@ static struct ibmveth_stat ibmveth_stats[] = { /* simple methods of getting data from the current rxq entry */ static inline u32 ibmveth_rxq_flags(struct ibmveth_adapter *adapter) { - return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].flags_off); + struct ibmveth_rx_q *rxq = &adapter->rx_queue[0]; + + return be32_to_cpu(rxq->queue_addr[rxq->index].flags_off); } static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter) @@ -112,7 +114,7 @@ static inline int ibmveth_rxq_toggle(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_pending_buffer(struct ibmveth_adapter *adapter) { - return ibmveth_rxq_toggle(adapter) == adapter->rx_queue.toggle; + return ibmveth_rxq_toggle(adapter) == adapter->rx_queue[0].toggle; } static inline int ibmveth_rxq_buffer_valid(struct ibmveth_adapter *adapter) @@ -132,14 +134,17 @@ static inline int ibmveth_rxq_large_packet(struct ibmveth_adapter *adapter) static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter) { - return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].length); + struct ibmveth_rx_q *rxq = &adapter->rx_queue[0]; + + return be32_to_cpu(rxq->queue_addr[rxq->index].length); } static u64 ibmveth_rxq_correlator(struct ibmveth_adapter *adapter) { - unsigned int idx = adapter->rx_queue.index; + struct ibmveth_rx_q *rxq = &adapter->rx_queue[0]; + unsigned int idx = rxq->index; - return READ_ONCE(adapter->rx_queue.queue_addr[idx].correlator); + return READ_ONCE(rxq->queue_addr[idx].correlator); } static inline int ibmveth_rxq_csum_good(struct ibmveth_adapter *adapter) @@ -393,7 +398,7 @@ static void ibmveth_replenish_buffer_pool(struct ibmveth_adapter *adapter, */ static void ibmveth_update_rx_no_buffer(struct ibmveth_adapter *adapter) { - __be64 *p = adapter->buffer_list_addr + 4096 - 8; + __be64 *p = adapter->buffer_list_addr[0] + 4096 - 8; adapter->rx_no_buffer = be64_to_cpup(p); } @@ -406,7 +411,7 @@ static void ibmveth_replenish_task(struct ibmveth_adapter *adapter) adapter->replenish_task_cycles++; for (i = (IBMVETH_NUM_BUFF_POOLS - 1); i >= 0; i--) { - struct ibmveth_buff_pool *pool = &adapter->rx_buff_pool[i]; + struct ibmveth_buff_pool *pool = &adapter->rx_buff_pool[0][i]; if (pool->active && (atomic_read(&pool->available) < pool->threshold)) @@ -459,8 +464,8 @@ static bool ibmveth_rxq_correlator_valid(struct ibmveth_adapter *adapter, /* An inactive pool keeps its size but has no skbuff array. */ if (pool < IBMVETH_NUM_BUFF_POOLS && - index < adapter->rx_buff_pool[pool].size && - adapter->rx_buff_pool[pool].skbuff) + index < adapter->rx_buff_pool[0][pool].size && + adapter->rx_buff_pool[0][pool].skbuff) return true; if (net_ratelimit()) @@ -504,7 +509,7 @@ static int ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter, if (!ibmveth_rxq_correlator_valid(adapter, correlator)) return -EINVAL; - skb = adapter->rx_buff_pool[pool].skbuff[index]; + skb = adapter->rx_buff_pool[0][pool].skbuff[index]; if (!skb) { ibmveth_rxq_no_skb(adapter, correlator); return -EFAULT; @@ -518,24 +523,24 @@ static int ibmveth_remove_buffer_from_pool(struct ibmveth_adapter *adapter, /* remove the skb pointer to mark free. actual freeing is done * by upper level networking after gro_receive */ - adapter->rx_buff_pool[pool].skbuff[index] = NULL; + adapter->rx_buff_pool[0][pool].skbuff[index] = NULL; dma_unmap_single(&adapter->vdev->dev, - adapter->rx_buff_pool[pool].dma_addr[index], - adapter->rx_buff_pool[pool].buff_size, + adapter->rx_buff_pool[0][pool].dma_addr[index], + adapter->rx_buff_pool[0][pool].buff_size, DMA_FROM_DEVICE); } - free_index = adapter->rx_buff_pool[pool].producer_index; - adapter->rx_buff_pool[pool].producer_index++; - if (adapter->rx_buff_pool[pool].producer_index >= - adapter->rx_buff_pool[pool].size) - adapter->rx_buff_pool[pool].producer_index = 0; - adapter->rx_buff_pool[pool].free_map[free_index] = index; + free_index = adapter->rx_buff_pool[0][pool].producer_index; + adapter->rx_buff_pool[0][pool].producer_index++; + if (adapter->rx_buff_pool[0][pool].producer_index >= + adapter->rx_buff_pool[0][pool].size) + adapter->rx_buff_pool[0][pool].producer_index = 0; + adapter->rx_buff_pool[0][pool].free_map[free_index] = index; mb(); - atomic_dec(&(adapter->rx_buff_pool[pool].available)); + atomic_dec(&adapter->rx_buff_pool[0][pool].available); return 0; } @@ -551,7 +556,7 @@ static struct sk_buff *ibmveth_rxq_get_buffer(struct ibmveth_adapter *adapter, if (!ibmveth_rxq_correlator_valid(adapter, correlator)) return NULL; - skb = adapter->rx_buff_pool[pool].skbuff[index]; + skb = adapter->rx_buff_pool[0][pool].skbuff[index]; if (!skb) ibmveth_rxq_no_skb(adapter, correlator); return skb; @@ -559,9 +564,11 @@ static struct sk_buff *ibmveth_rxq_get_buffer(struct ibmveth_adapter *adapter, static void ibmveth_rxq_advance(struct ibmveth_adapter *adapter) { - if (++adapter->rx_queue.index == adapter->rx_queue.num_slots) { - adapter->rx_queue.index = 0; - adapter->rx_queue.toggle = !adapter->rx_queue.toggle; + struct ibmveth_rx_q *rxq = &adapter->rx_queue[0]; + + if (++rxq->index == rxq->num_slots) { + rxq->index = 0; + rxq->toggle = !rxq->toggle; } } @@ -641,7 +648,7 @@ static int ibmveth_register_logical_lan(struct ibmveth_adapter *adapter, */ retry: rc = h_register_logical_lan(adapter->vdev->unit_address, - adapter->buffer_list_dma, rxq_desc.desc, + adapter->buffer_list_dma[0], rxq_desc.desc, adapter->filter_list_dma, mac_address); if (rc != H_SUCCESS && try_again) { @@ -670,11 +677,11 @@ static int ibmveth_open(struct net_device *netdev) netdev_dbg(netdev, "open starting\n"); for(i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - rxq_entries += adapter->rx_buff_pool[i].size; + rxq_entries += adapter->rx_buff_pool[0][i].size; rc = -ENOMEM; - adapter->buffer_list_addr = (void*) get_zeroed_page(GFP_KERNEL); - if (!adapter->buffer_list_addr) { + adapter->buffer_list_addr[0] = (void *)get_zeroed_page(GFP_KERNEL); + if (!adapter->buffer_list_addr[0]) { netdev_err(netdev, "unable to allocate list pages\n"); goto out; } @@ -687,17 +694,18 @@ static int ibmveth_open(struct net_device *netdev) dev = &adapter->vdev->dev; - adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) * + adapter->rx_queue[0].queue_len = sizeof(struct ibmveth_rx_q_entry) * rxq_entries; - adapter->rx_queue.queue_addr = - dma_alloc_coherent(dev, adapter->rx_queue.queue_len, - &adapter->rx_queue.queue_dma, GFP_KERNEL); - if (!adapter->rx_queue.queue_addr) + adapter->rx_queue[0].queue_addr = + dma_alloc_coherent(dev, adapter->rx_queue[0].queue_len, + &adapter->rx_queue[0].queue_dma, GFP_KERNEL); + if (!adapter->rx_queue[0].queue_addr) goto out_free_filter_list; - adapter->buffer_list_dma = dma_map_single(dev, - adapter->buffer_list_addr, 4096, DMA_BIDIRECTIONAL); - if (dma_mapping_error(dev, adapter->buffer_list_dma)) { + adapter->buffer_list_dma[0] = + dma_map_single(dev, adapter->buffer_list_addr[0], + 4096, DMA_BIDIRECTIONAL); + if (dma_mapping_error(dev, adapter->buffer_list_dma[0])) { netdev_err(netdev, "unable to map buffer list pages\n"); goto out_free_queue_mem; } @@ -714,19 +722,21 @@ static int ibmveth_open(struct net_device *netdev) goto out_unmap_filter_list; } - adapter->rx_queue.index = 0; - adapter->rx_queue.num_slots = rxq_entries; - adapter->rx_queue.toggle = 1; + adapter->rx_queue[0].index = 0; + adapter->rx_queue[0].num_slots = rxq_entries; + adapter->rx_queue[0].toggle = 1; mac_address = ether_addr_to_u64(netdev->dev_addr); rxq_desc.fields.flags_len = IBMVETH_BUF_VALID | - adapter->rx_queue.queue_len; - rxq_desc.fields.address = adapter->rx_queue.queue_dma; + adapter->rx_queue[0].queue_len; + rxq_desc.fields.address = adapter->rx_queue[0].queue_dma; - netdev_dbg(netdev, "buffer list @ 0x%p\n", adapter->buffer_list_addr); + netdev_dbg(netdev, "buffer list @ 0x%p\n", + adapter->buffer_list_addr[0]); netdev_dbg(netdev, "filter list @ 0x%p\n", adapter->filter_list_addr); - netdev_dbg(netdev, "receive q @ 0x%p\n", adapter->rx_queue.queue_addr); + netdev_dbg(netdev, "receive q @ 0x%p\n", + adapter->rx_queue[0].queue_addr); h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE); @@ -737,7 +747,7 @@ static int ibmveth_open(struct net_device *netdev) lpar_rc); netdev_err(netdev, "buffer TCE:0x%llx filter TCE:0x%llx rxq " "desc:0x%llx MAC:0x%llx\n", - adapter->buffer_list_dma, + adapter->buffer_list_dma[0], adapter->filter_list_dma, rxq_desc.desc, mac_address); @@ -746,11 +756,11 @@ static int ibmveth_open(struct net_device *netdev) } for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { - if (!adapter->rx_buff_pool[i].active) + if (!adapter->rx_buff_pool[0][i].active) continue; - if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[i])) { + if (ibmveth_alloc_buffer_pool(&adapter->rx_buff_pool[0][i])) { netdev_err(netdev, "unable to alloc pool\n"); - adapter->rx_buff_pool[i].active = 0; + adapter->rx_buff_pool[0][i].active = 0; rc = -ENOMEM; goto out_free_buffer_pools; } @@ -761,13 +771,13 @@ static int ibmveth_open(struct net_device *netdev) * call, so enable it only once everything ibmveth_poll() touches * exists. */ - napi_enable(&adapter->napi); + napi_enable(&adapter->napi[0]); netdev_dbg(netdev, "registering irq 0x%x\n", netdev->irq); rc = request_irq(netdev->irq, ibmveth_interrupt, 0, netdev->name, netdev); if (rc != 0) { - napi_disable(&adapter->napi); + napi_disable(&adapter->napi[0]); synchronize_net(); netdev_err(netdev, "unable to request irq 0x%x, rc %d\n", netdev->irq, rc); @@ -791,9 +801,9 @@ static int ibmveth_open(struct net_device *netdev) lpar_rc = h_free_logical_lan(adapter->vdev->unit_address); } while (H_IS_LONG_BUSY(lpar_rc) || (lpar_rc == H_BUSY)); while (--i >= 0) { - if (adapter->rx_buff_pool[i].active) + if (adapter->rx_buff_pool[0][i].active) ibmveth_free_buffer_pool(adapter, - &adapter->rx_buff_pool[i]); + &adapter->rx_buff_pool[0][i]); } out_unmap_filter_list: dma_unmap_single(dev, adapter->filter_list_dma, 4096, @@ -803,16 +813,16 @@ static int ibmveth_open(struct net_device *netdev) ibmveth_free_tx_ltb(adapter, i); out_unmap_buffer_list: - dma_unmap_single(dev, adapter->buffer_list_dma, 4096, + dma_unmap_single(dev, adapter->buffer_list_dma[0], 4096, DMA_BIDIRECTIONAL); out_free_queue_mem: - dma_free_coherent(dev, adapter->rx_queue.queue_len, - adapter->rx_queue.queue_addr, - adapter->rx_queue.queue_dma); + dma_free_coherent(dev, adapter->rx_queue[0].queue_len, + adapter->rx_queue[0].queue_addr, + adapter->rx_queue[0].queue_dma); out_free_filter_list: free_page((unsigned long)adapter->filter_list_addr); out_free_buffer_list: - free_page((unsigned long)adapter->buffer_list_addr); + free_page((unsigned long)adapter->buffer_list_addr[0]); out: return rc; } @@ -834,7 +844,7 @@ static int ibmveth_close(struct net_device *netdev) netdev_dbg(netdev, "close starting\n"); - napi_disable(&adapter->napi); + napi_disable(&adapter->napi[0]); /* napi_disable() returns once ibmveth_poll() has called * napi_complete_done(), but the poll still re-enables the * interrupt and reads the RX queue after that. @@ -858,22 +868,22 @@ static int ibmveth_close(struct net_device *netdev) ibmveth_update_rx_no_buffer(adapter); - dma_unmap_single(dev, adapter->buffer_list_dma, 4096, + dma_unmap_single(dev, adapter->buffer_list_dma[0], 4096, DMA_BIDIRECTIONAL); - free_page((unsigned long)adapter->buffer_list_addr); + free_page((unsigned long)adapter->buffer_list_addr[0]); dma_unmap_single(dev, adapter->filter_list_dma, 4096, DMA_BIDIRECTIONAL); free_page((unsigned long)adapter->filter_list_addr); - dma_free_coherent(dev, adapter->rx_queue.queue_len, - adapter->rx_queue.queue_addr, - adapter->rx_queue.queue_dma); + dma_free_coherent(dev, adapter->rx_queue[0].queue_len, + adapter->rx_queue[0].queue_addr, + adapter->rx_queue[0].queue_dma); for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - if (adapter->rx_buff_pool[i].active) + if (adapter->rx_buff_pool[0][i].active) ibmveth_free_buffer_pool(adapter, - &adapter->rx_buff_pool[i]); + &adapter->rx_buff_pool[0][i]); for (i = 0; i < netdev->real_num_tx_queues; i++) ibmveth_free_tx_ltb(adapter, i); @@ -1554,7 +1564,7 @@ static void ibmveth_rx_csum_helper(struct sk_buff *skb, static int ibmveth_poll(struct napi_struct *napi, int budget) { struct ibmveth_adapter *adapter = - container_of(napi, struct ibmveth_adapter, napi); + container_of(napi, struct ibmveth_adapter, napi[0]); struct net_device *netdev = adapter->netdev; int frames_processed = 0; unsigned long lpar_rc; @@ -1597,7 +1607,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget) pool = correlator >> 32; room = min_t(unsigned int, skb_tailroom(skb), - adapter->rx_buff_pool[pool].buff_size); + adapter->rx_buff_pool[0][pool].buff_size); off = offset; len = length; if (unlikely(len < ETH_HLEN || off >= room || @@ -1730,11 +1740,11 @@ static irqreturn_t ibmveth_interrupt(int irq, void *dev_instance) struct ibmveth_adapter *adapter = netdev_priv(netdev); unsigned long lpar_rc; - if (napi_schedule_prep(&adapter->napi)) { + if (napi_schedule_prep(&adapter->napi[0])) { lpar_rc = h_vio_signal(adapter->vdev->unit_address, VIO_IRQ_DISABLE); WARN_ON(lpar_rc != H_SUCCESS); - __napi_schedule(&adapter->napi); + __napi_schedule(&adapter->napi[0]); } return IRQ_HANDLED; } @@ -1802,7 +1812,7 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu) int need_restart = 0; for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - if (new_mtu_oh <= adapter->rx_buff_pool[i].buff_size) + if (new_mtu_oh <= adapter->rx_buff_pool[0][i].buff_size) break; if (i == IBMVETH_NUM_BUFF_POOLS) @@ -1817,9 +1827,9 @@ static int ibmveth_change_mtu(struct net_device *dev, int new_mtu) /* Look for an active buffer pool that can hold the new MTU */ for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { - adapter->rx_buff_pool[i].active = 1; + adapter->rx_buff_pool[0][i].active = 1; - if (new_mtu_oh <= adapter->rx_buff_pool[i].buff_size) { + if (new_mtu_oh <= adapter->rx_buff_pool[0][i].buff_size) { WRITE_ONCE(dev->mtu, new_mtu); vio_cmo_set_dev_desired(viodev, ibmveth_get_desired_dma @@ -1869,12 +1879,12 @@ static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev) for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { /* add the size of the active receive buffers */ - if (adapter->rx_buff_pool[i].active) + if (adapter->rx_buff_pool[0][i].active) ret += - adapter->rx_buff_pool[i].size * - IOMMU_PAGE_ALIGN(adapter->rx_buff_pool[i]. + adapter->rx_buff_pool[0][i].size * + IOMMU_PAGE_ALIGN(adapter->rx_buff_pool[0][i]. buff_size, tbl); - rxqentries += adapter->rx_buff_pool[i].size; + rxqentries += adapter->rx_buff_pool[0][i].size; } /* add the size of the receive queue entries */ ret += IOMMU_PAGE_ALIGN( @@ -1969,9 +1979,9 @@ static void ibmveth_put_pool_kobjs(struct ibmveth_adapter *adapter) int i; for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - kobject_put(&adapter->rx_buff_pool[i].kobj); + kobject_put(&adapter->rx_buff_pool[0][i].kobj); for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - wait_for_completion(&adapter->rx_buff_pool[i].released); + wait_for_completion(&adapter->rx_buff_pool[0][i].released); } static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) @@ -2024,7 +2034,7 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) adapter->mcastFilterSize = be32_to_cpu(*mcastFilterSize_p); ibmveth_init_link_settings(netdev); - netif_napi_add_weight(netdev, &adapter->napi, ibmveth_poll, 16); + netif_napi_add_weight(netdev, &adapter->napi[0], ibmveth_poll, 16); netdev->irq = dev->irq; netdev->netdev_ops = &ibmveth_netdev_ops; @@ -2056,6 +2066,8 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) netdev->features |= NETIF_F_FRAGLIST; } + adapter->num_rx_queues = IBMVETH_DEFAULT_RX_QUEUES; + if (ret == H_SUCCESS && (ret_attr & IBMVETH_ILLAN_RX_MULTI_BUFF_SUPPORT)) { adapter->rx_buffers_per_hcall = IBMVETH_MAX_RX_PER_HCALL; @@ -2078,13 +2090,13 @@ static int ibmveth_probe(struct vio_dev *dev, const struct vio_device_id *id) memcpy(pool_count, pool_count_cmo, sizeof(pool_count)); for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { - struct kobject *kobj = &adapter->rx_buff_pool[i].kobj; + struct kobject *kobj = &adapter->rx_buff_pool[0][i].kobj; int error; - ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i, + ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0][i], i, pool_count[i], pool_size[i], pool_active[i]); - init_completion(&adapter->rx_buff_pool[i].released); + init_completion(&adapter->rx_buff_pool[0][i].released); error = kobject_init_and_add(kobj, &ktype_veth_pool, &dev->dev.kobj, "pool%d", i); if (!error) @@ -2217,11 +2229,12 @@ static ssize_t veth_pool_store(struct kobject *kobj, struct attribute *attr, /* Make sure there is a buffer pool with buffers that can hold a packet of the size of the MTU */ for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) { - if (pool == &adapter->rx_buff_pool[i]) + if (pool == &adapter->rx_buff_pool[0][i]) continue; - if (!adapter->rx_buff_pool[i].active) + if (!adapter->rx_buff_pool[0][i].active) continue; - if (mtu <= adapter->rx_buff_pool[i].buff_size) + if (mtu <= + adapter->rx_buff_pool[0][i].buff_size) break; } @@ -2395,11 +2408,11 @@ static void ibmveth_remove_buffer_from_pool_test(struct kunit *test) /* Set sane values for buffer pools */ for (int i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i, + ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0][i], i, pool_count[i], pool_size[i], pool_active[i]); - pool = &adapter->rx_buff_pool[0]; + pool = &adapter->rx_buff_pool[0][0]; pool->skbuff = kunit_kcalloc(test, pool->size, sizeof(void *), GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pool->skbuff); @@ -2407,7 +2420,7 @@ static void ibmveth_remove_buffer_from_pool_test(struct kunit *test) KUNIT_EXPECT_EQ(test, -EINVAL, ibmveth_remove_buffer_from_pool(adapter, correlator, false)); KUNIT_EXPECT_EQ(test, -EINVAL, ibmveth_remove_buffer_from_pool(adapter, correlator, true)); - correlator = ((u64)0 << 32) | adapter->rx_buff_pool[0].size; + correlator = ((u64)0 << 32) | adapter->rx_buff_pool[0][0].size; KUNIT_EXPECT_EQ(test, -EINVAL, ibmveth_remove_buffer_from_pool(adapter, correlator, false)); KUNIT_EXPECT_EQ(test, -EINVAL, ibmveth_remove_buffer_from_pool(adapter, correlator, true)); @@ -2447,40 +2460,43 @@ static void ibmveth_rxq_get_buffer_test(struct kunit *test) INIT_WORK(&adapter->work, ibmveth_reset_kunit); - adapter->rx_queue.queue_len = 1; - adapter->rx_queue.index = 0; - adapter->rx_queue.queue_addr = kunit_kzalloc(test, sizeof(struct ibmveth_rx_q_entry), - GFP_KERNEL); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, adapter->rx_queue.queue_addr); + adapter->rx_queue[0].queue_len = 1; + adapter->rx_queue[0].index = 0; + adapter->rx_queue[0].queue_addr = + kunit_kzalloc(test, sizeof(struct ibmveth_rx_q_entry), + GFP_KERNEL); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, adapter->rx_queue[0].queue_addr); /* Set sane values for buffer pools */ for (int i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i, + ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0][i], i, pool_count[i], pool_size[i], pool_active[i]); - pool = &adapter->rx_buff_pool[0]; + pool = &adapter->rx_buff_pool[0][0]; pool->skbuff = kunit_kcalloc(test, pool->size, sizeof(void *), GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pool->skbuff); - adapter->rx_queue.queue_addr[0].correlator = (u64)IBMVETH_NUM_BUFF_POOLS << 32 | 0; + adapter->rx_queue[0].queue_addr[0].correlator = + (u64)IBMVETH_NUM_BUFF_POOLS << 32 | 0; cor = ibmveth_rxq_correlator(adapter); KUNIT_EXPECT_PTR_EQ(test, NULL, ibmveth_rxq_get_buffer(adapter, cor)); - adapter->rx_queue.queue_addr[0].correlator = (u64)0 << 32 | adapter->rx_buff_pool[0].size; + adapter->rx_queue[0].queue_addr[0].correlator = + (u64)0 << 32 | adapter->rx_buff_pool[0][0].size; cor = ibmveth_rxq_correlator(adapter); KUNIT_EXPECT_PTR_EQ(test, NULL, ibmveth_rxq_get_buffer(adapter, cor)); /* Pool 2 is in range but has no skbuff array, like an inactive pool. */ - adapter->rx_queue.queue_addr[0].correlator = (u64)2 << 32 | 0; + adapter->rx_queue[0].queue_addr[0].correlator = (u64)2 << 32 | 0; cor = ibmveth_rxq_correlator(adapter); KUNIT_EXPECT_PTR_EQ(test, NULL, ibmveth_rxq_get_buffer(adapter, cor)); pool->skbuff[0] = skb; - adapter->rx_queue.queue_addr[0].correlator = (u64)0 << 32 | 0; + adapter->rx_queue[0].queue_addr[0].correlator = (u64)0 << 32 | 0; cor = ibmveth_rxq_correlator(adapter); KUNIT_EXPECT_PTR_EQ(test, skb, ibmveth_rxq_get_buffer(adapter, cor)); @@ -2510,41 +2526,41 @@ static void ibmveth_rxq_harvest_buffer_test(struct kunit *test) INIT_WORK(&adapter->work, ibmveth_reset_kunit); - adapter->rx_queue.num_slots = 2; - adapter->rx_queue.index = 0; - adapter->rx_queue.toggle = 1; - adapter->rx_queue.queue_addr = + adapter->rx_queue[0].num_slots = 2; + adapter->rx_queue[0].index = 0; + adapter->rx_queue[0].toggle = 1; + adapter->rx_queue[0].queue_addr = kunit_kcalloc(test, 2, sizeof(struct ibmveth_rx_q_entry), GFP_KERNEL); - KUNIT_ASSERT_NOT_ERR_OR_NULL(test, adapter->rx_queue.queue_addr); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, adapter->rx_queue[0].queue_addr); /* Set sane values for buffer pools */ for (int i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) - ibmveth_init_buffer_pool(&adapter->rx_buff_pool[i], i, + ibmveth_init_buffer_pool(&adapter->rx_buff_pool[0][i], i, pool_count[i], pool_size[i], pool_active[i]); - pool = &adapter->rx_buff_pool[0]; + pool = &adapter->rx_buff_pool[0][0]; pool->skbuff = kunit_kcalloc(test, pool->size, sizeof(void *), GFP_KERNEL); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pool->skbuff); /* Slot 0: pool out of range. Slot 1: valid, but no skb. */ - adapter->rx_queue.queue_addr[0].correlator = + adapter->rx_queue[0].queue_addr[0].correlator = (u64)IBMVETH_NUM_BUFF_POOLS << 32 | 0; - adapter->rx_queue.queue_addr[1].correlator = (u64)0 << 32 | 0; + adapter->rx_queue[0].queue_addr[1].correlator = (u64)0 << 32 | 0; cor = ibmveth_rxq_correlator(adapter); ret = ibmveth_rxq_harvest_buffer(adapter, cor, true); KUNIT_EXPECT_EQ(test, -EINVAL, ret); - KUNIT_EXPECT_EQ(test, 1ULL, adapter->rx_queue.index); - KUNIT_EXPECT_EQ(test, 1ULL, adapter->rx_queue.toggle); + KUNIT_EXPECT_EQ(test, 1ULL, adapter->rx_queue[0].index); + KUNIT_EXPECT_EQ(test, 1ULL, adapter->rx_queue[0].toggle); cor = ibmveth_rxq_correlator(adapter); ret = ibmveth_rxq_harvest_buffer(adapter, cor, true); KUNIT_EXPECT_EQ(test, -EFAULT, ret); - KUNIT_EXPECT_EQ(test, 0ULL, adapter->rx_queue.index); - KUNIT_EXPECT_EQ(test, 0ULL, adapter->rx_queue.toggle); + KUNIT_EXPECT_EQ(test, 0ULL, adapter->rx_queue[0].index); + KUNIT_EXPECT_EQ(test, 0ULL, adapter->rx_queue[0].toggle); flush_work(&adapter->work); } diff --git a/drivers/net/ethernet/ibm/ibmveth.h b/drivers/net/ethernet/ibm/ibmveth.h index be0939caa328..4c74bd39d4e0 100644 --- a/drivers/net/ethernet/ibm/ibmveth.h +++ b/drivers/net/ethernet/ibm/ibmveth.h @@ -123,6 +123,8 @@ static inline long h_illan_attributes(unsigned long unit_address, #define IBMVETH_MAX_TX_BUF_SIZE (1024 * 64) #define IBMVETH_MAX_QUEUES 16U #define IBMVETH_DEFAULT_QUEUES 8U +#define IBMVETH_MAX_RX_QUEUES 1U +#define IBMVETH_DEFAULT_RX_QUEUES 1U #define IBMVETH_MAX_RX_PER_HCALL 8U static int pool_size[] = { 512, 1024 * 2, 1024 * 16, 1024 * 32, 1024 * 64 }; @@ -160,18 +162,20 @@ struct ibmveth_rx_q { struct ibmveth_adapter { struct vio_dev *vdev; struct net_device *netdev; - struct napi_struct napi; + struct napi_struct napi[IBMVETH_MAX_RX_QUEUES]; struct work_struct work; unsigned int mcastFilterSize; - void *buffer_list_addr; + void *buffer_list_addr[IBMVETH_MAX_RX_QUEUES]; void *filter_list_addr; void *tx_ltb_ptr[IBMVETH_MAX_QUEUES]; unsigned int tx_ltb_size; dma_addr_t tx_ltb_dma[IBMVETH_MAX_QUEUES]; - dma_addr_t buffer_list_dma; + dma_addr_t buffer_list_dma[IBMVETH_MAX_RX_QUEUES]; dma_addr_t filter_list_dma; - struct ibmveth_buff_pool rx_buff_pool[IBMVETH_NUM_BUFF_POOLS]; - struct ibmveth_rx_q rx_queue; + struct ibmveth_buff_pool + rx_buff_pool[IBMVETH_MAX_RX_QUEUES][IBMVETH_NUM_BUFF_POOLS]; + struct ibmveth_rx_q rx_queue[IBMVETH_MAX_RX_QUEUES]; + unsigned int num_rx_queues; int rx_csum; int large_send; bool is_active_trunk; -- 2.50.1 (Apple Git-155)