From patchwork Thu Dec 3 21:35:17 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: 11949659 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=-12.2 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,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 2933EC433FE for ; Thu, 3 Dec 2020 21:36:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C03AA22305 for ; Thu, 3 Dec 2020 21:36:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729320AbgLCVgt (ORCPT ); Thu, 3 Dec 2020 16:36:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:42641 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728034AbgLCVgs (ORCPT ); Thu, 3 Dec 2020 16:36:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607031322; 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=2hjENq5PBqAj5ZyDy1YdPKW4hQcF6Bo4mZqU9xYjYxs=; b=VvkLjvCK8KyZGC8cFW8VLCotPZG+Vpo16XmWA/AYxzJGTFVdRRxk9yrw7lAV+L53Z7VMXd StO8lCjtpZbAFSjf4j6pFA4CrWkZqMY9Nfml7bTHhuAxWknhRWWMlYfT4CBLKzV97kmKcZ rPc/Sg6bEc5kPuCWnx2jGJ39FchZCMc= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-551-vubIC1h9NfqXENtWqjDjKw-1; Thu, 03 Dec 2020 16:35:20 -0500 X-MC-Unique: vubIC1h9NfqXENtWqjDjKw-1 Received: by mail-qt1-f198.google.com with SMTP id t22so2708989qtq.2 for ; Thu, 03 Dec 2020 13:35:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:user-agent :mime-version:content-transfer-encoding; bh=2hjENq5PBqAj5ZyDy1YdPKW4hQcF6Bo4mZqU9xYjYxs=; b=ID/9E+o5+uDr55EczNMabha/1krs+mZtor18qGc89cZo/PtT2iUxlw1C64t7+/BuVq oVggQz+yq4Ew9I4dbViOoOWXkGMdEpfSZpiGWMSvvg3xcSUR81PBk+xR31KCJkaP/CNw LtO93DtNeQEg7PCpvJfzCm0tUKH0gMZbo1tP/0L5GDhN8xfTiDpdDAUQAQmSiMf2+Gy/ RiaKdlBIRdridlRnhiSIA1F1kYxh5gj9ZEQWDrmRhCTfeIwPZdu55pipKa+pok2t3sNL ahk2K/X5dZ3Qbrkg+s5hguSzVzeslZgCGDqxodwSMlpOutARcwAd9ttadOY2t84+qzqc ABwQ== X-Gm-Message-State: AOAM533c4/nTsROYW4awwNfpal4VNVgRvnQIjazvNY+gZyzHipxp8t7u JsaiJOjKqq7AvE4Su25ujgRrcnOVprjnL2DtK2XuZppZaZfD1dQmLKj159JcBQuVS++PloalxXY 5RgKaJjECPMPE X-Received: by 2002:a05:620a:990:: with SMTP id x16mr5154610qkx.316.1607031320136; Thu, 03 Dec 2020 13:35:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJw2l9NcgawV3L4H9UBAIhZxeD2lOOgRBccfU64KRJt4/85GYNO8Fo05jgzrW/YvPq6hpfuiqw== X-Received: by 2002:a05:620a:990:: with SMTP id x16mr5154584qkx.316.1607031319859; Thu, 03 Dec 2020 13:35:19 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id y189sm3019686qka.30.2020.12.03.13.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 13:35:19 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 2D1C3181CF8; Thu, 3 Dec 2020 22:35:17 +0100 (CET) Subject: [PATCH bpf 0/7] selftests/bpf: Restore test_offload.py to working order From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Jakub Kicinski Cc: "David S. Miller" , Daniel Borkmann , Alexei Starovoitov , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Jesper Dangaard Brouer , "Michael S. Tsirkin" , Romain Perier , Allen Pais , Grygorii Strashko , Simon Horman , "Gustavo A. R. Silva" , Lorenzo Bianconi , Wei Yongjun , Jiri Benc , oss-drivers@netronome.com, linux-omap@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Date: Thu, 03 Dec 2020 22:35:17 +0100 Message-ID: <160703131710.162669.9632344967082582016.stgit@toke.dk> User-Agent: StGit/0.23 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net This series restores the test_offload.py selftest to working order. It seems a number of subtle behavioural changes have crept into various subsystems which broke test_offload.py in a number of ways. Most of these are fairly benign changes where small adjustments to the test script seems to be the best fix, but one is an actual kernel bug that I've observed in the wild caused by a bad interaction between xdp_attachment_flags_ok() and the rework of XDP program handling in the core netdev code. Patch 1 fixes the bug by removing xdp_attachment_flags_ok(), and the reminder of the patches are adjustments to test_offload.py, including a new feature for netdevsim to force a BPF verification fail. Please see the individual patches for details. --- Toke Høiland-Jørgensen (7): xdp: remove the xdp_attachment_flags_ok() callback selftests/bpf/test_offload.py: Remove check for program load flags match netdevsim: Add debugfs toggle to reject BPF programs in verifier selftests/bpf/test_offload.py: only check verifier log on verification fails selftests/bpf/test_offload.py: fix expected case of extack messages selftests/bpf/test_offload.py: reset ethtool features after failed setting selftests/bpf/test_offload.py: filter bpftool internal map when counting maps .../ethernet/netronome/nfp/nfp_net_common.c | 6 --- drivers/net/ethernet/ti/cpsw_priv.c | 3 -- drivers/net/netdevsim/bpf.c | 15 ++++-- drivers/net/netdevsim/netdevsim.h | 1 + include/net/xdp.h | 2 - net/core/xdp.c | 12 ----- tools/testing/selftests/bpf/test_offload.py | 49 +++++++++---------- 7 files changed, 35 insertions(+), 53 deletions(-)