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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 EEB4DC10DCE for ; Fri, 13 Mar 2020 23:18:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C2D562074C for ; Fri, 13 Mar 2020 23:18:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Fm0aJIBL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726757AbgCMXSG (ORCPT ); Fri, 13 Mar 2020 19:18:06 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:38343 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726637AbgCMXSG (ORCPT ); Fri, 13 Mar 2020 19:18:06 -0400 Received: by mail-pg1-f196.google.com with SMTP id x7so5880110pgh.5 for ; Fri, 13 Mar 2020 16:18:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=5ldfOi5ONLbPwzyRrxGXEvBjlKjPPvku4R0mnSJkLVE=; b=Fm0aJIBLLWT6DaaZbI9PQAulKV6KQqmYdmWI7JjyHtFTMW7gs7aqhkl7b2LuLRtSkd /c+SrNqnS7qp9lST7sRRQDadN8CcZP7cWKn6mU3g2AcEsFWAW1bqtKepu4PDLagnQxnf hAP/FX3UKzzVhJ91P9KaIkl/sAD3QWGy+v6OU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=5ldfOi5ONLbPwzyRrxGXEvBjlKjPPvku4R0mnSJkLVE=; b=VA4+HWeJnjjYq1Nocv1BEq6UbV/ztEjNH+vQVkd5Alt8UA9I1tYIh9CnF5I6fL1xZ+ brFVLDwJwKfQ4ITeN0Xoh0eJZ3j89T66e0qIlGdoK5fEhtcm8gvxzU6/Uq53OJ1ftYsj n6dymx6MSQA/ZLp0X9ojo0TRItVyFte+ogsVWoPY/8GDrqW0RGvvntPGfWRVKSx7fQOD VNsjH6bkSDWI1b3jIoGTYzUKjbpzOeHAlWZ/vKhpcRor7DgTdjbBv8YGBQoVSVL80M8F JldxnHCFUQqM5W2bBShDRaK6/SnRrOp78Ny/pGOjtwnsp9HzkGaXoU25Wp0ypZAvqHlS tPsQ== X-Gm-Message-State: ANhLgQ3h2yiSAdMZjWPm0ck6/kUCsaW1NHNZ7i0wrX8Dzo/vfzZ38kD7 JzuS7Nv/6T0GQqj6QFMf/s23zQ== X-Google-Smtp-Source: ADFU+vs2gW1Jr/RUSgdC70UiRNwBxLRo2xZ2n+fKy8IdDt4Cr7wxF7y0z64FvaehW2RHASU+siQkcg== X-Received: by 2002:aa7:86d2:: with SMTP id h18mr13869948pfo.313.1584141485099; Fri, 13 Mar 2020 16:18:05 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id y15sm35693731pfl.149.2020.03.13.16.18.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Mar 2020 16:18:04 -0700 (PDT) Date: Fri, 13 Mar 2020 16:18:03 -0700 From: Kees Cook To: Shuah Khan Cc: shuah@kernel.org, luto@amacapital.net, wad@chromium.org, daniel@iogearbox.net, kafai@fb.com, yhs@fb.com, andriin@fb.com, gregkh@linuxfoundation.org, tglx@linutronix.de, khilman@baylibre.com, mpe@ellerman.id.au, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH v3] selftests: Fix seccomp to support relocatable build (O=objdir) Message-ID: <202003131615.D132E9E9@keescook> References: <20200313212404.24552-1-skhan@linuxfoundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200313212404.24552-1-skhan@linuxfoundation.org> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Fri, Mar 13, 2020 at 03:24:04PM -0600, Shuah Khan wrote: > Fix seccomp relocatable builds. This is a simple fix to use the right > lib.mk variable TEST_GEN_PROGS with dependency on kselftest_harness.h > header, and defining LDFLAGS for pthread lib. > > Removes custom clean rule which is no longer necessary with the use of > TEST_GEN_PROGS. > > Uses $(OUTPUT) defined in lib.mk to handle build relocation. > > The following use-cases work with this change: > > In seccomp directory: > make all and make clean > > From top level from main Makefile: > make kselftest-install O=objdir ARCH=arm64 HOSTCC=gcc \ > CROSS_COMPILE=aarch64-linux-gnu- TARGETS=seccomp > > Signed-off-by: Shuah Khan > --- > > Changes since v2: > -- Using TEST_GEN_PROGS is sufficient to generate objects. > Addresses review comments from Kees Cook. > > tools/testing/selftests/seccomp/Makefile | 18 ++++++++---------- > 1 file changed, 8 insertions(+), 10 deletions(-) > > diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile > index 1760b3e39730..a0388fd2c3f2 100644 > --- a/tools/testing/selftests/seccomp/Makefile > +++ b/tools/testing/selftests/seccomp/Makefile > @@ -1,17 +1,15 @@ > # SPDX-License-Identifier: GPL-2.0 > -all: > - > -include ../lib.mk > +CFLAGS += -Wl,-no-as-needed -Wall > +LDFLAGS += -lpthread > > .PHONY: all clean Isn't this line redundant to ../lib.mk's? > > -BINARIES := seccomp_bpf seccomp_benchmark > -CFLAGS += -Wl,-no-as-needed -Wall > +include ../lib.mk > + > +# OUTPUT set by lib.mk > +TEST_GEN_PROGS := $(OUTPUT)/seccomp_bpf $(OUTPUT)/seccomp_benchmark > > -seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h > - $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ > +$(TEST_GEN_PROGS): ../kselftest_harness.h > > -TEST_PROGS += $(BINARIES) > -EXTRA_CLEAN := $(BINARIES) > +all: $(TEST_GEN_PROGS) And isn't this one too? I think if those are removed it should all still work? Regardless: Reviewed-by: Kees Cook -Kees > > -all: $(BINARIES) > -- > 2.20.1 > -- Kees Cook