Skip to content

Fix file_open_ipc_handle() of file provider - producer and consumer should use two different files #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Fix file_open_ipc_handle() of file provider - producer and consumer should use two different files #830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9a47aae
Fix file_open_ipc_handle()
ldorau Oct 23, 2024
319d197
Fix ipc_file_prov test: should use two different files
ldorau Oct 23, 2024
6694f84
Fix ipc_file_prov_fsdax test: should use two different files
ldorau Oct 23, 2024
ddab0e6
Add UMF_TESTS_FSDAX_PATH_2 to CI
ldorau Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions .github/workflows/reusable_dax.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ env:
FSDAX_NAMESPACE : "1.0"
FSDAX_PMEM: "pmem1"
UMF_TESTS_FSDAX_PATH: "/mnt/pmem1/file"
UMF_TESTS_FSDAX_PATH_2: "/mnt/pmem1/file_2"
BUILD_DIR : "${{github.workspace}}/build"
INSTL_DIR : "${{github.workspace}}/../install-dir"
COVERAGE_DIR : "${{github.workspace}}/coverage"
Expand Down Expand Up @@ -55,11 +56,12 @@ jobs:
run: |
echo FSDAX_NAMESPACE="${{env.FSDAX_NAMESPACE}}"
echo UMF_TESTS_FSDAX_PATH="${{env.UMF_TESTS_FSDAX_PATH}}"
echo UMF_TESTS_FSDAX_PATH_2="${{env.UMF_TESTS_FSDAX_PATH_2}}"
ndctl list --namespace=namespace${{env.FSDAX_NAMESPACE}}
ls -al /dev/${{env.FSDAX_PMEM}} /mnt/${{env.FSDAX_PMEM}}
mount | grep -e "/dev/${{env.FSDAX_PMEM}}"
touch ${{env.UMF_TESTS_FSDAX_PATH}}
rm -f ${{env.UMF_TESTS_FSDAX_PATH}}
touch ${{env.UMF_TESTS_FSDAX_PATH}} ${{env.UMF_TESTS_FSDAX_PATH_2}}
rm -f ${{env.UMF_TESTS_FSDAX_PATH}} ${{env.UMF_TESTS_FSDAX_PATH_2}}

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down Expand Up @@ -100,9 +102,9 @@ jobs:
- name: Run the FSDAX tests
working-directory: ${{env.BUILD_DIR}}
run: |
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} ctest -C ${{matrix.build_type}} -R umf-provider_file_memory -V
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} ctest -C ${{matrix.build_type}} -R umf_example_dram_and_fsdax -V
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} ctest -C ${{matrix.build_type}} -R umf-ipc_file_prov_fsdax -V
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} UMF_TESTS_FSDAX_PATH_2=${{env.UMF_TESTS_FSDAX_PATH_2}} ctest -C ${{matrix.build_type}} -R umf-provider_file_memory -V
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} UMF_TESTS_FSDAX_PATH_2=${{env.UMF_TESTS_FSDAX_PATH_2}} ctest -C ${{matrix.build_type}} -R umf_example_dram_and_fsdax -V
UMF_TESTS_FSDAX_PATH=${{env.UMF_TESTS_FSDAX_PATH}} UMF_TESTS_FSDAX_PATH_2=${{env.UMF_TESTS_FSDAX_PATH_2}} ctest -C ${{matrix.build_type}} -R umf-ipc_file_prov_fsdax -V

- name: Check coverage
if: ${{ matrix.build_type == 'Debug' }}
Expand Down
4 changes: 0 additions & 4 deletions src/provider/provider_file_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,10 +665,6 @@ static umf_result_t file_open_ipc_handle(void *provider, void *providerIpcData,
umf_result_t ret = UMF_RESULT_SUCCESS;
int fd;

if (strncmp(file_ipc_data->path, file_provider->path, PATH_MAX)) {
return UMF_RESULT_ERROR_INVALID_ARGUMENT;
}

fd = utils_file_open(file_ipc_data->path);
if (fd == -1) {
LOG_PERR("opening the file to be mapped (%s) failed",
Expand Down
4 changes: 2 additions & 2 deletions test/ipc_file_prov.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
rm -f ${FILE_NAME}

echo "Starting ipc_file_prov CONSUMER on port $PORT ..."
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT $FILE_NAME &
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT ${FILE_NAME}_consumer &

echo "Waiting 1 sec ..."
sleep 1

echo "Starting ipc_file_prov PRODUCER on port $PORT ..."
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT $FILE_NAME
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT ${FILE_NAME}_producer

# remove the SHM file
rm -f ${FILE_NAME}
8 changes: 7 additions & 1 deletion test/ipc_file_prov_fsdax.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ if [ "$UMF_TESTS_FSDAX_PATH" = "" ]; then
exit 0
fi

if [ "$UMF_TESTS_FSDAX_PATH_2" = "" ]; then
echo "$0: Test skipped, UMF_TESTS_FSDAX_PATH_2 is not set";
exit 0
fi

FILE_NAME="$UMF_TESTS_FSDAX_PATH"
FILE_NAME_2="$UMF_TESTS_FSDAX_PATH_2"

# port should be a number from the range <1024, 65535>
PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
Expand All @@ -31,7 +37,7 @@ echo "Waiting 1 sec ..."
sleep 1

echo "Starting ipc_file_prov_fsdax PRODUCER on port $PORT ..."
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT $FILE_NAME "FSDAX"
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT $FILE_NAME_2 "FSDAX"

# remove the SHM file
rm -f ${FILE_NAME}
Loading