From patchwork Sun Jul 21 07:50:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Ambardar X-Patchwork-Id: 13737968 Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9BA858BE8; Sun, 21 Jul 2024 07:51:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721548289; cv=none; b=mx89KsKK1wQbJBebXIHXnZ/4KhZFFbqumj+LOiJrC+H0rxBXrmOjuYt196OGSRFlG+FWBCXepMdlAYBRJsi6r3HTm7Sh14iB+p0/dC3kZcQ9S6lNn5N8ToOyPMJ9Qj5BRwtp9mV7bX4Pb+GFLFQ/KiluUPPoDfoXcU+9oVwVESU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721548289; c=relaxed/simple; bh=B6lUOt+PP/bDbLGKNJb3ArjgmotFRT99qQSyBdII5Mw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SoAKuEdnAnvoSKCxdgPyWNQ3/ObNXCfH1l8S3smcBF/NWONL6txuWA94ZUgoqbZgVumZ1Y4Zkb4dm+pq8PF2k9TPVDf1RkgroTKfIYiZWwJxWU4+obzwJUtXrCyUMXGn0n12CcKMFiVXn6bU3X9364oW6/Bz0SAzBiodZzKkrts= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=X/bFoAWf; arc=none smtp.client-ip=209.85.167.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X/bFoAWf" Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3d94293f12fso1976968b6e.3; Sun, 21 Jul 2024 00:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721548286; x=1722153086; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=l6LzMCmGbeJ/HEkNuZ799gqzE3W9WkErKluYrr3obHs=; b=X/bFoAWfbFveuEY14WEljCTyvfqkLiHzeTiY/fWSotfcgS9PNqQXLBw7XC/HY/CbDZ bOiWBiVPHKYATCTnSZjw98O/r4hGl+XZuS0a+U7NvVBZauExOQ/5+4/bpQL5cY2yBsQE 5J57eUOfCIKDylDvGFLaVtaqABwU8gJkyKKcrMdGCxTfQvlf4O9WiWOczZLRa02Z/Nf8 I7dPMbKn5McjaPQwQTMhiaS9WDaDteqOtrPgf/+HZTmM9EAfYi8Ehhz5H6w6OoO5kjM+ ZJOyJQQ1wNAwzGtud8R3dY1LuKHof3JibTQVOe6Peoko/uKCidEFS9xV27SDgOhmGNH1 F6Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721548286; x=1722153086; 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=l6LzMCmGbeJ/HEkNuZ799gqzE3W9WkErKluYrr3obHs=; b=Y15+e7agGO2QBzchyidF4tbnfMHquhcVP3sucYTlXYiQVS2bZR/hVaotQNKs74OnDc r2y5JzLK8yqq9A4aeUn/KK1AUPj4h8/J1S0ql0YsCGpRdgf2V/DFcvU1HOb4q8OXLOnm ibQ9B+DR8RqfJKnEyQUWdBfKLJq0xWUU7r5ufSAI6DGH0b+zok6lCF114oBGHykmCxwV S3yVqEeQcQOsq8yWD7KX6Ss6Mh7ILLyC3HknL9IonPLJK9xAZez2L2cUkq9QyfZSmaED QChYbSHD96E/1D1FbX7CfsmGTo1wSNd5J6iClB/SVReipNVLVNvSZZKAMOPnnE+AWkw+ JRRw== X-Forwarded-Encrypted: i=1; AJvYcCXtpe5X6FmzYsOBucKdpN6J4MeVTogw6+f6XBcs9vSmxGIu5+/cXVof1x5fRueP3GqiYwoGFzK+HWnEo30kxaM8//UJvEES621G3XQoT84w X-Gm-Message-State: AOJu0YxlHtxyysIWJJvRU7tznge7dHKDibYZP0rsOYtdnlRdv1J2ghCi KMMjbkdE1wq3m4K2LBLX0k+MK8pJEpzvRn7+/Px7qJrWCXENFbNA16Oo2OyW X-Google-Smtp-Source: AGHT+IETkihDjHFX5igPpFYFPJoT+9cQlgf7H3jKl5eX6fnQ6U7sQl5eTDEIRrr85bt7KYptpKG74Q== X-Received: by 2002:a05:6358:6f02:b0:1aa:c71e:2b2c with SMTP id e5c5f4694b2df-1acc5ad5a58mr516096655d.11.1721548286333; Sun, 21 Jul 2024 00:51:26 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cb77504952sm5760591a91.40.2024.07.21.00.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jul 2024 00:51:25 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Subject: [PATCH bpf-next v1 1/2] selftests/bpf: Add missing system defines for mips Date: Sun, 21 Jul 2024 00:50:55 -0700 Message-Id: <2451c21ef2a582de94e7fcdc32aadc02ff874c51.1721541467.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update get_sys_includes in Makefile with missing MIPS-related definitions to fix many, many compilation errors building selftests/bpf. The following added defines drive conditional logic in system headers for word-size and endianness selection: MIPSEL, MIPSEB _MIPS_SZPTR _MIPS_SZLONG _MIPS_SIM, _ABIO32, _ABIN32, _ABI64 Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 05b234248b38..a9c447c63fee 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -396,7 +396,8 @@ define get_sys_includes $(shell $(1) $(2) -v -E - &1 \ | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \ $(shell $(1) $(2) -dM -E - X-Patchwork-Id: 13737969 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AFFC79E1; Sun, 21 Jul 2024 07:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721548290; cv=none; b=R3aRAxCoWve+LQbaSPa8gNL+7qAbwujUSCtZT8nxfk1FREudMEgR1tJRfERGZ7pTL1FMmiDa0EzSDTZzArF5wiZ3au1wzFUxa8/S2Bp94psiBup7GeYG9mKB7qFeaklDm6uSCbmD+SKGkP/q2titPZGaeYXh1JnY2d8kTizyK8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721548290; c=relaxed/simple; bh=gaYxMpVWcmx+rOqEfDteNR28R+GSm6Eq2rwKKxUzbOk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=evcon6LJSVKEq4lBVqEdBjwSFhzfxTsiQiwcVnqk93P118/S9uH2qa7LA/sB6HHDZU1u7Ff0VdYMK6j9Ov0y2VAMQtPW7DGixGKn1dPAQeZrq7kVGAplz0FvHZ9GKHitTeox1PouLYTC/0yWGii/qgqrFQq5R7NZoAAGk585CnA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=boi1Dw1e; arc=none smtp.client-ip=209.85.210.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="boi1Dw1e" Received: by mail-ot1-f52.google.com with SMTP id 46e09a7af769-7039e4a4a03so1872927a34.3; Sun, 21 Jul 2024 00:51:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721548287; x=1722153087; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iJQywKsVLTGkJj96t5HPgqXogiWsXBHjQ4pVqiolOiA=; b=boi1Dw1eXBIwAAnaNqOVNlu6RvFIADHUN7QzTHp3XuLLCvNRNuY3nNOiFg0lVG8flY bWlOy5YLgZp8te/lgihkVeyfF1RG2JByOJqmkjAaD9wrUb8FIMdNg1gQnFoBTYSNCrCU E6HUm0IfnRtFbU51o2WC97hECDjonPALXEarpgk9G8sguJFK3tEcxUxRNWbH4Ynjt5IA O2bP4zXcKXtoeMlXMCI0iZyvpME3xa9eaewCRHTePtTMNzRzqd887H5676zYQ3WtoWYk DBleK/sif2/uIHtuBhOGYeb/72A3iSaW86le8tT+kXNQBrAmV1p3e82GXhLnMWylvgHq GJbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721548287; x=1722153087; 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=iJQywKsVLTGkJj96t5HPgqXogiWsXBHjQ4pVqiolOiA=; b=ojBcuPoNVdYth4ZNq/qPrme6YkpGCQ9zft89ll1II08s7YF/9VlEQUMyg8lc8qzcJJ vgeNLwWdleLMOHMhATWaq2viLgIEBSKSVHErH40VhPIaSfW62LaUM9uUNMvnMQjiapmv 3Z+MACYL7MjSy1ostMO97mhrCP80x/kdVmr0kvwPn914DxwHioxcCGaC9UVsoM0aoj89 75M86qsL1C7HBvjEocsymu/yqdz5afEFIP/VIvwvVqg0v8X5Wf42ko4vs7XRhs9Nrc4A WLGZwq+Yro3iRZfg2fPB62EDMOO6q6KPMXRb5qtnihHxZIu3Asrq+Ey0lwJ2Gyz9XRjN vXVw== X-Forwarded-Encrypted: i=1; AJvYcCWqHoN8PRBa2tzS5nsUVnt9d19ABLmzr+EtLCfizi2P26uyUhRtNeU/45a4dG20JbCaHJXrY3ETLKnO2RLpcyN4i1dPYx4uxzoBc9Bg8Q8B X-Gm-Message-State: AOJu0Ywd/oIgp0Rb1ccFPpOrnprvRevpTm0REzKJD7lESruGKEqPOVoI +Mi7hENQgOYONSBIaRojLG7PdwsCkkuTCfH4ItgayLpMBGgv9CXps4e+yjbr X-Google-Smtp-Source: AGHT+IHyZknbTH8JzZ0DBAXddWaqGTScHsdQoQIRzXgZQjrRSXuaJtlcKFugRdnjwp+6o195YTiYYg== X-Received: by 2002:a05:6358:7e53:b0:1aa:bde7:5731 with SMTP id e5c5f4694b2df-1acc5c3f6f2mr522463755d.24.1721548287256; Sun, 21 Jul 2024 00:51:27 -0700 (PDT) Received: from localhost.localdomain (69-172-146-21.cable.teksavvy.com. [69.172.146.21]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2cb77504952sm5760591a91.40.2024.07.21.00.51.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jul 2024 00:51:26 -0700 (PDT) From: Tony Ambardar To: bpf@vger.kernel.org Cc: Tony Ambardar , linux-kselftest@vger.kernel.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Subject: [PATCH bpf-next v1 2/2] selftests/bpf: Fix error linking uprobe_multi on mips Date: Sun, 21 Jul 2024 00:50:56 -0700 Message-Id: <7eeb1a1a9910b30782adba9eb5cc47c6ce075223.1721541467.git.tony.ambardar@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Linking uprobe_multi.c on mips64el fails due to relocation overflows, when the GOT entries required exceeds the default maximum. Add a specific CFLAGS (-mxgot) for uprobe_multi.c on MIPS that allows using a larger GOT and avoids errors such as: /tmp/ccBTNQzv.o: in function `bench': uprobe_multi.c:49:(.text+0x1d7720): relocation truncated to fit: R_MIPS_GOT_DISP against `uprobe_multi_func_08188' uprobe_multi.c:49:(.text+0x1d7730): relocation truncated to fit: R_MIPS_GOT_DISP against `uprobe_multi_func_08189' ... collect2: error: ld returned 1 exit status Fixes: 519dfeaf5119 ("selftests/bpf: Add uprobe_multi test program") Signed-off-by: Tony Ambardar --- tools/testing/selftests/bpf/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index a9c447c63fee..0b4bfbc0ef68 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -784,9 +784,12 @@ $(OUTPUT)/veristat: $(OUTPUT)/veristat.o $(call msg,BINARY,,$@) $(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(filter %.a %.o,$^) $(LDLIBS) -o $@ +# Linking uprobe_multi can fail due to relocation overflows on mips. +uprobe_multi.c-CFLAGS := $(if $(filter mips, $(ARCH)),-mxgot) + $(OUTPUT)/uprobe_multi: uprobe_multi.c $(call msg,BINARY,,$@) - $(Q)$(CC) $(CFLAGS) -O0 $(LDFLAGS) $^ $(LDLIBS) -o $@ + $(Q)$(CC) $(CFLAGS) $($<-CFLAGS) -O0 $(LDFLAGS) $^ $(LDLIBS) -o $@ EXTRA_CLEAN := $(SCRATCH_DIR) $(HOST_SCRATCH_DIR) \ prog_tests/tests.h map_tests/tests.h verifier/tests.h \