From patchwork Thu Jun 14 16:04:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kodanev X-Patchwork-Id: 929537 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=oracle.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=oracle.com header.i=@oracle.com header.b="mFfmFDsk"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4167WH3CsSz9ry1 for ; Fri, 15 Jun 2018 01:55:39 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id DF2AA1A9B1F for ; Thu, 14 Jun 2018 17:55:36 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-2.smtp.seeweb.it (in-2.smtp.seeweb.it [IPv6:2001:4b78:1:20::2]) by picard.linux.it (Postfix) with ESMTP id 6073B1A980D for ; Thu, 14 Jun 2018 17:55:24 +0200 (CEST) Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-2.smtp.seeweb.it (Postfix) with ESMTPS id C364E600127 for ; Thu, 14 Jun 2018 17:55:23 +0200 (CEST) Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w5EFsKhS192209 for ; Thu, 14 Jun 2018 15:55:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references; s=corp-2017-10-26; bh=fI2tMKIufTO9iWXnhMD5OMWEKGR9w7L6fPfDZUZijVA=; b=mFfmFDsk9Q+i0bnNI7dbJJRql2R/h5XIjkR8RRB3++dritVhM4REpSmv3yqqd/seQyCg 0lolcV9Tt5DSKWPS0ro0SIrsRfXQfpUHrn2xeEjQjlUXnQSnRPPFzrMcPiNsZr4uOCz8 cHb/DmZY8BhCvwKFs+ztjyxT1lhYAivL6q3EEBx79F7GmDL9XbgIDB8C+KMoqXebqhKN /5GujQv3fYJLI8thi+Xi/80mNUF4ki8RYgUBphbX+Twd3zUCMcLH2KBCEWATDDvXz1Kn Te/vdI1HmWzWCEaQ3irwRtA4SDldru3JDMsfASep8SADYYHvLc+mXQjelL/WyRc5NkZC 3A== Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2jk0xrdqsv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 14 Jun 2018 15:55:22 +0000 Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id w5EFtLDA015229 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 14 Jun 2018 15:55:21 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w5EFtL3Q022106 for ; Thu, 14 Jun 2018 15:55:21 GMT Received: from ak.ru.oracle.com (/10.162.80.29) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 14 Jun 2018 08:55:21 -0700 From: Alexey Kodanev To: ltp@lists.linux.it Date: Thu, 14 Jun 2018 19:04:57 +0300 Message-Id: <1528992297-23920-4-git-send-email-alexey.kodanev@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1528992297-23920-1-git-send-email-alexey.kodanev@oracle.com> References: <1528992297-23920-1-git-send-email-alexey.kodanev@oracle.com> X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8923 signatures=668702 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=1 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=566 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1805220000 definitions=main-1806140174 X-Virus-Scanned: clamav-milter 0.99.2 at in-2.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_HELO_PASS, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-2.smtp.seeweb.it Subject: [LTP] [PATCH 4/4] network/busy_poll: check that we changed sysctl knobs in cleanup X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Alexey Kodanev Acked-by: Petr Vorel --- testcases/network/busy_poll/busy_poll01.sh | 13 ++++++++----- testcases/network/busy_poll/busy_poll02.sh | 6 ++++-- testcases/network/busy_poll/busy_poll03.sh | 6 ++++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/testcases/network/busy_poll/busy_poll01.sh b/testcases/network/busy_poll/busy_poll01.sh index 1749e52..0023f6c 100755 --- a/testcases/network/busy_poll/busy_poll01.sh +++ b/testcases/network/busy_poll/busy_poll01.sh @@ -8,11 +8,14 @@ cleanup() { - sysctl -q -w net.core.busy_read=$busy_read_old - sysctl -q -w net.core.busy_poll=$busy_poll_old - - tst_rhost_run -c "sysctl -q -w net.core.busy_read=$rbusy_read_old" - tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" + [ -n "$busy_read_old" ] && \ + sysctl -q -w net.core.busy_read=$busy_read_old + [ -n "$busy_poll_old" ] && \ + sysctl -q -w net.core.busy_poll=$busy_poll_old + [ -n "$rbusy_read_old" ] && \ + tst_rhost_run -c "sysctl -q -w net.core.busy_read=$rbusy_read_old" + [ -n "$rbusy_poll_old" ] && \ + tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" } set_busy_poll() diff --git a/testcases/network/busy_poll/busy_poll02.sh b/testcases/network/busy_poll/busy_poll02.sh index d0083c2..1f25b73 100755 --- a/testcases/network/busy_poll/busy_poll02.sh +++ b/testcases/network/busy_poll/busy_poll02.sh @@ -8,8 +8,10 @@ cleanup() { - sysctl -q -w net.core.busy_poll=$busy_poll_old - tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" + [ -n "$busy_poll_old" ] && \ + sysctl -q -w net.core.busy_poll=$busy_poll_old + [ -n "$rbusy_poll_old" ] && \ + tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" } set_busy_poll() diff --git a/testcases/network/busy_poll/busy_poll03.sh b/testcases/network/busy_poll/busy_poll03.sh index b55e220..3c70299 100755 --- a/testcases/network/busy_poll/busy_poll03.sh +++ b/testcases/network/busy_poll/busy_poll03.sh @@ -10,8 +10,10 @@ TST_TEST_DATA="udp udp_lite" cleanup() { - sysctl -q -w net.core.busy_poll=$busy_poll_old - tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" + [ -n "$busy_poll_old" ] && \ + sysctl -q -w net.core.busy_poll=$busy_poll_old + [ -n "$rbusy_poll_old" ] && \ + tst_rhost_run -c "sysctl -q -w net.core.busy_poll=$rbusy_poll_old" } set_busy_poll()