From patchwork Fri May 22 15:36:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexei Starovoitov X-Patchwork-Id: 475677 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 1D6AE1402A5 for ; Sat, 23 May 2015 01:36:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422671AbbEVPgw (ORCPT ); Fri, 22 May 2015 11:36:52 -0400 Received: from mail-pd0-f177.google.com ([209.85.192.177]:33081 "EHLO mail-pd0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757493AbbEVPgv (ORCPT ); Fri, 22 May 2015 11:36:51 -0400 Received: by pdbqa5 with SMTP id qa5so22372528pdb.0 for ; Fri, 22 May 2015 08:36:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Anni9jEAruQdvvD2MiamFWilaKYsyeOR/iXy3xcB5lU=; b=aus+0hCKgObe8sp8EzLsIjwTai6EdqK839100ZEPlXAZ2go3LSukkyswEF+Hq/yE60 zM7p2ezGtAIikGBEvmXWGBF9Bq7wORDc8/tnnZ24CwbcX3r9GBtLWtzLgPqXd/lMhvig SaasUaYybFW2Bd5NzWFOhO3t/l94txT3D2cDJpRIrPZD+u4nuzS+P7HCOnDRzFipOm2f vaVKr/yRstHSDQBOPNs0DNANm/FKs1wsLXHYdgUEfs4m5aRuGQbd63VlIutT9uWMdRUt erQopMlsVOPpeOVNTSjkGTW8hfaudIZ7L1BJrh0FiPJP59Dlpukm3lCeALhv/G0SvJuE AfQg== X-Gm-Message-State: ALoCoQmSWRwPQ/rrL3cMdQJ0baIEum87aoSjA3qs//GuCGrmfOatlzwzv5izuhfY7s+O1tzHIqN+ X-Received: by 10.70.46.161 with SMTP id w1mr17007329pdm.16.1432309011240; Fri, 22 May 2015 08:36:51 -0700 (PDT) Received: from localhost.localdomain ([12.229.56.227]) by mx.google.com with ESMTPSA id b10sm2479949pdo.84.2015.05.22.08.36.50 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 22 May 2015 08:36:50 -0700 (PDT) From: Alexei Starovoitov To: "David S. Miller" Cc: Michael Holzheu , Martin Schwidefsky , Daniel Borkmann , netdev@vger.kernel.org Subject: [PATCH net-next] test_bpf: Add backward jump test case Date: Fri, 22 May 2015 08:36:40 -0700 Message-Id: <1432309000-11545-1-git-send-email-ast@plumgrid.com> X-Mailer: git-send-email 1.7.9.5 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Michael Holzheu Currently the testsuite does not have a test case with a backward jump. The s390x JIT (kernel 4.0) had a bug in that area. So add one new test case for this now. Signed-off-by: Michael Holzheu Signed-off-by: Alexei Starovoitov Acked-by: Daniel Borkmann --- lib/test_bpf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index aaa0a40a7eb3..9b012a811ee1 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -3940,6 +3940,22 @@ static struct bpf_test tests[] = { { }, { { 0, 1 } }, }, + /* BPF_JMP | BPF_JGT | BPF_K jump backwards */ + { + "JMP_JGT_K: if (3 > 2) return 1 (jump backwards)", + .u.insns_int = { + BPF_JMP_IMM(BPF_JA, 0, 0, 2), /* goto start */ + BPF_ALU32_IMM(BPF_MOV, R0, 1), /* out: */ + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, 0), /* start: */ + BPF_LD_IMM64(R1, 3), /* note: this takes 2 insns */ + BPF_JMP_IMM(BPF_JGT, R1, 2, -6), /* goto out */ + BPF_EXIT_INSN(), + }, + INTERNAL, + { }, + { { 0, 1 } }, + }, { "JMP_JGE_K: if (3 >= 3) return 1", .u.insns_int = {