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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 82021C18E5B for ; Tue, 17 Mar 2020 05:39:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 577AA20663 for ; Tue, 17 Mar 2020 05:39:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TdZj3YUk" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725872AbgCQFjz (ORCPT ); Tue, 17 Mar 2020 01:39:55 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:43249 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725868AbgCQFjy (ORCPT ); Tue, 17 Mar 2020 01:39:54 -0400 Received: by mail-qk1-f193.google.com with SMTP id x18so10428527qki.10; Mon, 16 Mar 2020 22:39:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UwZxmkvrwRhIrcZt0WEpCmuaedOj5jqgsMhumcotKKI=; b=TdZj3YUkubjcMVWM+zJvvlnV6euPPgCK+b/PA8f2P7433xyw9CwJ4OAVomMNsXV1Ue qhfCXXRLzARRDHhyaoJ8mYZvzmZx/ZmkeXoEMjrjeaSYZ00y16Dfu5OETwCTyVwDsNtG Zzp0sL52+McMWHkQAgii1zzLmDVFnzd+FuHRIY2vWESNlOs3UpCfua6I0rVabr5ieP4D YSLA4bKgmRO0PmbXji6B+NTwlI2pGRN+M94UqsGILN2jFzAhshC6Tz/Fqs8lbDK0HbdS WOzrgykICk6ZCvdIBdMIxIH9EsXC9jHFWXiY3k09q+0pbYQzyD8CxsiSG4aWf4x2yyFB kzqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UwZxmkvrwRhIrcZt0WEpCmuaedOj5jqgsMhumcotKKI=; b=WsrUwbvL2jTQgcwXBWndN03YPiEkBmbh7PUUf5b1m80oViDjq/op5GkIqdEZCIiBwJ +FKROmzfP5BwyasknmmswAx6tZBFfqSToEJ36qHvgPS//QtdceVQIa7OwxXJmJQ/I/SH ss9dY6THv6ReCya+q+C3v4yr2c/VtHWlBO7kpho7PYo9x4svO0shP+g8klntlVcbKPoV roupUB9nFuRmmtAqg6cgA0XPQO9tw9Uu56EPeZ87sJECTzAZOBwzM+jqgJDLumxDL2il NyzbtzEAmjPuVGJ2eeQWA62JiYtqCRnt9O7nT8MBXhUEkDtpzlz7xXJvKmaVE9wzi6lW pPCg== X-Gm-Message-State: ANhLgQ0FPpum8nIKhGzl30UnE6H4AgP/dWHwIMbC3pE6EEahOnpGE02q o/Oz9iZF129gNEfooqTe1t0hwnVBY6MztqmaFPQ= X-Google-Smtp-Source: ADFU+vsoWkGYO+avhdI29ZRZV4RpkK8u06r6j/11i25pQ+uRiHxLwoILi+Y75zpBQRrZB2ylpXmJCu67ogAtONt59fo= X-Received: by 2002:a37:9104:: with SMTP id t4mr3377882qkd.449.1584423591664; Mon, 16 Mar 2020 22:39:51 -0700 (PDT) MIME-Version: 1.0 References: <20200314013932.4035712-1-andriin@fb.com> <20200314013932.4035712-3-andriin@fb.com> <20200317053550.uk2lzcqfrrmgsdq7@kafai-mbp> In-Reply-To: <20200317053550.uk2lzcqfrrmgsdq7@kafai-mbp> From: Andrii Nakryiko Date: Mon, 16 Mar 2020 22:39:40 -0700 Message-ID: Subject: Re: [Potential Spoof] [PATCH bpf-next 3/3] selftests/bpf: reset process and thread affinity after each test/sub-test To: Martin KaFai Lau Cc: Andrii Nakryiko , bpf , Networking , Alexei Starovoitov , Daniel Borkmann , Kernel Team Content-Type: text/plain; charset="UTF-8" Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Mon, Mar 16, 2020 at 10:35 PM Martin KaFai Lau wrote: > > On Fri, Mar 13, 2020 at 06:39:32PM -0700, Andrii Nakryiko wrote: > > Some tests and sub-tests are setting "custom" thread/process affinity and > > don't reset it back. Instead of requiring each test to undo all this, ensure > > that thread affinity is restored by test_progs test runner itself. > > > > Signed-off-by: Andrii Nakryiko > > --- > > tools/testing/selftests/bpf/test_progs.c | 42 +++++++++++++++++++++++- > > tools/testing/selftests/bpf/test_progs.h | 1 + > > 2 files changed, 42 insertions(+), 1 deletion(-) > > > > diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c > > index c8cb407482c6..b521e0a512b6 100644 > > --- a/tools/testing/selftests/bpf/test_progs.c > > +++ b/tools/testing/selftests/bpf/test_progs.c > > @@ -1,12 +1,15 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > /* Copyright (c) 2017 Facebook > > */ > > +#define _GNU_SOURCE > > #include "test_progs.h" > > #include "cgroup_helpers.h" > > #include "bpf_rlimit.h" > > #include > > -#include > > +#include > > +#include > > #include > > +#include > > #include /* backtrace */ > > > > /* defined in test_progs.h */ > > @@ -90,6 +93,34 @@ static void skip_account(void) > > } > > } > > > > +static void stdio_restore(void); > > + > > +/* A bunch of tests set custom affinity per-thread and/or per-process. Reset > > + * it after each test/sub-test. > > + */ > > +static void reset_affinity() { > > + > > + cpu_set_t cpuset; > > + int i, err; > > + > > + CPU_ZERO(&cpuset); > > + for (i = 0; i < env.nr_cpus; i++) > > + CPU_SET(i, &cpuset); > In case the user may run "taskset somemask test_progs", > is it better to store the inital_cpuset at the beginning > of main and then restore to inital_cpuset after each run? Not sure it's worth it (it's test runner, not really a general-purpose tool), but I can add that for sure. > > > + > > + err = sched_setaffinity(0, sizeof(cpuset), &cpuset); > > + if (err < 0) { > > + stdio_restore(); > > + fprintf(stderr, "Failed to reset process affinity: %d!\n", err); > > + exit(-1); > > + } > > + err = pthread_setaffinity_np(pthread_self(), sizeof(cpuset), &cpuset); > > + if (err < 0) { > > + stdio_restore(); > > + fprintf(stderr, "Failed to reset thread affinity: %d!\n", err); > > + exit(-1); > > + } > > +}