From patchwork Wed Feb 14 21:50:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 873542 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QwhOb0iD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhY6S6Pzdz9t2x for ; Thu, 15 Feb 2018 08:52:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031533AbeBNVw0 (ORCPT ); Wed, 14 Feb 2018 16:52:26 -0500 Received: from mail-it0-f66.google.com ([209.85.214.66]:38224 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031487AbeBNVwW (ORCPT ); Wed, 14 Feb 2018 16:52:22 -0500 Received: by mail-it0-f66.google.com with SMTP id k6so16693363ita.3 for ; Wed, 14 Feb 2018 13:52:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=e9eVCutUtAu3QlgFEfiBGv3u+Stwh2p2ZUOgoz5iqE8=; b=QwhOb0iDYq61dMx/NnZgMoE9TCAWoAaFWaYcXMk7aribGsjXq3Xje5hgxDMg2zUXVC ITy5aNUWLz1S03s9cahCfDyvim7vNtFI9PdFexs//VL52fdcGvbzRTQa79xqMn2XtqGz BnzRbYchO+OTi5vvg89IhmRhG6emvwNfiZs5ODprfheVCUgJvklsqmstT0GLq+72AEd7 3ZDhFKNSlF+XBt2UfTTrZS/WQ7nDobsMEW798aeA2vAyfrcaR5MfaHWH1ORUkJp2TEJI etBKUy4OD/3FGryYfsGqzrgM8Pvcwz4IVRQ3pmjuymz2TwwJLVEYqwZ/j4oc30H+hiqn QyXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=e9eVCutUtAu3QlgFEfiBGv3u+Stwh2p2ZUOgoz5iqE8=; b=dFAbeYKYzMXvrDWUaHDA4cdYgUQmyHGR6H9mph0scXbRJ0DCkei21IBUqC/oINZc2o 3YGxrBawVL+bUyS40CSpIMBjbihGzFxMO7prSZ4d6tvArsrof6S94cVTbwXdmkRyPu7x +KULSF63PJpVorOXQmLojST9k2Abc6rWVCVYK+DI80yhrlUYDbw5do3oZGXZ5MiqQzgg QmJIjpyNq5Dl6+XiDzOvmYoLktbAx7B72XIga52lxwGGxaXb5cs2Km16JVVCBhhTK0dT li0nzKz5+sXlY0/9k6n3tByfwDT2ruc2tZ3i3pOCdPhXgvTg2NxGYYvE6fYFu1lqiMus i8mg== X-Gm-Message-State: APf1xPD+Yj4TEoF4rbzDCGNj3ny+J7qMWzaACoDE4IuKIX/WBzr/nckU CSaGPRUXsOcHCC3zmsqL+xq4utp6 X-Google-Smtp-Source: AH8x226aRXjBhG0gfj6OX1o+XFyckHi/6i8N2LvA9xGSaY9GsL1cxFe0EQTioEiFTmtXAE7yf91jHA== X-Received: by 10.36.121.5 with SMTP id z5mr635312itc.146.1518645141687; Wed, 14 Feb 2018 13:52:21 -0800 (PST) Received: from allosaurus.lan ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id d5sm16279541ioc.18.2018.02.14.13.52.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 13:52:20 -0800 (PST) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org Subject: [PATCH bpf-next 1/4] selftests/bpf: Print unexpected output on fail Date: Wed, 14 Feb 2018 13:50:34 -0800 Message-Id: <20180214215037.15973-2-joe@wand.net.nz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180214215037.15973-1-joe@wand.net.nz> References: <20180214215037.15973-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This makes it easier to debug off-hand when the error message isn't exactly as expected. Signed-off-by: Joe Stringer --- tools/testing/selftests/bpf/test_verifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index c0f16e93f9bd..6cf9bd6f08b7 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -11291,7 +11291,8 @@ static void do_test_single(struct bpf_test *test, bool unpriv, goto fail_log; } if (!strstr(bpf_vlog, expected_err) && !reject_from_alignment) { - printf("FAIL\nUnexpected error message!\n"); + printf("FAIL\nUnexpected error message!\n\tEXP: %s\n\tRES: %s\n", + expected_err, bpf_vlog); goto fail_log; } } From patchwork Wed Feb 14 21:50:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 873545 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ktZeDrBo"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhY702vF3z9t2f for ; Thu, 15 Feb 2018 08:53:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031540AbeBNVwc (ORCPT ); Wed, 14 Feb 2018 16:52:32 -0500 Received: from mail-it0-f67.google.com ([209.85.214.67]:38226 "EHLO mail-it0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031408AbeBNVwX (ORCPT ); Wed, 14 Feb 2018 16:52:23 -0500 Received: by mail-it0-f67.google.com with SMTP id k6so16693409ita.3 for ; Wed, 14 Feb 2018 13:52:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=1tVnhBXU2rPaWKcPJQXwTzl0arqkXUnpozpMq1jfrlE=; b=ktZeDrBo5MxVdcF2pVB8SC5rZTbQd092eUS7bzNG4fbjecRu2kpwIYihi7MjRZyhjs l/8ZBlJz9UJezQ73LCeFh7kYNy/pvhDE3hJ9ysC5mHGV8h5yYFcvq3wDmFHKMB0nPfEg +KIzSQhlBFxBG6lgzNMcBk51Jv82jxTasMIIeLubQrT+CHLIJshl7lAYvD1zSKu1W2wO 2tS2NEBk+o7bEt2ajuLP9AnvuDrGfBt8gliL0IjxrdSBwr3RmlfFN64gOYTa/igKCB30 UR4N0fnJXHBNiW9FSFvyLPK0lPkPzg6uEGNN9raKY9CFmnQ0+vM7aLJN0WYWafYTyipa 2sPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=1tVnhBXU2rPaWKcPJQXwTzl0arqkXUnpozpMq1jfrlE=; b=XA4yTqpTcA0FtEdQ/foDfDJ0/a1gPdjoS0teHLl2mFn+RuKE8WQmC8p8TrM1l92KdE XkYShTsSMhQzuIm/guk3X7hbVruv1cPJUyekwbG87fMMAV47sOqKk13DrFoZ1xtXIBkY FO4y3a1Dc0Z6vcuCo+6/4fT9yKg77pXxlMQudN9vCS3rB9YqvJpXTcp6KatNyeEu5e9m Kg/HHcFpDxJIL4p+LbOAm5prMnEmvKec22J67j0H/I5fmQE2zEEAAhtoIuHsydz2lO3t a7GK7vAhYsaCxkbcd8FNB8LNZ2LfHSdt1pvOJl/rGSrUmfAvzaN8uRconqt0HKnyDzCD IsNw== X-Gm-Message-State: APf1xPABEDa2Ijz3JNeQ98H5AnkHfCzmUXKj2akxJ6EKzP3vEoZAZeqj MzUiPcvUZEyfVTW536/SQoU= X-Google-Smtp-Source: AH8x225N7iVvizjwNT3JdPB5R15k2EnkBVZK/SFopUsdYsYsXT3jCYnQ+XiSbMlP/jizjpAYLFy3sw== X-Received: by 10.36.77.130 with SMTP id l124mr633384itb.56.1518645142798; Wed, 14 Feb 2018 13:52:22 -0800 (PST) Received: from allosaurus.lan ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id d5sm16279541ioc.18.2018.02.14.13.52.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 13:52:22 -0800 (PST) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org Subject: [PATCH bpf-next 2/4] selftests/bpf: Count tests skipped by unpriv Date: Wed, 14 Feb 2018 13:50:35 -0800 Message-Id: <20180214215037.15973-3-joe@wand.net.nz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180214215037.15973-1-joe@wand.net.nz> References: <20180214215037.15973-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When priviliged tests are skipped due to user rights, count the number of skipped tests so it's more obvious that the test did not check everything. Signed-off-by: Joe Stringer --- tools/testing/selftests/bpf/test_verifier.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 6cf9bd6f08b7..7ab02526c403 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -11378,7 +11378,7 @@ static int set_admin(bool admin) static int do_test(bool unpriv, unsigned int from, unsigned int to) { - int i, passes = 0, errors = 0; + int i, passes = 0, errors = 0, skips = 0; for (i = from; i < to; i++) { struct bpf_test *test = &tests[i]; @@ -11395,13 +11395,17 @@ static int do_test(bool unpriv, unsigned int from, unsigned int to) set_admin(true); } - if (!unpriv) { + if (unpriv) { + printf("#%d/p %s SKIP\n", i, test->descr); + skips++; + } else { printf("#%d/p %s ", i, test->descr); do_test_single(test, false, &passes, &errors); } } - printf("Summary: %d PASSED, %d FAILED\n", passes, errors); + printf("Summary: %d PASSED, %d SKIPPED, %d FAILED\n", passes, + skips, errors); return errors ? EXIT_FAILURE : EXIT_SUCCESS; } From patchwork Wed Feb 14 21:50:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 873544 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ukzhomgE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhY6d06Dbz9t2x for ; Thu, 15 Feb 2018 08:52:41 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031553AbeBNVwd (ORCPT ); Wed, 14 Feb 2018 16:52:33 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:35828 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031491AbeBNVwY (ORCPT ); Wed, 14 Feb 2018 16:52:24 -0500 Received: by mail-it0-f65.google.com with SMTP id e1so16698234ita.0 for ; Wed, 14 Feb 2018 13:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=2OoJ0sT+4dRvVq+0bZpLfPLNHis8HUHsyFlsfd52AvA=; b=ukzhomgEwRxD4fiNtTR7bfBAU2WkUAt3jzbTzdP2WNTsgT0q7KDRfpHKBIq8CzQ5KK DsPK0/JLJLnZoBR5fzyuaX2l6SkKmCnDUuqIJAGxQS3Xg/QlqDYfvxF4UHEQG0PsRmQ8 MLCytBb/yzOooiADjIZGbpt7un47/JVylXwffXKjrz5wZmWGoC2oH0D2gI9LJxQY/v83 lyLNtRNZ1lfF6qtp4XgzPUiCPDwEXny87/8B1yV9p4Cf/p2aQmTV3lLYM3Y+zUUq7Ei2 +bGeIYBkaaro5hmJae+QsN5FXPeofACA/v2ZC1prX9C3W1cXUWrD2B6pmDcVx8pLOyQ0 zleA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=2OoJ0sT+4dRvVq+0bZpLfPLNHis8HUHsyFlsfd52AvA=; b=oR9KX8FXqK+DRJPuRUGe2r1opQs6a1mYPEBO48qmTVt3GI+aIVCSrMvOxK2HsmVJwV oii+mMgPLbTfn5veSpCUOrwVh9dTAhBEAnZpnoF433zSv5LQopp78e8mcLeKEh4AkfYP /OUp5QAXQ0Y7Zf/5MXSLHEvCfASh0b6IU/pdeEwRRLXljnEJw0r46ljRP/8RPetGecON xnIKCc2CIUQj66MPPOQ0Y0qzbPbBusWfR3qtpfmmP1q+KFshd6/ntVTLz+Cf4kRqNYbw Y1OPybkW4fnGLXJvaYeK56YFJkgKSZjy6+2bV2vCZ9KpGzLWMRGAjsjt2WYt79Llkcjq FMoA== X-Gm-Message-State: APf1xPBlQ0TcTlQqYjSqeCAVZr7DuQp/13HrmrDTnm9rcB5HbebARIRU i7P1MCm96Y/FD2FqAExLuyI= X-Google-Smtp-Source: AH8x225tO5gSQkmndGMKFB8hbX9TBw1etzEPNkzWBKSwYjimfBKgeg8gK7fCbbp1vWrUOHnNw+AOOQ== X-Received: by 10.36.40.16 with SMTP id h16mr621546ith.125.1518645143712; Wed, 14 Feb 2018 13:52:23 -0800 (PST) Received: from allosaurus.lan ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id d5sm16279541ioc.18.2018.02.14.13.52.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 13:52:23 -0800 (PST) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org Subject: [PATCH bpf-next 3/4] selftests/bpf: Only run tests if !bpf_disabled Date: Wed, 14 Feb 2018 13:50:36 -0800 Message-Id: <20180214215037.15973-4-joe@wand.net.nz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180214215037.15973-1-joe@wand.net.nz> References: <20180214215037.15973-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The "kernel.unprivileged_bpf_disabled" sysctl, if enabled, causes all unprivileged tests to fail because it permanently disables unprivileged BPF access for the currently running kernel. Skip the relevant tests if the user attempts to run the testsuite with this sysctl enabled. Signed-off-by: Joe Stringer --- tools/testing/selftests/bpf/test_verifier.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c index 7ab02526c403..2971ba2829ac 100644 --- a/tools/testing/selftests/bpf/test_verifier.c +++ b/tools/testing/selftests/bpf/test_verifier.c @@ -57,6 +57,9 @@ #define F_NEEDS_EFFICIENT_UNALIGNED_ACCESS (1 << 0) #define F_LOAD_WITH_STRICT_ALIGNMENT (1 << 1) +#define UNPRIV_SYSCTL "kernel/unprivileged_bpf_disabled" +static bool unpriv_disabled = false; + struct bpf_test { const char *descr; struct bpf_insn insns[MAX_INSNS]; @@ -11376,6 +11379,17 @@ static int set_admin(bool admin) return ret; } +static void get_unpriv_disabled() +{ + char buf[2]; + FILE *fd; + + fd = fopen("/proc/sys/"UNPRIV_SYSCTL, "r"); + if (fgets(buf, 2, fd) == buf && atoi(buf)) + unpriv_disabled = true; + fclose(fd); +} + static int do_test(bool unpriv, unsigned int from, unsigned int to) { int i, passes = 0, errors = 0, skips = 0; @@ -11386,7 +11400,10 @@ static int do_test(bool unpriv, unsigned int from, unsigned int to) /* Program types that are not supported by non-root we * skip right away. */ - if (!test->prog_type) { + if (!test->prog_type && unpriv_disabled) { + printf("#%d/u %s SKIP\n", i, test->descr); + skips++; + } else if (!test->prog_type) { if (!unpriv) set_admin(false); printf("#%d/u %s ", i, test->descr); @@ -11433,6 +11450,13 @@ int main(int argc, char **argv) } } + get_unpriv_disabled(); + if (unpriv && unpriv_disabled) { + printf("Cannot run as unprivileged user with sysctl %s.\n", + UNPRIV_SYSCTL); + return EXIT_FAILURE; + } + setrlimit(RLIMIT_MEMLOCK, unpriv ? &rlim : &rinf); return do_test(unpriv, from, to); } From patchwork Wed Feb 14 21:50:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 873543 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XjDHPMyk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zhY6Y22Y0z9t2f for ; Thu, 15 Feb 2018 08:52:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031561AbeBNVwe (ORCPT ); Wed, 14 Feb 2018 16:52:34 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:34199 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031509AbeBNVwZ (ORCPT ); Wed, 14 Feb 2018 16:52:25 -0500 Received: by mail-it0-f65.google.com with SMTP id j21so14144453ita.1 for ; Wed, 14 Feb 2018 13:52:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mvBuhx/idrmsDzN/beB+SOXPzO6qresvqHgQDRkJHAA=; b=XjDHPMykqZU1ppALfuK5ZDe6cve3obFatvVB8gbZZyfdYLY96jp/YIjoGEhfs8ECSl sxt2QvRAdOCTgJSd1eFNKs5RB4tqQDVi5AsjTeT+biqiZq/k9Bcy+oPImHzb0HFDbuis MqKdWiFDrsAUCIyJV9SYPHlxkmThd9RIuWKrcAfw3b64jMGeqnWWlXKcQN735sE/RFxu QVyOpwE5Xh1qgqVZjQzxlh6XZgWb0soFIcxitBIndvXm3t2GIByq3490lmOddjZ69onc hAVlqarGJ6466plDHuI2AND5njDa8c7ONJiYRKDSRssthGkuGzSU8q66HprtxCRfAA+6 2HJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mvBuhx/idrmsDzN/beB+SOXPzO6qresvqHgQDRkJHAA=; b=VvEm/PvJ1V+hILdV5tivBMxH4P1U5lColxqEcps8/p57ihfYQ14rqevmJSSq/xeolb LjvV5UZvbxvosnCJIo9MHbZgmfsm9rujLmMMGvb5APX2LKahmUXySpwRm0EDKMYmQ8wk nq5750JNO1xWNQ3VmeEknaKvAjZ75SOtccNOYVEOC4Ma3O78S+TBANJJfY1Y1EwRSk2b X+p72tLrCwdQ0R63Dox9ro1vNojQCjCyn9fIk1DYSn+UOwG45kS4UdLo4CTxiSD9I1w2 NlB9uXHlXY3Mj+OsAfmy5Z9y04ydgoPcZA04pdakxM3w8Ed3JDcTRBqFg1WkEh5F4GNI 7Mqg== X-Gm-Message-State: APf1xPBaAWqn09wxeZ+dUrwRYst7cBLwcraL2OlwochEZ5HDRJVknbV9 1VaREemJhHCTdfjtc5oiSFG61KNE X-Google-Smtp-Source: AH8x226iIQaJMxGkT/xm5w2WlgLF4Kt4XfcN094frRb/xsdva3CHcj+CCQhEH62P/ah0Fg+r7CavzA== X-Received: by 10.36.117.150 with SMTP id y144mr619108itc.141.1518645144608; Wed, 14 Feb 2018 13:52:24 -0800 (PST) Received: from allosaurus.lan ([99.0.85.34]) by smtp.gmail.com with ESMTPSA id d5sm16279541ioc.18.2018.02.14.13.52.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Feb 2018 13:52:24 -0800 (PST) From: Joe Stringer To: daniel@iogearbox.net Cc: netdev@vger.kernel.org Subject: [PATCH bpf-next 4/4] bpf: Remove unused callee_saved array Date: Wed, 14 Feb 2018 13:50:37 -0800 Message-Id: <20180214215037.15973-5-joe@wand.net.nz> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180214215037.15973-1-joe@wand.net.nz> References: <20180214215037.15973-1-joe@wand.net.nz> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This array appears to be completely unused, remove it. Signed-off-by: Joe Stringer --- kernel/bpf/verifier.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 5fb69a85d967..3c74b163eaeb 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -508,10 +508,6 @@ static struct bpf_verifier_state *push_stack(struct bpf_verifier_env *env, static const int caller_saved[CALLER_SAVED_REGS] = { BPF_REG_0, BPF_REG_1, BPF_REG_2, BPF_REG_3, BPF_REG_4, BPF_REG_5 }; -#define CALLEE_SAVED_REGS 5 -static const int callee_saved[CALLEE_SAVED_REGS] = { - BPF_REG_6, BPF_REG_7, BPF_REG_8, BPF_REG_9 -}; static void __mark_reg_not_init(struct bpf_reg_state *reg);