From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B171C1E98E3 for ; Thu, 23 Oct 2025 01:00:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181232; cv=none; b=r3+J4eSpgc1Y59NzEubZX9vjzGPoQedI95Z3YwJIaEwGmyVJhiCgcnXM3rH9SJGan9fI3Y+hkLbJyqgfochOW2WiT2axwfbOruVTXfjCZfxtDawpHnbWz6QJrFJpm0lXeuxlI51EviNBFefrhhfw5hOleWaUEti+oWMy/Zbzbxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761181232; c=relaxed/simple; bh=4pbEdZWO3naganJPGX2hHH04O1jq6bd0JAXIDNigrjk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=XP9JWNI6+vM22rMLy2z6/q0GwcRvq4sSEn8QVJvHu6tn5n66QAkbjSIy3zzxIy1Y7Hs70CIGqkxkZGaUAY9Zt1gU59hAyRp5ydkza9GGHCXBE7GTJU32KyeiO0G2ufE1iUsVjjmCU5hdf0+YkHtCtkcIRktT2+L8GLJk8/Maxy8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dWanEwaX; arc=none smtp.client-ip=209.85.216.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dWanEwaX" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-33d962c0e9aso205683a91.0 for ; Wed, 22 Oct 2025 18:00:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761181230; x=1761786030; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oXOvnbfPKIC6rRblSxQAXqJxbJ18ywkGP6EdCLVk0Qg=; b=dWanEwaX4qyY4otH9BIzAq4fA1PfDUzVMnAhcpgGxSQyKL+3vz8DfW0CJNO3jDzZHW 6AznwGs1VHGdF9gJcRWkbMC4eGVyGrf8raqGZNC7HiarvVLWYIeMo3/Dr+0nRUcH+++u wOLkjgy+6PMi8T0Q4WpXsNpW/QTkOW+PS4X9ziI+/tvkvpKMwrHFMV2N699B1th2lLD7 ENwQOy763hnuGy+8o1Hgrgz7zC9GPWJpBFTHdBe7Xku7NcgBfyXHhBZv6jFJ/f7YLIVX MxpAsD8tPLnPust3OQtJKjMn1Wc5bdkahzrF2Ez6Ivq7XW1YzCeoXMD5Ok5QEQVxkv6a EPig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761181230; x=1761786030; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oXOvnbfPKIC6rRblSxQAXqJxbJ18ywkGP6EdCLVk0Qg=; b=nGnawAuHKZ73JhBb7NNP6itagvg/BpUZ1QHsNte9y9Hy1rLr/oazor4pjmjfihdiGf HWsg/lOu4yDDrN/7Pkuvix04oGsZm1Auo9ZW4t+unLEUgulVHjaPxCAPR8GeoaUlGNB4 SjiBNLAz0DCWgonL9mm24sK5tBLrxY/EhvPabmZdoHEiR8Dkh4Sq6HKMnVa6qE8p+t5l zp0fTfp+8XkeUhU73Xi3TJ9jWzEjQz+wzGqC1OHZmU8xCsj9PLnVIHc+XHD5856dtptj InZi+ntMZWvZhRUD/GVZCwQbt/ULStzTjZdongeMpgnABJ2sifOaiq6gggAEPm1HGP62 SvNA== X-Forwarded-Encrypted: i=1; AJvYcCXCuxPjfYbVRvpslKtUthMCbx8rCjzTwVJm7tS2SgMnsUKkpTjbLhbiOWkgfKkI9sa6JdmXwFvejUl08tMkMiw=@vger.kernel.org X-Gm-Message-State: AOJu0YyWskXGQTaSb6EqyYPPs6g94WVuRgKJ55VBXXu1HiuzPiwGTPsa DjqTBWnUWGm9BmGYvrPFvDO6RQrJ9UCc+iwNtiNtS1nhFE/Dzmjlh+Au X-Gm-Gg: ASbGncuA0Lb7K027DAWDyIlYJMIe156+CurBFnR01FQEbcxmxHOrb4vhuzOzdll7Vj1 d7zgyIgZ45ov9/5zvBudcFTL+wWXUrg6HTTKG3GfDHghjxLaOlGG0nI7hrHJYvk1c6f7p0KVTRq CA4X/2YcDE/NT4923/1Z4IYB8tJrp8GTDdbqJ34r1Oj2nXs8Gc+sLssQ1Yc3bdDqjfTlnWnJgR1 tcniSKWjsz6T3NJCfD7Xh9YWaLUxeoSq9fkzR0NasfC1fCrL5T0VKEYuYshhY4WU+nNHhFgnDWn kEniUda+BTOOXuy21/DeRgLl84E8v/jjDV2yj6A4eUSQOyPDW1T7ivk7qJV4hmu2cd7A5e6c7Vn 8aM2bYPF+ZBEyR5nby4q/zRFFlSChxPlXQzTqJpgoKetw7BlI81kBtjoUQ4rHXkPf9xYl88Q0z9 Fu8imNkb4= X-Google-Smtp-Source: AGHT+IGDhjee3qb0RmCmk094kyxxRhSnp6cpHy/pZvteX5hCRnyEn25K/Mo2iLuTUZkw6wAqEltkkw== X-Received: by 2002:a17:90b:4a03:b0:32e:7277:9a81 with SMTP id 98e67ed59e1d1-33e21ec3286mr7594732a91.4.1761181229218; Wed, 22 Oct 2025 18:00:29 -0700 (PDT) Received: from localhost ([2a03:2880:2ff:4::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-33fb016f865sm491272a91.11.2025.10.22.18.00.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Oct 2025 18:00:28 -0700 (PDT) From: Bobby Eshleman Date: Wed, 22 Oct 2025 18:00:09 -0700 Subject: [PATCH net-next 05/12] selftests/vsock: do not unconditionally die if qemu fails Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20251022-vsock-selftests-fixes-and-improvements-v1-5-edeb179d6463@meta.com> References: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> In-Reply-To: <20251022-vsock-selftests-fixes-and-improvements-v1-0-edeb179d6463@meta.com> To: Stefano Garzarella , Shuah Khan , Bobby Eshleman , Jakub Kicinski Cc: virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Bobby Eshleman X-Mailer: b4 0.13.0 From: Bobby Eshleman If QEMU fails to boot, then set the returncode (via timeout) instead of unconditionally dying. This is in preparation for tests that expect QEMU to fail to boot. In that case, we just want to know if the boot failed or not so we can test the pass/fail criteria, and continue executing the next test. Signed-off-by: Bobby Eshleman --- tools/testing/selftests/vsock/vmtest.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/vsock/vmtest.sh b/tools/testing/selftests/vsock/vmtest.sh index 9c72559aa894..6c8f199b771b 100755 --- a/tools/testing/selftests/vsock/vmtest.sh +++ b/tools/testing/selftests/vsock/vmtest.sh @@ -221,10 +221,8 @@ vm_start() { --append "${KERNEL_CMDLINE}" \ --rw &> ${logfile} & - if ! timeout ${WAIT_TOTAL} \ - bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0'; then - die "failed to boot VM" - fi + timeout "${WAIT_TOTAL}" \ + bash -c 'while [[ ! -s '"${pidfile}"' ]]; do sleep 1; done; exit 0' } vm_wait_for_ssh() { -- 2.47.3