Skip to content

[RISC-V] Fix System.Net.Sockets.Tests on Qemu #104094

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 10 commits into from
Jul 24, 2024
Merged

[RISC-V] Fix System.Net.Sockets.Tests on Qemu #104094

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
dd886c7
[RISC-V] Fix System.Net.Sockets.Tests on Qemu
yurai007 Jun 27, 2024
a54d6ce
[RISC-V] Address code review comments
yurai007 Jul 3, 2024
4cf9509
[RISC-V] Address code review comments cont
yurai007 Jul 3, 2024
22981df
[RISC-V] Address code review comments cont cont
yurai007 Jul 5, 2024
a82fee7
[RISC-V] Address last code review comments
yurai007 Jul 9, 2024
ab84e6d
[RISC-V] Address last code review comments cont
yurai007 Jul 9, 2024
49dd253
[RISC-V] Remove redundant import
yurai007 Jul 9, 2024
4fe6b04
[RISC-V] Address last code review comments
yurai007 Jul 10, 2024
421f18f
[RISC-V] Restore IsNotQemuLinux, remove isQemu
yurai007 Jul 12, 2024
d65036f
Apply suggestions from code review
jkotas Jul 12, 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
1 change: 1 addition & 0 deletions src/libraries/Common/tests/TestUtilities/System/PlatformDetection.Unix.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ public static partial class PlatformDetection

public static bool IsMonoLinuxArm64 => IsMonoRuntime && IsLinux && IsArm64Process;
public static bool IsNotMonoLinuxArm64 => !IsMonoLinuxArm64;
public static bool IsNotRiscV64Ubuntu => !IsUbuntu || !IsRiscV64Process;

// OSX family
public static bool IsApplePlatform => IsOSX || IsiOS || IstvOS || IsMacCatalyst;
Expand Down
28 changes: 16 additions & 12 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/ArgumentValidationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,18 +794,20 @@ await Task.WhenAll(

[Theory]
[PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix
[InlineData(0)]
[InlineData(1)]
public void Connect_ConnectTwice_NotSupported(int invalidatingAction)
[InlineData(false)]
[InlineData(true)]
public void Connect_ConnectTwice_NotSupported(bool invalidatingAction)
{
using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
switch (invalidatingAction)
// On RISC-V Qemu we omit one test case due to: https://gitlab.com/qemu-project/qemu/-/issues/2410
bool invalidatingActionOnPlatform = invalidatingAction && PlatformDetection.IsNotRiscV64Ubuntu;
switch (invalidatingActionOnPlatform)
{
case 0:
case false:
IntPtr handle = client.Handle; // exposing the underlying handle
break;
case 1:
case true:
client.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.Debug, 1); // untracked socket option
break;
}
Expand All @@ -825,20 +827,22 @@ public void Connect_ConnectTwice_NotSupported(int invalidatingAction)

[Theory]
[PlatformSpecific(TestPlatforms.AnyUnix)] // API throws PNSE on Unix
[InlineData(0)]
[InlineData(1)]
public void ConnectAsync_ConnectTwice_NotSupported(int invalidatingAction)
[InlineData(false)]
[InlineData(true)]
public void ConnectAsync_ConnectTwice_NotSupported(bool invalidatingAction)
{
AutoResetEvent completed = new AutoResetEvent(false);

using (Socket client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
{
switch (invalidatingAction)
// On RISC-V Qemu we omit one test case due to: https://gitlab.com/qemu-project/qemu/-/issues/2410
bool invalidatingActionOnPlatform = invalidatingAction && PlatformDetection.IsNotRiscV64Ubuntu;
switch (invalidatingActionOnPlatform)
{
case 0:
case false:
IntPtr handle = client.Handle; // exposing the underlying handle
break;
case 1:
case true:
client.SetSocketOption(SocketOptionLevel.IP, SocketOptionName.Debug, 1); // untracked socket option
break;
}
Expand Down
7 changes: 4 additions & 3 deletions src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketOptionNameTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace System.Net.Sockets.Tests
public partial class SocketOptionNameTest
{
private static bool SocketsReuseUnicastPortSupport => Capability.SocketsReuseUnicastPortSupport().HasValue;
private static bool SupportedOnPlatform = PlatformDetection.IsNotWindowsNanoNorServerCore && PlatformDetection.IsNotRiscV64Ubuntu;

[ConditionalFact(nameof(SocketsReuseUnicastPortSupport))]
public void ReuseUnicastPort_CreateSocketGetOption()
Expand Down Expand Up @@ -50,7 +51,7 @@ public void ReuseUnicastPort_CreateSocketSetOption()
}
}

[Fact]
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotRiscV64Ubuntu))]
public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetSucceeds_GetThrows()
{
int interfaceIndex = 0;
Expand All @@ -64,7 +65,7 @@ public void MulticastOption_CreateSocketSetGetOption_GroupAndInterfaceIndex_SetS
}
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
[ConditionalFact(nameof(SupportedOnPlatform))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 and RISC-V Qemu
public async Task MulticastInterface_Set_AnyInterface_Succeeds()
{
// On all platforms, index 0 means "any interface"
Expand Down Expand Up @@ -120,7 +121,7 @@ public void MulticastInterface_Set_InvalidIndex_Throws()
}
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsNotWindowsNanoNorServerCore))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286
[ConditionalFact(nameof(SupportedOnPlatform))] // Skip on Nano: https://github.com/dotnet/runtime/issues/26286 and RISC-V Qemu
[SkipOnPlatform(TestPlatforms.OSX | TestPlatforms.FreeBSD, "Expected behavior is different on OSX or FreeBSD")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/52124", TestPlatforms.iOS | TestPlatforms.tvOS | TestPlatforms.MacCatalyst)]
public async Task MulticastInterface_Set_IPv6_AnyInterface_Succeeds()
Expand Down
10 changes: 9 additions & 1 deletion src/native/libs/System.Native/pal_networking.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2088,7 +2088,15 @@ int32_t SystemNative_GetSockOpt(
{
return Error_EFAULT;
}

#if defined(TARGET_RISCV64)
uint8_t nonEmptyOptionValueBuffer;
if (socketOptionLevel == SocketOptionLevel_SOL_TCP && socketOptionName == SocketOptionName_SO_TCP_KEEPALIVE_TIME && optionValue == NULL
&& *optionLen == 0)
{
// It's workaround for Qemu bug: https://gitlab.com/qemu-project/qemu/-/issues/2390.
optionValue = &nonEmptyOptionValueBuffer;
}
#endif
int fd = ToFileDescriptor(socket);

//
Expand Down