From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f227.google.com (mail-qk1-f227.google.com [209.85.222.227]) (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 545FD23A566 for ; Thu, 18 Sep 2025 01:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.227 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758160239; cv=none; b=klxoTRAaVzpanyJ5u2vtU8okCCTK9OASX68HWoFozydxL1hBRLm0DTo2qeaJRMd1uXVABfqj0GeEhvZcBQqjeb8GnsHUvhAemVwfC5A/PjWYI9shwfAJ3QDgLLkI8GCNRMozdrLpd3kN2IlSznc6GsSk7tPICFhLQwirCPdNzE0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758160239; c=relaxed/simple; bh=YgaAljjCEjYu2z1bmyuyvJK4rSyuSbdErm8XvDe+Qck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SMHMKFslrjXKKUaRIwbnHkL/3SPBPGXxKm9kxZI4eDQedol8cRFWNOA7x2IWJL1Gngj+C1ZHGSTNw3sXy6e/WmKeTnB2O73qMQO0qU0HC5ZdlfQi/qlQGU0yQ47LWkApyhi6O4lvY/lWqSafB/rDYEYx/CbUVFcheshDWWKenWo= 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=Y8Y6VxCr; arc=none smtp.client-ip=209.85.222.227 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="Y8Y6VxCr" Received: by mail-qk1-f227.google.com with SMTP id af79cd13be357-837d73dddc6so3459385a.2 for ; Wed, 17 Sep 2025 18:50:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1758160236; x=1758765036; 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=484GJ0fhKoa3hEGK1iZwSCdH9LWZt7uifdWOXLD/L/4=; b=Y8Y6VxCr8mvbcLcbsAoRPh7vncBZZS2sH842XJIAYqkf6pvt4O4U5dap0S46rKy9Bz HtKne1/WsxPx685UkqRfl5Cz+GZP9HoxuT5xXwJ/RidIicrLrlOgefnjlMyf6pGsJPAN x3IJJWxAitBCwv+Jie5s/04cMM/8jqpn8j5fz9zRKn8GTJFRvI7+dvDAnXDuZmdBQAwk s51wuIcwBdfviI7gW6DT6EAXo3QLy8RlqopxvIVJdZToCtQyskkp87v9/y6+oic6F9Sa pHDbNjhyzvrQS6XYL5d7/fY1mvjEdOTBc+5EriU5TIMREyrtB0fFojQyabYbhorle2Ib mDeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758160236; x=1758765036; 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=484GJ0fhKoa3hEGK1iZwSCdH9LWZt7uifdWOXLD/L/4=; b=tlCg//004hm3PNHmUzaqj1SweVJglxuVI2K/GBl0Qizgs0VRv6X9ToroR5XFKkh1Ac TZmezqaiNFwsdEPM4aSO/q5KtkBjOqIG6pm48VKfN5bGFcuqB3oRsnv5X1Y7LXijsyhz kS8CfLY4hStG4diT6McX7ge5ZYnEtobXQ+tUF3BQfr+LlDpjQDeimOgjeTEKYQaL8P0X a+x0ZNtlRJjVL1RweCeMNI0Nb2IDk9BlKwMocqKlP1yQhfR1t69W/E5m7HQja5ktGbi5 jMP04HY21lmJN77e3MyCjuzXXZ0nlqRwUxObZ9d4qU+HWHrDgVvnHIm5Cq0Vyl2WkMd8 L/9A== X-Gm-Message-State: AOJu0Yw0m8ueuBIyFvAj3Zg7jij335awMEyaxwYAWlsIFtZRj23VRbD+ KjSf4Kyw1gWZQm4wKnCNlQbCC76PbeGiKvZuMjJ6UEVWkataikt+LUIp8MWJ4m1KwpmcmVsVPhs oMkczWpEqLJNLrAiluLdUAjLPOaXp11cbWrYi X-Gm-Gg: ASbGncsOy64Swbq1vkuzDtsFYNyOZ2wT9lnjzyT4B2Ba3kYm76LRot6A0AZQdvwOX7H 8f+SFZpvtECOyP5uzyKoJVYtG7hesxUR8vm5iMfwxFsw126vWVqJE9RAHIWLrRIe4dN3cbK1TNl YoqnuNmkmnmweydErdWmC9u/NB4meSDouigWLDz5VkrVPZn0j91kzKXKMtOrUBJicdrS5SEcwyG nxk/95+wKxPtSwYXFxe5LmhEM3Qzj19g+C8d3KcK/VBjNJ/kmdsDX3XQYPw76XfQXADvcWopZFc oHfgtcSlhTdt1ZbtQdEZGKmRL3mUGA/oVUcJw70j7bvbOdIhis8cKR36un8JgAE9r+wjFQbX X-Google-Smtp-Source: AGHT+IErBYL3/Nsn80r0sQPK5XbZBh4OUvJ12WMsWq2TG6b3AgM8Dh0ua+qlHiSFawMaO170kBRkcOes47tI X-Received: by 2002:a05:6214:529e:b0:78f:e44f:bb6f with SMTP id 6a1803df08f44-78fe44fbf21mr22825096d6.0.1758160236216; Wed, 17 Sep 2025 18:50:36 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-7935206af0esm697716d6.42.2025.09.17.18.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Sep 2025 18:50:36 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 93B47340325; Wed, 17 Sep 2025 19:50:35 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 8E5E7E41B42; Wed, 17 Sep 2025 19:50:35 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 04/17] ublk: add helpers to check ublk_device flags Date: Wed, 17 Sep 2025 19:49:40 -0600 Message-ID: <20250918014953.297897-5-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250918014953.297897-1-csander@purestorage.com> References: <20250918014953.297897-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 Introduce ublk_device analogues of the ublk_queue flag helpers: - ublk_support_zero_copy() -> ublk_dev_support_user_copy() - ublk_support_auto_buf_reg() -> ublk_dev_support_auto_buf_reg() - ublk_support_user_copy() -> ublk_dev_support_user_copy() - ublk_need_map_io() -> ublk_dev_need_map_io() - ublk_need_req_ref() -> ublk_dev_need_req_ref() - ublk_need_get_data() -> ublk_dev_need_get_data() These will be used in subsequent changes to avoid accessing the ublk_queue just for the flags, and instead use the ublk_device. Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 4cb023d26593..04b8613ce623 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -660,26 +660,48 @@ static void ublk_apply_params(struct ublk_device *ub) static inline bool ublk_support_zero_copy(const struct ublk_queue *ubq) { return ubq->flags & UBLK_F_SUPPORT_ZERO_COPY; } +static inline bool ublk_dev_support_zero_copy(const struct ublk_device *ub) +{ + return ub->dev_info.flags & UBLK_F_SUPPORT_ZERO_COPY; +} + static inline bool ublk_support_auto_buf_reg(const struct ublk_queue *ubq) { return ubq->flags & UBLK_F_AUTO_BUF_REG; } +static inline bool ublk_dev_support_auto_buf_reg(const struct ublk_device *ub) +{ + return ub->dev_info.flags & UBLK_F_AUTO_BUF_REG; +} + static inline bool ublk_support_user_copy(const struct ublk_queue *ubq) { return ubq->flags & UBLK_F_USER_COPY; } +static inline bool ublk_dev_support_user_copy(const struct ublk_device *ub) +{ + return ub->dev_info.flags & UBLK_F_USER_COPY; +} + static inline bool ublk_need_map_io(const struct ublk_queue *ubq) { return !ublk_support_user_copy(ubq) && !ublk_support_zero_copy(ubq) && !ublk_support_auto_buf_reg(ubq); } +static inline bool ublk_dev_need_map_io(const struct ublk_device *ub) +{ + return !ublk_dev_support_user_copy(ub) && + !ublk_dev_support_zero_copy(ub) && + !ublk_dev_support_auto_buf_reg(ub); +} + static inline bool ublk_need_req_ref(const struct ublk_queue *ubq) { /* * read()/write() is involved in user copy, so request reference * has to be grabbed @@ -693,10 +715,17 @@ static inline bool ublk_need_req_ref(const struct ublk_queue *ubq) */ return ublk_support_user_copy(ubq) || ublk_support_zero_copy(ubq) || ublk_support_auto_buf_reg(ubq); } +static inline bool ublk_dev_need_req_ref(const struct ublk_device *ub) +{ + return ublk_dev_support_user_copy(ub) || + ublk_dev_support_zero_copy(ub) || + ublk_dev_support_auto_buf_reg(ub); +} + static inline void ublk_init_req_ref(const struct ublk_queue *ubq, struct ublk_io *io) { if (ublk_need_req_ref(ubq)) refcount_set(&io->ref, UBLK_REFCOUNT_INIT); @@ -724,10 +753,15 @@ static inline bool ublk_sub_req_ref(struct ublk_io *io) static inline bool ublk_need_get_data(const struct ublk_queue *ubq) { return ubq->flags & UBLK_F_NEED_GET_DATA; } +static inline bool ublk_dev_need_get_data(const struct ublk_device *ub) +{ + return ub->dev_info.flags & UBLK_F_NEED_GET_DATA; +} + /* Called in slow path only, keep it noinline for trace purpose */ static noinline struct ublk_device *ublk_get_device(struct ublk_device *ub) { if (kobject_get_unless_zero(&ub->cdev_dev.kobj)) return ub; -- 2.45.2