xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'akpm' (patches from Andrew)

Browse Source 
Merge more updates from Andrew Morton:

 - most of the rest of MM

 - a small number of misc things

 - lib/ updates

 - checkpatch

 - autofs updates

 - ipc/ updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (126 commits)
  ipc: optimize semget/shmget/msgget for lots of keys
  ipc/sem: play nicer with large nsops allocations
  ipc/sem: drop sem_checkid helper
  ipc: convert kern_ipc_perm.refcount from atomic_t to refcount_t
  ipc: convert sem_undo_list.refcnt from atomic_t to refcount_t
  ipc: convert ipc_namespace.count from atomic_t to refcount_t
  kcov: support compat processes
  sh: defconfig: cleanup from old Kconfig options
  mn10300: defconfig: cleanup from old Kconfig options
  m32r: defconfig: cleanup from old Kconfig options
  drivers/pps: use surrounding "if PPS" to remove numerous dependency checks
  drivers/pps: aesthetic tweaks to PPS-related content
  cpumask: make cpumask_next() out-of-line
  kmod: move #ifdef CONFIG_MODULES wrapper to Makefile
  kmod: split off umh headers into its own file
  MAINTAINERS: clarify kmod is just a kernel module loader
  kmod: split out umh code into its own file
  test_kmod: flip INT checks to be consistent
  test_kmod: remove paranoid UINT_MAX check on uint range processing
  vfat: deduplicate hex2bin()
  ...
This commit is contained in:
Linus Torvalds
2017-09-09 10:30:07 -07:00
parent c054be10ff 0cfb6aee70
commit fbf4432ff7
271 changed files with 7223 additions and 2012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tools/testing/selftests/kcmp/kcmp_test.c
View File

@@ -8,7 +8,6 @@
#include <errno.h>
#include <string.h>
#include <fcntl.h>
#include <linux/unistd.h>
#include <linux/kcmp.h>
@@ -16,20 +15,28 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/epoll.h>
#include "../kselftest.h"
static long sys_kcmp(int pid1, int pid2, int type, int fd1, int fd2)
static long sys_kcmp(int pid1, int pid2, int type, unsigned long fd1, unsigned long fd2)
{
return syscall(__NR_kcmp, pid1, pid2, type, fd1, fd2);
}
static const unsigned int duped_num = 64;
int main(int argc, char **argv)
{
const char kpath[] = "kcmp-test-file";
struct kcmp_epoll_slot epoll_slot;
struct epoll_event ev;
int pid1, pid2;
int pipefd[2];
int fd1, fd2;
int epollfd;
int status;
int fddup;
fd1 = open(kpath, O_RDWR | O_CREAT | O_TRUNC, 0644);
pid1 = getpid();
@@ -39,6 +46,37 @@ int main(int argc, char **argv)
ksft_exit_fail();
}
if (pipe(pipefd)) {
perror("Can't create pipe");
ksft_exit_fail();
}
epollfd = epoll_create1(0);
if (epollfd < 0) {
perror("epoll_create1 failed");
ksft_exit_fail();
}
memset(&ev, 0xff, sizeof(ev));
ev.events = EPOLLIN | EPOLLOUT;
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, pipefd[0], &ev)) {
perror("epoll_ctl failed");
ksft_exit_fail();
}
fddup = dup2(pipefd[1], duped_num);
if (fddup < 0) {
perror("dup2 failed");
ksft_exit_fail();
}
if (epoll_ctl(epollfd, EPOLL_CTL_ADD, fddup, &ev)) {
perror("epoll_ctl failed");
ksft_exit_fail();
}
close(fddup);
pid2 = fork();
if (pid2 < 0) {
perror("fork failed");
@@ -95,6 +133,24 @@ int main(int argc, char **argv)
ksft_inc_pass_cnt();
}
/* Compare epoll target */
epoll_slot = (struct kcmp_epoll_slot) {
.efd = epollfd,
.tfd = duped_num,
.toff = 0,
};
ret = sys_kcmp(pid1, pid1, KCMP_EPOLL_TFD, pipefd[1],
(unsigned long)(void *)&epoll_slot);
if (ret) {
printf("FAIL: 0 expected but %d returned (%s)\n",
ret, strerror(errno));
ksft_inc_fail_cnt();
ret = -1;
} else {
printf("PASS: 0 returned as expected\n");
ksft_inc_pass_cnt();
}
ksft_print_cnts();
if (ret)