From patchwork Fri Feb 21 21:52:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 13986360 X-Patchwork-Delegate: kuba@kernel.org 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 E30A2254AEB; Fri, 21 Feb 2025 21:52:58 +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=1740174781; cv=none; b=WZYSeMGJq6VDPUkOjk8ggJBXyZp2E+1tq3lXjMPtDu/GpbCcbNam+fgUvXApnafkTYps5dp1T0GEBIAKkHk6fK5g8+gwr2f5gGG6EBTK+bo38fmVZyQgi7uH6Tjbi0bXvA5G3F0nsB5Lrj/VM9jGJhx2I2BFjpwVH2ToJv7/PpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740174781; c=relaxed/simple; bh=UtKew6Eez2SIXGIbQ5rXGr5jFF1Mk29CHbzNmGZAzXo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XOGt6bVzg6Iff5GXRGqUD5GhlDXdFR36iuISROHGjHLCjIumh7yleMTOJ2x8+/lz8sKpzlGVbUaPwX5qbuhGCG983joukfzv7DkrbOFE05eXeanFlkMU/QedqJZUZ5OyxygIwa9uY/oLnUp7SYub7mHJN2sYHu2qHNynFlfJSjs= 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=XjErbkeB; 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="XjErbkeB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1740174772; x=1740779572; i=ps.report@gmx.net; bh=UtKew6Eez2SIXGIbQ5rXGr5jFF1Mk29CHbzNmGZAzXo=; 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=XjErbkeBCRxRySC+DRLk/BhItVACLA9f6b2/eRCX2Nh/v19Zh/VazPddQyLHdGGM +2h/pI6o0iqm4/08f2NFXVPEyW/Yuh5BABJNUgGIae+BqsbLM77PvfVHGWmK+/E5F 0HgRTmrzPXWLGWNaTCSDMbPNqLZ7/6sPQI2Ee/kk623RPFk+lK3csAPMGo1Url33u PjkEuApqP2s7v5ii8sPfYIhLsvGbXhABv8KBn/yDS1Hv7P8oxpuRUtwRvjakVgDQS tvaZOrjOsJUvq5WFX++I09NixVfiFtLsZOOViJ7wCVngAjkvgytEa7+KjbPh9cNOl X5PuDlgtbGfMDW1y0A== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.92]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MpUUw-1sxueG31Bc-00khYe; Fri, 21 Feb 2025 22:52:52 +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 Subject: [PATCH net-next v6 7/8] net: pktgen: remove all superfluous index assignements Date: Fri, 21 Feb 2025 22:52:45 +0100 Message-ID: <20250221215246.383373-8-ps.report@gmx.net> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250221215246.383373-1-ps.report@gmx.net> References: <20250221215246.383373-1-ps.report@gmx.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Provags-ID: V03:K1:LEXTvr0eBkmeE0oHrcwUkDBgMRv2Lnvnd+7EYb0OUfYL1RkiOU2 l+XlHzO21/VojZv6oLmLBJFx+IIBr0/sLsLkJTMENtou3kfLSg+u2miDv7VksRIvrbqq2IC cvoehvzE95SI4NgCK0JrEfSMrm1J5MWwOjOdrJlOj2kDA9CNCEp65S5NHtVsGo9zmyG4S1H usaTLnCc4BkycD9v4BtEA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:cuDUjUyhPWc=;ni/nDQ1uGVO8q4/xLHAczPV3nDb hTe4S2yeDdmmygg1RHIIN9fhpIzyw0EBBGLCl/mH/l1VaqdaBPPjkHVY/+vUXlxlbGLUyD4ZM LdrgKXnEi+YxqSPi0+bRnPw4H+WfSucAETMnPJteFJrMu5LM4bu2aR+aV3IEvxQ0/ilu+E7TD 6Y2PPCe0feZDRKlPNPfxAlKl4kiib/caYBtbtb8mD8vvMTgCqCdFqXw4ogAGrPe7PwyBpn2/k KTQjG+A/dv4jVLfEwn5GZdQCLi1/KTofZbWFBJtxgXSW9c8ycVD8M4WkESBQ0cqIi7JtOqabC uvQCZ/v85qw0SmX1rGswMB5WqKFtAYPMUNfEOMchOztpR96kXFy9X+JTPXgKvmIc2tKy0MIKJ wL1KrbY4U0yqWp6AEClMsPD/JSbeepguIndzbS9rZ5TlX8zAFyon7aHUjf4Jkpnt8sCF5yKz9 pQ1kc3/lH9SelkKApWuFfhc0aeC55knPzgnBq444uzkiQSZ2d1kqlg/mdXFIMQJR1jcj1jzRk WL/ctigBIskqaO1sF2nvKQJW2NX7wNqmFmTuNHx/xixJTmqNY9Uu55ArvwyVkLbOl689lpJA4 f7uzjBGGoPlpYiObyOtSjsuLMucPHXyMgl4yGVeJ/oF603v9OE176+U2ZINqllF1BTdk4lJpL hXKcw57ldvL51Ls/9vypXisGnBbrKHBRH42dokY++ete+BUgOGa4vsCSCP8KDQWEB0PKavfrT RPshIkK3vBKQHoxPrAT9HlWNQdbP6e7H5K9CXIVSh9sugRzdzpuLb+sQYKAkob4o3P6nhkDUi husDCbq1t2Q2odLyrWVJL7Ujo/PVfagemuaAEsVlpc8yH+p8uL3vSvUg63EbOO+HcAJZcEviT uidOO41t0OnACSuSBRPWOIoaEuMvmnQwZYIrhkQG6ViEC1jXgvoLQRLLHR9BuixD6Gqp+fyEu tlQJzW0n12zji7bfMS3UEjdxnbNyY0+5bAoTvJDpyRQny0d8esRn1MxMlceTQ7P6BTtgHj3MC KoIxPpbGOvhpphoEqC6YAllICD5PNqmOKRuSMjhyGw93WJ/DYF7MjVWrr68ycuhClCAvifZVi SSViMWYDlNAKdEDncVkwhMTr2pCuVAtSooD6kd4cZ1evFWXkOvPlV+p4RFJnEnkQU7SM/LT37 vy9mHev06fUKEMDyqPppOwDWH3zR6F6XWpqkJMgeaSA0oJQEiaUxZOyQHgFpnuM9KNToYi4np wa2q0KVz2fm8jWdqvVZd2soapyzyMGAXxVl4I63PdXUUpWz8rEJynS2LEK/LF76CfQq8jfiPn sqSQwZc8BpDsUkWiRjUQGKA+aYuKxdeIYwJmxKE2Tw35ZwDFuBbJXRbrI3MxqYZ3hIPCU8r4q qzAlLJdvEkBQWIJhckfzNxv2qVgQ78WqEwu912+trWBkBxnJI53j3Ptea5 X-Patchwork-Delegate: kuba@kernel.org Remove all superfluous index ('i += len') assignements (value not used afterwards). Signed-off-by: Peter Seiderer Reviewed-by: Simon Horman --- 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 bb13a4591709..96511e57c3fb 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -1030,7 +1030,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) { @@ -1048,7 +1047,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) { @@ -1068,7 +1066,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) { @@ -1091,7 +1088,6 @@ static ssize_t pktgen_if_write(struct file *file, fill_imix_distribution(pkt_dev); - i += len; return count; } @@ -1101,7 +1097,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; @@ -1113,7 +1108,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; @@ -1124,7 +1118,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 @@ -1140,7 +1133,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; @@ -1156,7 +1148,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; @@ -1172,7 +1163,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; @@ -1186,7 +1176,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; @@ -1200,7 +1189,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; @@ -1214,7 +1202,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; @@ -1238,7 +1225,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); @@ -1250,7 +1236,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); @@ -1262,7 +1247,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; @@ -1277,7 +1261,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; @@ -1292,7 +1275,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) && @@ -1312,8 +1294,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); @@ -1337,7 +1317,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; @@ -1378,7 +1357,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) { @@ -1436,7 +1414,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; } @@ -1457,7 +1435,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; } @@ -1481,7 +1459,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; } @@ -1504,7 +1481,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; } @@ -1526,7 +1502,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; } @@ -1550,7 +1525,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; } @@ -1571,7 +1545,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; } @@ -1592,7 +1566,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; } @@ -1645,7 +1619,6 @@ static ssize_t pktgen_if_write(struct file *file, if (len < 0) return len; - i += len; if (value > MAX_CFLOWS) value = MAX_CFLOWS; @@ -1660,7 +1633,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; @@ -1672,7 +1644,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; @@ -1684,7 +1655,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; @@ -1696,7 +1666,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; @@ -1709,7 +1678,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, @@ -1732,7 +1701,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 */ @@ -1760,7 +1728,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); @@ -1776,7 +1743,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); @@ -1792,7 +1758,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 */ @@ -1820,7 +1785,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); @@ -1836,7 +1800,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); @@ -1854,7 +1817,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); @@ -1872,7 +1834,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); @@ -1888,7 +1849,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); @@ -2005,7 +1965,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);