From patchwork Mon Feb 20 13:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 655261 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2CF7EC6FD18 for ; Mon, 20 Feb 2023 13:24:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231793AbjBTNYF (ORCPT ); Mon, 20 Feb 2023 08:24:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232022AbjBTNXn (ORCPT ); Mon, 20 Feb 2023 08:23:43 -0500 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A92819F22 for ; Mon, 20 Feb 2023 05:23:40 -0800 (PST) Received: by mail-wr1-x433.google.com with SMTP id z8so917509wrm.8 for ; Mon, 20 Feb 2023 05:23:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=144qxu++siL9l6DQXXh9/0gOUbLXJw/9OVqAAlK5ryo=; b=j3tLwgvFOzxvVdx5SRyI8CWAsIX4u95SjaLte0MCDHmt6sX0l35vbUf7F4oIFzTE4b nGMb2Tevp22HMbw3vR5AGA+ZSxbFshg9q1eB7nV9nNPwhyqtoCua9vpdIjiCAeAUoxz5 1poKWJQpTsPMea47wveFgm5ePWCBL0am1trW/ygGYC8dHuNLPIQEYMk5Mbn+R/vyUZJH fs1calVdMxn36oHShsuljxqNYYOW/R05xQkzPRrKigz9qbohje+pmE8JVNESLLwAJZ4G BMD9rnwKxYvsp93f6YLiMgnLTn65v8dlXZxOWC0jfKoEW0hnuWr1v0DYIxMHMyjiLd4/ 3DMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=144qxu++siL9l6DQXXh9/0gOUbLXJw/9OVqAAlK5ryo=; b=WO5xvqUIPOzLrS3B5+dSEuL2/jnkXi+CgrTLYWg4b4RSDkcfkT5YrFOorhQTcdwafv coSp9FYu3InCr3LTjXuAauDlGSgi3X097NAUWDExsClLbZcDb0hOsRPmZhcUtBYuRNz0 vnOkX/Z4/3kYz78I7tLzCsxJ5Z4S8DhPD1WrpL90ZRFVPCOY9K3S+7aW59R363aP97g/ E/mVPjNX8rIgfGZ7Fd4WIZCdMKvRKsaIOuq5E4P3xzbgpktiQ2yifketO6gxx07GORZR GnDjDHdgJvEAqhQs5e3/pH0FGmT6Azfx5gxXdqTGop1NPeYk50Q945Kgt8USc34w2oNI CSGw== X-Gm-Message-State: AO0yUKV0FjvpSq21EWIQq4wWFOlD3K3MbP6IVNV7G5fCM/RN3FGJU+79 FsKTNZ3ISenhmma/zslTIhuyyQ== X-Google-Smtp-Source: AK7set+miZCTdPsqEhcGWaaK035y9eZ+hrvl6q8Yf7y0oxOp8EkxYMrUdqaPAWhdph34OUgEQL4Yew== X-Received: by 2002:a5d:4cc1:0:b0:2c5:a19e:6d12 with SMTP id c1-20020a5d4cc1000000b002c5a19e6d12mr1972893wrt.10.1676899418577; Mon, 20 Feb 2023 05:23:38 -0800 (PST) Received: from localhost (mail.chocen-mesto.cz. [85.163.43.2]) by smtp.gmail.com with ESMTPSA id u11-20020adfdb8b000000b002c54fb024b2sm4953907wri.61.2023.02.20.05.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Feb 2023 05:23:37 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, linux-kselftest@vger.kernel.org, shuah@kernel.org, amirtz@nvidia.com Subject: [patch net] sefltests: netdevsim: wait for devlink instance after netns removal Date: Mon, 20 Feb 2023 14:23:36 +0100 Message-Id: <20230220132336.198597-1-jiri@resnulli.us> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Jiri Pirko When devlink instance is put into network namespace and that network namespace gets deleted, devlink instance is moved back into init_ns. This is done as a part of cleanup_net() routine. Since cleanup_net() is called asynchronously from workqueue, there is no guarantee that the devlink instance move is done after "ip netns del" returns. So fix this race by making sure that the devlink instance is present before any other operation. Reported-by: Amir Tzin Fixes: b74c37fd35a2 ("selftests: netdevsim: add tests for devlink reload with resources") Signed-off-by: Jiri Pirko Reviewed-by: Pavan Chebbi --- .../selftests/drivers/net/netdevsim/devlink.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh index a08c02abde12..7f7d20f22207 100755 --- a/tools/testing/selftests/drivers/net/netdevsim/devlink.sh +++ b/tools/testing/selftests/drivers/net/netdevsim/devlink.sh @@ -17,6 +17,18 @@ SYSFS_NET_DIR=/sys/bus/netdevsim/devices/$DEV_NAME/net/ DEBUGFS_DIR=/sys/kernel/debug/netdevsim/$DEV_NAME/ DL_HANDLE=netdevsim/$DEV_NAME +wait_for_devlink() +{ + "$@" | grep -q $DL_HANDLE +} + +devlink_wait() +{ + local timeout=$1 + + busywait "$timeout" wait_for_devlink devlink dev +} + fw_flash_test() { RET=0 @@ -256,6 +268,9 @@ netns_reload_test() ip netns del testns2 ip netns del testns1 + # Wait until netns async cleanup is done. + devlink_wait 2000 + log_test "netns reload test" } @@ -348,6 +363,9 @@ resource_test() ip netns del testns2 ip netns del testns1 + # Wait until netns async cleanup is done. + devlink_wait 2000 + log_test "resource test" }