From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id EFC3172F9A for ; Wed, 25 May 2022 14:00:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E07D52AABD for ; Wed, 25 May 2022 13:59:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EA2012AAA1 for ; Wed, 25 May 2022 13:59:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C097543858 for ; Wed, 25 May 2022 13:59:42 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 25 May 2022 13:59:37 +0200 Message-Id: <20220525115939.347193-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.067 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [RFC/PATCH v2 qemu 1/3] PVE-Backup: create jobs: correctly cancel in error scenario X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2022 12:00:14 -0000 The first call to job_cancel_sync() will cancel and free all jobs in the transaction, so ensure that it's called only once and get rid of the job_unref() that would operate on freed memory. It's also necessary to NULL backup_state.pbs in the error scenario, because a subsequent backup_cancel QMP call (as happens in PVE when the backup QMP command fails) would try to call proxmox_backup_abort() and run into a segfault. Signed-off-by: Fabian Ebner --- All patches are intended to be ordered after 0038-PVE-Backup-Don-t-block-on-finishing-and-cleanup-crea.patch or could also be squashed into that (while lifting the commit message to the main repo). Of course I can also send that directly if this is ACKed. Would be glad if someone could confirm that the cleanup for PBS is correct like this. I didn't have the time to look into all the details there yet. New in v2. pve-backup.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pve-backup.c b/pve-backup.c index 6f05796fad..dfaf4c93f8 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -509,6 +509,11 @@ static void create_backup_jobs_bh(void *opaque) { } if (*errp) { + /* + * It's enough to cancel one job in the transaction, the rest will + * follow automatically. + */ + bool canceled = false; l = backup_state.di_list; while (l) { PVEBackupDevInfo *di = (PVEBackupDevInfo *)l->data; @@ -519,12 +524,12 @@ static void create_backup_jobs_bh(void *opaque) { di->target = NULL; } - if (di->job) { + if (!canceled && di->job) { AioContext *ctx = di->job->job.aio_context; aio_context_acquire(ctx); job_cancel_sync(&di->job->job, true); - job_unref(&di->job->job); aio_context_release(ctx); + canceled = true; } } } @@ -974,6 +979,7 @@ err: if (pbs) { proxmox_backup_disconnect(pbs); + backup_state.pbs = NULL; } if (backup_dir) { -- 2.30.2