From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f100.google.com (mail-io1-f100.google.com [209.85.166.100]) (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 319D622A7EB for ; Wed, 30 Apr 2025 22:52:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.100 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053569; cv=none; b=gp5Yr50qKH3YKAX5FZeA+u6GUQ9yN0xQIlTwnkShmC1JrL3pk4mLa3OeWO1/9ERXQ0dmBSU4rD10VJuhdQUrJD52na0sSsyIawYr6BWALKnTyFamYpiykLBoL4zNFf9vJuU7k5PSixpyPHkp2CktC40tpG/I9gQsWm1yHWAI+eg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746053569; c=relaxed/simple; bh=1hyN+kc3XNgmfNwghwmkyi4ejxAW3PAW3imq8XmVVTo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zip7qtvd4K978mAuHfTNc4TtuqTbm13mmEzY8C9O0PP5/OG4GvidAhMP4K9JbdWcIgQ2lbegqsdyDQC1GG4YZs4zL3Rm8M/hA/M64CKHYCqSOdyc2XcUermyC3xkapdXMFVCrCYgos07oXliIunDZGtMi9IVRBJ5RMvfbNxGCoU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=T7CcPZ/2; arc=none smtp.client-ip=209.85.166.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="T7CcPZ/2" Received: by mail-io1-f100.google.com with SMTP id ca18e2360f4ac-85dc6dd9c5fso1698539f.3 for ; Wed, 30 Apr 2025 15:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1746053566; x=1746658366; darn=vger.kernel.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=R4iRqRYOY3v92ahJdyDMU1UlrSYDHa45zvlKwr5Fr/I=; b=T7CcPZ/2ts228nRdFvDdkZO36s4I8UonmMAw2w6StfAzbViM70cj7rkcNnemkZlvYr 0pFnP/bvy0bRzJFvz61DT5B7Gvp95281fEQd4NbOkdEJH+a/ELLc5qq03067UgqQG1U4 UDsFP8xUZ73Dj0zsaAQdVMIsihlv/6e1wndS0uSBU2IgadWo2DeEUc6M9ih2TdT66RDV 4VtbVAx/WAz4cpiB2noWGA83i7Utqn8cIn6oFuJouwoMTGFoKojLy4cYxcg34Fqq4v6W ODSvFMXRZ2lFmelxsbfOM6kxIqzl/D7g7oOYE3FtgSoKz4433rYDopq/Oh+EWdxQhHLW qhEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746053566; x=1746658366; 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=R4iRqRYOY3v92ahJdyDMU1UlrSYDHa45zvlKwr5Fr/I=; b=Pn0XOeTwgs7F1aOETaDC6zqhyej6+9ybJfYMwXt54EnWThwlVBc4KFqRFfSdif5pCS 0GceAa5nXWUATqeTi4VLAYVas4IzmP1eG1T6Vkct3GgFxTnvg0KCR2ym8YpsEAnDdGL0 Qpuyycd1/dxYcCnel2N6fNIkzO6NGL23BsKPXZxoN6csdpcHp7otGbbAztSyiDXGOJEB OHNXJQXvJrtQUd8duN+o2H4nYbEOUFAMXh0xDxreT4Lg70/I3bi6q3Fej1uHCONQaT+m mB9lq1Wu5AtkUfS1kr1FNsgD65TpigCeKxYKSCHCD/I67X6gtvyHAjxajai/NlqR91f8 N1IA== X-Forwarded-Encrypted: i=1; AJvYcCVlV6oDJaXXxkRn+OOkweA2veOLPlPr6SzRE4gNjkMp34QouXqxffhtwFgZB48a0UKaX5WJzI99GxP8Cg==@vger.kernel.org X-Gm-Message-State: AOJu0YzmdTOF7jatUq+rxRqhxvHex20eL0zbX0cGHTRQQguw68JKmGsG ZHULdsxJy3n8891cS0ecwkHWzscxXsjXsTt6UwrR/vo/Zz5fieFjZpLZ/Vw5Mnjh2IE+d9KPAoa 5B0g4DFyVDnQfXx/GOZsirKDaURsachN0 X-Gm-Gg: ASbGncshNXZni53ATw+MtE9iCpu9xxsmsvP908WUOQXcdPOGvapxxKdfjy9OPhSASI0 ZoGkrVGicYVo8QqY8M3NsAKq2SFSlsVvSHiMnX8+5R7mrWfSNNkf8NnKbznzPV77gYJOF/EbcKK e8n7hWBLPbzqU4wkcnW76MbFbQJn3Ev9GPr4Y+rWxIEepwoPk3ANnFVuNvyOocWHErDAbMnniFP Kgy6Fp7IXSfBhx6s9tzJ9J3QCwtQjMR4PsSJ1xOjYFeBwG8MafxBiOsdrYYZjEG+DrA/tBZbe/Q +Y8IYgsAQu9Cdnd6nFZFp4ebpUlFTKtWedF3AAy39CKW X-Google-Smtp-Source: AGHT+IH51L+NKmfS1JUzYUlNoJGB0g+pMOtYBRXXIJ6Yp8zTD3wqPafStBmoG8THnE72BpR1jjI2GQmmQL0b X-Received: by 2002:a05:6e02:1fcb:b0:3d9:2961:fa01 with SMTP id e9e14a558f8ab-3d9682a4f0dmr15322105ab.3.1746053566230; Wed, 30 Apr 2025 15:52:46 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 8926c6da1cb9f-4f8630943besm318541173.57.2025.04.30.15.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 15:52:46 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (unknown [IPv6:2620:125:9007:640:ffff::418a]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id DF96D340199; Wed, 30 Apr 2025 16:52:45 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id DDDF1E41CC0; Wed, 30 Apr 2025 16:52:45 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: Uday Shankar , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 8/9] ublk: check UBLK_IO_FLAG_OWNED_BY_SRV in ublk_abort_queue() Date: Wed, 30 Apr 2025 16:52:33 -0600 Message-ID: <20250430225234.2676781-9-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250430225234.2676781-1-csander@purestorage.com> References: <20250430225234.2676781-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ublk_abort_queue() currently checks whether the UBLK_IO_FLAG_ACTIVE flag is cleared to tell whether to abort each ublk_io in the queue. But it's possible for a ublk_io to not be ACTIVE but also not have a request in flight, such as when no fetch request has yet been submitted for a tag or when a fetch request is cancelled. So ublk_abort_queue() must additionally check for an inflight request. Simplify this code by checking for UBLK_IO_FLAG_OWNED_BY_SRV instead, which indicates precisely whether a request is currently inflight. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- drivers/block/ublk_drv.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 483205a0dfe8..97c61c0bf964 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -1609,20 +1609,15 @@ static void ublk_abort_queue(struct ublk_device *ub, struct ublk_queue *ubq) int i; for (i = 0; i < ubq->q_depth; i++) { struct ublk_io *io = &ubq->ios[i]; - if (!(io->flags & UBLK_IO_FLAG_ACTIVE)) { + if (io->flags & UBLK_IO_FLAG_OWNED_BY_SRV) { struct request *rq; - /* - * Either we fail the request or ublk_rq_task_work_cb - * will do it - */ rq = blk_mq_tag_to_rq(ub->tag_set.tags[ubq->q_id], i); - if (rq && blk_mq_request_started(rq)) - __ublk_fail_req(ubq, io, rq); + __ublk_fail_req(ubq, io, rq); } } } /* Must be called when queue is frozen */ -- 2.45.2