Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12768c1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.5-rc1' of... 

Merge tag 'linux-kselftest-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest updates from Shuah Khan:
 "This 14 patch update:

   - adds a new test for intel_pstate driver
   - adds empty string and async test cases to firmware class tests
   - fixes and cleans up several existing tests"

* tag 'linux-kselftest-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: firmware: add empty string and async tests
  firmware: actually return NULL on failed request_firmware_nowait()
  test: firmware_class: add asynchronous request trigger
  test: firmware_class: use kstrndup() where appropriate
  test: firmware_class: report errors properly on failure
  selftests/seccomp: fix 32-bit build warnings
  add breakpoints/.gitignore
  add ptrace/.gitignore
  update .gitignore in selftests/timers
  update .gitignore in selftests/vm
  tools, testing, add test for intel_pstate driver
  selftest/ipc: actually test it
  selftests/capabilities: actually test it
  selftests/capabilities: clean up for Makefile
parents a4eff16c 1b1fe542

drivers/base/firmware_class.c

+5 −3
Original line number Diff line number Diff line
@@ -1118,15 +1118,17 @@ static int 
_request_firmware(const struct firmware **firmware_p, const char *name,

		  struct device *device, unsigned int opt_flags)

{

	struct firmware *fw;

	struct firmware *fw = NULL;

	long timeout;

	int ret;



	if (!firmware_p)

		return -EINVAL;



	if (!name || name[0] == '\0')

		return -EINVAL;

	if (!name || name[0] == '\0') {

		ret = -EINVAL;

		goto out;

	}



	ret = _request_firmware_prepare(&fw, name, device);

	if (ret <= 0) /* error or already assigned */

lib/test_firmware.c

+74 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/printk.h>

#include <linux/completion.h>

#include <linux/firmware.h>

#include <linux/device.h>

#include <linux/fs.h>
@@ -54,10 +55,9 @@ static ssize_t trigger_request_store(struct device *dev, 
	int rc;

	char *name;



	name = kzalloc(count + 1, GFP_KERNEL);

	name = kstrndup(buf, count, GFP_KERNEL);

	if (!name)

		return -ENOSPC;

	memcpy(name, buf, count);



	pr_info("loading '%s'\n", name);
@@ -65,17 +65,73 @@ static ssize_t trigger_request_store(struct device *dev, 
	release_firmware(test_firmware);

	test_firmware = NULL;

	rc = request_firmware(&test_firmware, name, dev);

	if (rc)

	if (rc) {

		pr_info("load of '%s' failed: %d\n", name, rc);

	pr_info("loaded: %zu\n", test_firmware ? test_firmware->size : 0);

		goto out;

	}

	pr_info("loaded: %zu\n", test_firmware->size);

	rc = count;



out:

	mutex_unlock(&test_fw_mutex);



	kfree(name);



	return count;

	return rc;

}

static DEVICE_ATTR_WO(trigger_request);



static DECLARE_COMPLETION(async_fw_done);



static void trigger_async_request_cb(const struct firmware *fw, void *context)

{

	test_firmware = fw;

	complete(&async_fw_done);

}



static ssize_t trigger_async_request_store(struct device *dev,

					   struct device_attribute *attr,

					   const char *buf, size_t count)

{

	int rc;

	char *name;



	name = kstrndup(buf, count, GFP_KERNEL);

	if (!name)

		return -ENOSPC;



	pr_info("loading '%s'\n", name);



	mutex_lock(&test_fw_mutex);

	release_firmware(test_firmware);

	test_firmware = NULL;

	rc = request_firmware_nowait(THIS_MODULE, 1, name, dev, GFP_KERNEL,

				     NULL, trigger_async_request_cb);

	if (rc) {

		pr_info("async load of '%s' failed: %d\n", name, rc);

		kfree(name);

		goto out;

	}

	/* Free 'name' ASAP, to test for race conditions */

	kfree(name);



	wait_for_completion(&async_fw_done);



	if (test_firmware) {

		pr_info("loaded: %zu\n", test_firmware->size);

		rc = count;

	} else {

		pr_err("failed to async load firmware\n");

		rc = -ENODEV;

	}



out:

	mutex_unlock(&test_fw_mutex);



	return rc;

}

static DEVICE_ATTR_WO(trigger_async_request);



static int __init test_firmware_init(void)

{

	int rc;
@@ -92,9 +148,20 @@ static int __init test_firmware_init(void) 
		goto dereg;

	}



	rc = device_create_file(test_fw_misc_device.this_device,

				&dev_attr_trigger_async_request);

	if (rc) {

		pr_err("could not create async sysfs interface: %d\n", rc);

		goto remove_file;

	}



	pr_warn("interface ready\n");



	return 0;



remove_file:

	device_remove_file(test_fw_misc_device.this_device,

			   &dev_attr_trigger_async_request);

dereg:

	misc_deregister(&test_fw_misc_device);

	return rc;
@@ -105,6 +172,8 @@ module_init(test_firmware_init); 
static void __exit test_firmware_exit(void)

{

	release_firmware(test_firmware);

	device_remove_file(test_fw_misc_device.this_device,

			   &dev_attr_trigger_async_request);

	device_remove_file(test_fw_misc_device.this_device,

			   &dev_attr_trigger_request);

	misc_deregister(&test_fw_misc_device);

tools/testing/selftests/Makefile

+2 −0
Original line number Diff line number Diff line 
TARGETS = breakpoints

TARGETS += capabilities

TARGETS += cpu-hotplug

TARGETS += efivarfs

TARGETS += exec

TARGETS += firmware

TARGETS += ftrace

TARGETS += futex

TARGETS += ipc

TARGETS += kcmp

TARGETS += lib

TARGETS += membarrier

tools/testing/selftests/breakpoints/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
breakpoint_test

tools/testing/selftests/capabilities/Makefile

+9 −12
Original line number Diff line number Diff line 
all:



include ../lib.mk



.PHONY: all clean



TARGETS := validate_cap test_execve

TEST_FILES := validate_cap

TEST_PROGS := test_execve



CFLAGS := -O2 -g -std=gnu99 -Wall -lcap-ng

BINARIES := $(TEST_FILES) $(TEST_PROGS)



all: $(TARGETS)

CFLAGS += -O2 -g -std=gnu99 -Wall

LDLIBS += -lcap-ng -lrt -ldl



all: $(BINARIES)



clean:

	$(RM) $(TARGETS)

	$(RM) $(BINARIES)



include ../lib.mk

$(TARGETS): %: %.c

	$(CC) -o $@ $(CFLAGS) $(EXTRA_CFLAGS) $^ -lrt -ldl