From patchwork Tue Sep 29 12:30:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Patchwork-Id: 289398 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=-13.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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 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 3A360C4727F for ; Tue, 29 Sep 2020 12:31:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D746020759 for ; Tue, 29 Sep 2020 12:31:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GkmW/ZIE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732562AbgI2Mbs (ORCPT ); Tue, 29 Sep 2020 08:31:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:50096 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730187AbgI2Mak (ORCPT ); Tue, 29 Sep 2020 08:30:40 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601382639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xvzLng++d0GQjJBUi/0nO1Ms1IYQwD4+9R7Ygprni3c=; b=GkmW/ZIEYGksVnNdbbsCe6sBpyK18HCRGp7fk0DXe3sqaMjrByyco2TZInRzT6ODkWMckr LHZLFWWIXdGuA7ubwzjRrhHAuzknxvbetKl6sYxuj+YG3whg/ljpLtTiyIuNA3IFOWQ2oO OtGNhyWw+oIqi77YimE6p1MTVbs8oVc= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-75-fUQNtP1NMqOWXgcD__ck5A-1; Tue, 29 Sep 2020 08:30:37 -0400 X-MC-Unique: fUQNtP1NMqOWXgcD__ck5A-1 Received: by mail-oo1-f69.google.com with SMTP id n6so1986714oos.12 for ; Tue, 29 Sep 2020 05:30:37 -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:mime-version :content-transfer-encoding; bh=xvzLng++d0GQjJBUi/0nO1Ms1IYQwD4+9R7Ygprni3c=; b=MAGwwHscnmeOy4XjFNyqczWzp+9AKExPkEnm3Ub0bLzmjT8tailtwwVHhecjsovPDj 7IwpoGLr7AhjvgRkP04OhCxV3h1l/vKEIl1CXEKj1VuUBBYMVZSaJZwSfLqY776Q6hoF 9rSMbiwUvotftR2JLfEMNTLB5QF3yyoHxpbg+xboxwfgkcGspiiSGuTbLoBRP0BcHcim XGYlunGEI8pmaeS4TlvJ+VxItTl+321CRix7/m6lmqMKy9MDUNc98wEq8yg/hQ5nsNMy 5y1fP+zJZIFtr69eekDeKL1Jfxpr8MdTYJnenOEX6Zj2zMSC1Hp9AXAG0BflvScE5PLH W7cw== X-Gm-Message-State: AOAM530mYl0Cb5R+a37GnWnxjMb1aQjDNGjPEns7J06jA4TY/wN8rKkz 9TLdVGKIYWgkGMhXnlHUygF704PG+OAeLY9h59HMZ71ZkKSjEC+TnqkqkYwIEcuDyLPfPdVWZ6b xHRwJb1wmfG2lfv2X X-Received: by 2002:aca:bd8a:: with SMTP id n132mr2398097oif.100.1601382636963; Tue, 29 Sep 2020 05:30:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxtMOVSRmpEJspMGu1B9TMyJUHZE/vqWdRPfqoJwttt3tbdemxQ/MKrn2R6TluIvpwr/UyNw== X-Received: by 2002:aca:bd8a:: with SMTP id n132mr2398080oif.100.1601382636497; Tue, 29 Sep 2020 05:30:36 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id k3sm2852115oof.6.2020.09.29.05.30.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2020 05:30:35 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 6847B183C5B; Tue, 29 Sep 2020 14:30:32 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: daniel@iogearbox.net, ast@fb.com Cc: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , bpf@vger.kernel.org, netdev@vger.kernel.org, Martin KaFai Lau Subject: [PATCH bpf-next] selftests: Make sure all 'skel' variables are declared static Date: Tue, 29 Sep 2020 14:30:26 +0200 Message-Id: <20200929123026.46751-1-toke@redhat.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If programs in prog_tests using skeletons declare the 'skel' variable as global but not static, that will lead to linker errors on the final link of the prog_tests binary due to duplicate symbols. Fix a few instances of this. Fixes: b18c1f0aa477 ("bpf: selftest: Adapt sock_fields test to use skel and global variables") Fixes: 9a856cae2217 ("bpf: selftest: Add test_btf_skc_cls_ingress") Signed-off-by: Toke Høiland-Jørgensen --- tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c | 2 +- tools/testing/selftests/bpf/prog_tests/sock_fields.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c b/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c index 4ce0e8a25bc5..86ccf37e26b3 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c +++ b/tools/testing/selftests/bpf/prog_tests/btf_skc_cls_ingress.c @@ -16,7 +16,7 @@ #include "test_progs.h" #include "test_btf_skc_cls_ingress.skel.h" -struct test_btf_skc_cls_ingress *skel; +static struct test_btf_skc_cls_ingress *skel; struct sockaddr_in6 srv_sa6; static __u32 duration; diff --git a/tools/testing/selftests/bpf/prog_tests/sock_fields.c b/tools/testing/selftests/bpf/prog_tests/sock_fields.c index 66e83b8fc69d..af87118e748e 100644 --- a/tools/testing/selftests/bpf/prog_tests/sock_fields.c +++ b/tools/testing/selftests/bpf/prog_tests/sock_fields.c @@ -36,7 +36,7 @@ struct bpf_spinlock_cnt { static struct sockaddr_in6 srv_sa6, cli_sa6; static int sk_pkt_out_cnt10_fd; -struct test_sock_fields *skel; +static struct test_sock_fields *skel; static int sk_pkt_out_cnt_fd; static __u64 parent_cg_id; static __u64 child_cg_id;