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: 1410655 Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YBUbAyYy; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Cn8LW3d9mz9sVM for ; Fri, 4 Dec 2020 08:37:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388015AbgLCVgw (ORCPT ); Thu, 3 Dec 2020 16:36:52 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:25199 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728034AbgLCVgu (ORCPT ); Thu, 3 Dec 2020 16:36:50 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607031324; 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=YBUbAyYyCnBqeT0+ujfI2WEM+jX8P684kCclbNH4UfuCp4cN27J4iRmFG6ogylg78R2ipy MnaWpNzLPnDUVTyh4Vy7PsL90jEANcjyVvRU+sZ+AxY/Nk89MqctVRaefaa5c1alrie0vx vm2Td8avl4CgoLga3ExZ4WeB/FTp0Gw= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-585-gbRUMJnkPbWitGR4812TRA-1; Thu, 03 Dec 2020 16:35:20 -0500 X-MC-Unique: gbRUMJnkPbWitGR4812TRA-1 Received: by mail-qv1-f69.google.com with SMTP id v8so2821889qvq.12 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=prm2PPjk9znyN0LX/Q3WBTFioOZ/8Uvglz8YLOzJTu51XhwVkaHsBoSBLDdu6QMufL te81MqRSWAN7qxBLg9AJ3v5I+S3GoXm8C5rig1L3uiCdKimOPyD3nV1MUP+EFpU2RjM7 FYvKZUC2l8kIFWGAX4NwaTTgKcMTyWBh8KM+Eo+W6hieuPFcLd68ffRFgtZm/61X1R4K FrAdsPUtUFWZXo5wu1TobO5Z8YFvWmboCE+2tioMYv0oa1siUEzJfmSUteyVav3Xabgb qKvcwTQbYoFTG00yE4KgGJvnk0pedQiC1kfyOg2Whdy8UCm8ozYeCXJl/E1iHL6rsO52 6LdA== X-Gm-Message-State: AOAM533rJRs3PPPrD4eNmRCfYElgtNobQ+6AnHnH240FSuG7c/9ld1+B 1rSzr7blTGZDpK4I1XAf6MHpJeYk0+DV/d9LO9MIIuvATeYpZsMygH4YwEmajPdnf31SqsOlEqp NpTPGaN1ATjynCAj8 X-Received: by 2002:a05:620a:990:: with SMTP id x16mr5154607qkx.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: netdev@vger.kernel.org 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(-)