From mboxrd@z Thu Jan 1 00:00:00 1970 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=-17.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham 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 D4CEAC0650E for ; Wed, 3 Jul 2019 20:51:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A1BB9218A3 for ; Wed, 3 Jul 2019 20:51:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jne86OKJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727164AbfGCUvE (ORCPT ); Wed, 3 Jul 2019 16:51:04 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:39472 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726821AbfGCUvE (ORCPT ); Wed, 3 Jul 2019 16:51:04 -0400 Received: by mail-qt1-f202.google.com with SMTP id o16so4569281qtj.6 for ; Wed, 03 Jul 2019 13:51:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=EQHLSuPIc/oYvaB2vk7M21m/1+VQk4KM7GLfnO/In8U=; b=jne86OKJc9ev0L5z/69jJWMmW0vRt1Vj8LQYaiqrWqU1n2uGE4UUz2ml42d/yMwcTe Uh6quJ7A9GtIgEO+GMUTRiq4fZ2LH6+zEG7TnBH+1ypCBaqFCrAwij2mENW9SyYaheaX MFVKf1gN0PBI2BgbUJKsstwkQOXWOhonKcJ3EwzMrEQfAmfHLveQeQac23upkHPYYJh9 NR13nw39IRHZTJ2rTe4aklq4C8/8CW1iCaWXGqp/lbXFeSLxLOjS7GvPF5fkVhsClsd/ imXol9vsQRhMDEeoDszmqsvRnlqgvzXydpq/VYt+rTIinJymdIULM1hN338J1iqmg5iR PUKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=EQHLSuPIc/oYvaB2vk7M21m/1+VQk4KM7GLfnO/In8U=; b=TFh0RiALzJafa4AUaaAVkP8Vf3wpTSyp7+imE3XgAOOLIO1bDKd/y2RjTMgIsZ1KCS y+AKuqtFf+lddEyysHOKjA0/9bTKytoDu4CI4O78VFsoNKzs72wiOM4vqN7QLekkrfGb 8nY7vIcmDL2fUA8/fiYM6Ox35QLinA+texsMYDm1txcr2VpzbS7k/c+s1tOc1u1ynAkp 2DSmkClcJs2ckOUI7ig/IQEkIondrg1q2tTK8qZJ9sYepDLTcbXkQG2Zvb7Bfi9USFwD 6rQBEnjRyqDtFAZ72De+FN68YE/QSn4xECfep09vilQZyZoLFQAD2xmKDq3X9QB3nCrE DGSQ== X-Gm-Message-State: APjAAAWqtJmgkZQe4idA7Jult8/ffb58ZeFhoZ52iijjJyLxM+kJ7KXj W3G6Rp9pKagBQSpb1cu2V8xscIs= X-Google-Smtp-Source: APXvYqxWHXP6E82FZJ9VF1npsQLmXvY6v2JOFrt3HrrdzjYjqH2xgqUKBg0mleRT5x/Eu21KDBOAoy4= X-Received: by 2002:a37:9944:: with SMTP id b65mr33607864qke.105.1562187062968; Wed, 03 Jul 2019 13:51:02 -0700 (PDT) Date: Wed, 3 Jul 2019 13:51:00 -0700 Message-Id: <20190703205100.142904-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH bpf-next] selftests/bpf: make verifier loop tests arch independent From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Take the first x bytes of pt_regs for scalability tests, there is no real reason we need x86 specific rax. Signed-off-by: Stanislav Fomichev --- tools/testing/selftests/bpf/progs/loop1.c | 3 ++- tools/testing/selftests/bpf/progs/loop2.c | 3 ++- tools/testing/selftests/bpf/progs/loop3.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/loop1.c b/tools/testing/selftests/bpf/progs/loop1.c index dea395af9ea9..d530c61d2517 100644 --- a/tools/testing/selftests/bpf/progs/loop1.c +++ b/tools/testing/selftests/bpf/progs/loop1.c @@ -14,11 +14,12 @@ SEC("raw_tracepoint/kfree_skb") int nested_loops(volatile struct pt_regs* ctx) { int i, j, sum = 0, m; + volatile int *any_reg = (volatile int *)ctx; for (j = 0; j < 300; j++) for (i = 0; i < j; i++) { if (j & 1) - m = ctx->rax; + m = *any_reg; else m = j; sum += i * m; diff --git a/tools/testing/selftests/bpf/progs/loop2.c b/tools/testing/selftests/bpf/progs/loop2.c index 0637bd8e8bcf..91bb89d901e3 100644 --- a/tools/testing/selftests/bpf/progs/loop2.c +++ b/tools/testing/selftests/bpf/progs/loop2.c @@ -14,9 +14,10 @@ SEC("raw_tracepoint/consume_skb") int while_true(volatile struct pt_regs* ctx) { int i = 0; + volatile int *any_reg = (volatile int *)ctx; while (true) { - if (ctx->rax & 1) + if (*any_reg & 1) i += 3; else i += 7; diff --git a/tools/testing/selftests/bpf/progs/loop3.c b/tools/testing/selftests/bpf/progs/loop3.c index 30a0f6cba080..3a7f12d7186c 100644 --- a/tools/testing/selftests/bpf/progs/loop3.c +++ b/tools/testing/selftests/bpf/progs/loop3.c @@ -14,9 +14,10 @@ SEC("raw_tracepoint/consume_skb") int while_true(volatile struct pt_regs* ctx) { __u64 i = 0, sum = 0; + volatile __u64 *any_reg = (volatile __u64 *)ctx; do { i++; - sum += ctx->rax; + sum += *any_reg; } while (i < 0x100000000ULL); return sum; } -- 2.22.0.410.gd8fdbe21b5-goog