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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98A51C433EF for ; Fri, 7 Jan 2022 22:11:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230446AbiAGWL2 (ORCPT ); Fri, 7 Jan 2022 17:11:28 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21614 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230442AbiAGWL0 (ORCPT ); Fri, 7 Jan 2022 17:11:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1641593486; 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: in-reply-to:in-reply-to:references:references; bh=omVKaNcy5fAR+P8CusXzfyn6nmrKkdfnGWZtZt9VL2k=; b=XzeR2MZ+9Za7nQgyI6fp4i2OP7VQjhVz5plaIwpRqmVOpce/spkj9L0Mj8Vy+wAPvxPJsD mYXPGuecv8QMW9YbuTI2lRiPKt6QEPc8eHjDr/p/heLbhoJqpXTX9qicE3JBvHx+GRG93e Vd/7SNMNUmtyiNKLValIzK+BCHnBxWM= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-599-az3ShygDNEeW7Yl0JSLPgQ-1; Fri, 07 Jan 2022 17:11:22 -0500 X-MC-Unique: az3ShygDNEeW7Yl0JSLPgQ-1 Received: by mail-ed1-f72.google.com with SMTP id h11-20020a05640250cb00b003fa024f87c2so5772117edb.4 for ; Fri, 07 Jan 2022 14:11:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=omVKaNcy5fAR+P8CusXzfyn6nmrKkdfnGWZtZt9VL2k=; b=o4CL4thJOlWAWMk6bNYAVu7NoFGDRxINB0pU3QTb3N+w4rD7W6BV0rijK77/e5eVLE i18ImGxemYJCfpaoVRZPb6Lq6+hoG5mIAXe+s+6O9sr18MOnt8RqfJZ2EkYtXP1WvMFE 2Qlu9qQYi2ClZdCnt5m3lBzRyGONzetIVfsJN8jR/syrsrg9lwKW1vYpjTcCxD9D4xe2 v3M8oqDB7fi2eofoKAdjXbKAzUlv1lrTHHUQFJ2eonOAldvf3jtCxIoiEAR1uj7r5xtd 3CGxoVyjbyUVkJUsDdrQJ79NdLPYaLQzJiqWYQgLZkLMqDJxFcuqjFOki0q53htCDfbF 9ocw== X-Gm-Message-State: AOAM533nsKpbkotFDe8FBw4kkeN1bttj+hF1qV5UyaFBHVl0OGjXUXPb 8X4P3K5bvdx6yM6pW3qUsCih1uoiaACGxxCOqHyVPJezXz+p6EtubIdV5xFC7AwoJKLbxMvv/zT lAT4YoqXSc2SF X-Received: by 2002:a05:6402:154:: with SMTP id s20mr65522104edu.148.1641593481125; Fri, 07 Jan 2022 14:11:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJzKzpJCWoqaZSxUYfC+gJ25uxor1OuK6byXmPFu4l+4AGwMSieKYCB5o2yckQxwbmLbVn0IGg== X-Received: by 2002:a05:6402:154:: with SMTP id s20mr65521979edu.148.1641593478704; Fri, 07 Jan 2022 14:11:18 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id g7sm1744790ejt.29.2022.01.07.14.11.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jan 2022 14:11:17 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 4F592181F2E; Fri, 7 Jan 2022 23:11:17 +0100 (CET) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov , Daniel Borkmann , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Shuah Khan , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH bpf v2 3/3] bpf/selftests: Add check for updating XDP bpf_link with wrong program type Date: Fri, 7 Jan 2022 23:11:15 +0100 Message-Id: <20220107221115.326171-3-toke@redhat.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220107221115.326171-1-toke@redhat.com> References: <20220107221115.326171-1-toke@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Add a check to the xdp_link selftest that the kernel rejects replacing an XDP program with a different program type on link update. v2: - Split this out into its own patch. Signed-off-by: Toke Høiland-Jørgensen --- tools/testing/selftests/bpf/prog_tests/xdp_link.c | 5 +++++ tools/testing/selftests/bpf/progs/test_xdp_link.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_link.c b/tools/testing/selftests/bpf/prog_tests/xdp_link.c index eec0bf83546b..b2b357f8c74c 100644 --- a/tools/testing/selftests/bpf/prog_tests/xdp_link.c +++ b/tools/testing/selftests/bpf/prog_tests/xdp_link.c @@ -127,6 +127,11 @@ void serial_test_xdp_link(void) ASSERT_EQ(link_info.prog_id, id1, "link_prog_id"); ASSERT_EQ(link_info.xdp.ifindex, IFINDEX_LO, "link_ifindex"); + /* updating program under active BPF link with different type fails */ + err = bpf_link__update_program(link, skel1->progs.tc_handler); + if (!ASSERT_ERR(err, "link_upd_invalid")) + goto cleanup; + err = bpf_link__detach(link); if (!ASSERT_OK(err, "link_detach")) goto cleanup; diff --git a/tools/testing/selftests/bpf/progs/test_xdp_link.c b/tools/testing/selftests/bpf/progs/test_xdp_link.c index ee7d6ac0f615..64ff32eaae92 100644 --- a/tools/testing/selftests/bpf/progs/test_xdp_link.c +++ b/tools/testing/selftests/bpf/progs/test_xdp_link.c @@ -10,3 +10,9 @@ int xdp_handler(struct xdp_md *xdp) { return 0; } + +SEC("tc") +int tc_handler(struct __sk_buff *skb) +{ + return 0; +} -- 2.34.1