diff --git a/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp b/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp index 6be70d10cf..bcee682051 100644 --- a/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp +++ b/level_zero/sysman/test/unit_tests/sources/events/linux/test_zes_events.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2023 Intel Corporation + * Copyright (C) 2023-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1141,7 +1141,7 @@ TEST_F(SysmanEventsFixture, GivenEventsAreRegisteredWhenEventRegisterIsCalledAga } TEST_F(SysmanEventsFixture, GivenWriteSystemCallReturnsFailureWhenEventRegisterIsCalledThenSuccessIsReturned) { - VariableBackup mockWrite(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup mockWrite(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return -1; }); diff --git a/level_zero/tools/test/unit_tests/sources/sysman/events/linux/test_zes_events.cpp b/level_zero/tools/test/unit_tests/sources/sysman/events/linux/test_zes_events.cpp index d4ba3e6882..ea8619b684 100644 --- a/level_zero/tools/test/unit_tests/sources/sysman/events/linux/test_zes_events.cpp +++ b/level_zero/tools/test/unit_tests/sources/sysman/events/linux/test_zes_events.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2023 Intel Corporation + * Copyright (C) 2020-2024 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -1095,7 +1095,7 @@ TEST_F(SysmanEventsFixture, GivenEventsAreRegisteredWhenEventRegisterIsCalledAga } TEST_F(SysmanEventsFixture, GivenWriteSystemCallReturnsFailureWhenEventRegisterIsCalledThenSuccessIsReturned) { - VariableBackup mockWrite(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup mockWrite(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return -1; }); diff --git a/shared/source/os_interface/linux/sys_calls.h b/shared/source/os_interface/linux/sys_calls.h index 4e5e724d3f..37c38ceb38 100644 --- a/shared/source/os_interface/linux/sys_calls.h +++ b/shared/source/os_interface/linux/sys_calls.h @@ -34,7 +34,7 @@ ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset); void *mmap(void *addr, size_t size, int prot, int flags, int fd, off_t off) noexcept; int munmap(void *addr, size_t size) noexcept; ssize_t read(int fd, void *buf, size_t count); -ssize_t write(int fd, void *buf, size_t count); +ssize_t write(int fd, const void *buf, size_t count); int fcntl(int fd, int cmd); int fcntl(int fd, int cmd, int arg); char *realpath(const char *path, char *buf); diff --git a/shared/source/os_interface/linux/sys_calls_linux.cpp b/shared/source/os_interface/linux/sys_calls_linux.cpp index ab71610d1e..e7505ac5e2 100644 --- a/shared/source/os_interface/linux/sys_calls_linux.cpp +++ b/shared/source/os_interface/linux/sys_calls_linux.cpp @@ -131,7 +131,7 @@ ssize_t read(int fd, void *buf, size_t count) { return ::read(fd, buf, count); } -ssize_t write(int fd, void *buf, size_t count) { +ssize_t write(int fd, const void *buf, size_t count) { return ::write(fd, buf, count); } diff --git a/shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp b/shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp index a8848607f1..29769be53c 100644 --- a/shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp +++ b/shared/test/common/os_interface/linux/sys_calls_linux_ult.cpp @@ -86,7 +86,7 @@ int (*sysCallsReadlink)(const char *path, char *buf, size_t bufsize) = nullptr; int (*sysCallsIoctl)(int fileDescriptor, unsigned long int request, void *arg) = nullptr; int (*sysCallsPoll)(struct pollfd *pollFd, unsigned long int numberOfFds, int timeout) = nullptr; ssize_t (*sysCallsRead)(int fd, void *buf, size_t count) = nullptr; -ssize_t (*sysCallsWrite)(int fd, void *buf, size_t count) = nullptr; +ssize_t (*sysCallsWrite)(int fd, const void *buf, size_t count) = nullptr; int (*sysCallsPipe)(int pipeFd[2]) = nullptr; int (*sysCallsFstat)(int fd, struct stat *buf) = nullptr; char *(*sysCallsRealpath)(const char *path, char *buf) = nullptr; @@ -345,7 +345,7 @@ ssize_t read(int fd, void *buf, size_t count) { return 0; } -ssize_t write(int fd, void *buf, size_t count) { +ssize_t write(int fd, const void *buf, size_t count) { if (sysCallsWrite != nullptr) { return sysCallsWrite(fd, buf, count); } diff --git a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h index e5c8706cab..508d723851 100644 --- a/shared/test/common/os_interface/linux/sys_calls_linux_ult.h +++ b/shared/test/common/os_interface/linux/sys_calls_linux_ult.h @@ -29,7 +29,7 @@ extern int (*sysCallsReadlink)(const char *path, char *buf, size_t bufsize); extern int (*sysCallsIoctl)(int fileDescriptor, unsigned long int request, void *arg); extern int (*sysCallsPoll)(struct pollfd *pollFd, unsigned long int numberOfFds, int timeout); extern ssize_t (*sysCallsRead)(int fd, void *buf, size_t count); -extern ssize_t (*sysCallsWrite)(int fd, void *buf, size_t count); +extern ssize_t (*sysCallsWrite)(int fd, const void *buf, size_t count); extern int (*sysCallsPipe)(int pipeFd[2]); extern int (*sysCallsFstat)(int fd, struct stat *buf); extern char *(*sysCallsRealpath)(const char *path, char *buf); diff --git a/shared/test/unit_test/os_interface/linux/ccs_mode_tests.cpp b/shared/test/unit_test/os_interface/linux/ccs_mode_tests.cpp index 2451ceffee..e195245db3 100644 --- a/shared/test/unit_test/os_interface/linux/ccs_mode_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/ccs_mode_tests.cpp @@ -19,7 +19,7 @@ extern std::map> directoryFilesMap; static uint32_t ccsMode = 1u; -static ssize_t mockWrite(int fd, void *buf, size_t count) { +static ssize_t mockWrite(int fd, const void *buf, size_t count) { std::memcpy(&ccsMode, buf, count); return count; } @@ -40,7 +40,7 @@ TEST(CcsModeTest, GivenInvalidCcsModeWhenConfigureCcsModeIsCalledThenVerifyCcsMo return 1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); }); @@ -82,7 +82,7 @@ TEST(CcsModeTest, GivenValidCcsModeWhenConfigureCcsModeIsCalledThenVerifyCcsMode return 1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); }); @@ -113,7 +113,7 @@ TEST(CcsModeTest, GivenValidCcsModeAndOpenSysCallFailsWhenConfigureCcsModeIsCall return -1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); }); @@ -144,7 +144,7 @@ TEST(CcsModeTest, GivenValidCcsModeAndOpenSysCallFailsWithNoPermissionsWhenConfi return -1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); }); @@ -185,7 +185,7 @@ TEST(CcsModeTest, GivenValidCcsModeAndOpenSysCallFailsWithNoAccessWhenConfigureC return -1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); }); @@ -226,7 +226,7 @@ TEST(CcsModeTest, GivenNumCCSFlagSetToCurrentConfigurationWhenConfigureCcsModeIs }); SysCalls::writeFuncCalled = 0u; - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { SysCalls::writeFuncCalled++; return mockWrite(fd, buf, count); }); @@ -260,7 +260,7 @@ TEST(CcsModeTest, GivenNumCCSFlagSetToCurrentConfigurationAndReadSysCallFailsWhe }); SysCalls::writeFuncCalled = 0u; - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { SysCalls::writeFuncCalled++; return mockWrite(fd, buf, count); }); @@ -293,7 +293,7 @@ TEST(CcsModeTest, GivenValidCcsModeAndWriteSysCallFailsWhenConfigureCcsModeIsCal }); SysCalls::writeFuncCalled = 0u; - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { SysCalls::writeFuncCalled++; errno = -EAGAIN; return -1; @@ -328,7 +328,7 @@ TEST(CcsModeTest, GivenWriteSysCallFailsWithEbusyForFirstTimeWhenConfigureCcsMod }); SysCalls::writeFuncCalled = 0u; - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { if (SysCalls::writeFuncCalled++ == 0u) { errno = -EBUSY; return -1; @@ -375,7 +375,7 @@ TEST(CcsModeTest, GivenValidCcsModeAndOpenCallFailsOnRestoreWhenConfigureCcsMode return -1; }); - VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, void *buf, size_t count) -> ssize_t { + VariableBackup writeBackup(&SysCalls::sysCallsWrite, [](int fd, const void *buf, size_t count) -> ssize_t { return mockWrite(fd, buf, count); });