From patchwork Tue Jul 10 11:13:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kleber Sacilotto de Souza X-Patchwork-Id: 941933 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Q02K0z7mz9s1b; Tue, 10 Jul 2018 21:14:00 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1fcqag-0002kf-Hg; Tue, 10 Jul 2018 11:13:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1fcqac-0002jz-NT for kernel-team@lists.ubuntu.com; Tue, 10 Jul 2018 11:13:50 +0000 Received: from mail-ed1-f72.google.com ([209.85.208.72]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fcqac-0006bh-Fy for kernel-team@lists.ubuntu.com; Tue, 10 Jul 2018 11:13:50 +0000 Received: by mail-ed1-f72.google.com with SMTP id f8-v6so2674508eds.6 for ; Tue, 10 Jul 2018 04:13:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=l+yjJh8TmTSYPPJ19H931xfWl1KMt7bvYi+MqeQJFso=; b=X1clG/E765MDSi0ZBknRrm2sMX3NBMHU/tsGztugcYF0gagy7qW+RafKNSuEk9BTr9 rri+6SBroqhE5bfrauXuaFXn7D3xij9zIK0Ds6TzA/qPQrykHXEqBJHo3S4cI77SfYky a6wRQBY+81iV35ksOdrgqlpwxZ20+R5FuPgB4e++DsxxqeQAny7WRMrbYx3IobbrHVXJ rCQDtyH7DdROl/qHPpYwrKqcDJ2NnRmzchvFjLS8jhs1TvablKc03D/II1bEYFNOqUGy BGoen3c8N/tg9lL15yK3Ez+AmnOnc9PvPLKMMCX1gQgSowDHjJ7+ON6SXDZriyKhMjE3 lVdw== X-Gm-Message-State: APt69E0EWj5pLoxg6IDb7ZSOBndZPVUlhx1yuTu+HfsyG4NSDtzpDumA a6JVn7/DzYWABWu50I5q2Qr1S0l7hk3FILTtcKTBnCNYWxlrdM4Dm48aoEcx4WnhJXQOVAmQhYG /SOEINNh2W/EnpRS8mW9Wcjyy7NUQoxLdbCA0VlNB2g== X-Received: by 2002:a50:8f84:: with SMTP id y4-v6mr14086474edy.71.1531221229926; Tue, 10 Jul 2018 04:13:49 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdaJoTrNcPUS5Sjon+Utee7BDphY+3W9XpLhg+Q74mf4WwMTnBstJr0R81sy77UeswQCG87TQ== X-Received: by 2002:a50:8f84:: with SMTP id y4-v6mr14086464edy.71.1531221229758; Tue, 10 Jul 2018 04:13:49 -0700 (PDT) Received: from localhost ([2a02:8109:98c0:1604:7504:6cc9:f396:598d]) by smtp.gmail.com with ESMTPSA id p23-v6sm7398464edm.31.2018.07.10.04.13.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Jul 2018 04:13:48 -0700 (PDT) From: Kleber Sacilotto de Souza To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH 1/1] test_bpf: flag tests that cannot be jited on s390 Date: Tue, 10 Jul 2018 13:13:45 +0200 Message-Id: <20180710111345.28481-2-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180710111345.28481-1-kleber.souza@canonical.com> References: <20180710111345.28481-1-kleber.souza@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1753941 Flag with FLAG_EXPECTED_FAIL the BPF_MAXINSNS tests that cannot be jited on s390 because they exceed BPF_SIZE_MAX and fail when CONFIG_BPF_JIT_ALWAYS_ON is set. Also set .expected_errcode to -ENOTSUPP so the tests pass in that case. Signed-off-by: Kleber Sacilotto de Souza Acked-by: Song Liu Signed-off-by: Daniel Borkmann (backported from commit 3203c9010060806ff88c9989aeab4dc8d9a474dc) [ klebers: compile out for s390 also the testcases: - BPF_MAXINSNS: ld_abs+vlan_push/pop - BPF_MAXINSNS: jump around ld_abs ] Signed-off-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader Acked-by: Thadeu Lima de Souza Cascardo --- lib/test_bpf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 59359aad645d..1fe4d4b33217 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -5419,21 +5419,31 @@ static struct bpf_test tests[] = { { /* Mainly checking JIT here. */ "BPF_MAXINSNS: Ctx heavy transformations", { }, +#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390) + CLASSIC | FLAG_EXPECTED_FAIL, +#else CLASSIC, +#endif { }, { { 1, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) }, { 10, !!(SKB_VLAN_TCI & VLAN_TAG_PRESENT) } }, .fill_helper = bpf_fill_maxinsns6, + .expected_errcode = -ENOTSUPP, }, { /* Mainly checking JIT here. */ "BPF_MAXINSNS: Call heavy transformations", { }, +#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390) + CLASSIC | FLAG_NO_DATA | FLAG_EXPECTED_FAIL, +#else CLASSIC | FLAG_NO_DATA, +#endif { }, { { 1, 0 }, { 10, 0 } }, .fill_helper = bpf_fill_maxinsns7, + .expected_errcode = -ENOTSUPP, }, { /* Mainly checking JIT here. */ "BPF_MAXINSNS: Jump heavy test", @@ -5475,11 +5485,17 @@ static struct bpf_test tests[] = { { "BPF_MAXINSNS: ld_abs+get_processor_id", { }, +#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390) + CLASSIC | FLAG_EXPECTED_FAIL, +#else CLASSIC, +#endif { }, { { 1, 0xbee } }, .fill_helper = bpf_fill_ld_abs_get_processor_id, + .expected_errcode = -ENOTSUPP, }, +#if !(defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390)) { "BPF_MAXINSNS: ld_abs+vlan_push/pop", { }, @@ -5496,6 +5512,7 @@ static struct bpf_test tests[] = { { { 2, 10 } }, .fill_helper = bpf_fill_jump_around_ld_abs, }, +#endif /* * LD_IND / LD_ABS on fragmented SKBs */