From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E572B458EB for ; Mon, 2 Sep 2024 21:50:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4FF2040E1F; Mon, 2 Sep 2024 21:50:29 +0200 (CEST) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id 56380402C0 for ; Mon, 2 Sep 2024 21:50:28 +0200 (CEST) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-714302e7285so4188141b3a.2 for ; Mon, 02 Sep 2024 12:50:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1725306627; x=1725911427; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qlXRnqIja4sia61/L/FCrlvLwavailM14Dinu7XzgoY=; b=RH98AoWXOqTIvMfmQtPsys4/H3xo7bEG3UXqT0P85776tnSBt0Vv+Fj/DR4nVp1cBP W3g74jJsFQAXdEEEduIuz6G0Mi2BsfS4zutN/o0Z9O/lpBjthaj2T3yakIcGhnf0X0xc 4KMgLlQQenXEiZxsoiL9U6uMr++w3fQF/WS+OJkr5gKXOfIcyWbHw7QuYh8usAvbgcMM 8CnfZWfr4eBjuDjGbYeSn6KHXnWK0NptgwZb+I1bXyR81sx/Xu4g1t2IPyWMbp7ufSni bBlUgrLtS7bE7VhfjwcHRHVoFF0s687D60FhnbXuNeZa0OURvbseQxlVEl/TuIuvIg+o xDgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725306627; x=1725911427; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qlXRnqIja4sia61/L/FCrlvLwavailM14Dinu7XzgoY=; b=eq+IPmY547JYalvgfm32UlxIWtdVPhDtBBn2UQ6wN28hB4dejOiwjv0QiiKBWjuMcN 6onjfgi9BpflOvHMzrLw5zlInpj7F6ppt4dydEUgCDq5a158+PzycU3z6vpnbXTuJD1d AizU+WRxXaGcf9l1fQY7f16TQOfhKyaPHkDQOHdZKpH9kPN+FAlI2XT2fBUBv1vEjkRC VYIOeZkEtbTfPb51bvzP4mb9/mIWO5dBak5rhNXyFma1Jgrljp1sF/IRAnziK/krlTta dbo1yjDMG5EnSPhNqEuuvbG+VP/KfaClQCpEDzx+cBom3NZsfiveAvrXmD6PNWWwddUv O9OA== X-Forwarded-Encrypted: i=1; AJvYcCU43VG+OjzvIwD8wOFMkSw7+mB3BRhrgvyHhuAtM+HgxJDNuYofIu/Wt0xZyXgTK81bWiJCw5Q=@dpdk.org X-Gm-Message-State: AOJu0YzgXGeU1yo85LB/ICeZlEPV1UUWdre71pOvBQRBMeJHER0Yorq1 qKl6eTSaTu0UPTNhoTjKK5kJtKKukGFIgCK/SlecZPhlftRq++J626KdXKh1ExCKP7rypPF3HFj pPkSKwQ== X-Google-Smtp-Source: AGHT+IGzb3C6ubXi86F1IB5Thr7thnRzG0k76k6HRsRCdSqmRH7WTxgTT4DWALE4lIot+weEYOulLg== X-Received: by 2002:a17:903:181:b0:205:4d74:8b01 with SMTP id d9443c01a7336-2054d74ab76mr83453385ad.24.1725306627418; Mon, 02 Sep 2024 12:50:27 -0700 (PDT) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-205e970d0b6sm8449975ad.214.2024.09.02.12.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 12:50:27 -0700 (PDT) From: Stephen Hemminger To: Kevin Traynor Cc: Stephen Hemminger , stable@dpdk.org, Ferruh Yigit , David Marchand Subject: [PATCH v2 2/3] app/testpmd: fix early exit from signal Date: Mon, 2 Sep 2024 12:47:54 -0700 Message-ID: <20240902194909.132478-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240902194909.132478-1-stephen@networkplumber.org> References: <20240902194909.132478-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Other signals may occur causing read to get interrupted. Loop until quit flag is set by signal, a character is entered, or end of file. This fixes bug where testpmd would exit early because of signal used by TAP device. Bugzilla ID: 1305 Fixes: 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal") Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Ferruh Yigit Reviewed-by: David Marchand (cherry picked from commit a996cd04aeeaeca88e6313174101a1229349fb47) --- app/test-pmd/testpmd.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 57e7fa0637..bade1feba4 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -11,7 +11,6 @@ #include #ifndef RTE_EXEC_ENV_WINDOWS #include -#include #endif #include #include @@ -4524,25 +4523,17 @@ main(int argc, char** argv) } } else { char c; - fd_set fds; printf("Press enter to exit\n"); - - FD_ZERO(&fds); - FD_SET(0, &fds); - - /* wait for signal or enter */ - ret = select(1, &fds, NULL, NULL, NULL); - if (ret < 0 && errno != EINTR) - rte_exit(EXIT_FAILURE, - "Select failed: %s\n", - strerror(errno)); - - /* if got enter then consume it */ - if (ret == 1 && read(0, &c, 1) < 0) - rte_exit(EXIT_FAILURE, - "Read failed: %s\n", + while (f_quit == 0) { + /* end-of-file or any character exits loop */ + if (read(0, &c, 1) >= 0) + break; + if (errno == EINTR) + continue; + rte_exit(EXIT_FAILURE, "Read failed: %s\n", strerror(errno)); + } } } -- 2.45.2