Draft: Rnou/fix verbs

Ramon Nourequested to merge
rnou/fix_verbs into master

Merge request reports

include/config.hpp

+1 −0
Changes for include/config.hpp: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ namespace io { 
 * If buffer is not zeroed, sparse regions contain invalid data.

 */

constexpr auto zero_buffer_before_read = false;

constexpr auto enable_chunk_read_before_write = true;

/*

 * When the daemon handler serves a read request, it starts tasklets (for each

 * chunk) from the io pool to read all chunks of that read request in parallel.

src/client/gkfs_functions.cpp

+55 −0
Changes for src/client/gkfs_functions.cpp: 55 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1104,8 +1104,63 @@ gkfs_do_write(gkfs::filemap::OpenFile& file, const char* buf, size_t count, 
       count > gkfs::config::proxy::fwd_io_count_threshold) {

        ret_write = gkfs::rpc::forward_write_proxy(*path, buf, offset, count);

    } else {

        // If we are going to write chunk 0 (0 to chunksize), with an offset >

        // 0, and we are using ofi+verbs Do a forward_read from 0 to offset,

        // concat read buffer (0..offset) with the rest of the chunk and write

        // the first chunk. Then do a forward write of the rest of the data.

        if(gkfs::config::io::enable_chunk_read_before_write &&

           offset > 0 &&

           offset < gkfs::config::rpc::chunksize &&

           gkfs::config::rpc::chunksize < count) {

            // Read the first chunk

            char* read_buf = new char[offset];

            std::set<int8_t> failed;

            auto ret_read = gkfs::rpc::forward_read(*path, read_buf, 0, offset,

                                                    0, failed);

            if(ret_read.first != 0) {

                LOG(ERROR, "Failed to read first chunk for RMW: {}",

                    ret_read.first);

                delete[] read_buf;

                errno = ret_read.first;

                return -1;

            }



            // Create a new buffer for the first chunk write

            char* first_chunk_write_buf =

                    new char[gkfs::config::rpc::chunksize];

            // Copy existing data up to offset

            memcpy(first_chunk_write_buf, read_buf, offset);

            // Copy new data into the first chunk

            memcpy(first_chunk_write_buf + offset, buf,

                   gkfs::config::rpc::chunksize - offset);



            // Write the first chunk

            ret_write =

                    gkfs::rpc::forward_write(*path, first_chunk_write_buf, 0,

                                             gkfs::config::rpc::chunksize, 0);

            delete[] read_buf;

            delete[] first_chunk_write_buf;



            if(ret_write.first != 0) {

                LOG(ERROR, "Failed to write first chunk during RMW: {}",

                    ret_write.first);

                errno = ret_write.first;

                return -1;

            }



            // Write the rest of the data

            if(count > gkfs::config::rpc::chunksize) {

                ret_write = gkfs::rpc::forward_write(

                        *path, buf + (gkfs::config::rpc::chunksize - offset),

                        gkfs::config::rpc::chunksize,

                        count - (gkfs::config::rpc::chunksize - offset), 0);

            }

        } else {





            ret_write = gkfs::rpc::forward_write(*path, buf, offset, count, 0);

        }

    }

    err = ret_write.first;

    write_size = ret_write.second;

src/client/intercept.cpp

+7 −0
Changes for src/client/intercept.cpp: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1031,6 +1031,13 @@ hook_forwarded_syscall(long syscall_number, long arg0, long arg1, long arg2, 
    pthread_setspecific(reentrance_guard_key, (void*) 1);





    pthread_once(&key_once_control, make_key);

    if(pthread_getspecific(reentrance_guard_key) != NULL) {

        return;

    }

    pthread_setspecific(reentrance_guard_key, (void*) 1);





    if(::get_current_syscall_info() == gkfs::syscall::no_info) {

        pthread_setspecific(reentrance_guard_key, NULL);

        return;