From patchwork Wed Feb 8 18:13:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrei Gherzan X-Patchwork-Id: 1739605 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=jx6NZFcB; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PBp6R62fNz23y9 for ; Thu, 9 Feb 2023 05:14:06 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pPox8-0006Y4-NW; Wed, 08 Feb 2023 18:13:54 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pPox6-0006XO-Hg for kernel-team@lists.ubuntu.com; Wed, 08 Feb 2023 18:13:52 +0000 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 3CDE03F1F3 for ; Wed, 8 Feb 2023 18:13:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1675880032; bh=7yQZY4wEqno5oTq4Lb5ymSmain/Vv+bof7SfI+LBmXE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=jx6NZFcBvhPNOAZpw83yPg+e40iDHFLDQ24s2bcOYMEO7zH6my8+5DaXr/zbzyRgH 4cDMJu8id3wMe65W8cw+vjgEs3VscKGyMGhIIrbAaAQf47hALWfujdmiBjeSnwthYJ mO8MAvpU8W7U0mDqoMLFPDdOQgrdz178Wf5Uwp7fiGafR/JFfTB1iMlmgSIZe8o8eo PYhNx/ij2SmiqVXjJus6t+oAixIoJQtfJfCCivi6ZL+HhAgpPMy++/GKUP+35LDPj6 VR6t0cWxG8mxViC1vvFVkCTgRktub2FmtfkC60ovwrZ9ZXzC0sKJm44cKmuJ2lzqnx Zus82rVXdnd0g== Received: by mail-wr1-f72.google.com with SMTP id w10-20020a5d544a000000b002c3de7a10b0so2242347wrv.5 for ; Wed, 08 Feb 2023 10:13:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7yQZY4wEqno5oTq4Lb5ymSmain/Vv+bof7SfI+LBmXE=; b=jDZmFfigrrZesSoT18P5uCPTDzX2WBeojL8VaxbMLnLl8mlbqsmzxWz7cnwMDiNYc7 RYKmIFzf7BeaMGFu6PfhEBtMbPvn6kJBEUkPj/htKPimizuwwvZBpywtFdejiwefeyCA 5dnx9DHdyVYvOX/8i82Vvf1w5HvAIoCI1Os08yJH9DJhJZ25MshHTx24U7yfqrua3cl6 C6sBv14K+7Ta0D4C12uzJIO4Xx+YSNy8jm0PwZ8LZ433ZaStjrU7ojHOu1tGex5MuMnD RAuEaIgcJrFmnvNJ3ygTXXkVVwsA0dZHzOKuWcFQCtXAzoJEiS1a+Xu3MAn+j/89Jq78 XC3Q== X-Gm-Message-State: AO0yUKXY3hBil0JrSbtSgNbWPkewGWiXxJy50fgdFzkmrPh+ncsNLDUX wJup91SXdc4dD/HxEWohr7c4w4J8n/HPCOQ3jAPnw/ue8bByWKG+Gp0yTCJz+bEOkE2DD+wOfwb t3Tuc0qpDToIsmnEN3OuEwGjfUJ16Uv/ZrbeBPlOjrNrrcds= X-Received: by 2002:a05:600c:a290:b0:3dd:af7a:53db with SMTP id hu16-20020a05600ca29000b003ddaf7a53dbmr7408804wmb.11.1675880031630; Wed, 08 Feb 2023 10:13:51 -0800 (PST) X-Google-Smtp-Source: AK7set8JJSE21VF0JOk257hD+BAH6rKYxYcC7/31HoaVPpzqp/vu68/4WyseBmITzvSJ9jIYJh1CDA== X-Received: by 2002:a05:600c:a290:b0:3dd:af7a:53db with SMTP id hu16-20020a05600ca29000b003ddaf7a53dbmr7408796wmb.11.1675880031467; Wed, 08 Feb 2023 10:13:51 -0800 (PST) Received: from qwirkle.internal ([81.2.157.149]) by smtp.gmail.com with ESMTPSA id g16-20020a05600c4ed000b003dfee43863fsm3058136wmq.26.2023.02.08.10.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Feb 2023 10:13:50 -0800 (PST) From: Andrei Gherzan To: kernel-team@lists.ubuntu.com Subject: [SRU][Kinetic][PATCH 2/3] selftests: net: Fix O=dir builds Date: Wed, 8 Feb 2023 18:13:37 +0000 Message-Id: <20230208181338.476272-3-andrei.gherzan@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230208181338.476272-1-andrei.gherzan@canonical.com> References: <20230208181338.476272-1-andrei.gherzan@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrei Gherzan Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Björn Töpel The BPF Makefile in net/bpf did incorrect path substitution for O=dir builds, e.g. make O=/tmp/kselftest headers make O=/tmp/kselftest -C tools/testing/selftests would fail in selftest builds [1] net/ with clang-16: error: no such file or directory: 'kselftest/net/bpf/nat6to4.c' clang-16: error: no input files Add a pattern prerequisite and an order-only-prerequisite (for creating the directory), to resolve the issue. [1] https://lore.kernel.org/all/202212060009.34CkQmCN-lkp@intel.com/ Reported-by: kernel test robot Fixes: 837a3d66d698 ("selftests: net: Add cross-compilation support for BPF programs") Signed-off-by: Björn Töpel Link: https://lore.kernel.org/r/20221206102838.272584-1-bjorn@kernel.org Signed-off-by: Jakub Kicinski (cherry-picked from 17961a37ce4077ae43128ba5ce0b1dfd8f02fdb9) Signed-off-by: Andrei Gherzan --- tools/testing/selftests/net/bpf/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/bpf/Makefile b/tools/testing/selftests/net/bpf/Makefile index 1d4a0059fb47..ef106dee8675 100644 --- a/tools/testing/selftests/net/bpf/Makefile +++ b/tools/testing/selftests/net/bpf/Makefile @@ -12,7 +12,7 @@ CCINCLUDE += -I$(SCRATCH_DIR)/include BPFOBJ := $(BUILD_DIR)/libbpf/libbpf.a -MAKE_DIRS := $(BUILD_DIR)/libbpf +MAKE_DIRS := $(BUILD_DIR)/libbpf $(OUTPUT)/bpf $(MAKE_DIRS): mkdir -p $@ @@ -38,8 +38,8 @@ endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) -$(TEST_CUSTOM_PROGS): $(BPFOBJ) - $(CLANG) -O2 -target bpf -c $(@:.o=.c) $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@ +$(TEST_CUSTOM_PROGS): $(OUTPUT)/%.o: %.c $(BPFOBJ) | $(MAKE_DIRS) + $(CLANG) -O2 -target bpf -c $< $(CCINCLUDE) $(CLANG_SYS_INCLUDES) -o $@ $(BPFOBJ): $(wildcard $(BPFDIR)/*.[ch] $(BPFDIR)/Makefile) \ $(APIDIR)/linux/bpf.h \