From patchwork Thu Feb 27 13:56:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13994542 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (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 75B45225408; Thu, 27 Feb 2025 13:56:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.17.20 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664582; cv=none; b=YAZUqLxKzmwcL4IxQO15tXfwHivL+YbpuEARy2mC51XE/lveC2EXD5QqaVyiWK1nc32deaMs3FPJ5EG5e3WTOBmTabpBevllANfohrwhnojdiNNNnW41OwHEWtNk41Nqt+VRUk7QAT5AzDlx9qmSPwwiPXoPkFWbPnzcGXQ1JGk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740664582; c=relaxed/simple; bh=VTUIYxvOejiRil1eARRLJZNl0TdkdlSsBXRkQL05spc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W+TJRYxwRy3EViW8KlNhRMRoC+MtEvPd7iOjwHz3yPYCyaVgV1eC/epXc5+hisQJURyUoUjwaWEaLJ4X49DBjq7cHzCWP6x7RWIOMf8F8SrbP3Z0Th83tJq0Am5jspD1Wts9g0SDR9hfQvKlyy+9GKK/mtzK2KuKhCFf2dd+Oe8= 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=BOLAOwdr; arc=none smtp.client-ip=212.227.17.20 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="BOLAOwdr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740664576; x=1741269376; i=ps.report@gmx.net; bh=VTUIYxvOejiRil1eARRLJZNl0TdkdlSsBXRkQL05spc=; 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=BOLAOwdrqAzXuJuzmGkpYpvYVpk72Y01cME4NV7o2gwpfU2daEC4/vkf+k6qHCZU Er6SK43UDGgYv8nzjMNAoGs36uPig9QtJklqMo6Rl3x4pGInKLOz2xBFXosHsS8RS 3sUsJRh5e2ne6+/CZfGErS4F0YiXzosPPM483iR0Q3EE6d1Kne7znWqXBP2yUWfSe jltf4b4CreXMwv/oKh6VlB4xLLiJ/SPeaIDPTQKFr1e0QOyIprjB8QbqKuMtb5TBQ ydC2dv3rMvQITEfGnFqd7EyQjty4qx7kXyXjDzE1julZ2vLGtcLuGUI0/htC19hBY lIirboq7JeWZCEWAww== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.151]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N3bSt-1t6VgR1pCt-00w72I; Thu, 27 Feb 2025 14:56:16 +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 , Fedor Pchelkin , Arnd Bergmann , Nam Cao Subject: [PATCH net-next v8 7/8] net: pktgen: remove all superfluous index assignements Date: Thu, 27 Feb 2025 14:56:03 +0100 Message-ID: <20250227135604.40024-8-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250227135604.40024-1-ps.report@gmx.net> References: <20250227135604.40024-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:EarVIzoh0M0cjRE43xaTG/5ghkYbotQuaKH+EqBwRekpC5rDG4T SwNcRKssz11WRm+9KYoIya9uwWGwVv4xtKgznv72pUGIqOsMprRjYNIX0lekXQABiCGDMQh 2SK6eUUL1HkAWyQus7Da5ShNR/Q+m1XfewgkDRX0tx7A8RGTnJ9fKaNsVYcD0FunCOitTCE kXW7557QZwLYQECIFTxtQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:yK63mgyz0f8=;PvyG8qiTlng+NUd4ZliJBrwCURh IF8XMEIaoX5xVdvaK+xODVQW1CUyFXMTch4Lo+aTC0Vj3rUHOWOQRTcmeHKFTStwtEwN1KRGW 0vx4G83wZEtYHmM2elXw7TPonjC8FTaDntGfLJkBMnrSqNAzSENV8EpZpFJesOKtt/zpqly82 sw/p1BIclK8iYNiA9t+EQskgF7gx6B8qHhg11gZCDcK4+eEZ90L6uYs0xJmyidga+B52YvdP8 LO7QxArPffBICCPTR4WFOB7jkKFsD4HOikm50s9hCUMfDBHIPHCql/99/tOOv/+4qsYmgSCbg eCDKc6ltcQOP6PyYLYzqJhlh1O+PzAEcgaFVbTd8O2hGa+W218PTKASK3bH4vbZlHhWHFkiKz n8B1fOiNHmOiIFcGMY4eFuf2k2jLu421KBQMVg87YUOzgAFmA6pB94MIUP3+9WTOlSugBciM9 3GoRsWkQuIY9Q7dCx/kr32CE3lXU5skzD2C+gC/mVwuP2CUP6OkpHvyxgFxrTvzTdfUuUaNM1 kXsl9FwF7VobdObzGwJuW0ZSZmZHR1qe74u9NsUeWLpvA92RA0DfWsYCEfIhRW0NoR5q6vXZq mpTc/AzvgMMJQgz16SMFKbgvU8ED0vS9A30dEOlZR6Ge577WqwRktYRv8J7jjFkYW8t2SQJ2Q XsG7ukqgUq6mjfwIWjFqlwPBw51AaQKocayVmzaLEsfX7Dkc20cwYjYB7MT1MCAqr3HlRYP9r hS8xPr2NntfX+tszHOLbMA5TbDcL2xenoJvhw5CbCGJarYprd5BsrvZBM9nVR0OOGZ2JbZCJi u2shbRWBAWI0Yb4neXGAlHB0uq1hN7Ya7DLRfC3nIsYCM+P1Ytn5qVDYWxFzOoXrdTibzkadC PdQfXPUqAEGQrQcqpgFBtchLeGAXqLZ1x5poB2dQPmBUnjc9sSnVRRoWCnkV+LrOAsR8ToRW7 0ve9ij144Lob8IJqdZD/KibOpNzbdfj9OqsNM5llrNPSy8JLNyGDJElwAdAduEYgBVuYfxEKS yvyU4SYirMrQAwTLxVrY5FjMuy/2kkKnWJom5WCDZ2lOHY13avfEeN4K37ha7F39WVxlZahpv SOeZmBtS9qasjOwJc38+WAFQwP1PdBXrpScCJ6xu+fDcRNA9+B9TbGP7P4sK+kVIPNGWumVSA zYM7YQm8deh1TXyEz9cN0haHG6Mz+21ELlF8UMMbtdMswhvyFqw6d1wmeB5hKtl0tEKzMZ/k1 0GXK5sboQaGpVumzEEOdcXD+In/t3k64Gdp9Ut0MsBMmTxx/RuDiv1pbiEzd700+f5/Fj+Nis QPj6Y/dOvZWCuMaLvvhvVyfuHzPS4I+hjR9ykeh78Z/2XxPJZ8maxZ58tusKiiTR/LIZqQu8+ QZCjyBiBBuE1T4NmiM1MGM5vFu7+cs+Ejd3LUDm/L7Gb2A6WnwWejIl3+xaHzYTW/x/zn1DZb esdF+tQ== Remove all superfluous index ('i += len') assignements (value not used afterwards). Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- Changes v7 -> v8 - rebased on actual net-next/main - no changes Changes v6 -> v7 - rebased on actual net-next/main - no changes Changes v5 -> v6 - add rev-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 c604a68f2840..e850598db3e7 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1028,7 +1028,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) { @@ -1046,7 +1045,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) { @@ -1066,7 +1064,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) { @@ -1089,7 +1086,6 @@ static ssize_t pktgen_if_write(struct file *file, fill_imix_distribution(pkt_dev); - i += len; return count; } @@ -1099,7 +1095,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; @@ -1111,7 +1106,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; @@ -1122,7 +1116,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 @@ -1138,7 +1131,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; @@ -1154,7 +1146,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; @@ -1170,7 +1161,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; @@ -1184,7 +1174,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; @@ -1198,7 +1187,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; @@ -1212,7 +1200,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; @@ -1236,7 +1223,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); @@ -1248,7 +1234,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); @@ -1260,7 +1245,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; @@ -1275,7 +1259,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; @@ -1290,7 +1273,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) && @@ -1310,8 +1292,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); @@ -1335,7 +1315,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; @@ -1376,7 +1355,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) { @@ -1434,7 +1412,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; } @@ -1455,7 +1433,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; } @@ -1479,7 +1457,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; } @@ -1502,7 +1479,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; } @@ -1524,7 +1500,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; } @@ -1548,7 +1523,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; } @@ -1569,7 +1543,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; } @@ -1590,7 +1564,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; } @@ -1643,7 +1617,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value > MAX_CFLOWS) value = MAX_CFLOWS; @@ -1658,7 +1631,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; @@ -1670,7 +1642,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; @@ -1682,7 +1653,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; @@ -1694,7 +1664,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; @@ -1707,7 +1676,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, @@ -1730,7 +1699,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 */ @@ -1758,7 +1726,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); @@ -1774,7 +1741,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); @@ -1790,7 +1756,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 */ @@ -1818,7 +1783,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); @@ -1834,7 +1798,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); @@ -1852,7 +1815,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); @@ -1870,7 +1832,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); @@ -1886,7 +1847,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); @@ -2003,7 +1963,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);