Re: [PATCH 6/6] selftests: futex: remove duplicate unneeded defines

[Muhammad Usama Anjum]

On 10/3/23 1:46 PM, Ingo Molnar wrote:
> 
> * Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx> wrote:
> 
>> Kselftests are kernel tests and must be build with kernel headers from
>> same source version. These duplicate defines should automatically
>> picked up from kernel headers. Use KHDR_INCLUDES to add kernel header
>> files.
>>
>> Signed-off-by: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx>
>> ---
>>  .../selftests/futex/include/futextest.h       | 22 -------------------
>>  1 file changed, 22 deletions(-)
>>
>> diff --git a/tools/testing/selftests/futex/include/futextest.h b/tools/testing/selftests/futex/include/futextest.h
>> index ddbcfc9b7bac4..59f66af3a6d10 100644
>> --- a/tools/testing/selftests/futex/include/futextest.h
>> +++ b/tools/testing/selftests/futex/include/futextest.h
>> @@ -25,28 +25,6 @@
>>  typedef volatile u_int32_t futex_t;
>>  #define FUTEX_INITIALIZER 0
>>  
>> -/* Define the newer op codes if the system header file is not up to date. */
>> -#ifndef FUTEX_WAIT_BITSET
>> -#define FUTEX_WAIT_BITSET		9
>> -#endif
>> -#ifndef FUTEX_WAKE_BITSET
>> -#define FUTEX_WAKE_BITSET		10
>> -#endif
>> -#ifndef FUTEX_WAIT_REQUEUE_PI
>> -#define FUTEX_WAIT_REQUEUE_PI		11
>> -#endif
>> -#ifndef FUTEX_CMP_REQUEUE_PI
>> -#define FUTEX_CMP_REQUEUE_PI		12
>> -#endif
>> -#ifndef FUTEX_WAIT_REQUEUE_PI_PRIVATE
>> -#define FUTEX_WAIT_REQUEUE_PI_PRIVATE	(FUTEX_WAIT_REQUEUE_PI | \
>> -					 FUTEX_PRIVATE_FLAG)
>> -#endif
>> -#ifndef FUTEX_REQUEUE_PI_PRIVATE
>> -#define FUTEX_CMP_REQUEUE_PI_PRIVATE	(FUTEX_CMP_REQUEUE_PI | \
>> -					 FUTEX_PRIVATE_FLAG)
>> -#endif
> 
> AFAICT I cannot really pick this up into the locking tree as-is, as this patch
> relies on the KHDR_INCLUDES change in patch #1, so that all self-tests get the
> kernel headers included, correct?
No this patch is self contained and doesn't depend on the patch #1.
KHDR_INCLUDES was included several releases back in kselftest's Makefile
and in kselftests of futex. Correct headers are being included already. In
this patch, I'm removing just the un-needed dead code. Other patches were
already picked up by other maintainers.

> 
> Thanks,
> 
> 	Ingo

-- 
BR,
Muhammad Usama Anjum