From patchwork Thu Dec 3 21:35:23 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: 11949685 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.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 8F3FFC4361B for ; Thu, 3 Dec 2020 21:37:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4FAE722305 for ; Thu, 3 Dec 2020 21:37:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389409AbgLCVg6 (ORCPT ); Thu, 3 Dec 2020 16:36:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:27763 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389397AbgLCVg6 (ORCPT ); Thu, 3 Dec 2020 16:36:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607031331; 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=DI29VqJzS72LXaEV13zDjLKn6lqs69y45EkLgkg/Hr4=; b=FM/HHnmRx9JERGtKBdgRlHXPOAw81NsNpJfdR0MpxwzWy6+pTmrld67W6QqW710EsToGj+ fEtXZiyJe+AKauJfUCDdhC5XOBHrA8MKjG+HcQjo/G2+xLJqAVW6MxM0ztCxK/I0/bhjum ccMbOK6yArsbmK8rjb1H320/p4kJhwE= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-275--v8VO9Y7P2ej5x_F6FnVZw-1; Thu, 03 Dec 2020 16:35:30 -0500 X-MC-Unique: -v8VO9Y7P2ej5x_F6FnVZw-1 Received: by mail-qk1-f197.google.com with SMTP id s29so3199885qkm.3 for ; Thu, 03 Dec 2020 13:35:30 -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:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=DI29VqJzS72LXaEV13zDjLKn6lqs69y45EkLgkg/Hr4=; b=sOhvLwINzNfr3bgwuZhiL9h+fp1T7pEYi88SXYN3WXTzD76OZRo8Rpc2F6wMl0oEZp bg8vpHIf/VvL/py/Uw1q6+CswU9Y84hrTw1ABzCB6hYFnQYQ55a1M5gkIJZT6uDnabW9 IaJSYUCHhj8j3q41B0qANVZSu5JEotw04xgq5BlPChNrprq1orboEQ/QOLKuAyKne8qr MWDCFqfN0FaH30jjR7JGpWeiDfuvFPgViohn3RpTe+QybD9gbwmOdgAUg1ZJKzZIiz7C EbF50jKkNV6ut1Sq8Ac1FAis//II4Z85kMUwVIWyxEzYdQg0omknKUV3hb4iymuCrLEW n8jQ== X-Gm-Message-State: AOAM531B1EB/g45MQQJnFPTF30vcoaDDGFHE/6fh7UmveTRLoh+eoAQE Wa3NV7BIqbhoL3YiYILvnSi4gWR25pSjunGgrNmCV89rU2lfidHTET9iLWuRhj37ByFXU4tzXNQ GWqKDnaf2/n+HDUgGglOuHg== X-Received: by 2002:a05:620a:55b:: with SMTP id o27mr5033795qko.226.1607031329434; Thu, 03 Dec 2020 13:35:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxfRbExoNkCbGd9OYQ3RciN25NTK0UbfbhfIQFCsxLV947DkzuxS3TC6F6RTtAe0QwlSNHrmg== X-Received: by 2002:a05:620a:55b:: with SMTP id o27mr5033743qko.226.1607031329039; Thu, 03 Dec 2020 13:35:29 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id j124sm2913011qkf.113.2020.12.03.13.35.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 13:35:25 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id B23311843F0; Thu, 3 Dec 2020 22:35:23 +0100 (CET) Subject: [PATCH bpf 6/7] selftests/bpf/test_offload.py: reset ethtool features after failed setting 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:23 +0100 Message-ID: <160703132365.162669.12565799511526821110.stgit@toke.dk> In-Reply-To: <160703131710.162669.9632344967082582016.stgit@toke.dk> References: <160703131710.162669.9632344967082582016.stgit@toke.dk> User-Agent: StGit/0.23 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Toke Høiland-Jørgensen When setting the ethtool feature flag fails (as expected for the test), the kernel now tracks that the feature was requested to be 'off' and refuses to subsequently disable it again. So reset it back to 'on' so a subsequent disable (that's not supposed to fail) can succeed. Signed-off-by: Toke Høiland-Jørgensen --- tools/testing/selftests/bpf/test_offload.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py index 5b0fe8e0b2d2..f861503433c9 100755 --- a/tools/testing/selftests/bpf/test_offload.py +++ b/tools/testing/selftests/bpf/test_offload.py @@ -940,6 +940,7 @@ try: start_test("Test disabling TC offloads is rejected while filters installed...") ret, _ = sim.set_ethtool_tc_offloads(False, fail=False) fail(ret == 0, "Driver should refuse to disable TC offloads with filters installed...") + sim.set_ethtool_tc_offloads(True) start_test("Test qdisc removal frees things...") sim.tc_flush_filters()