From patchwork Tue Dec 11 11:56:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011075 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Hr4oYcGA"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43DdgF3zn8z9s3l for ; Tue, 11 Dec 2018 22:55:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbeLKLzb (ORCPT ); Tue, 11 Dec 2018 06:55:31 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42078 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLzb (ORCPT ); Tue, 11 Dec 2018 06:55:31 -0500 Received: by mail-pf1-f194.google.com with SMTP id 64so7011642pfr.9; Tue, 11 Dec 2018 03:55:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BcU/PensVZQ/3s9/UpUArjYA7/LB9SQLVIT05ofsJ2M=; b=Hr4oYcGAa4fW3BOEQJzJQ9OMmjKP61ivoOX7jLSnXzFGD2dyTcrinTjoScmrYEEhP/ PDcD7HakU3PWBAJ8MsmfDEwGxo1mZauDmpR+0O2mQ06XjUBzfAz1KvnkHSC3k61C8EGY ZR0TwqNqqXrmerpCHxUivDrzNPQYsP8ZftOHxNCw0j5mcNvuxdaV5v/vM4NOim3KjJI4 wtIJKZ66PgZfFAOo6blE7yI3LG0j19tiEyfO9+j4w24NyRzHsCzcbLTxI2GvyCe478sc BckkALDJX7kY0Z5uQp0G/PKr4Gox5ANzqZOFrUoOIVTK8ZvPh/AtZGmlU1V7CbXYSuDq qs4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BcU/PensVZQ/3s9/UpUArjYA7/LB9SQLVIT05ofsJ2M=; b=igsR6lVxWnj0Hr5+VJJwrCYkeQQhW4jRwikk7nuoYSVQtg4PSWFlvJRsmCFzSPl9qk 68BU4bCHUVrcxsDnsXw3p+i82DO75HOlvt9qPs8PS/WY+3sG9gLl22kwzFE8xTZnfBXh mvKxAiIUOkkDRAWeWmq/3h6ywv47K2KUmeAZW34u1Rw2ufv3MbFGRSWXCRCqII2YRx5t 1NC3qrXDA00oLLCEghKSzB28Cu18OihfNWQjwR1yQ1pXWeOHi72dv5Vrp6X8aUQztVXx 40I3CAsTTH0IGhZh+A0lT7Fzdtyht59FTLQW1ky+ts81So6ohkQ0w3TFpFwMbHhdKsJF 5R7A== X-Gm-Message-State: AA+aEWb9QwdwCmwsVnRspV29gUpkbf1LuNHzYcAAVSNWuVIDzGoCert4 b7NMPDUc2x7biKAWJ3oFom0= X-Google-Smtp-Source: AFSGD/VXWCzpaFH7d/IdlwQgkt/hn7KAIY1RVZ3Ol3oSta610Up8ZQm/qfPsS7AR8pmdZCl02HWhaA== X-Received: by 2002:a63:62c3:: with SMTP id w186mr14420679pgb.345.1544529329257; Tue, 11 Dec 2018 03:55:29 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id u6sm15804540pgr.79.2018.12.11.03.55.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:28 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 1/7] selftest/bpf: Fix trailing semicolon in the statement Date: Tue, 11 Dec 2018 20:56:01 +0900 Message-Id: <20181211115607.13774-2-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix python PEP8 style issue Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/tcp_client.py | 4 ++-- tools/testing/selftests/bpf/tcp_server.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/tcp_client.py b/tools/testing/selftests/bpf/tcp_client.py index 7f8200a8702b..c3c44633c801 100755 --- a/tools/testing/selftests/bpf/tcp_client.py +++ b/tools/testing/selftests/bpf/tcp_client.py @@ -24,7 +24,7 @@ def send(sock, s): try: n = sock.send(s) except (socket.error) as e: n = 0 if n == 0: - return count; + return count count += n return count @@ -45,7 +45,7 @@ while n < 1000: buf += b'+' n += 1 -sock.settimeout(1); +sock.settimeout(1) n = send(sock, buf) n = read(sock, 500) sys.exit(0) diff --git a/tools/testing/selftests/bpf/tcp_server.py b/tools/testing/selftests/bpf/tcp_server.py index b39903fca4c8..183d07509a0a 100755 --- a/tools/testing/selftests/bpf/tcp_server.py +++ b/tools/testing/selftests/bpf/tcp_server.py @@ -24,7 +24,7 @@ def send(sock, s): try: n = sock.send(s) except (socket.error) as e: n = 0 if n == 0: - return count; + return count count += n return count @@ -72,7 +72,7 @@ while True: address = str(address[0]) readList.append(clientSocket) else: - sock.settimeout(1); + sock.settimeout(1) s = read(sock, 1000) n = send(sock, buf) sock.close() From patchwork Tue Dec 11 11:56:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011076 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XSNLipqv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43DdgP70WBz9s3q for ; Tue, 11 Dec 2018 22:55:45 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726413AbeLKLzj (ORCPT ); Tue, 11 Dec 2018 06:55:39 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:39106 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLzj (ORCPT ); Tue, 11 Dec 2018 06:55:39 -0500 Received: by mail-pf1-f194.google.com with SMTP id c72so7022469pfc.6; Tue, 11 Dec 2018 03:55:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Z8fi+4hZoWoOB0xXjU5wSf479DpIZ2+IWk4s+qeP434=; b=XSNLipqvcnMbY0Jt0NojebOIxcVtc2V8Yc13+IqzPjFNnNTwsmgstBtnqchoK5f49e /w+yZNCf95Eg6VaVw/X/XbR03o2N1XfBu+Zuj18qoLtTAP4knfyZtlgwsx0GaN8g1oe+ EU399lY0ipep0/zS2BmBQ0S6mSQYDrefBmQns9CKiORkQ0TGRmvRuPnX9Uvs/wlQ+hn8 gugVKcTCxMjG6MzUY2glkXu06mc+QPBUpswhIri/W1qzjEMPBV9s91kkmrojmKNayb0L pjPmsDqgoGIVkfXreOfGaOZ64RRrK657Hh29uHByV5Sjsw0tTlP5fApy3SIHTuwzEsdI +Nbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Z8fi+4hZoWoOB0xXjU5wSf479DpIZ2+IWk4s+qeP434=; b=le15a4v8W/LJgtLbdBmI3AHG4arYROYmXw8tk/yj8NAzZrZdSS49HVpswPqYMGyioM yi0ZLSZ15iKbvIXyJ6/gI6wBTKxtL1XgYzVHdeedZyAGJyVb8Fwlsf6wbEbRRz9SMRQD HEzsvdMZuA/C8Dx7LzJTsnGirCQ0l2cftSz91wUcehPnrGJoDHyJXUx1avAwS5GU5lVQ IEFRoRoZphEVDeLhZmdmt7e1KxT9QK/xonY3NVe/exr9IM5ghvv1QCnN45+axuFlAXws cgdRfchUc9rc2BskLXPTobzJO0odW8UuJx3/6DWbaczaNbCY594cFfJ9DIcv8jzCTtUj G1FA== X-Gm-Message-State: AA+aEWabRD7YbIuHWrdSPe9+l5BKE4qvolNkdQPLg6LC6pa1SzI4Izcu oHSuf5pGV6++w97RdWf/FBbFPx6m X-Google-Smtp-Source: AFSGD/U1VhThH/XT2E40lJEaSj0angzvYtlqLJhCAy59sfb+zSPiz0oMyoulANFYRlFsuW2KTezLpA== X-Received: by 2002:a65:6447:: with SMTP id s7mr14212956pgv.226.1544529338951; Tue, 11 Dec 2018 03:55:38 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id r12sm15395880pgv.83.2018.12.11.03.55.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:38 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 2/7] selftest/bpf: optimize import Date: Tue, 11 Dec 2018 20:56:02 +0900 Message-Id: <20181211115607.13774-3-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix PEP8 warnings Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/tcp_client.py | 7 +++---- tools/testing/selftests/bpf/tcp_server.py | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/bpf/tcp_client.py b/tools/testing/selftests/bpf/tcp_client.py index c3c44633c801..ad3de27cd605 100755 --- a/tools/testing/selftests/bpf/tcp_client.py +++ b/tools/testing/selftests/bpf/tcp_client.py @@ -3,10 +3,9 @@ # SPDX-License-Identifier: GPL-2.0 # -import sys, os, os.path, getopt -import socket, time -import subprocess -import select +import socket +import sys + def read(sock, n): buf = b'' diff --git a/tools/testing/selftests/bpf/tcp_server.py b/tools/testing/selftests/bpf/tcp_server.py index 183d07509a0a..f7491517cc49 100755 --- a/tools/testing/selftests/bpf/tcp_server.py +++ b/tools/testing/selftests/bpf/tcp_server.py @@ -3,10 +3,11 @@ # SPDX-License-Identifier: GPL-2.0 # -import sys, os, os.path, getopt -import socket, time -import subprocess +import socket +import os.path import select +import sys + def read(sock, n): buf = b'' From patchwork Tue Dec 11 11:56:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011077 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AQ+sooAP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43DdgY3DZLz9s47 for ; Tue, 11 Dec 2018 22:55:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726445AbeLKLzr (ORCPT ); Tue, 11 Dec 2018 06:55:47 -0500 Received: from mail-pg1-f177.google.com ([209.85.215.177]:35818 "EHLO mail-pg1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLzr (ORCPT ); Tue, 11 Dec 2018 06:55:47 -0500 Received: by mail-pg1-f177.google.com with SMTP id s198so6544589pgs.2; Tue, 11 Dec 2018 03:55:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SlJCnY5DeXCwcqWwl1Fo1heqQs1jJancafkPG5apsCE=; b=AQ+sooAPKlIg/i0xOI3aQWJtXEtgnx7Hej+YK9TzuqWNLt1wrRaJHUVcotomRSVwZD uD7cYqI3olvoeqaJVMfN+xRXUqcJ2iVbsNS3hsuyhGaeOTyP5d3AYjHNJiPP9GLLJVDp /q0Op02cM/3uIXeBJoVoRWokMqr/wE7R0XUiX2qqSihrCDM/SiJaUdPY4c3WR80JBFU6 aceip08xGfrGQBvh8nMGZCVmCWAeGfZQkqyULLjfw5p9U3PShgapski60Pbdhn8gk27X IsMw92sWb8yMtCFe+xbB9ZW3zP19QjVyEuq+J6JKA7Zomvg3BdDONuK5P3+44ESjmMsy fXlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SlJCnY5DeXCwcqWwl1Fo1heqQs1jJancafkPG5apsCE=; b=Jflow7dY5VJlr7zx92PhY0Z0DZKk/mteem09yaj6IZb1n5JS/dg8fz8OBAf2/Td9UU AB7+KIbbEePxUwrrNP2XG4r5CiPfEp7p6FfMi6JECp/nTkgobksc1L+T3XGOKUhoIhAg lm6720ndyydoht29RQBOThRAJ5NB8RY0VPztjWakZEcwEGKBjZsw2iBAvLC89wyM8+lQ ARx6GuIWqh3cvvfOsuAq7myi6gm3LMg5D//tOTKH4jU54bS2kDt505PNNBdWdzpxz+U/ uOyH0LygdQXABvNCY8WbjgO7T7gZD4QwcyUCwav+HGj1XrUMUQAzua6pAh0G5W4sJzOI FnLQ== X-Gm-Message-State: AA+aEWbpD79/WAtbiD9ZffGtWpq9fG2EbSc9syTXCnTGc37r61qxqdWG VvwLelpQr+qGpx46Fsz4gbE= X-Google-Smtp-Source: AFSGD/XX1VPlPbjKbTpa9TlMWBd9A8cM6IBuNZUH4ikPgXaTklxN7C+AQB/sxPNA0xj9Pt+FDJsO/A== X-Received: by 2002:a63:2784:: with SMTP id n126mr14653571pgn.48.1544529346345; Tue, 11 Dec 2018 03:55:46 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id 85sm20227525pfw.17.2018.12.11.03.55.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:45 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 3/7] selftest/bpf: PEP 8: multiple statements on one line (colon) Date: Tue, 11 Dec 2018 20:56:03 +0900 Message-Id: <20181211115607.13774-4-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Reformat the file for fixing PEP 8 style Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/tcp_client.py | 13 +++++++++---- tools/testing/selftests/bpf/tcp_server.py | 16 +++++++++++----- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/bpf/tcp_client.py b/tools/testing/selftests/bpf/tcp_client.py index ad3de27cd605..31f022bf06fa 100755 --- a/tools/testing/selftests/bpf/tcp_client.py +++ b/tools/testing/selftests/bpf/tcp_client.py @@ -11,17 +11,22 @@ def read(sock, n): buf = b'' while len(buf) < n: rem = n - len(buf) - try: s = sock.recv(rem) - except (socket.error) as e: return b'' + try: + s = sock.recv(rem) + except (socket.error) as e: + return b'' buf += s return buf + def send(sock, s): total = len(s) count = 0 while count < total: - try: n = sock.send(s) - except (socket.error) as e: n = 0 + try: + n = sock.send(s) + except (socket.error) as e: + n = 0 if n == 0: return count count += n diff --git a/tools/testing/selftests/bpf/tcp_server.py b/tools/testing/selftests/bpf/tcp_server.py index f7491517cc49..af79210249af 100755 --- a/tools/testing/selftests/bpf/tcp_server.py +++ b/tools/testing/selftests/bpf/tcp_server.py @@ -13,17 +13,22 @@ def read(sock, n): buf = b'' while len(buf) < n: rem = n - len(buf) - try: s = sock.recv(rem) - except (socket.error) as e: return b'' + try: + s = sock.recv(rem) + except (socket.error) as e: + return b'' buf += s return buf + def send(sock, s): total = len(s) count = 0 while count < total: - try: n = sock.send(s) - except (socket.error) as e: n = 0 + try: + n = sock.send(s) + except (socket.error) as e: + n = 0 if n == 0: return count count += n @@ -42,7 +47,8 @@ HostName = socket.gethostname() serverSocket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) host = socket.gethostname() -try: serverSocket.bind((host, 0)) +try: + serverSocket.bind((host, 0)) except socket.error as msg: print('bind fails: ' + str(msg)) From patchwork Tue Dec 11 11:56:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011081 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FTdOJEcg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Ddh52FGqz9s3q for ; Tue, 11 Dec 2018 22:56:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726479AbeLKLzy (ORCPT ); Tue, 11 Dec 2018 06:55:54 -0500 Received: from mail-pf1-f175.google.com ([209.85.210.175]:43611 "EHLO mail-pf1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLzw (ORCPT ); Tue, 11 Dec 2018 06:55:52 -0500 Received: by mail-pf1-f175.google.com with SMTP id w73so7005852pfk.10; Tue, 11 Dec 2018 03:55:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=i3bXWUq5CeAhUMNM7C0c+x4MGX+cdRwyO0jh9GC4XT0=; b=FTdOJEcg8+i4zPT81d+FvZLxyNOeVOeRv7l6341jGbZBMMJaSIUzaoAiEbFSS1rKs1 zP3qWvOV/HVmC0MLgEMEbTiVq/Zh5u6AwiA/qdmQSdSB3jva/OleqMGpeE9N4DmwNXil avDq9x9ENeKC7vtCF+/nckgtgHEGnQClypu9jxOGPlHAlZgmWEHwny3LQPaiXZultT3B xW8sgqjpvVMpTHAd12WSKPOv859HIKsjD/FRcrPssxJnCItzWsl0hHDkqFvM643E8SZG n9Bf+21hGZhUc8AfyHhUrMt5ifwTE68m5icPqDB7VjPR1t0wUNkgD+hxz+L/u4fqoU53 5/YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i3bXWUq5CeAhUMNM7C0c+x4MGX+cdRwyO0jh9GC4XT0=; b=CCZ5I/Z7rmIqStHNJ/dWHQWQXjtYkVksM+4ev8MSc+/Z5zEUwpoCvc1KjpUN1tyvgn YpTzxxyLNc/H+K224aN+QZnxvbJX21XRnfgc4q2BNcyrQFd0YBw4OYAm/+aIrnN27NIG sNzw0ok7QpOSuzGxzlJpaYuwg29fH6c1gg6RvzCSFiTRUbaI7/LQ1jQ1IWaW/B4LGXdv irASDnpe/RWi+p8KryyPbzfVroAqiMU6BEP2+By0kQe3fV4I25AKfyQ3chLeUX3qjSR8 VC+Owf5jGgIObsS6XakmwjgNDdehx7AF/4krHPiWdlh784WTd38tP3woSE3yfSUIkVE3 bFyA== X-Gm-Message-State: AA+aEWag5GhR1LFiHFiiIQuS0sTIWDJPr9q/MoGfpxZujECuQWO66XFJ mfK3HWG8/MSEge7GUmE5SXY= X-Google-Smtp-Source: AFSGD/WNJHaO/Wmg7k7N14g0fp8w+vlZe4BbNuJjkkxH+gjiXpdHEBfETkxk9QS1v03KKLIVpi18pQ== X-Received: by 2002:a63:ce50:: with SMTP id r16mr14221312pgi.217.1544529351783; Tue, 11 Dec 2018 03:55:51 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id o84sm24104383pfi.172.2018.12.11.03.55.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:51 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 4/7] selftest/bpf: test_offload PEP8 format style fix Date: Tue, 11 Dec 2018 20:56:04 +0900 Message-Id: <20181211115607.13774-5-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/test_offload.py | 68 ++++++++++++++++----- 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index d59642e70f56..f80c4f13991d 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -29,25 +29,30 @@ log_level = 1 skip_extack = False bpf_test_dir = os.path.dirname(os.path.realpath(__file__)) pp = pprint.PrettyPrinter() -devs = [] # devices we created for clean up -files = [] # files to be removed -netns = [] # net namespaces to be removed +devs = [] # devices we created for clean up +files = [] # files to be removed +netns = [] # net namespaces to be removed + def log_get_sec(level=0): return "*" * (log_level + level) + def log_level_inc(add=1): global log_level log_level += add + def log_level_dec(sub=1): global log_level log_level -= sub + def log_level_set(level): global log_level log_level = level + def log(header, data, level=None): """ Output to an optional log. @@ -67,6 +72,7 @@ def log(header, data, level=None): logfile.write("\n") logfile.write(data) + def skip(cond, msg): if not cond: return @@ -74,6 +80,7 @@ def skip(cond, msg): log("SKIP: " + msg, "", level=1) os.sys.exit(0) + def fail(cond, msg): if not cond: return @@ -81,11 +88,13 @@ def fail(cond, msg): log("FAIL: " + msg, "", level=1) os.sys.exit(1) + def start_test(msg): log(msg, "", level=1) log_level_inc() print(msg) + def cmd(cmd, shell=True, include_stderr=False, background=False, fail=True): """ Run a command in subprocess and return tuple of (retval, stdout); @@ -101,6 +110,7 @@ def cmd(cmd, shell=True, include_stderr=False, background=False, fail=True): return cmd_result(proc, include_stderr=include_stderr, fail=fail) + def cmd_result(proc, include_stderr=False, fail=False): stdout, stderr = proc.communicate() stdout = stdout.decode("utf-8") @@ -128,11 +138,13 @@ def cmd_result(proc, include_stderr=False, fail=False): else: return proc.returncode, stdout + def rm(f): cmd("rm -f %s" % (f)) if f in files: files.remove(f) + def tool(name, args, flags, JSON=True, ns="", fail=True, include_stderr=False): params = "" if JSON: @@ -158,10 +170,12 @@ def tool(name, args, flags, JSON=True, ns="", fail=True, include_stderr=False): else: return ret, out + def bpftool(args, JSON=True, ns="", fail=True, include_stderr=False): - return tool("bpftool", args, {"json":"-p"}, JSON=JSON, ns=ns, + return tool("bpftool", args, {"json": "-p"}, JSON=JSON, ns=ns, fail=fail, include_stderr=include_stderr) + def bpftool_prog_list(expected=None, ns=""): _, progs = bpftool("prog show", JSON=True, ns=ns, fail=True) # Remove the base progs @@ -174,6 +188,7 @@ def bpftool_prog_list(expected=None, ns=""): (len(progs), expected)) return progs + def bpftool_map_list(expected=None, ns=""): _, maps = bpftool("map show", JSON=True, ns=ns, fail=True) # Remove the base maps @@ -186,6 +201,7 @@ def bpftool_map_list(expected=None, ns=""): (len(maps), expected)) return maps + def bpftool_prog_list_wait(expected=0, n_retry=20): for i in range(n_retry): nprogs = len(bpftool_prog_list()) @@ -194,6 +210,7 @@ def bpftool_prog_list_wait(expected=0, n_retry=20): time.sleep(0.05) raise Exception("Time out waiting for program counts to stabilize want %d, have %d" % (expected, nprogs)) + def bpftool_map_list_wait(expected=0, n_retry=20): for i in range(n_retry): nmaps = len(bpftool_map_list()) @@ -202,6 +219,7 @@ def bpftool_map_list_wait(expected=0, n_retry=20): time.sleep(0.05) raise Exception("Time out waiting for map counts to stabilize want %d, have %d" % (expected, nmaps)) + def bpftool_prog_load(sample, file_name, maps=[], prog_type="xdp", dev=None, fail=True, include_stderr=False): args = "prog load %s %s" % (os.path.join(bpf_test_dir, sample), file_name) @@ -217,28 +235,35 @@ def bpftool_prog_load(sample, file_name, maps=[], prog_type="xdp", dev=None, files.append(file_name) return res + def ip(args, force=False, JSON=True, ns="", fail=True, include_stderr=False): if force: args = "-force " + args - return tool("ip", args, {"json":"-j"}, JSON=JSON, ns=ns, + return tool("ip", args, {"json": "-j"}, JSON=JSON, ns=ns, fail=fail, include_stderr=include_stderr) + def tc(args, JSON=True, ns="", fail=True, include_stderr=False): - return tool("tc", args, {"json":"-p"}, JSON=JSON, ns=ns, + return tool("tc", args, {"json": "-p"}, JSON=JSON, ns=ns, fail=fail, include_stderr=include_stderr) + def ethtool(dev, opt, args, fail=True): return cmd("ethtool %s %s %s" % (opt, dev["ifname"], args), fail=fail) -def bpf_obj(name, sec=".text", path=bpf_test_dir,): + +def bpf_obj(name, sec=".text", path=bpf_test_dir, ): return "obj %s sec %s" % (os.path.join(path, name), sec) + def bpf_pinned(name): return "pinned %s" % (name) + def bpf_bytecode(bytecode): return "bytecode \"%s\"" % (bytecode) + def mknetns(n_retry=10): for i in range(n_retry): name = ''.join([random.choice(string.ascii_letters) for i in range(8)]) @@ -248,12 +273,14 @@ def mknetns(n_retry=10): return name return None + def int2str(fmt, val): ret = [] for b in struct.pack(fmt, val): ret.append(int(b)) return " ".join(map(lambda x: str(x), ret)) + def str2int(strtab): inttab = [] for i in strtab: @@ -268,6 +295,7 @@ def str2int(strtab): (len(strtab))) return struct.unpack(fmt, ba)[0] + class DebugfsDir: """ Class for accessing DebugFS directories as a dictionary. @@ -318,6 +346,7 @@ class DebugfsDir: return dfs + class NetdevSim: """ Class for netdevsim netdevice and its attributes. @@ -340,9 +369,9 @@ class NetdevSim: def _netdevsim_create(self): link = "" if self.link is None else "link " + self.link.dev['ifname'] - _, old = ip("link show") + _, old = ip("link show") ip("link add sim%d {link} type netdevsim".format(link=link)) - _, new = ip("link show") + _, new = ip("link show") for dev in new: f = filter(lambda x: x["ifname"] == dev["ifname"], old) @@ -384,7 +413,8 @@ class NetdevSim: if nbound == bound and nprogs == total: return time.sleep(0.05) - raise Exception("Time out waiting for program counts to stabilize want %d/%d, have %d bound, %d loaded" % (bound, total, nbound, nprogs)) + raise Exception("Time out waiting for program counts to stabilize want %d/%d, have %d bound, %d loaded" % ( + bound, total, nbound, nprogs)) def set_ns(self, ns): name = "1" if ns == "" else ns @@ -473,7 +503,7 @@ class NetdevSim: if chain is not None: spec += " chain %d" % (chain) - return tc("filter {op} dev {dev} {qdisc} {spec} {cls} {params}"\ + return tc("filter {op} dev {dev} {qdisc} {spec} {cls} {params}" .format(op=op, dev=self['ifname'], qdisc=qdisc, spec=spec, cls=cls, params=params), fail=fail, include_stderr=include_stderr) @@ -502,6 +532,7 @@ class NetdevSim: args = "hw-tc-offload %s" % ("on" if enable else "off") return ethtool(self, "-K", args, fail=fail) + ################################################################################ def clean_up(): global files, netns, devs @@ -515,6 +546,7 @@ def clean_up(): files = [] netns = [] + def pin_prog(file_name, idx=0): progs = bpftool_prog_list(expected=(idx + 1)) prog = progs[idx] @@ -523,6 +555,7 @@ def pin_prog(file_name, idx=0): return file_name, bpf_pinned(file_name) + def pin_map(file_name, idx=0, expected=1): maps = bpftool_map_list(expected=expected) m = maps[idx] @@ -531,6 +564,7 @@ def pin_map(file_name, idx=0, expected=1): return file_name, bpf_pinned(file_name) + def check_dev_info_removed(prog_file=None, map_file=None): bpftool_prog_list(expected=0) ret, err = bpftool("prog show pin %s" % (prog_file), fail=False) @@ -546,6 +580,7 @@ def check_dev_info_removed(prog_file=None, map_file=None): "Showing map with removed device expected ENODEV, error is %s" % (err["error"])) + def check_dev_info(other_ns, ns, prog_file=None, map_file=None, removed=False): progs = bpftool_prog_list(expected=1, ns=ns) prog = progs[0] @@ -568,6 +603,7 @@ def check_dev_info(other_ns, ns, prog_file=None, map_file=None, removed=False): fail("dev" not in m.keys(), "Device parameters not reported") fail(dev != m["dev"], "Map's device different than program's") + def check_extack(output, reference, args): if skip_extack: return @@ -575,13 +611,16 @@ def check_extack(output, reference, args): comp = len(lines) >= 2 and lines[1] == 'Error: ' + reference fail(not comp, "Missing or incorrect netlink extack message") + def check_extack_nsim(output, reference, args): check_extack(output, "netdevsim: " + reference, args) + def check_no_extack(res, needle): fail((res[1] + res[2]).count(needle) or (res[1] + res[2]).count("Warning:"), "Found '%s' in command output, leaky extack?" % (needle)) + def check_verifier_log(output, reference): lines = output.split("\n") for l in reversed(lines): @@ -589,6 +628,7 @@ def check_verifier_log(output, reference): return fail(True, "Missing or incorrect message from netdevsim in verifier log") + def test_spurios_extack(sim, obj, skip_hw, needle): res = sim.cls_bpf_add_filter(obj, prio=1, handle=1, skip_hw=skip_hw, include_stderr=True) @@ -1056,7 +1096,7 @@ try: sim = NetdevSim() map_obj = bpf_obj("sample_map_ret0.o") start_test("Test loading program with maps...") - sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON + sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON start_test("Test bpftool bound info reporting (own ns)...") check_dev_info(False, "") @@ -1087,7 +1127,7 @@ try: sim = NetdevSim() start_test("Test map update (no flags)...") - sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON + sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON maps = bpftool_map_list(expected=2) array = maps[0] if maps[0]["type"] == "array" else maps[1] htab = maps[0] if maps[0]["type"] == "hash" else maps[1] @@ -1168,7 +1208,7 @@ try: sim.remove() sim = NetdevSim() - sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON + sim.set_xdp(map_obj, "offload", JSON=False) # map fixup msg breaks JSON sim.remove() bpftool_map_list_wait(expected=0) From patchwork Tue Dec 11 11:56:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011080 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RocxJCVv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Ddh05jkvz9s3q for ; Tue, 11 Dec 2018 22:56:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726505AbeLKLz4 (ORCPT ); Tue, 11 Dec 2018 06:55:56 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:46040 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLzz (ORCPT ); Tue, 11 Dec 2018 06:55:55 -0500 Received: by mail-pl1-f193.google.com with SMTP id a14so6818849plm.12; Tue, 11 Dec 2018 03:55:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k27n73fQlgWGQRe3Ovzbe9wT07z2hRcSnkRn+qEUwiw=; b=RocxJCVvzts+9R84N3FXnWxM/Y+9NkJWsCVKOUpB8IQhSbZ2RSHmtLz48vwE4OW5Uk LYpVAstKvHwsrVwJKYMC+UuJXGDD1lEJMYwWBECbEeF44MB9C/wRrqifGCWLWYZpLPON iN+J9XLbe8ea4QOJg19fQRyjFzMhmeRvRVD3yRNTSdPtJ9fnvs6Nb5cNmcyXKL5GTzCk wLfZmljCn1R2Uyxj5762JiyLfH4tKjesMqEKBMGVkrXTHX18bcO9QCFAZ5m//ZMqrLQx Gl1Adh4MmdWrhIklSQ2SQbj/OfYjhhNfR7DMqUDq91AnI4RBaT9IpOrgtiIUlwdCca/i mewg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k27n73fQlgWGQRe3Ovzbe9wT07z2hRcSnkRn+qEUwiw=; b=UXo8hcH0RH59u5TCnett/Wc4Q6bljw9WSzt+S/BABOcmuXv0+nC+5RPvRclbxvVO7p Co1pIwACmA9QEWWPxTFftrfeh2zXpOi4K4+tM2IV7aLKzIywml73osIQe7GQ7Oy98KgC 8hdpU7AGD+Y8ixJ6Gv7u4deLHK2ersSw8/xrhBC0IEVayQCJeS6anYxh0ByNUhl9tAX4 5OY8opwZzbcgJSVYYbd3EuoFZ30qYcOwn+tW4iMxMie2ouk9fZ0Sg59RICnegt3uwmGo zVOlJXWMcm7Bm77sZNs+I0NpzvNJbwL+Kzy6PSd4QQOCYdqw6486XfaxcW9Qoe4jAawz nxuA== X-Gm-Message-State: AA+aEWaiJSB+W2XoNNxS6BNieJapXC6OQivpnx9hBJXD7YR2aVI/os5g /JAgwYctTF+/HU+x2TiuN8w= X-Google-Smtp-Source: AFSGD/WKrcoxhA9Ab6B2VShOoV0OUuennftNG1d5NegWfJbjKEUiVgpRiz70KArVUrUEdi6DanXJ7w== X-Received: by 2002:a17:902:680f:: with SMTP id h15mr15440314plk.40.1544529355078; Tue, 11 Dec 2018 03:55:55 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id h124sm18710202pfg.143.2018.12.11.03.55.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:54 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 5/7] selftest/bpf: Fix PEP8 ambiguous variable name Date: Tue, 11 Dec 2018 20:56:05 +0900 Message-Id: <20181211115607.13774-6-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/test_offload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index f80c4f13991d..0f9130ebfd2c 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -623,8 +623,8 @@ def check_no_extack(res, needle): def check_verifier_log(output, reference): lines = output.split("\n") - for l in reversed(lines): - if l == reference: + for line in reversed(lines): + if line == reference: return fail(True, "Missing or incorrect message from netdevsim in verifier log") From patchwork Tue Dec 11 11:56:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011078 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CwMVkgw9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Ddgn4zHLz9s3l for ; Tue, 11 Dec 2018 22:56:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726531AbeLKL4A (ORCPT ); Tue, 11 Dec 2018 06:56:00 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33297 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKLz6 (ORCPT ); Tue, 11 Dec 2018 06:55:58 -0500 Received: by mail-pg1-f193.google.com with SMTP id z11so6548814pgu.0; Tue, 11 Dec 2018 03:55:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ksf+l9dgiALe7Zg9ZUU9BOjXKuL1SU9cdW27O4NHX4M=; b=CwMVkgw9GzZcCxJXyQ0LHHoMBv9La3EOZB9qZHDPVNMQOvOB078DAcUCpAhf1igO3v ptPvHKrINtN/vS37dcKt+MTjwBzpsthzERX7DwiPFkXegEJ6nigkdaSxgQu1moNSZGPL P9MU+FSGBhucDIfJL9dW+N3VW4JNUQXb/J9sCLNn4gIGiAoJpqq2dTPqG3jfN2uYqeA1 DUg2vsTcyoOZ5YKeRxp9AHC1C2cJTeNNROZbD+GTvs5n7G7Nzc1WnEMA43pCqGMU1zOB w80nYGjXpXyj4vDEu5I29HKtLxRdvfKiX49bTh1vg8fbWzdzraIn+/8q6HOt4EuHfyTc GxKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ksf+l9dgiALe7Zg9ZUU9BOjXKuL1SU9cdW27O4NHX4M=; b=K8s/KxZudhbDxO9hfRkYnBm/xNwvApm42EM1f0k6fjrIMGhJohqdTplh6F8VSK+eP7 dpZkq8h8dRKpP7LcDPk1SmtJWUL7sUUcvHRf3gZVH6LkFMYCdUGZY2ofYKI6Qzo+pldz +IAgNBkJBE0ranQ5tFygAcANcTkqXOHmENsI8kUfL0d4XOjYm27UBRdYQWEDj5VYhYfX cvHFB9lFNA37bhmxF0XztENH+HbcnCEfCE+083fmIyE19EzrHYSFLU7aYppv90ydZSGF Ogg4zXiE4FxxS9tJjGFskCCDTbT16Wy2sxQfLbkh+1sK1aipYp5hUt+goGPGJ8UswKPw TcuQ== X-Gm-Message-State: AA+aEWaiwKhIOSGj5jRSvz29FkiDNPtg8t1/ZfZ1cNv2tk8nTyFqn1u9 XZEThsJlRXrkZTHAKpmP1PQ= X-Google-Smtp-Source: AFSGD/WA2ox449NyaVmkXh21gR+qv6b8B+IjJVeNOLyQxJIJBoI4jWv+cC6Zym9g+xCnptlPEid/lQ== X-Received: by 2002:a63:3287:: with SMTP id y129mr14406986pgy.337.1544529358134; Tue, 11 Dec 2018 03:55:58 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id q75sm19795928pfa.38.2018.12.11.03.55.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:55:57 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 6/7] selftest/bpf: remove redundant parenthesis Date: Tue, 11 Dec 2018 20:56:06 +0900 Message-Id: <20181211115607.13774-7-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/test_offload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index 0f9130ebfd2c..b06cc0eea0eb 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -140,7 +140,7 @@ def cmd_result(proc, include_stderr=False, fail=False): def rm(f): - cmd("rm -f %s" % (f)) + cmd("rm -f %s" % f) if f in files: files.remove(f) From patchwork Tue Dec 11 11:56:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alice Ferrazzi X-Patchwork-Id: 1011079 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="scub+JjW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Ddgt1YG7z9sB7 for ; Tue, 11 Dec 2018 22:56:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726554AbeLKL4E (ORCPT ); Tue, 11 Dec 2018 06:56:04 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34429 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726130AbeLKL4D (ORCPT ); Tue, 11 Dec 2018 06:56:03 -0500 Received: by mail-pg1-f194.google.com with SMTP id 17so6544453pgg.1; Tue, 11 Dec 2018 03:56:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2YPMnrZvb/ynXn//cGGy9dniHzNzN3agBhFSIWj+m/Y=; b=scub+JjWu816DwOm7gKbzY6eTQJni0wcPZNApNxW1vYBfo9nysd+3hPxTtpsQJAsiS iI/N4UxfstUj0Ts9CgKf5xx0diZ8zCAh7/u+XqC7Y/6ic9A9dHLl4c581SKuweGMx4hy a1nfSmlszeoI/c4kRKs9ZQLeZZRG4DbCQ2T8n2UwzHO3JO5i7S5pom5EomgKn4riFRi3 17KuQyce3w0vJFx++xv867dHGw+92Tzoc06XrITUWiRaDyZoMd1yX1bx+XfgVZ561aaF M/SjmWxQdN60JfTGYguZTq2lZfFO3V9lt4TJzoXDPYCyxYgYZ0YV8X+M2E60CTy1Z0KJ n3IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2YPMnrZvb/ynXn//cGGy9dniHzNzN3agBhFSIWj+m/Y=; b=SXQHbQy5mn64goDpR9jC55tT0NA/PrhWZs1uE51FmzRfNWG4RuunQOMjEt/Xu9UaFu qUCJVlf/SPfPQeu1LF0J3lvaoTLcmUWCESAvE3gygilJt4Yg2btyasyKpYiNvN9oL8/L /z+7Ax3SyCgc/MnNISluKSM5BDtnfcfsn/RmQdJIZzQYoMgj8kf1zkMIqRBOe2XRdG7b LFvcQEDbZ3U3ovdfCxEFMaFIxYF6eq8Wr93vE9LhYa7JYVe18uLGaw6x1FwMo3SEucjv In8bp0LfNXtf8HjQGoZcNhpSVHHZeylZfTedsvCO5Rtfw0N+ZurdhGHDs/K9rVq4kW3u MOMQ== X-Gm-Message-State: AA+aEWZLa825zuc+r4TclqiNtlQ/OlHG+HIDg9g63mKp8628zBq3OZJl 32NR7O/w5cifeaDVtBggqkOsFoyE X-Google-Smtp-Source: AFSGD/XdTftpYxdBi8BETy9Pl9MYcZuCsVuTMqN8o/TMJmfDcpvF8BCaqS2jO8Ekgu9jkTk/oau/bQ== X-Received: by 2002:a63:a84a:: with SMTP id i10mr14543305pgp.263.1544529362854; Tue, 11 Dec 2018 03:56:02 -0800 (PST) Received: from localhost (219x123x27x194.ap219.ftth.ucom.ne.jp. [219.123.27.194]) by smtp.gmail.com with ESMTPSA id u8sm19581710pfl.16.2018.12.11.03.56.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 03:56:02 -0800 (PST) From: Alice Ferrazzi Cc: ast@kernel.org, daniel@iogearbox.net, shuah@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Alice Ferrazzi Subject: [PATCH 7/7] selftest/bpf: fix E501 line too long Date: Tue, 11 Dec 2018 20:56:07 +0900 Message-Id: <20181211115607.13774-8-alice.ferrazzi@gmail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211115607.13774-1-alice.ferrazzi@gmail.com> References: <20181211115607.13774-1-alice.ferrazzi@gmail.com> MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org fix PEP8 style issues Signed-off-by: Alice Ferrazzi --- tools/testing/selftests/bpf/test_offload.py | 35 +++++++++++++-------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index b06cc0eea0eb..3f78da0f87d5 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -208,7 +208,8 @@ def bpftool_prog_list_wait(expected=0, n_retry=20): if nprogs == expected: return time.sleep(0.05) - raise Exception("Time out waiting for program counts to stabilize want %d, have %d" % (expected, nprogs)) + raise Exception("Time out waiting for program counts \ +to stabilize want %d, have %d" % (expected, nprogs)) def bpftool_map_list_wait(expected=0, n_retry=20): @@ -217,7 +218,8 @@ def bpftool_map_list_wait(expected=0, n_retry=20): if nmaps == expected: return time.sleep(0.05) - raise Exception("Time out waiting for map counts to stabilize want %d, have %d" % (expected, nmaps)) + raise Exception("Time out waiting for map counts to \ +stabilize want %d, have %d" % (expected, nmaps)) def bpftool_prog_load(sample, file_name, maps=[], prog_type="xdp", dev=None, @@ -413,7 +415,8 @@ class NetdevSim: if nbound == bound and nprogs == total: return time.sleep(0.05) - raise Exception("Time out waiting for program counts to stabilize want %d/%d, have %d bound, %d loaded" % ( + raise Exception("Time out waiting for program counts to \ +stabilize want %d/%d, have %d bound, %d loaded" % ( bound, total, nbound, nprogs)) def set_ns(self, ns): @@ -533,7 +536,7 @@ class NetdevSim: return ethtool(self, "-K", args, fail=fail) -################################################################################ +############################################################################### def clean_up(): global files, netns, devs @@ -617,7 +620,8 @@ def check_extack_nsim(output, reference, args): def check_no_extack(res, needle): - fail((res[1] + res[2]).count(needle) or (res[1] + res[2]).count("Warning:"), + fail((res[1] + res[2]).count(needle) or (res[1] + + res[2]).count("Warning:"), "Found '%s' in command output, leaky extack?" % (needle)) @@ -778,8 +782,9 @@ try: start_test("Test TC replace bad flags...") for i in range(3): for j in range(3): - ret, _ = sim.cls_bpf_add_filter(obj, op="replace", prio=1, handle=1, - skip_sw=(j == 1), skip_hw=(j == 2), + ret, _ = sim.cls_bpf_add_filter(obj, op="replace", prio=1, + handle=1, skip_sw=(j == 1), + skip_hw=(j == 2), fail=False) fail(bool(ret) != bool(j), "Software TC incorrect load in replace test, iteration %d" % @@ -824,9 +829,11 @@ try: fail(dprog["state"] != "xlated", "Offloaded program state not translated") fail(dprog["loaded"] != "Y", "Offloaded program is not loaded") - start_test("Test disabling TC offloads is rejected while filters installed...") + start_test("Test disabling TC offloads is rejected while \ +filters installed...") ret, _ = sim.set_ethtool_tc_offloads(False, fail=False) - fail(ret == 0, "Driver should refuse to disable TC offloads with filters installed...") + fail(ret == 0, "Driver should refuse to disable TC offloads with filters \ +installed...") start_test("Test qdisc removal frees things...") sim.tc_flush_filters() @@ -922,7 +929,8 @@ try: offload = bpf_pinned("/sys/fs/bpf/offload") ret, _, err = sim.set_xdp(offload, "drv", fail=False, include_stderr=True) fail(ret == 0, "attached offloaded XDP program to drv") - check_extack(err, "using device-bound program without HW_MODE flag is not supported.", args) + check_extack(err, "using device-bound program without HW_MODE flag is not \ +supported.", args) rm("/sys/fs/bpf/offload") sim.wait_for_flush() @@ -1072,8 +1080,8 @@ try: delay_msec = 500 sim.dfs["bpf_bind_verifier_delay"] = delay_msec start = time.time() - cmd_line = "tc filter add dev %s ingress bpf %s da skip_sw" % \ - (sim['ifname'], obj) + cmd_line = "tc filter add dev %s ingress bpf %s da skip_sw" % + (sim['ifname'], obj) tc_proc = cmd(cmd_line, background=True, fail=False) # Wait for the verifier to start while sim.dfs_num_bound_progs() <= 2: @@ -1244,7 +1252,8 @@ try: ret, _ = simA.set_xdp(progB, "offload", force=True, JSON=False, fail=False) fail(ret == 0, "cross-ASIC program allowed") for d in simB: - ret, _ = d.set_xdp(progA, "offload", force=True, JSON=False, fail=False) + ret, _ = d.set_xdp(progA, "offload", force=True, JSON=False, + fail=False) fail(ret == 0, "cross-ASIC program allowed") start_test("Test multi-dev ASIC cross-dev install...")