mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-20 11:36:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sys_fs: Lock dev_hdd1 mount point at cellSysCacheClear

Browse source
This commit is contained in:
Eladash 2020-04-04 20:06:36 +03:00 • committed by Ani
parent a178374052
commit 0b24b09a06
4 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/Cell/Modules/cellFs.cpp
View file

@ -863,12 +863,6 @@ s32 cellFsStReadWaitCallback(u32 fd, u64 size, vm::ptr<void(s32 xfd, u64 xsize)>
using fs_aio_cb_t = vm::ptr<void(vm::ptr<CellFsAio> xaio, s32 error, s32 xid, u64 size)>;
// temporarily
struct lv2_fs_mount_point
{
std::mutex mutex;
};
struct fs_aio_thread : ppu_thread
{
using ppu_thread::ppu_thread;

4
rpcs3/Emu/Cell/Modules/cellSysCache.cpp
View file

@ -28,6 +28,8 @@ void fmt_class_string<CellSysCacheError>::format(std::string& out, u64 arg)
});
}
extern lv2_fs_mount_point g_mp_sys_dev_hdd1;
struct syscache_info
{
const std::string cache_root = Emu.GetHdd1Dir() + "/caches/";
@ -77,6 +79,8 @@ struct syscache_info
// Poison opened files in /dev_hdd1 to return CELL_EIO on access
if (remove_root)
{
std::lock_guard lock(g_mp_sys_dev_hdd1.mutex);
idm::select<lv2_fs_object, lv2_file>([](u32 id, lv2_file& file)
{
if (std::memcmp("/dev_hdd1", file.name.data(), 9) == 0)

13
rpcs3/Emu/Cell/lv2/sys_fs.cpp
View file

@ -10,15 +10,6 @@
LOG_CHANNEL(sys_fs);
struct lv2_fs_mount_point
{
const u32 sector_size = 512;
const u32 block_size = 4096;
const bs_t<lv2_mp_flag> flags{};
shared_mutex mutex;
};
lv2_fs_mount_point g_mp_sys_dev_hdd0;
lv2_fs_mount_point g_mp_sys_dev_hdd1{512, 32768, lv2_mp_flag::no_uid_gid};
lv2_fs_mount_point g_mp_sys_dev_usb{512, 4096, lv2_mp_flag::no_uid_gid};
@ -1277,14 +1268,14 @@ error_code sys_fs_fcntl(ppu_thread& ppu, u32 fd, u32 op, vm::ptr<void> _arg, u32
fs::file stream;
stream.reset(std::move(sdata_file));
if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&]() -> std::shared_ptr<lv2_file>
if (const u32 id = idm::import<lv2_fs_object, lv2_file>([&file = *file, &stream = stream]() -> std::shared_ptr<lv2_file>
{
if (!g_fxo->get<loaded_npdrm_keys>()->npdrm_fds.try_inc(16))
{
return nullptr;
}
return std::make_shared<lv2_file>(*file, std::move(stream), file->mode, file->flags, lv2_file_type::npdrm);
return std::make_shared<lv2_file>(file, std::move(stream), file.mode, file.flags, lv2_file_type::npdrm);
}))
{
arg->out_code = CELL_OK;

12
rpcs3/Emu/Cell/lv2/sys_fs.h
View file

@ -3,6 +3,7 @@
#include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h"
#include "Utilities/File.h"
#include "Utilities/mutex.h"
#include <string>
@ -121,8 +122,6 @@ struct FsMselfEntry
u8 m_reserve[16];
};
struct lv2_fs_mount_point;
enum class lv2_mp_flag
{
read_only,
@ -138,6 +137,15 @@ enum class lv2_file_type
npdrm,
};
struct lv2_fs_mount_point
{
const u32 sector_size = 512;
const u32 block_size = 4096;
const bs_t<lv2_mp_flag> flags{};
shared_mutex mutex;
};
struct lv2_fs_object
{
using id_type = lv2_fs_object;