From patchwork Thu Feb 13 11:19:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13973130 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) (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 CC929242932; Thu, 13 Feb 2025 11:19:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739445593; cv=none; b=VQ4sc20qL4DxoeQE8cO6NZZQeLU4pJz0ZgZt8uXSAM1TajhDfC7cMYmztYl0rW3ylqJJppHX/DMkA1tMgzii5owezu76/2n0/xA1+QEhwXC1hHChkt/CBMe7v60IbtCZUZE6xpAaEISY6eIKhLg69As5S3bXRA7pWYdvni3f6Io= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739445593; c=relaxed/simple; bh=9uuNd+3GB1+s/Ck5oO4hLGm+v5ubjOuu0ksS9ejQBNs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mi+uDzt1S6C9JmiiI29vWO5tnFnwQSXrdhi9GHKYJL+7Fh81FNmnKC/RKKRvBEfeRo/q+vMugeMrFGrClYWQlsxT/aFlTvTTHodJTQR8lvzj29lYJ1bcL2LQpOJI0/LuBLo6T9Q4x8A/ANiIbaRfN/krbfAUdWOQE6vVdz+3ZjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net; spf=pass smtp.mailfrom=gmx.net; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b=TBZRDG/F; arc=none smtp.client-ip=212.227.15.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gmx.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmx.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmx.net header.i=ps.report@gmx.net header.b="TBZRDG/F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1739445567; x=1740050367; i=ps.report@gmx.net; bh=9uuNd+3GB1+s/Ck5oO4hLGm+v5ubjOuu0ksS9ejQBNs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=TBZRDG/FU0Dd4edOMyPZ+IfPz2xRYwX40eJqSzlOBXPLNCpof4UyIQ7/T//7VrGt SEK+moDh96OhXlQqkvAZ4G7TTFDZQFVTQF1p7cgtdpGM+tt970HS0znfzn/Q3pACV kOmDga7MT3x7Dhqs7IODF5uJ8H2n0SO0h2bT2RqSpgvN5wbbvp24k+n/ZCgZkjwf2 XIFTOjSnPtYeao5w020W/NUuIHIaXzieyjO4iR1Si0HU+LEovLV5fUAgydDvZSNGn Lhh7GikTJ2amgk0u1eT71q/Jvb3KQjG4xsRJkoi8yI5AKX9TnUhEdVkWpgt8SL++O tp84Dydk7x3OTtkXig== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.197]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M2wGs-1tfEvb2j9w-006yzf; Thu, 13 Feb 2025 12:19:27 +0100 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Peter Seiderer , Thomas Gleixner , Artem Chernyshev , Nam Cao , Frederic Weisbecker Subject: [PATCH net-next v5 7/8] net: pktgen: remove all superfluous index assignements Date: Thu, 13 Feb 2025 12:19:19 +0100 Message-ID: <20250213111920.1439021-8-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250213111920.1439021-1-ps.report@gmx.net> References: <20250213111920.1439021-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:vgUEgNqAatG/XR1nP5KVaQnazr37N5sLpoB+44LlcguynB0/xZk xTDi+3eNeKMPZgUTQAqxiwXkXV6C48nb+OpG5mVXJzdP7jY0efdE8AftqGtQ1ao8yIDO1++ iWxdGXGzVRjcbksf5O9B/SfpUEt/nVAmtS04bI6GZZNNd+xTiN0M9QHxUkDTM5uNm4K9MZe WWOq5k6GhVHc2i8UpGkIA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:FcH4IGXayf8=;FoGcasg0FZKe6gwAuzvYfL2dbSe nIdX+32GMTUMsxyt7w+frcz9J/VqsLZ44Z+ItkTTouB1Taz0+PIXDUO88Bye5XazkmLQIUJks QMiasMhoRZEiQeS+61M+q+lEsTCRPlA7nnU5065mqr8IRd43p/bSVSluXAmFArQaV0TL2W//a HncM97jSrsz1606BWRni2+oW0eqwZcOn8/MA+lagjVP1a2VuyKCxSRKd3cFoQCRx9jjULShAf b9bWYjNQqxmOX7mQwgjatstvxvlWCKedkvvZY/GtApnY16EYOEQgtEuwhQGn6MsRsqV5Gc3Xr tyUQyuSxK9bUJCqfkjPe39PB/obgdk4mpN6kK1072qDXF6Xg/IyDAt3YRimAK2QUUxUltVKr9 Ao/1LTNO7tGlW2SZWWBI0qluGJn2wtpr1Mjs4C4t9E/a3Dn0sGEpfbbJ33B7gmtoGVrRDcTZX gQBZWXr6BY/JlokRoOzogFBjJMl3PbhdbrhnlU7A6oO4MonGu2Kzp7lS+Utt8M+fWBkKE0T5G HsD0yuh01uFgblkk1SWJXXlYzG9ZZDzLYm7sq+EsB2sPuWnpu9kaHfQHLxRXFTdVC2XqvgcVW MC8o4s8Wu7a3PEh07gWf9MZG9t3C6iyTDE3FPapg36nQFngQwt+o5Bl9im29EYsZoyJx4uZzT M+WNiQyPmpNhMpxvqdhdMHM8mrNfI9zfnXeMjVEVV0GSTC8tSGOtDQ5hYdEt5NEjy9Nif6BVc BHiHRSdCvd0ldgPBqff8qIL4wkpPOq50GXlWaDCoVhBpxGkcS8tstHTjIPob+1GKHQA4b+QLC YCVCagQtU5cRDtb0IspqrxlcOT296UeaHiKHjV2ld4AVLDQAUQDRJyiIGUsZF2GGvWtNZ4rDH 93/swLHPXCbElP8Oaq2W8oM0uhf9LASDGNgapxbrmh3CMfuG+d3N+Qb5WxbGJJ60ERP1UP2dE E4tqa9w5lWZ/lZHMQKBDJpVVOyD65xWF8lDiEAeT0PhvZiMRvuyfECyaeUFZAKYV/9HXR/8tg IvDTk9p91MbQX3raeTDyDr6cwHxNF4//vgw1S8do72vMGDsybqpQa/xuzeSIzwGEh2sHlUInp LX6wSubYZtEucTSI2LAPrBWoRqdXWRD2RAJOV8Ivlw94DSO4kumBfNVsZMpFW80uvHHqWRjss lIsDDjR0Fpu4xTd3RhY98AYAbZ0uP5ZAOrOG4UHWXcrwnuuI7YdzmzoCOrstkn/wg6iJ2a7w2 HY+EHbyI8GCnwRenEpCbODJps4OQ0zUpjE2clmZmaL+y1sHQSr9b6R4ZRBX8yyvAvXAE/vunm dM8xschpplX8feFXNMiWvu6ljmVvJp02H8Dlu+pTORpp+74BanCTJILf5YvYl13kYx/A9oHJ/ 5hwrO3OAmvm+Cbag2B+NDsxSp4rqgCQAI1RXG3ECMjI9hnP6IBAK/9/Por Remove all superfluous index ('i += len') assignements (value not used afterwards). Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v4 -> v5 - new patch (suggested by Simon Horman) --- net/core/pktgen.c | 52 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 46 deletions(-) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 1a0cfff2f3d7..bc01020fa03c 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1040,7 +1040,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value < 14 + 20 + 8) value = 14 + 20 + 8; if (value != pkt_dev->min_pkt_size) { @@ -1058,7 +1057,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value < 14 + 20 + 8) value = 14 + 20 + 8; if (value != pkt_dev->max_pkt_size) { @@ -1078,7 +1076,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value < 14 + 20 + 8) value = 14 + 20 + 8; if (value != pkt_dev->min_pkt_size) { @@ -1101,7 +1098,6 @@ static ssize_t pktgen_if_write(struct file *file, fill_imix_distribution(pkt_dev); - i += len; return count; } @@ -1111,7 +1107,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; debug = value; sprintf(pg_result, "OK: debug=%u", debug); return count; @@ -1123,7 +1118,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->nfrags = value; sprintf(pg_result, "OK: frags=%d", pkt_dev->nfrags); return count; @@ -1134,7 +1128,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value == 0x7FFFFFFF) pkt_dev->delay = ULLONG_MAX; else @@ -1150,7 +1143,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (!value) return -EINVAL; pkt_dev->delay = pkt_dev->min_pkt_size*8*NSEC_PER_USEC/value; @@ -1166,7 +1158,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (!value) return -EINVAL; pkt_dev->delay = NSEC_PER_SEC/value; @@ -1182,7 +1173,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value != pkt_dev->udp_src_min) { pkt_dev->udp_src_min = value; pkt_dev->cur_udp_src = value; @@ -1196,7 +1186,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value != pkt_dev->udp_dst_min) { pkt_dev->udp_dst_min = value; pkt_dev->cur_udp_dst = value; @@ -1210,7 +1199,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value != pkt_dev->udp_src_max) { pkt_dev->udp_src_max = value; pkt_dev->cur_udp_src = value; @@ -1224,7 +1212,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value != pkt_dev->udp_dst_max) { pkt_dev->udp_dst_max = value; pkt_dev->cur_udp_dst = value; @@ -1248,7 +1235,6 @@ static ssize_t pktgen_if_write(struct file *file, !(pkt_dev->flags & F_SHARED))) return -EINVAL; - i += len; pkt_dev->clone_skb = value; sprintf(pg_result, "OK: clone_skb=%d", pkt_dev->clone_skb); @@ -1260,7 +1246,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->count = value; sprintf(pg_result, "OK: count=%llu", (unsigned long long)pkt_dev->count); @@ -1272,7 +1257,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (pkt_dev->src_mac_count != value) { pkt_dev->src_mac_count = value; pkt_dev->cur_src_mac_offset = 0; @@ -1287,7 +1271,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (pkt_dev->dst_mac_count != value) { pkt_dev->dst_mac_count = value; pkt_dev->cur_dst_mac_offset = 0; @@ -1302,7 +1285,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value > 1) && ((pkt_dev->xmit_mode == M_QUEUE_XMIT) || ((pkt_dev->xmit_mode == M_START_XMIT) && @@ -1322,8 +1304,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; - if (node_possible(value)) { pkt_dev->node = value; sprintf(pg_result, "OK: node=%d", pkt_dev->node); @@ -1347,7 +1327,6 @@ static ssize_t pktgen_if_write(struct file *file, memset(f, 0, sizeof(f)); if (copy_from_user(f, &user_buffer[i], len)) return -EFAULT; - i += len; if (strcmp(f, "start_xmit") == 0) { pkt_dev->xmit_mode = M_START_XMIT; @@ -1388,7 +1367,6 @@ static ssize_t pktgen_if_write(struct file *file, memset(f, 0, 32); if (copy_from_user(f, &user_buffer[i], len)) return -EFAULT; - i += len; flag = pktgen_read_flag(f, &disable); if (flag) { @@ -1446,7 +1424,7 @@ static ssize_t pktgen_if_write(struct file *file, } if (debug) pr_debug("dst_min set to: %s\n", pkt_dev->dst_min); - i += len; + sprintf(pg_result, "OK: dst_min=%s", pkt_dev->dst_min); return count; } @@ -1467,7 +1445,7 @@ static ssize_t pktgen_if_write(struct file *file, } if (debug) pr_debug("dst_max set to: %s\n", pkt_dev->dst_max); - i += len; + sprintf(pg_result, "OK: dst_max=%s", pkt_dev->dst_max); return count; } @@ -1491,7 +1469,6 @@ static ssize_t pktgen_if_write(struct file *file, if (debug) pr_debug("dst6 set to: %s\n", buf); - i += len; sprintf(pg_result, "OK: dst6=%s", buf); return count; } @@ -1514,7 +1491,6 @@ static ssize_t pktgen_if_write(struct file *file, if (debug) pr_debug("dst6_min set to: %s\n", buf); - i += len; sprintf(pg_result, "OK: dst6_min=%s", buf); return count; } @@ -1536,7 +1512,6 @@ static ssize_t pktgen_if_write(struct file *file, if (debug) pr_debug("dst6_max set to: %s\n", buf); - i += len; sprintf(pg_result, "OK: dst6_max=%s", buf); return count; } @@ -1560,7 +1535,6 @@ static ssize_t pktgen_if_write(struct file *file, if (debug) pr_debug("src6 set to: %s\n", buf); - i += len; sprintf(pg_result, "OK: src6=%s", buf); return count; } @@ -1581,7 +1555,7 @@ static ssize_t pktgen_if_write(struct file *file, } if (debug) pr_debug("src_min set to: %s\n", pkt_dev->src_min); - i += len; + sprintf(pg_result, "OK: src_min=%s", pkt_dev->src_min); return count; } @@ -1602,7 +1576,7 @@ static ssize_t pktgen_if_write(struct file *file, } if (debug) pr_debug("src_max set to: %s\n", pkt_dev->src_max); - i += len; + sprintf(pg_result, "OK: src_max=%s", pkt_dev->src_max); return count; } @@ -1655,7 +1629,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value > MAX_CFLOWS) value = MAX_CFLOWS; @@ -1670,7 +1643,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->spi = value; sprintf(pg_result, "OK: spi=%u", pkt_dev->spi); return count; @@ -1682,7 +1654,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->lflow = value; sprintf(pg_result, "OK: flowlen=%u", pkt_dev->lflow); return count; @@ -1694,7 +1665,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->queue_map_min = value; sprintf(pg_result, "OK: queue_map_min=%u", pkt_dev->queue_map_min); return count; @@ -1706,7 +1676,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->queue_map_max = value; sprintf(pg_result, "OK: queue_map_max=%u", pkt_dev->queue_map_max); return count; @@ -1719,7 +1688,7 @@ static ssize_t pktgen_if_write(struct file *file, len = get_labels(&user_buffer[i], max, pkt_dev); if (len < 0) return len; - i += len; + cnt = sprintf(pg_result, "OK: mpls="); for (n = 0; n < pkt_dev->nr_labels; n++) cnt += sprintf(pg_result + cnt, @@ -1742,7 +1711,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value <= 4095) { pkt_dev->vlan_id = value; /* turn on VLAN */ @@ -1770,7 +1738,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value <= 7) && (pkt_dev->vlan_id != 0xffff)) { pkt_dev->vlan_p = value; sprintf(pg_result, "OK: vlan_p=%u", pkt_dev->vlan_p); @@ -1786,7 +1753,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value <= 1) && (pkt_dev->vlan_id != 0xffff)) { pkt_dev->vlan_cfi = value; sprintf(pg_result, "OK: vlan_cfi=%u", pkt_dev->vlan_cfi); @@ -1802,7 +1768,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value <= 4095) && ((pkt_dev->vlan_id != 0xffff))) { pkt_dev->svlan_id = value; /* turn on SVLAN */ @@ -1830,7 +1795,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value <= 7) && (pkt_dev->svlan_id != 0xffff)) { pkt_dev->svlan_p = value; sprintf(pg_result, "OK: svlan_p=%u", pkt_dev->svlan_p); @@ -1846,7 +1810,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if ((value <= 1) && (pkt_dev->svlan_id != 0xffff)) { pkt_dev->svlan_cfi = value; sprintf(pg_result, "OK: svlan_cfi=%u", pkt_dev->svlan_cfi); @@ -1864,7 +1827,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (len == 2) { pkt_dev->tos = tmp_value; sprintf(pg_result, "OK: tos=0x%02x", pkt_dev->tos); @@ -1882,7 +1844,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (len == 2) { pkt_dev->traffic_class = tmp_value; sprintf(pg_result, "OK: traffic_class=0x%02x", pkt_dev->traffic_class); @@ -1898,7 +1859,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; pkt_dev->skb_priority = value; sprintf(pg_result, "OK: skb_priority=%i", pkt_dev->skb_priority); @@ -2015,7 +1975,7 @@ static ssize_t pktgen_thread_write(struct file *file, } if (copy_from_user(f, &user_buffer[i], len)) return -EFAULT; - i += len; + mutex_lock(&pktgen_thread_lock); ret = pktgen_add_device(t, f); mutex_unlock(&pktgen_thread_lock);