From patchwork Thu Apr 10 07:17:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 14045996 X-Patchwork-Delegate: kuba@kernel.org 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 5ACDC20CCD0; Thu, 10 Apr 2025 07:18:09 +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=1744269492; cv=none; b=dshHwzudHq/7EJC4I7DqqfhyzzoclIeYYwp5zuGm60HYLEiUS2yJZAofjhhbN8OZyv/Ll8zL6FQi7+awaN1Ko+bqbkPkS4w8fX/wZEpJK8thXrwUZ+/GvOh84dashI9AfL1UcGpTEC+gqA1oqXSKRzkpzdmH2y1hkhx1jiAGqFA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744269492; c=relaxed/simple; bh=2gXd9w/b1brVEYRsxS3GP4N+Vzgt56PJau7/375ytls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IHuLgWRuzRqSTuo5pXECDWWhWftr7CFXD1g/MHReiqJb/A8P9kR68ovD56Xlyzo3walPdYXiSMC03EK45INQHMVIcc7zqSteQInlOdoc1eJWqabbCj5FfAOQtO78Q0eW0FEYxJB/hM+77TDYxO1Lyy6uXYY690+bRO+KJwefkps= 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=tSsRld4m; 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="tSsRld4m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1744269483; x=1744874283; i=ps.report@gmx.net; bh=2gXd9w/b1brVEYRsxS3GP4N+Vzgt56PJau7/375ytls=; 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=tSsRld4mlkedWjcZH8zF3qe3OhXCAG5cew5lV/jn9sTSPB2U+wGeUon8Vr8DSDRj cZ9OooucV7EIEMNIqu/3/Kl9XSjKT/wDkw61KLnSwLjoof/Yc1UJjoz5qpwqvxtIs Yix+PTkQG2eOJVsnhZzLroTyU4+o80bLtN6++sO+NUeQ7fo71QZoIAQOMhNjnwuRJ nqnkYGOdvKBTV4d385Hg4qUosLCh0CkGy1gjDJgouoPfWMix8ck/ZQEi2zyTgjo5/ CRPP/NDYpuwF3m120hL+4Jf4mIKWFHnCtbJBzPu9Wx5ZoYD3Xr83dPpoKN0VQiwAD 4w3FJ9TeHz6wSdERuA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([82.135.81.74]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MDysm-1tsqXX0o9k-00A9CI; Thu, 10 Apr 2025 09:18:03 +0200 From: Peter Seiderer To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Peter Seiderer Subject: [PATCH net-next v1 07/11] net: pktgen: fix code style (WARNING: Missing a blank line after declarations) Date: Thu, 10 Apr 2025 09:17:44 +0200 Message-ID: <20250410071749.30505-8-ps.report@gmx.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250410071749.30505-1-ps.report@gmx.net> References: <20250410071749.30505-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:DRQM3oqiJL8GXAXCmoM3CCwZ4Ye3qi8EieOxWmsBD+sjUr2B8rm VeauWXXpf6s2zGyYDlsJj0cwAlds37QuViqBO2bQc8G1SwNz2EESln7xo/QJlaecieZRBx0 sYvzyYOgsoaXWMbIuqwnZ5twqoR1PyIhaxYFA5MYLcOEf+Hsvsr1miyjz5zBlzzec2xj3jw JCS0ofBBVndUSBL676p5g== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:0Vb4fycjxbc=;E90ANPOYCdeETurPsPfVfytAn7K yFfifi9F7UFeAqG2HdFdLKqlSA0pjZxjl6xZp4k0xhgjirJTRkVQLCxAdEuRL/4vDF4oepbmq 7rjEXMBmznUsOwg1i0kQG4TLVgmEXPM8EsvUifbbL1vPqOYI/nPOQEjP2c0XkjsXwAk56SW0J LL2qCR47zcR8iTbG/gbuJeC8Wxdjk0nq2Zm08FnR54vhPJ0i7v5UnjhXzgPNFV1wDBooxdCEc Zieb/TMUEICeZv28N2h2y1/bFRL8XxEQWjLJlghe/UOuXclDL7u97YDlcVh9alglsCxMva4+S utZC0UhMiMb7zzSfqiVR/KVMbpgz9gRZ8znYuYcacEMnO8+Ntg30d2vevTBrrRUwBU/cgj4lc tVEQWH2ufiNfjNw5fQbVeRuDSDYaUPosRniNHkA5P0BpzeZoFdF+4K82Beddt97BzWnbx2K5O uopGUMhHt0r/5+0J1UReCZsOKHSk3v5gmFVYulLLAoyHu9zNU05R35IS5xx7N2jwYsdr+1J4v 1RNltVsJGv9vs66uf1kpDJwhRm1p9vk9w8Gik97aBKdLLVVnH75tt0J2tGZHy8dbsnN4h4aKC lvs5EBWQgVhHGTbzXJYoOM35BeaJgXmuJNu0oj9P6yt/aF+zDKZMrondc0KYgpIFUZiL6Z7NF rDcGjNka7oFvlz/UQ/PER2gCa/J9P3dj+7QS51ikRV9irUISPOP6t1zIsP9M96Ezf7srgAsrZ TlO4jgayBmlBzCV508GrF/82e6OdWanneXtkzNuLg45IKm4eKLWSmx6X+jIKDm6UgNdjBquVb 7fpr6PnkF2B1HJTJS5hRRoebQJqSmGCJzHWXvx3diisKTbF31O+1+rUPnWmgvT2HfaFMfbPfX Q0mzqKr9k7ilSMM899J+ybKt+A/jf9Aut2JpnX242Slqs1VXPv1mhU+8gMDkXjLCBwvyOOg1F pCoopyfkg2LXptdHe7Ws/NtdEqH1R3MSzTASY0eM9y9vreMyErko4d8ZjwjTxrl4HJgcWOGhV pl4oYTvRWJlLfqIBOxjV8h1P0Xo8bq2Iam90bKSlNThLNyI2xQVP6iy2GdsahY0ZIuZYGI1kK RcDfOrf0xjLbRnNwDzXot7Fr8AxYZOq1ZLFZ+z2PRpqIa6fztiI7vBb9Lv+SDtp5T/Mwbkkkm w2O3w02ps9qnjBkUNes0m7wFMz1pCTCDji+3YNNVXFWCIAbqcY+5A6U1fnI1xxplnqQogve9b 7oL+F9WCPmXzqX8YUANg7nG/4gQxiiFo6/AlcFr9jTK5qbi+LPtAYhWGnUBtodEzF83NKOpBK XkhkWQM2LXejGdTbN48JGDta4oD7noYqQxGTd8m7tgJTvB8OtefK6q7h7tfQeSWAZ2NCOGeZH Lu0wxU2HJsvz9lMSZCpGmmCw0bIxLod09d3W05lMaeu3Upx9l8PE+CPOCLKTEOUt0e5mKa3YL BGTUKxzJ4f+bQqjmQdJ7DKNt2kB0= X-Patchwork-Delegate: kuba@kernel.org Fix checkpatch code style warnings: WARNING: Missing a blank line after declarations #761: FILE: net/core/pktgen.c:761: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations #780: FILE: net/core/pktgen.c:780: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations #806: FILE: net/core/pktgen.c:806: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations #823: FILE: net/core/pktgen.c:823: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations #1968: FILE: net/core/pktgen.c:1968: + char f[32]; + memset(f, 0, 32); WARNING: Missing a blank line after declarations #2410: FILE: net/core/pktgen.c:2410: + struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id); + if (!x) { WARNING: Missing a blank line after declarations #2442: FILE: net/core/pktgen.c:2442: + __u16 t; + if (pkt_dev->flags & F_QUEUE_MAP_RND) { WARNING: Missing a blank line after declarations #2523: FILE: net/core/pktgen.c:2523: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations #2567: FILE: net/core/pktgen.c:2567: + __u32 t; + if (pkt_dev->flags & F_IPSRC_RND) WARNING: Missing a blank line after declarations #2587: FILE: net/core/pktgen.c:2587: + __be32 s; + if (pkt_dev->flags & F_IPDST_RND) { WARNING: Missing a blank line after declarations #2634: FILE: net/core/pktgen.c:2634: + __u32 t; + if (pkt_dev->flags & F_TXSIZE_RND) { WARNING: Missing a blank line after declarations #2736: FILE: net/core/pktgen.c:2736: + int i; + for (i = 0; i < pkt_dev->cflows; i++) { WARNING: Missing a blank line after declarations #2738: FILE: net/core/pktgen.c:2738: + struct xfrm_state *x = pkt_dev->flows[i].x; + if (x) { WARNING: Missing a blank line after declarations #2752: FILE: net/core/pktgen.c:2752: + int nhead = 0; + if (x) { WARNING: Missing a blank line after declarations #2795: FILE: net/core/pktgen.c:2795: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations #3480: FILE: net/core/pktgen.c:3480: + ktime_t idle_start = ktime_get(); + schedule(); Signed-off-by: Peter Seiderer --- net/core/pktgen.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 6d2bf1ae5eb9..72063f3f8c61 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -758,6 +758,7 @@ static ssize_t hex32_arg(const char __user *user_buffer, size_t maxlen, for (; i < maxlen; i++) { int value; char c; + if (get_user(c, &user_buffer[i])) return -EFAULT; value = hex_to_bin(c); @@ -777,6 +778,7 @@ static ssize_t count_trail_chars(const char __user *user_buffer, size_t maxlen) for (i = 0; i < maxlen; i++) { char c; + if (get_user(c, &user_buffer[i])) return -EFAULT; switch (c) { @@ -803,6 +805,7 @@ static ssize_t num_arg(const char __user *user_buffer, size_t maxlen, for (i = 0; i < maxlen; i++) { char c; + if (get_user(c, &user_buffer[i])) return -EFAULT; if ((c >= '0') && (c <= '9')) { @@ -820,6 +823,7 @@ static ssize_t strn_len(const char __user *user_buffer, size_t maxlen) for (i = 0; i < maxlen; i++) { char c; + if (get_user(c, &user_buffer[i])) return -EFAULT; switch (c) { @@ -1965,6 +1969,7 @@ static ssize_t pktgen_thread_write(struct file *file, if (!strcmp(name, "add_device")) { char f[32]; + memset(f, 0, 32); max = min(sizeof(f) - 1, count - i); len = strn_len(&user_buffer[i], max); @@ -2407,6 +2412,7 @@ static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow) #ifdef CONFIG_XFRM struct xfrm_state *x = pkt_dev->flows[flow].x; struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id); + if (!x) { if (pkt_dev->spi) { @@ -2439,6 +2445,7 @@ static void set_cur_queue_map(struct pktgen_dev *pkt_dev) else if (pkt_dev->queue_map_min <= pkt_dev->queue_map_max) { __u16 t; + if (pkt_dev->flags & F_QUEUE_MAP_RND) { t = get_random_u32_inclusive(pkt_dev->queue_map_min, pkt_dev->queue_map_max); @@ -2520,6 +2527,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) if (pkt_dev->flags & F_MPLS_RND) { unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) if (pkt_dev->labels[i] & MPLS_STACK_BOTTOM) pkt_dev->labels[i] = MPLS_STACK_BOTTOM | @@ -2564,6 +2572,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) imx = ntohl(pkt_dev->saddr_max); if (imn < imx) { __u32 t; + if (pkt_dev->flags & F_IPSRC_RND) t = get_random_u32_inclusive(imn, imx - 1); else { @@ -2584,6 +2593,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) if (imn < imx) { __u32 t; __be32 s; + if (pkt_dev->flags & F_IPDST_RND) { do { @@ -2631,6 +2641,7 @@ static void mod_cur_headers(struct pktgen_dev *pkt_dev) if (pkt_dev->min_pkt_size < pkt_dev->max_pkt_size) { __u32 t; + if (pkt_dev->flags & F_TXSIZE_RND) { t = get_random_u32_inclusive(pkt_dev->min_pkt_size, pkt_dev->max_pkt_size - 1); @@ -2733,8 +2744,10 @@ static void free_SAs(struct pktgen_dev *pkt_dev) if (pkt_dev->cflows) { /* let go of the SAs if we have them */ int i; + for (i = 0; i < pkt_dev->cflows; i++) { struct xfrm_state *x = pkt_dev->flows[i].x; + if (x) { xfrm_state_put(x); pkt_dev->flows[i].x = NULL; @@ -2749,6 +2762,7 @@ static int process_ipsec(struct pktgen_dev *pkt_dev, if (pkt_dev->flags & F_IPSEC) { struct xfrm_state *x = pkt_dev->flows[pkt_dev->curfl].x; int nhead = 0; + if (x) { struct ethhdr *eth; struct iphdr *iph; @@ -2792,6 +2806,7 @@ static int process_ipsec(struct pktgen_dev *pkt_dev, static void mpls_push(__be32 *mpls, struct pktgen_dev *pkt_dev) { unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) *mpls++ = pkt_dev->labels[i] & ~MPLS_STACK_BOTTOM; @@ -3477,6 +3492,7 @@ static void pktgen_rem_thread(struct pktgen_thread *t) static void pktgen_resched(struct pktgen_dev *pkt_dev) { ktime_t idle_start = ktime_get(); + schedule(); pkt_dev->idle_acc += ktime_to_ns(ktime_sub(ktime_get(), idle_start)); }