Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02D55FA3731 for ; Thu, 17 Oct 2019 08:37:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C7D2220869 for ; Thu, 17 Oct 2019 08:37:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="r+BzTn0B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392992AbfJQIh4 (ORCPT ); Thu, 17 Oct 2019 04:37:56 -0400 Received: from mail-lf1-f65.google.com ([209.85.167.65]:44549 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388788AbfJQIhz (ORCPT ); Thu, 17 Oct 2019 04:37:55 -0400 Received: by mail-lf1-f65.google.com with SMTP id q12so1155955lfc.11 for ; Thu, 17 Oct 2019 01:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iyXqf2Y5RVgz0dXJDcgvlyJCh/JIvnGuh8RzmE45oX0=; b=r+BzTn0BajFC/ZI5g1K2t2f9T+3f2xuwJg8Eqd9aSRIRbvS9DXxRYnFMeSLd5TQoVC nzRuRNEuk1bl7KahgGzNEHVBZxJ5w2XEo8Z2OTYgSMpojdFUWKLD4it1wYD/6NPAKKFp MvTDiAc6M4Fk3REMyBDc3b/AeILoexp5m+4JM= 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:mime-version :content-transfer-encoding; bh=iyXqf2Y5RVgz0dXJDcgvlyJCh/JIvnGuh8RzmE45oX0=; b=r/kiWN2yx7Rt/OX16O1wWryqOuUCaTKl3eGoQRJLToMqxDn43oWC0PMncAbjxqjz3y 8D0qtfISmkJOpYpF0zkmND19ZdvHzb6OIgGUukSZdNHD6P6aISX1qzyEVuoqudLxXzrU +vXp4SsBcpQeYdMi0LRI2LeUsktvpY5uG0fLA4XkpcKzxjFC4lUHpaqU57Svy/Z7KHFP NmIDO1h1F+mPN6gCPZ1fKPvxK/z1Nroid+/EOVtPShJhQsBCRfvt1SWKSROsQkFMiNuL oEMxCI7XC/Mugd4cHykkI+1K7wkkZT/sIe2cHR74QNXjMQjBAu4b85eQmQURaV1URleW ExVQ== X-Gm-Message-State: APjAAAX8qEUPpLUcslXjOZcG2EFTytMWq7ClWtJDOImVT4jIaL+RWaHx T7+yucNPpY+l/gu4Z6WPNk3h8g== X-Google-Smtp-Source: APXvYqwLL5rugmzKDMycdTY030AImuFDveTcvViXTY8X4oBD724KF5HLxwJ+k2O0HGl3y2NYBlhKwA== X-Received: by 2002:a19:dc14:: with SMTP id t20mr1518966lfg.21.1571301473596; Thu, 17 Oct 2019 01:37:53 -0700 (PDT) Received: from cloudflare.com ([176.221.114.230]) by smtp.gmail.com with ESMTPSA id n11sm266072lfd.88.2019.10.17.01.37.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 01:37:52 -0700 (PDT) From: Jakub Sitnicki To: bpf@vger.kernel.org Cc: netdev@vger.kernel.org, kernel-team@cloudflare.com, Alexei Starovoitov , Andrii Nakryiko Subject: [PATCH bpf-next] selftests/bpf: Restore the netns after flow dissector reattach test Date: Thu, 17 Oct 2019 10:37:52 +0200 Message-Id: <20191017083752.30999-1-jakub@cloudflare.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org flow_dissector_reattach test changes the netns we run in but does not restore it to the one we started in when finished. This interferes with tests that run after it. Fix it by restoring the netns when done. Fixes: f97eea1756f3 ("selftests/bpf: Check that flow dissector can be re-attached") Reported-by: Alexei Starovoitov Reported-by: Andrii Nakryiko Signed-off-by: Jakub Sitnicki --- .../bpf/prog_tests/flow_dissector_reattach.c | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c index 777faffc4639..1f51ba66b98b 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c @@ -91,12 +91,18 @@ static void do_flow_dissector_reattach(void) void test_flow_dissector_reattach(void) { - int init_net, err; + int init_net, self_net, err; + + self_net = open("/proc/self/ns/net", O_RDONLY); + if (CHECK_FAIL(self_net < 0)) { + perror("open(/proc/self/ns/net"); + return; + } init_net = open("/proc/1/ns/net", O_RDONLY); if (CHECK_FAIL(init_net < 0)) { perror("open(/proc/1/ns/net)"); - return; + goto out_close; } err = setns(init_net, CLONE_NEWNET); @@ -108,7 +114,7 @@ void test_flow_dissector_reattach(void) if (is_attached(init_net)) { test__skip(); printf("Can't test with flow dissector attached to init_net\n"); - return; + goto out_setns; } /* First run tests in root network namespace */ @@ -118,10 +124,17 @@ void test_flow_dissector_reattach(void) err = unshare(CLONE_NEWNET); if (CHECK_FAIL(err)) { perror("unshare(CLONE_NEWNET)"); - goto out_close; + goto out_setns; } do_flow_dissector_reattach(); +out_setns: + /* Move back to netns we started in. */ + err = setns(self_net, CLONE_NEWNET); + if (CHECK_FAIL(err)) + perror("setns(/proc/self/ns/net)"); + out_close: close(init_net); + close(self_net); } -- 2.20.1