Skip to content

Conversation

@p0-tato
Copy link
Contributor

@p0-tato p0-tato commented Dec 12, 2024

I noticed that the syscall description for Mali GPU Driver fuzzing was missing the KBASE_IOCTL_KINSTR_PRFCNT_* related ioctls, so I added them.

@tarasmadan
Copy link
Collaborator

Thank you! Let's run the tests first.

@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 12, 2024

image

In my environment, I was able to confirm that these syscall descriptions are working properly.

@a-nogikh
Copy link
Collaborator

Please fix the following CI errors:

Error: Wrong commit subject format: 'sys/linux: Additional Descriptions for Mali GPU Driver'. Please use 'main/affected/package: short change description'. See docs/contributing.md for details. Regex pattern used to check commit subjects is '^(Revert "|(([a-z0-9/_.-]+|Makefile|CONTRIBUTORS|README.md)(, )?)+:\ [^A-Z].+[^.]$)'.
Error: Wrong commit subject format: 'sys/linux: Additional Descriptions for Mali GPU Driver'. Please use 'main/affected/package: short change description'. See docs/contributing.md for details. Regex pattern used to check commit subjects is '^(Revert "|(([a-z0-9/_.-]+|Makefile|CONTRIBUTORS|README.md)(, )?)+:\ [^A-Z].+[^.]$)'.
Error: Wrong commit subject format: 'Additional descriptions for Mali Driver'. Please use 'main/affected/package: short change description'. See docs/contributing.md for details. Regex pattern used to check commit subjects is '^(Revert "|(([a-z0-9/_.-]+|Makefile|CONTRIBUTORS|README.md)(, )?)+:\ [^A-Z].+[^.]$)'.

@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 12, 2024

I'm sorry, I think I might have made a mistake somewhere. Could you please guide me on how to fix the CI? 😢

@a-nogikh
Copy link
Collaborator

You just need to change your commit descriptions and force-push the branch, CI tests will run automatically

Merge branch 'master' into master

And that will cause tests to break again :( In our project, we rebase instead of doing merges. Please drop this commit.

@p0-tato p0-tato force-pushed the master branch 5 times, most recently from 45f67db to 18a0a7e Compare December 12, 2024 15:26
@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 12, 2024

Thank you so much for your guidance! I have fixed that problem. Could you please check again to confirm?

@a-nogikh
Copy link
Collaborator

Now there's one more problem

sys/linux/dev_mali.txt:1:1: The file is not formatted/regenerated. Run 'make generate' and include it into the commit.
Error: The file is not formatted/regenerated. Run 'make generate' and include it into the commit.

Also please notice that now you have 3 commits with identical descriptions:
https://github.com/google/syzkaller/pull/5598/commits

@p0-tato p0-tato force-pushed the master branch 3 times, most recently from a238c96 to 35b3541 Compare December 12, 2024 16:21
@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 12, 2024

Thank you so much! I have reviewed and fixed the issues you pointed out. Could you kindly check again and let me know if everything looks good?

@p0-tato p0-tato force-pushed the master branch 4 times, most recently from 378eac3 to 134e864 Compare December 13, 2024 07:39
@ramosian-glider
Copy link
Member

Please squash "run make extract" into "Additional descriptions for Mali Driver", there's no need to have intermediate patches in the tree.

@p0-tato p0-tato force-pushed the master branch 2 times, most recently from 1c5de96 to 845962e Compare December 13, 2024 09:46
@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 13, 2024

Thank you for your advice. I made the changes as requested.

@tarasmadan tarasmadan enabled auto-merge December 13, 2024 10:00
@tarasmadan tarasmadan disabled auto-merge December 13, 2024 10:00
@p0-tato p0-tato force-pushed the master branch 4 times, most recently from 95594ae to 8a00be5 Compare December 13, 2024 15:30
@ramosian-glider
Copy link
Member

@Ji-Hyeon-Jeong, where do these constants actually come from? Is there any source that we can reference here?

@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 17, 2024

@ramosian-glider I've extracted all constant from ARM Mali5th Gen Driver r53p0 version, (https://developer.arm.com/downloads/-/mali-drivers/5th-gen-gpu-architecture-kernel).

Every constants I've added come from driver/product/kernel/include/uapi/gpu/arm/midgard/mali_kbase_hwcnt_reader.h(457L~463L & 495L~504L).

Sorry for the delay in checking this 😢 — I had something else to take care of yesterday.

image

sys/linux: run make extract

sys/linux: add Descriptions for Mali GPU Driver

sys/linux: add Descriptions for Mali GPU Driver

sys/linux: add descriptions for Mali Driver

sys/linux: add descriptions for Mali Driver
@p0-tato
Copy link
Contributor Author

p0-tato commented Dec 18, 2024

@ramosian-glider I noticed that prfcnt_control_cmd was pushed without being updated to ptr64[out, array[int64]], so I made the correction and pushed it again. Could you please check it? Thank you so much!

@ramosian-glider ramosian-glider added this pull request to the merge queue Dec 19, 2024
Merged via the queue into google:master with commit 1d58202 Dec 19, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants