zishuo/ascend-docker-runtime
1
0
Fork 0
mirror of https://github.com/Ascend/ascend-docker-runtime.git synced 2025-10-18 18:00:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Match-id-211a5acee295801abbb9cb3fd85a2877e35002ed

Browse Source
This commit is contained in:
BianTanggui
2020-06-01 10:09:17 +08:00
parent f251af69a1
commit 396df6e2ea
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/src/main.c
View File

@@ -20,6 +20,7 @@
#define DAVINCI_MANAGER_PATH "/dev/davinci_manager" #define DAVINCI_MANAGER_PATH "/dev/davinci_manager"
#define DEVMM_SVM_PATH "/dev/devmm_svm" #define DEVMM_SVM_PATH "/dev/devmm_svm"
#define HISI_HDC_PATH "/dev/hisi_hdc" #define HISI_HDC_PATH "/dev/hisi_hdc"
#define ASCEND_DRIVER_PATH "/usr/local/Ascend/driver"
#define DEFAULT_DIR_MODE 0755 #define DEFAULT_DIR_MODE 0755
#define BUF_SIZE 1024 #define BUF_SIZE 1024
#define ALLOW_PATH "/devices.allow" #define ALLOW_PATH "/devices.allow"
@@ -309,6 +310,18 @@ int DoCtrlDeviceMounting(const char *rootfs)
return 0; return 0;
} }
int DoDirectoryMounting(const char *rootfs)
{
/* directory */
unsigned long reMountRwFlag = MS_BIND | MS_REMOUNT | MS_RDONLY | MS_NODEV | MS_NOSUID;
int ret = MountFiles(rootfs, ASCEND_DRIVER_PATH, reMountRwFlag);
if (ret < 0) {
fprintf(stderr, "error: failed to do mount %s\n", ASCEND_DRIVER_PATH);
return -1;
}
return 0;
}
int DoMounting(const struct CmdArgs *args) int DoMounting(const struct CmdArgs *args)
{ {
int ret; int ret;
@@ -325,6 +338,12 @@ int DoMounting(const struct CmdArgs *args)
return -1; return -1;
} }
ret = DoDirectoryMounting(args->rootfs);
if (ret < 0) {
fprintf(stderr, "error: failed to do mount directory\n");
return -1;
}
return 0; return 0;
} }

22
cli/test/testcase/gtest_mytestcase.cpp
View File

@@ -46,6 +46,7 @@ extern "C" int SetupCgroup(struct CmdArgs *args, const char *cgroupPath);
extern "C" int SetupMounts(struct CmdArgs *args); extern "C" int SetupMounts(struct CmdArgs *args);
extern "C" void FreeCmdArgs(struct CmdArgs *args); extern "C" void FreeCmdArgs(struct CmdArgs *args);
extern "C" int Process(int argc, char **argv); extern "C" int Process(int argc, char **argv);
extern "C" int DoMounting(const struct CmdArgs *args);
struct CmdArgs { struct CmdArgs {
char *devices; char *devices;
@@ -105,6 +106,11 @@ int Stub_DoCtrlDeviceMounting_Success(const char *rootfs)
return 0; return 0;
} }
int Stub_DoMounting_Success(const struct CmdArgs *args)
{
return 0;
}
int Stub_SetupCgroup_Success(struct CmdArgs *args, const char *cgroupPath) int Stub_SetupCgroup_Success(struct CmdArgs *args, const char *cgroupPath)
{ {
return 0; return 0;
@@ -647,6 +653,22 @@ TEST(SetupMounts, Status6)
MOCKER(EnterNsByFd).stubs().will(invoke(Stub_EnterNsByFd_Success)); MOCKER(EnterNsByFd).stubs().will(invoke(Stub_EnterNsByFd_Success));
int ret = SetupMounts(&args); int ret = SetupMounts(&args);
GlobalMockObject::verify(); GlobalMockObject::verify();
EXPECT_EQ(-1, ret);
}
TEST(SetupMounts, Status7)
{
struct CmdArgs args = {
.devices = "1,2",
.rootfs = "/home",
.pid = 1
};
MOCKER(EnterNsByPath).stubs().will(invoke(Stub_EnterNsByPath_Success));
MOCKER(DoMounting).stubs().will(invoke(Stub_DoMounting_Success));
MOCKER(SetupCgroup).stubs().will(invoke(Stub_SetupCgroup_Success));
MOCKER(EnterNsByFd).stubs().will(invoke(Stub_EnterNsByFd_Success));
int ret = SetupMounts(&args);
GlobalMockObject::verify();
EXPECT_EQ(0, ret); EXPECT_EQ(0, ret);
} }