Merge branch 'perf-tools' into perf-tools-next (39d14c0d) · Commits · git / linux-net

Documentation/filesystems/overlayfs.rst

+13 −3

Original line number	Diff line number	Diff line
		@@ -145,7 +145,9 @@ filesystem, an overlay filesystem needs to record in the upper filesystem
		that files have been removed. This is done using whiteouts and opaque
		directories (non-directories are always opaque).

		A whiteout is created as a character device with 0/0 device number.
		A whiteout is created as a character device with 0/0 device number or
		as a zero-size regular file with the xattr "trusted.overlay.whiteout".

		When a whiteout is found in the upper level of a merged directory, any
		matching name in the lower level is ignored, and the whiteout itself
		is also hidden.
		@@ -154,6 +156,13 @@ A directory is made opaque by setting the xattr "trusted.overlay.opaque"
		to "y". Where the upper filesystem contains an opaque directory, any
		directory in the lower filesystem with the same name is ignored.

		An opaque directory should not conntain any whiteouts, because they do not
		serve any purpose. A merge directory containing regular files with the xattr
		"trusted.overlay.whiteout", should be additionally marked by setting the xattr
		"trusted.overlay.opaque" to "x" on the merge directory itself.
		This is needed to avoid the overhead of checking the "trusted.overlay.whiteout"
		on all entries during readdir in the common case.

		readdir
		-------

		@@ -534,8 +543,9 @@ A lower dir with a regular whiteout will always be handled by the overlayfs
		mount, so to support storing an effective whiteout file in an overlayfs mount an
		alternative form of whiteout is supported. This form is a regular, zero-size
		file with the "overlay.whiteout" xattr set, inside a directory with the
		"overlay.whiteouts" xattr set. Such whiteouts are never created by overlayfs,
		but can be used by userspace tools (like containers) that generate lower layers.
		"overlay.opaque" xattr set to "x" (see `whiteouts and opaque directories`_).
		These alternative whiteouts are never created by overlayfs, but can be used by
		userspace tools (like containers) that generate lower layers.
		These alternative whiteouts can be escaped using the standard xattr escape
		mechanism in order to properly nest to any depth.

MAINTAINERS

+5 −3

Original line number	Diff line number	Diff line
		@@ -4547,7 +4547,7 @@ F: drivers/net/ieee802154/ca8210.c

		CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS
		M: David Howells <dhowells@redhat.com>
		L: linux-cachefs@redhat.com (moderated for non-subscribers)
		L: netfs@lists.linux.dev
		S: Supported
		F: Documentation/filesystems/caching/cachefiles.rst
		F: fs/cachefiles/
		@@ -7955,12 +7955,13 @@ L: rust-for-linux@vger.kernel.org
		S: Maintained
		F: rust/kernel/net/phy.rs

		EXEC & BINFMT API
		EXEC & BINFMT API, ELF
		R: Eric Biederman <ebiederm@xmission.com>
		R: Kees Cook <keescook@chromium.org>
		L: linux-mm@kvack.org
		S: Supported
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/execve
		F: Documentation/userspace-api/ELF.rst
		F: fs/binfmt_.c
		F: fs/exec.c
		F: include/linux/binfmts.h
		@@ -8223,7 +8224,8 @@ F: include/linux/iomap.h

		FILESYSTEMS [NETFS LIBRARY]
		M: David Howells <dhowells@redhat.com>
		L: linux-cachefs@redhat.com (moderated for non-subscribers)
		R: Jeff Layton <jlayton@kernel.org>
		L: netfs@lists.linux.dev
		L: linux-fsdevel@vger.kernel.org
		S: Supported
		F: Documentation/filesystems/caching/

Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -986,6 +986,10 @@ NOSTDINC_FLAGS += -nostdinc
		# perform bounds checking.
		KBUILD_CFLAGS += $(call cc-option, -fstrict-flex-arrays=3)

		#Currently, disable -Wstringop-overflow for GCC 11, globally.
		KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow)
		KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow)

		# disable invalid "can't wrap" optimizations for signed / pointers
		KBUILD_CFLAGS += -fno-strict-overflow

arch/riscv/net/bpf_jit_comp64.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -795,6 +795,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,
		struct bpf_tramp_links *fentry = &tlinks[BPF_TRAMP_FENTRY];
		struct bpf_tramp_links *fexit = &tlinks[BPF_TRAMP_FEXIT];
		struct bpf_tramp_links *fmod_ret = &tlinks[BPF_TRAMP_MODIFY_RETURN];
		bool is_struct_ops = flags & BPF_TRAMP_F_INDIRECT;
		void *orig_call = func_addr;
		bool save_ret;
		u32 insn;
		@@ -878,7 +879,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,

		stack_size = round_up(stack_size, 16);

		if (func_addr) {
		if (!is_struct_ops) {
		/* For the trampoline called from function entry,
		* the frame of traced function and the frame of
		* trampoline need to be considered.
		@@ -998,7 +999,7 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im,

		emit_ld(RV_REG_S1, -sreg_off, RV_REG_FP, ctx);

		if (func_addr) {
		if (!is_struct_ops) {
		/* trampoline called from function entry */
		emit_ld(RV_REG_T0, stack_size - 8, RV_REG_SP, ctx);
		emit_ld(RV_REG_FP, stack_size - 16, RV_REG_SP, ctx);

drivers/block/rbd.c

+19 −13

Original line number	Diff line number	Diff line
		@@ -3452,14 +3452,15 @@ static bool rbd_lock_add_request(struct rbd_img_request *img_req)
		static void rbd_lock_del_request(struct rbd_img_request *img_req)
		{
		struct rbd_device *rbd_dev = img_req->rbd_dev;
		bool need_wakeup;
		bool need_wakeup = false;

		lockdep_assert_held(&rbd_dev->lock_rwsem);
		spin_lock(&rbd_dev->lock_lists_lock);
		rbd_assert(!list_empty(&img_req->lock_item));
		if (!list_empty(&img_req->lock_item)) {
		list_del_init(&img_req->lock_item);
		need_wakeup = (rbd_dev->lock_state == RBD_LOCK_STATE_RELEASING &&
		list_empty(&rbd_dev->running_list));
		}
		spin_unlock(&rbd_dev->lock_lists_lock);
		if (need_wakeup)
		complete(&rbd_dev->releasing_wait);
		@@ -3842,14 +3843,19 @@ static void wake_lock_waiters(struct rbd_device *rbd_dev, int result)
		return;
		}

		list_for_each_entry(img_req, &rbd_dev->acquiring_list, lock_item) {
		while (!list_empty(&rbd_dev->acquiring_list)) {
		img_req = list_first_entry(&rbd_dev->acquiring_list,
		struct rbd_img_request, lock_item);
		mutex_lock(&img_req->state_mutex);
		rbd_assert(img_req->state == RBD_IMG_EXCLUSIVE_LOCK);
		if (!result)
		list_move_tail(&img_req->lock_item,
		&rbd_dev->running_list);
		else
		list_del_init(&img_req->lock_item);
		rbd_img_schedule(img_req, result);
		mutex_unlock(&img_req->state_mutex);
		}

		list_splice_tail_init(&rbd_dev->acquiring_list, &rbd_dev->running_list);
		}

		static bool locker_equal(const struct ceph_locker *lhs,
		@@ -5326,7 +5332,7 @@ static void rbd_dev_release(struct device *dev)

		if (need_put) {
		destroy_workqueue(rbd_dev->task_wq);
		ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
		ida_free(&rbd_dev_id_ida, rbd_dev->dev_id);
		}

		rbd_dev_free(rbd_dev);
		@@ -5402,8 +5408,8 @@ static struct rbd_device rbd_dev_create(struct rbd_client rbdc,
		return NULL;

		/* get an id and fill in device name */
		rbd_dev->dev_id = ida_simple_get(&rbd_dev_id_ida, 0,
		minor_to_rbd_dev_id(1 << MINORBITS),
		rbd_dev->dev_id = ida_alloc_max(&rbd_dev_id_ida,
		minor_to_rbd_dev_id(1 << MINORBITS) - 1,
		GFP_KERNEL);
		if (rbd_dev->dev_id < 0)
		goto fail_rbd_dev;
		@@ -5425,7 +5431,7 @@ static struct rbd_device rbd_dev_create(struct rbd_client rbdc,
		return rbd_dev;

		fail_dev_id:
		ida_simple_remove(&rbd_dev_id_ida, rbd_dev->dev_id);
		ida_free(&rbd_dev_id_ida, rbd_dev->dev_id);
		fail_rbd_dev:
		rbd_dev_free(rbd_dev);
		return NULL;