From patchwork Thu Jul 12 03:36:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 942771 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=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="PemChTYq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41R1pB6Yqrz9s01 for ; Thu, 12 Jul 2018 13:37:06 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726705AbeGLDoi (ORCPT ); Wed, 11 Jul 2018 23:44:38 -0400 Received: from mail-qt0-f170.google.com ([209.85.216.170]:34051 "EHLO mail-qt0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726529AbeGLDoi (ORCPT ); Wed, 11 Jul 2018 23:44:38 -0400 Received: by mail-qt0-f170.google.com with SMTP id m13-v6so23008718qth.1 for ; Wed, 11 Jul 2018 20:37:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YQjaJrrALOaF0VgnY007hFg6Yt1SXn27Mnhtd4Xx/h8=; b=PemChTYq3SDuBdxg+4NEaDM6Jxz9uZKT7WuIN4LfEfpFElGJu1epapDe7ae0u+AuQS vWqLTHqU9NL7rrwmS8xGJDPLkytRJzlqYObMfWWQ6IjrEDUCdmHOB3BHs8HZoP6xoRwh svPzXL4YCH08ih6pw2fBglTyx/Ae8IGev1FPuQ2MFsHbuCzmKkUEx88DL8G/yePrE915 2FU7SaGmuSy1SazwIxevli6DQLJXGdx8kdUmT2KE5mk3Q4Ov1iK3HXAmo3GAFyzkixI0 CO7sr5Q/Axz3iSp8mEGTYp9frJLDmT5gEVQ9XIL+mTS1r5FEHS77kiB0tVM8bVry7StD EpTQ== 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; bh=YQjaJrrALOaF0VgnY007hFg6Yt1SXn27Mnhtd4Xx/h8=; b=Aiuo+fVHz9ah/COcfLwsHEt6PLI8N6RZnLQUHILmlllhH6pnkeB/QZUIh1C2pxjtyl HNJ/aVSkP9aOoDtem54EzXeiyeG8tsNGZuL0+4Pmq9gq7vlI5DXlljuwhm8nWgipRmQ1 4D6ekCpobLNjs1r3gy02Oc6nSSghLQA/6ZPwWMURmbZbsoheiM3+4Lj5ws9EOBfas7Pg jMCLt8TCvT6wusKVRV9LweEWG13W/DbEsVeYV/XVREsDH5SA3aWpJgg5DjBLeqH5kALr 1T7Vi+2zX3yYtgvhcPHysm1Pad3q50jrseQcY/JD6KQw2NnqqNZJHJorwDjM2txCOkH7 mp6w== X-Gm-Message-State: AOUpUlEmYaztvUL+8+sCy4PEptKytzCeAoMqgeCDCmKFvk3So5WQnYZI MdF+mu3ZRnVHpb2uBb8zRNuJSipl X-Google-Smtp-Source: AAOMgpdzgJad4DQ1JblKafVFx8AxVpsyhc2/eXIQ/b58ob964mK3UpySThpdUjyxOi6trJXM4hhJJA== X-Received: by 2002:a0c:bd96:: with SMTP id n22-v6mr513116qvg.187.1531366623257; Wed, 11 Jul 2018 20:37:03 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id s125-v6sm9350072qkd.14.2018.07.11.20.37.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 20:37:02 -0700 (PDT) From: Jakub Kicinski To: alexei.starovoitov@gmail.com, daniel@iogearbox.net Cc: oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH bpf-next 6/7] selftests/bpf: add test for multiple programs Date: Wed, 11 Jul 2018 20:36:43 -0700 Message-Id: <20180712033644.23954-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180712033644.23954-1-jakub.kicinski@netronome.com> References: <20180712033644.23954-1-jakub.kicinski@netronome.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add tests for having an XDP program attached in the driver and another one attached in HW simultaneously. Signed-off-by: Jakub Kicinski Reviewed-by: Quentin Monnet --- tools/testing/selftests/bpf/test_offload.py | 63 +++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index 4f982a0255c2..b746227eaff2 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -339,6 +339,11 @@ netns = [] # net namespaces to be removed self.dfs = DebugfsDir(self.dfs_dir) return self.dfs + def dfs_read(self, f): + path = os.path.join(self.dfs_dir, f) + _, data = cmd('cat %s' % (path)) + return data.strip() + def dfs_num_bound_progs(self): path = os.path.join(self.dfs_dir, "bpf_bound_progs") _, progs = cmd('ls %s' % (path)) @@ -814,6 +819,10 @@ netns = [] "Device parameters reported for non-offloaded program") start_test("Test XDP prog replace with bad flags...") + ret, _, err = sim.set_xdp(obj, "generic", force=True, + fail=False, include_stderr=True) + fail(ret == 0, "Replaced XDP program with a program in different mode") + fail(err.count("File exists") != 1, "Replaced driver XDP with generic") ret, _, err = sim.set_xdp(obj, "", force=True, fail=False, include_stderr=True) fail(ret == 0, "Replaced XDP program with a program in different mode") @@ -883,6 +892,60 @@ netns = [] rm(pin_file) bpftool_prog_list_wait(expected=0) + start_test("Test multi-attachment XDP - attach...") + sim.set_xdp(obj, "offload") + xdp = sim.ip_link_show(xdp=True)["xdp"] + offloaded = sim.dfs_read("bpf_offloaded_id") + fail("prog" not in xdp, "Base program not reported in single program mode") + fail(len(ipl["xdp"]["attached"]) != 1, + "Wrong attached program count with one program") + + sim.set_xdp(obj, "") + two_xdps = sim.ip_link_show(xdp=True)["xdp"] + offloaded2 = sim.dfs_read("bpf_offloaded_id") + + fail(two_xdps["mode"] != 4, "Bad mode reported with multiple programs") + fail("prog" in two_xdps, "Base program reported in multi program mode") + fail(xdp["attached"][0] not in two_xdps["attached"], + "Offload program not reported after driver activated") + fail(len(two_xdps["attached"]) != 2, + "Wrong attached program count with two programs") + fail(two_xdps["attached"][0]["prog"]["id"] == + two_xdps["attached"][1]["prog"]["id"], + "offloaded and drv programs have the same id") + fail(offloaded != offloaded2, + "offload ID changed after loading driver program") + + start_test("Test multi-attachment XDP - replace...") + ret, _, err = sim.set_xdp(obj, "offload", fail=False, include_stderr=True) + fail(err.count("busy") != 1, "Replaced one of programs without -force") + + start_test("Test multi-attachment XDP - detach...") + ret, _, err = sim.unset_xdp("drv", force=True, + fail=False, include_stderr=True) + fail(ret == 0, "Removed program with a bad mode") + check_extack(err, "program loaded with different flags.", args) + + sim.unset_xdp("offload") + xdp = sim.ip_link_show(xdp=True)["xdp"] + offloaded = sim.dfs_read("bpf_offloaded_id") + + fail(xdp["mode"] != 1, "Bad mode reported after multiple programs") + fail("prog" not in xdp, + "Base program not reported after multi program mode") + fail(xdp["attached"][0] not in two_xdps["attached"], + "Offload program not reported after driver activated") + fail(len(ipl["xdp"]["attached"]) != 1, + "Wrong attached program count with remaining programs") + fail(offloaded != "0", "offload ID reported with only driver program left") + + start_test("Test multi-attachment XDP - device remove...") + sim.set_xdp(obj, "offload") + sim.remove() + + sim = NetdevSim() + sim.set_ethtool_tc_offloads(True) + start_test("Test mixing of TC and XDP...") sim.tc_add_ingress() sim.set_xdp(obj, "offload")