From patchwork Wed Jun 27 15:19:21 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: 935562 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=canonical.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41G65X2plXz9s1B for ; Thu, 28 Jun 2018 01:19:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934350AbeF0PTZ (ORCPT ); Wed, 27 Jun 2018 11:19:25 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:33325 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934152AbeF0PTY (ORCPT ); Wed, 27 Jun 2018 11:19:24 -0400 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1fYCE7-00036i-6D for netdev@vger.kernel.org; Wed, 27 Jun 2018 15:19:23 +0000 Received: by mail-ed1-f69.google.com with SMTP id l23-v6so1391958edr.1 for ; Wed, 27 Jun 2018 08:19:23 -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:cc:subject:date:message-id; bh=ZXUv/XD8C5gSliyHCy6jj1Lv+s41/gEVt1Rf2hthRHk=; b=lUoxa6eF3FuLeDvJ6HMW14WUsNbboktsBV3ar0cWv2uoz3+pKRyCh8xNJuvXJ8oBke 3vF6YleH41Ggt8F99q7db8gL4UT+2zr5s6QMzM5sgvc2rZSxv9nPoDgEpzV/BDYe4/Ks rBGdtSJyXr3OVs2I2ygxR8Kq2buMLn+gMnk890tcNBBFoDZ/H1oGXLkx0IPp0T/pTn32 rNb1hjkrFTtwA2dPdBr2+5gghnn88ZdxTFtu6N3C0plYAJRWMBdiqbf3dqNrg2hR5Buu VMm6D6MhAls0Oma7wMBuWA1MDShchOCksLEVjRYEYExMFbwOPYnSOxP/p2hf43597cmd b7Sg== X-Gm-Message-State: APt69E1GofMcs/MYYiYvOKbBOBhZPVxH2JXwPeraCR09eXCgm3GK97Fg uMf1lPT1EVwm7yMR7BS5BPL5sE287JDAelxO/JyV3WFRUXz9uC1ThXqImmkBsTjj2AMP2GG6X/P EHDrV4tYCn16g/oyd32BwS8TEOKsJCU9UtA== X-Received: by 2002:a50:a722:: with SMTP id h31-v6mr5912890edc.251.1530112762963; Wed, 27 Jun 2018 08:19:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcpfGduDo697PAe9JpZl5J0Bl5e3oDzLJHvVIKXoq8YPSBZkDcdHyMJbvQMHzTxHbMMHxbFEA== X-Received: by 2002:a50:a722:: with SMTP id h31-v6mr5912879edc.251.1530112762746; Wed, 27 Jun 2018 08:19:22 -0700 (PDT) Received: from localhost ([89.27.146.114]) by smtp.gmail.com with ESMTPSA id e1-v6sm1815809edr.23.2018.06.27.08.19.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 27 Jun 2018 08:19:21 -0700 (PDT) From: Kleber Sacilotto de Souza To: linux-s390@vger.kernel.org, netdev@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann Subject: [PATCH] test_bpf: flag tests that cannot be jited on s390 Date: Wed, 27 Jun 2018 17:19:21 +0200 Message-Id: <20180627151921.15018-1-kleber.souza@canonical.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- lib/test_bpf.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 60aedc879361..08d3d59dca17 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -5282,21 +5282,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", @@ -5347,18 +5357,28 @@ static struct bpf_test tests[] = { { "BPF_MAXINSNS: exec all MSH", { }, +#if defined(CONFIG_BPF_JIT_ALWAYS_ON) && defined(CONFIG_S390) + CLASSIC | FLAG_EXPECTED_FAIL, +#else CLASSIC, +#endif { 0xfa, 0xfb, 0xfc, 0xfd, }, { { 4, 0xababab83 } }, .fill_helper = bpf_fill_maxinsns13, + .expected_errcode = -ENOTSUPP, }, { "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, }, /* * LD_IND / LD_ABS on fragmented SKBs