gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xpmem: Add xpmem_openat

Browse Source 
In arm64, glibc-open of /dev/xpmem is hooked in sys_openat. This
commit adds xpmem_openat which is called by sys_openat.
This commit silently applies copy_from_user fix to sys_open as well.

Change-Id: I3b4f7bf0e152c359250bb2b56910db9192390cb1
Fujitsu: POSTK_DEBUG_ARCH_DEP_46, POSTK_DEBUG_ARCH_DEP_62
This commit is contained in:
Masamichi Takagi
2018-10-26 15:51:53 +09:00
committed by Dominique Martinet
parent e12d5ed341
commit 04c11f35e9
6 changed files with 83 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
kernel/xpmem.c
View File

@@ -36,9 +36,7 @@
struct xpmem_partition *xpmem_my_part = NULL; /* pointer to this partition */
#if defined(POSTK_DEBUG_ARCH_DEP_46) || defined(POSTK_DEBUG_ARCH_DEP_62)
int xpmem_open(int num, const char *pathname,
static int do_xpmem_open(int syscall_num, const char *pathname,
int flags, ihk_mc_user_context_t *ctx)
{
int ret;
@@ -48,23 +46,8 @@ int xpmem_open(int num, const char *pathname,
struct mckfd *mckfd;
long irqstate;
XPMEM_DEBUG("call: syscall_num=%d, pathname=%s, flags=%d", num, pathname, flags);
#else /* POSTK_DEBUG_ARCH_DEP_46 || POSTK_DEBUG_ARCH_DEP_62 */
int xpmem_open(
ihk_mc_user_context_t *ctx)
{
const char *pathname = (const char *)ihk_mc_syscall_arg0(ctx);
int flags = (int)ihk_mc_syscall_arg1(ctx);
int ret;
struct thread *thread = cpu_local_var(current);
struct process *proc = thread->proc;
struct syscall_request request IHK_DMA_ALIGN;
int fd;
struct mckfd *mckfd;
long irqstate;
XPMEM_DEBUG("call: pathname=%s, flags=%d", pathname, flags);
#endif /* POSTK_DEBUG_ARCH_DEP_46 || POSTK_DEBUG_ARCH_DEP_62 */
XPMEM_DEBUG("call: syscall_num=%d, pathname=%s, flags=%d",
syscall_num, pathname, flags);
if (!xpmem_my_part) {
ret = xpmem_init();
@@ -73,22 +56,11 @@ int xpmem_open(
}
}
#ifdef POSTK_DEBUG_ARCH_DEP_62 /* Absorb the difference between open and openat args. */
fd = syscall_generic_forwarding(num, ctx);
fd = syscall_generic_forwarding(syscall_num, ctx);
if(fd < 0){
XPMEM_DEBUG("syscall_num=%d error: fd=%d", num, fd);
XPMEM_DEBUG("syscall_num=%d error: fd=%d", syscall_num, fd);
return fd;
}
#else /* POSTK_DEBUG_ARCH_DEP_62 */
request.number = __NR_open;
request.args[0] = (unsigned long)pathname;
request.args[1] = flags;
fd = do_syscall(&request, ihk_mc_get_processor_id());
if (fd < 0) {
XPMEM_DEBUG("__NR_open error: fd=%d", fd);
return fd;
}
#endif /* POSTK_DEBUG_ARCH_DEP_62 */
ret = __xpmem_open();
if (ret) {
@@ -129,6 +101,17 @@ int xpmem_open(
return mckfd->fd;
}
int xpmem_open(const char *pathname,
int flags, ihk_mc_user_context_t *ctx)
{
return do_xpmem_open(__NR_open, pathname, flags, ctx);
}
int xpmem_openat(const char *pathname,
int flags, ihk_mc_user_context_t *ctx)
{
return do_xpmem_open(__NR_openat, pathname, flags, ctx);
}
static int xpmem_ioctl(
struct mckfd *mckfd,
@@ -2127,7 +2110,7 @@ static void xpmem_unpin_pages(
}
static struct xpmem_thread_group * __xpmem_tg_ref_by_tgid_nolock_internal(
static struct xpmem_thread_group *__xpmem_tg_ref_by_tgid_nolock_internal(
pid_t tgid,
int index,
int return_destroying)
@@ -2152,7 +2135,7 @@ static struct xpmem_thread_group * __xpmem_tg_ref_by_tgid_nolock_internal(
}
static struct xpmem_thread_group * xpmem_tg_ref_by_segid(
static struct xpmem_thread_group *xpmem_tg_ref_by_segid(
xpmem_segid_t segid)
{
struct xpmem_thread_group *tg;
@@ -2163,7 +2146,7 @@ static struct xpmem_thread_group * xpmem_tg_ref_by_segid(
}
static struct xpmem_thread_group * xpmem_tg_ref_by_apid(
static struct xpmem_thread_group *xpmem_tg_ref_by_apid(
xpmem_apid_t apid)
{
struct xpmem_thread_group *tg;
@@ -2215,8 +2198,7 @@ static struct xpmem_segment * xpmem_seg_ref_by_segid(
}
static void xpmem_seg_deref(
struct xpmem_segment *seg)
static void xpmem_seg_deref(struct xpmem_segment *seg)
{
DBUG_ON(ihk_atomic_read(&seg->refcnt) <= 0);
if (ihk_atomic_dec_return(&seg->refcnt) != 0) {
@@ -2262,8 +2244,7 @@ static struct xpmem_access_permit * xpmem_ap_ref_by_apid(
}
static void xpmem_ap_deref(
struct xpmem_access_permit *ap)
static void xpmem_ap_deref(struct xpmem_access_permit *ap)
{
DBUG_ON(ihk_atomic_read(&ap->refcnt) <= 0);
if (ihk_atomic_dec_return(&ap->refcnt) != 0) {
@@ -2278,8 +2259,7 @@ static void xpmem_ap_deref(
}
static void xpmem_att_deref(
struct xpmem_attachment *att)
static void xpmem_att_deref(struct xpmem_attachment *att)
{
DBUG_ON(ihk_atomic_read(&att->refcnt) <= 0);
if (ihk_atomic_dec_return(&att->refcnt) != 0) {