From patchwork Thu Sep 2 18:52:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Almbladh X-Patchwork-Id: 506978 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=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 CAB69C43217 for ; Thu, 2 Sep 2021 18:53:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B60DF610FA for ; Thu, 2 Sep 2021 18:53:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347333AbhIBSy1 (ORCPT ); Thu, 2 Sep 2021 14:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347212AbhIBSxr (ORCPT ); Thu, 2 Sep 2021 14:53:47 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 521BEC061757 for ; Thu, 2 Sep 2021 11:52:48 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a25so6699884ejv.6 for ; Thu, 02 Sep 2021 11:52:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=anyfinetworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PoSasBp8FUxIYX3dqECHvXhlDjnUa++BQhLErp0Za5o=; b=r4eSPdEW5uOWjUFSkkKRupcg3/VRTebHijmWQSPbCBsFvK99FLjOJ4Ilclrti07LHk d1mJhpgaWJHMPzS3nv+52Xmftu3ke6ohJngVKV0rMcuFiA2ZFCDkjEKsBM2uTI8RXUMw Zh3Hq5R/3hMm2O3hNg6DVE+JUp0G4M3zWjcttTVgC5nVVOx7cW3SFQyUgVstTAvLQ2XR 0uAGgoRUFTdum5O9woCP8XPB0aHx9pJpF7nKuT+vLZvcshlFSIQ2BN7P7W+SF2aQJ3sc erBWn9uMx5vNskejdyPv3Xigav7eJmdZ9tarIMPOu/60RXMkb7xyECz/kOyMTnY4i+TG eP9w== 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:mime-version:content-transfer-encoding; bh=PoSasBp8FUxIYX3dqECHvXhlDjnUa++BQhLErp0Za5o=; b=Eu42wMNDyh+YeWXJ0suhsDfvvUStP0CxNAGBoQcxBaxZx6ZkipxY48DEtOqOu8+cqm 2e8CXsk0XGhla/eyPVz0S3dMRfN91lfteBF8an14TqyT+LBlhG5qsGHtzmPklTYZ3Yc2 wM/65+KPRSphrHgG8NPK3QiI3rxf1uFPH9xhoC2efIcWTDv8GRQN+EggRD/BKd4XciTM nY6NbnmFck7mmES4wbMmIR+Nk23f879FgBkSyo8edOgzHXelykUa7tDlgFqkQJbGo104 QeN079PyAdTq8tFHtCaAbEsnXSv/KQNQFYpBppWVrgDzBN+1Oo7Ydyiwl+a4zFwwOhV8 /isg== X-Gm-Message-State: AOAM53215H6owOMrOAWsYAsW2kXa2EtvnWtEikIQE+y4co4iyKYvNwzb 9xWQAY0W2hA5xrrjpk6hRhD1mw== X-Google-Smtp-Source: ABdhPJyFhh/dQGREVXttN6PN7G6HJfwwLHedm8uL5JwUnBJRdOZskOWBVIf5g8D1nDf7uBC8BMnW6g== X-Received: by 2002:a17:906:ff0c:: with SMTP id zn12mr5348420ejb.114.1630608766969; Thu, 02 Sep 2021 11:52:46 -0700 (PDT) Received: from anpc2.lan (static-213-115-136-2.sme.telenor.se. [213.115.136.2]) by smtp.gmail.com with ESMTPSA id mb14sm1592235ejb.81.2021.09.02.11.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 11:52:46 -0700 (PDT) From: Johan Almbladh To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, iii@linux.ibm.com Cc: kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, Johan Almbladh Subject: [PATCH bpf-next 09/13] bpf/tests: Add JMP tests with small offsets Date: Thu, 2 Sep 2021 20:52:25 +0200 Message-Id: <20210902185229.1840281-10-johan.almbladh@anyfinetworks.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210902185229.1840281-1-johan.almbladh@anyfinetworks.com> References: <20210902185229.1840281-1-johan.almbladh@anyfinetworks.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds a set of tests for JMP to verify that the JITed jump offset is calculated correctly. We pretend that the verifier has inserted any zero extensions to make the jump-over operations JIT to one instruction each, in order to control the exact JITed jump offset. Signed-off-by: Johan Almbladh --- lib/test_bpf.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/lib/test_bpf.c b/lib/test_bpf.c index 183ead9445ba..c3d772f663da 100644 --- a/lib/test_bpf.c +++ b/lib/test_bpf.c @@ -10707,6 +10707,77 @@ static struct bpf_test tests[] = { .fill_helper = bpf_fill_jmp32_jsle_reg, .nr_testruns = NR_PATTERN_RUNS, }, + /* Short relative jumps */ + { + "Short relative jump: offset=0", + .u.insns_int = { + BPF_ALU64_IMM(BPF_MOV, R0, 0), + BPF_JMP_IMM(BPF_JEQ, R0, 0, 0), + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, -1), + }, + INTERNAL | FLAG_NO_DATA | FLAG_VERIFIER_ZEXT, + { }, + { { 0, 0 } }, + }, + { + "Short relative jump: offset=1", + .u.insns_int = { + BPF_ALU64_IMM(BPF_MOV, R0, 0), + BPF_JMP_IMM(BPF_JEQ, R0, 0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, -1), + }, + INTERNAL | FLAG_NO_DATA | FLAG_VERIFIER_ZEXT, + { }, + { { 0, 0 } }, + }, + { + "Short relative jump: offset=2", + .u.insns_int = { + BPF_ALU64_IMM(BPF_MOV, R0, 0), + BPF_JMP_IMM(BPF_JEQ, R0, 0, 2), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, -1), + }, + INTERNAL | FLAG_NO_DATA | FLAG_VERIFIER_ZEXT, + { }, + { { 0, 0 } }, + }, + { + "Short relative jump: offset=3", + .u.insns_int = { + BPF_ALU64_IMM(BPF_MOV, R0, 0), + BPF_JMP_IMM(BPF_JEQ, R0, 0, 3), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, -1), + }, + INTERNAL | FLAG_NO_DATA | FLAG_VERIFIER_ZEXT, + { }, + { { 0, 0 } }, + }, + { + "Short relative jump: offset=4", + .u.insns_int = { + BPF_ALU64_IMM(BPF_MOV, R0, 0), + BPF_JMP_IMM(BPF_JEQ, R0, 0, 4), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_ALU32_IMM(BPF_ADD, R0, 1), + BPF_EXIT_INSN(), + BPF_ALU32_IMM(BPF_MOV, R0, -1), + }, + INTERNAL | FLAG_NO_DATA | FLAG_VERIFIER_ZEXT, + { }, + { { 0, 0 } }, + }, /* Staggered jump sequences, immediate */ { "Staggered jumps: JMP_JA",