Fixup memcg check for cgroupv2 & don't use memcgSwap if memcg is unav…

…ailable

Fixes kubernetes#10935

pkg/drivers/kic/oci/oci.go

@@ -113,7 +113,7 @@ func HasMemoryCgroup() bool {
 	if runtime.GOOS == "linux" {
 		var memory string
 		if cgroup2, err := IsCgroup2UnifiedMode(); err == nil && cgroup2 {
-			memory = "/sys/fs/cgroup/memory/memsw.limit_in_bytes"
+			memory = "/sys/fs/cgroup/memory/memory.high"
 		}
 		if _, err := os.Stat(memory); os.IsNotExist(err) {
 			klog.Warning("Your kernel does not support memory limit capabilities or the cgroup is not mounted.")
@@ -124,6 +124,10 @@ func HasMemoryCgroup() bool {
 }
 
 func hasMemorySwapCgroup() bool {
+	if !HasMemoryCgroup() {
+		return false
+	}
+
 	memcgSwap := true
 	if runtime.GOOS == "linux" {
 		var memoryswap string
@@ -193,14 +197,14 @@ func CreateContainerNode(p CreateParams) error {
 		// podman mounts var/lib with no-exec by default  https://github.com/containers/libpod/issues/5103
 		runArgs = append(runArgs, "--volume", fmt.Sprintf("%s:/var:exec", p.Name))
 
-		if memcgSwap {
-			runArgs = append(runArgs, fmt.Sprintf("--memory-swap=%s", p.Memory))
-		}
-
 		if memcg {
 			runArgs = append(runArgs, fmt.Sprintf("--memory=%s", p.Memory))
 		}
 
+		if memcgSwap {
+			runArgs = append(runArgs, fmt.Sprintf("--memory-swap=%s", p.Memory))
+		}
+
 		virtualization = "podman" // VIRTUALIZATION_PODMAN
 	}
 	if p.OCIBinary == Docker {