Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Cross-merge bpf fixes after downstream PR. No conflicts. Adjacent changes in: include/linux/bpf.h include/uapi/linux/bpf.h kernel/bpf/btf.c kernel/bpf/helpers.c kernel/bpf/syscall.c kernel/bpf/verifier.c kernel/trace/bpf_trace.c mm/slab_common.c tools/include/uapi/linux/bpf.h tools/testing/selftests/bpf/Makefile

Alexei Starovoitov committed 2 years ago

Commit bfa7b5c2 parents c6fb803 ae90f6a1167 files · +15425 −10300Browse files

Showing the changes to scripts (9 of 1167 files). Show all

Unified · Split

9 files

scripts/Kconfig.include +3 −0
scripts/Makefile.compiler +7 −7
scripts/Makefile.dtbs +3 −1
scripts/include/list.h +50 −0
scripts/kconfig/expr.c +1 −0
scripts/kconfig/parser.y +8 −2
scripts/kconfig/qconf.cc +3 −3
scripts/package/builddeb +0 −1
scripts/rustc-llvm-version.sh +22 −0

scripts/Kconfig.include+3−0

@@ -65,6 +65,9 @@ cc-option-bit = $(if-success,$(CC) -Werror $(1) -E -x c /dev/null -o /dev/null,$ · 64 unmodified lines
65	m32-flag := $(cc-option-bit,-m32)	65	m32-flag := $(cc-option-bit,-m32)
66	m64-flag := $(cc-option-bit,-m64)	66	m64-flag := $(cc-option-bit,-m64)
67		67
		68	rustc-version := $(shell,$(srctree)/scripts/rustc-version.sh $(RUSTC))
		69	rustc-llvm-version := $(shell,$(srctree)/scripts/rustc-llvm-version.sh $(RUSTC))
		70
68	# $(rustc-option,<flag>)	71	# $(rustc-option,<flag>)
69	# Return y if the Rust compiler supports <flag>, n otherwise	72	# Return y if the Rust compiler supports <flag>, n otherwise
70	# Calls to this should be guarded so that they are not evaluated if	73	# Calls to this should be guarded so that they are not evaluated if

scripts/Makefile.compiler+7−7

 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
-cc-option-yn = $(call try-run,\
+cc-option-yn = $(if $(call cc-option,$1),y,n)
-	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
 # cc-disable-warning
 # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
-cc-disable-warning = $(call try-run,\
+cc-disable-warning = $(if $(call cc-option,-W$(strip $1)),-Wno-$(strip $1))
-	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
 # gcc-min-version
 # Usage: cflags-$(call gcc-min-version, 70100) += -foo
 # __rustc-option
 # Usage: MY_RUSTFLAGS += $(call __rustc-option,$(RUSTC),$(MY_RUSTFLAGS),-Cinstrument-coverage,-Zinstrument-coverage)
+# TODO: remove RUSTC_BOOTSTRAP=1 when we raise the minimum GNU Make version to 4.4
 __rustc-option = $(call try-run,\
-	$(1) $(2) $(3) --crate-type=rlib /dev/null --out-dir=$$TMPOUT -o "$$TMP",$(3),$(4))
+	echo '#![allow(missing_docs)]#![feature(no_core)]#![no_core]' | RUSTC_BOOTSTRAP=1\
+	$(1) --sysroot=/dev/null $(filter-out --sysroot=/dev/null,$(2)) $(3)\
+	--crate-type=rlib --out-dir=$(TMPOUT) --emit=obj=- - >/dev/null,$(3),$(4))
 # rustc-option
 # Usage: rustflags-y += $(call rustc-option,-Cinstrument-coverage,-Zinstrument-coverage)
 # rustc-option-yn
 # Usage: flag := $(call rustc-option-yn,-Cinstrument-coverage)
-rustc-option-yn = $(call try-run,\
+rustc-option-yn = $(if $(call rustc-option,$1),y,n)
-	$(RUSTC) $(KBUILD_RUSTFLAGS) $(1) --crate-type=rlib /dev/null --out-dir=$$TMPOUT -o "$$TMP",y,n)

scripts/Makefile.dtbs+3−1

 # Assembly file to wrap dtb(o)
 # ---------------------------------------------------------------------------
+builtin-dtb-section = $(if $(filter arch/$(SRCARCH)/boot/dts%, $(obj)),.dtb.init.rodata,.rodata)
 # Generate an assembly file to wrap the output of the device tree compiler
 quiet_cmd_wrap_S_dtb = WRAP    $@
       cmd_wrap_S_dtb = {								\
 		symbase=__$(patsubst .%,%,$(suffix $<))_$(subst -,_,$(notdir $*));	\
 		echo '\#include <asm-generic/vmlinux.lds.h>';				\
-		echo '.section .dtb.init.rodata,"a"';					\
+		echo '.section $(builtin-dtb-section),"a"';				\
 		echo '.balign STRUCT_ALIGNMENT';					\
 		echo ".global $${symbase}_begin";					\
 		echo "$${symbase}_begin:";						\

scripts/include/list.h+50−0

@@ -127,6 +127,36 @@ static inline void list_del(struct list_head *entry) · 126 unmodified lines
127	entry->prev = LIST_POISON2;	127	entry->prev = LIST_POISON2;
128	}	128	}
129		129
		130	/**
		131	* list_replace - replace old entry by new one
		132	* @old : the element to be replaced
		133	* @new : the new element to insert
		134	*
		135	* If @old was empty, it will be overwritten.
		136	*/
		137	static inline void list_replace(struct list_head *old,
		138	struct list_head *new)
		139	{
		140	new->next = old->next;
		141	new->next->prev = new;
		142	new->prev = old->prev;
		143	new->prev->next = new;
		144	}
		145
		146	/**
		147	* list_replace_init - replace old entry by new one and initialize the old one
		148	* @old : the element to be replaced
		149	* @new : the new element to insert
		150	*
		151	* If @old was empty, it will be overwritten.
		152	*/
		153	static inline void list_replace_init(struct list_head *old,
		154	struct list_head *new)
		155	{
		156	list_replace(old, new);
		157	INIT_LIST_HEAD(old);
		158	}
		159
130	/**	160	/**
131	* list_move - delete from one list and add as another's head	161	* list_move - delete from one list and add as another's head
132	* @list: the entry to move	162	* @list: the entry to move
@@ -150,6 +180,26 @@ static inline void list_move_tail(struct list_head *list, · 17 unmodified lines
150	list_add_tail(list, head);	180	list_add_tail(list, head);
151	}	181	}
152		182
		183	/**
		184	* list_is_first -- tests whether @list is the first entry in list @head
		185	* @list: the entry to test
		186	* @head: the head of the list
		187	*/
		188	static inline int list_is_first(const struct list_head list, const struct list_head head)
		189	{
		190	return list->prev == head;
		191	}
		192
		193	/**
		194	* list_is_last - tests whether @list is the last entry in list @head
		195	* @list: the entry to test
		196	* @head: the head of the list
		197	*/
		198	static inline int list_is_last(const struct list_head list, const struct list_head head)
		199	{
		200	return list->next == head;
		201	}
		202
153	/**	203	/**
154	* list_is_head - tests whether @list is the list @head	204	* list_is_head - tests whether @list is the list @head
155	* @list: the entry to test	205	* @list: the entry to test

scripts/kconfig/expr.c+1−0

@@ -47,6 +47,7 @@ static struct expr expr_lookup(enum expr_type type, void l, void *r) · 46 unmodified lines
47	e->type = type;	47	e->type = type;
48	e->left._initdata = l;	48	e->left._initdata = l;
49	e->right._initdata = r;	49	e->right._initdata = r;
		50	e->val_is_valid = false;
50		51
51	hash_add(expr_hashtable, &e->node, hash);	52	hash_add(expr_hashtable, &e->node, hash);
52		53

scripts/kconfig/parser.y+8−2

 			yynerrs++;
 		}
-		list_add_tail(&current_entry->sym->choice_link,
+		/*
-			      &current_choice->choice_members);
+		 * If the same symbol appears twice in a choice block, the list
+		 * node would be added twice, leading to a broken linked list.
+		 * list_empty() ensures that this symbol has not yet added.
+		 */
+		if (list_empty(&current_entry->sym->choice_link))
+			list_add_tail(&current_entry->sym->choice_link,
+				      &current_choice->choice_members);
 	}
 	printd(DEBUG_PARSE, "%s:%d:endconfig\n", cur_filename, cur_lineno);

scripts/kconfig/qconf.cc+3−3

 {
 	QByteArray str = url.toEncoded();
 	const std::size_t count = str.size();
-	char *data = new char[count + 1];
+	char *data = new char[count + 2];  // '$' + '\0'
 	struct symbol **result;
 	struct menu *m = NULL;
 	connect(helpText, &ConfigInfoView::menuSelected,
 		this, &ConfigMainWindow::setMenuLink);
+	conf_read(NULL);
 	QString listMode = configSettings->value("/listMode", "symbol").toString();
 	if (listMode == "single")
 		showSingleView();
 	configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
 	configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings()));
-	conf_read(NULL);
 	v->show();
 	configApp->exec();

scripts/package/builddeb+0−1

@@ -74,7 +74,6 @@ install_linux_image () { · 73 unmodified lines
74		74
75	mkdir -p "${pdir}/DEBIAN"	75	mkdir -p "${pdir}/DEBIAN"
76	cat <<-EOF > "${pdir}/DEBIAN/${script}"	76	cat <<-EOF > "${pdir}/DEBIAN/${script}"
77
78	#!/bin/sh	77	#!/bin/sh
79		78
80	set -e	79	set -e

scripts/rustc-llvm-version.sh+22−0

@@ -0,0 +1,22 @@
	1	#!/bin/sh
	2	# SPDX-License-Identifier: GPL-2.0
	3	#
	4	# Usage: $ ./rustc-llvm-version.sh rustc
	5	#
	6	# Print the LLVM version that the Rust compiler uses in a 6 digit form.
	7
	8	# Convert the version string x.y.z to a canonical up-to-6-digits form.
	9	get_canonical_version()
	10	{
	11	IFS=.
	12	set -- $1
	13	echo $((10000 * $1 + 100 * $2 + $3))
	14	}
	15
	16	if output=$("$@" --version --verbose 2>/dev/null \| grep LLVM); then
	17	set -- $output
	18	get_canonical_version $3
	19	else
	20	echo 0
	21	exit 1
	22	fi