From patchwork Fri Mar 28 19:42:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Sander Mateos X-Patchwork-Id: 14032380 Received: from mail-qv1-f98.google.com (mail-qv1-f98.google.com [209.85.219.98]) (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 DB4C81E2821 for ; Fri, 28 Mar 2025 19:42:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743190963; cv=none; b=K0su6MpTrlkdIoZ23yC8mRM4YpK/wGroMdjPx/nwFtwg5ngXePneB+GsAm9XyQo46lCBU5nD+gYMAkrEZnr0KFQht8HWf2krwfuJJNU1Y9UsZcU9CBOAXZqkH6MJd+N+HKMI9NTtFdmD7Zmgvv3TaKdb/kCIKmAEUGFqox6dlLo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743190963; c=relaxed/simple; bh=IIFz4j2C2Eh7fAQD0vF3myZwWOH3MPOPveM/pvRkH1c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YOyMsqfvrQGZJS5rGUC00roqZ09k0rOiV6soIzmuMt2q1YG5mLKr06udzldNgoSvxv3rzwV9/vza3CUpGrUwwlNmCPNgPX9Y5QdaaF+i121OP/YonxuMtGEPHhI0ZtrpUyzKHxw2w6QaeKTQ+qKET9wt/Q+34X9aK7ut6CBRlCY= 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=dcPP/t60; arc=none smtp.client-ip=209.85.219.98 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="dcPP/t60" Received: by mail-qv1-f98.google.com with SMTP id 6a1803df08f44-6eaf348103cso4078716d6.0 for ; Fri, 28 Mar 2025 12:42:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743190961; x=1743795761; 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=lLazX2sR1QiGKeTx3lHr1mcmdxpFqxEOFWM2x5oC3Fg=; b=dcPP/t60EJ04nWA4KNJSsA28QsWcIhbE+btJeaFWjL8RBB9EWMcwDo7Jrw3pJ0a6Uy OUhC42H5kJO3/3DtTC+OXjC963gJ5P3BfRtSvJ9BVfZdq4EIToMyLzU1MClaCAhc10qp xpNSJ3Cq59ANj2a+VWs4SM18EBFgaM35wCrAB1PG1XZxXOpEPWt3iJ2aXGneAIiwhqrJ z3FJA8V4LTgpMvSjhokkSeZYcTaM6eamUnAwMZRf/nkOnNjcfUb2KmXip3e12QRLtfSG YMJ7LFo+ZE6aTGjH+xqiRcMq47/kYEOogqoLH+sTsIuP/xHQgktgLq+s3usLAuVQwJdS PlaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743190961; x=1743795761; 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=lLazX2sR1QiGKeTx3lHr1mcmdxpFqxEOFWM2x5oC3Fg=; b=l8xoZ2V5DFf2Cwlh3WjLQbQqON1h59obxn6fJLzqNpFqUUZSs4K5jh5uFDb5tOHGFO /MuxDpVzXALxiCc/HfEe+eXvVTpVFNGuZme9Wd3fhSCtmSr5U5nVHwNvPBXHr63CAk54 UmTf8aMlF7bKR8sjZhMZLsvQNbhyh19VGxQgVHGREfiqARQ7+rb9QMPqeCTL5c82e39C TaUw5XPYW/v9qAtLg7qerKOdmawCrCctZJZyiyn6FV/voRy+9FskFHPJ21VrDYFkR+Rq VpOaS4pnilcCNXqWTEFyCaVT2233WzRozy1bEha1JxElSYgRzX46R06aDhZB3c5S0yli w2kQ== X-Forwarded-Encrypted: i=1; AJvYcCUbv4k1sWKLBmiRNyIH54kWzs1byTogwCS0HEQl6wWwFK8T+g+J58NuF/A7wQTaJhrVVB3mm7wOMsx0OQGP9zU=@vger.kernel.org X-Gm-Message-State: AOJu0YzDQb0Ohbt5xY9IS9B7kZ0kyKxkRKbYeLToSF56ajiwF+WuRFqy 4/cwju5RF68bbSHnAOyO2+xhav3fsojnMSZ9W4hQAJ1+EasPGSpbCOdZUYKOtcaaaDlSgWfd8R0 tkDJe4zSZxXgBVaJ1rD2GMmZifvHQtU8V X-Gm-Gg: ASbGncsvj4XK/C8fWPNIEY6NjtBdJdb4ez8DeVpXghfZdiZev/weOQojoLiyHfaDRJS LeWIQ/uB9lKgwccMeMx43e710KSJebFut50gZ78SDnJmwfXCndMhgqe7HtOrjy+ZLlwfmMiVGjI 8IcLFy7zPT+tMVys+AeVa6oCmCe99Xx7+YPri2wrWMuQYQO1g1/dSGTzgPSGsYZAoSX8j+0P1YA 7C58OGbLxDpKduZK+xMzcLflnA/ryMk14ePNed7ytbzEeh68KRnRvV1Hf8uyR3szANBP4UzI6j/ oYMFJKfO3bsJu+Kusg9wZZVYU3m8D1ZxvO9M39KXQIoUAzfU X-Google-Smtp-Source: AGHT+IGTVuJ9wsa8D0YOPf/IR0bLXPoK/A+oaStmp2cHkFUKuudrLMCf9S4wmCfByWcdBV5jz2al3JueEfox X-Received: by 2002:a05:622a:110f:b0:474:e996:197a with SMTP id d75a77b69052e-477ed7b2291mr3086091cf.10.1743190960620; Fri, 28 Mar 2025 12:42:40 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id d75a77b69052e-47782a2849asm2198541cf.6.2025.03.28.12.42.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 12:42:40 -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 8A3F73402DD; Fri, 28 Mar 2025 13:42:39 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 8669BE40DF3; Fri, 28 Mar 2025 13:42:39 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 1/2] ublk: specify io_cmd_buf pointer type Date: Fri, 28 Mar 2025 13:42:29 -0600 Message-ID: <20250328194230.2726862-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328194230.2726862-1-csander@purestorage.com> References: <20250328194230.2726862-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 io_cmd_buf points to an array of ublksrv_io_desc structs but its type is char *. Indexing the array requires an explicit multiplication and cast. The compiler also can't check the pointer types. Change io_cmd_buf's type to struct ublksrv_io_desc * so it can be indexed directly and the compiler can type-check the code. Signed-off-by: Caleb Sander Mateos --- drivers/block/ublk_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index 355a59c78539..ed73e2ffdf09 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -153,11 +153,11 @@ struct ublk_queue { int q_id; int q_depth; unsigned long flags; struct task_struct *ubq_daemon; - char *io_cmd_buf; + struct ublksrv_io_desc *io_cmd_buf; bool force_abort; bool timeout; bool canceling; bool fail_io; /* copy of dev->state == UBLK_S_DEV_FAIL_IO */ @@ -701,15 +701,15 @@ static inline bool ublk_rq_has_data(const struct request *rq) } static inline struct ublksrv_io_desc *ublk_get_iod(struct ublk_queue *ubq, int tag) { - return (struct ublksrv_io_desc *) - &(ubq->io_cmd_buf[tag * sizeof(struct ublksrv_io_desc)]); + return &ubq->io_cmd_buf[tag]; } -static inline char *ublk_queue_cmd_buf(struct ublk_device *ub, int q_id) +static inline struct ublksrv_io_desc * +ublk_queue_cmd_buf(struct ublk_device *ub, int q_id) { return ublk_get_queue(ub, q_id)->io_cmd_buf; } static inline int __ublk_queue_cmd_buf_size(int depth) From patchwork Fri Mar 28 19:42:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caleb Sander Mateos X-Patchwork-Id: 14032381 Received: from mail-qv1-f100.google.com (mail-qv1-f100.google.com [209.85.219.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 9873E1E2821 for ; Fri, 28 Mar 2025 19:43:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743190994; cv=none; b=SRH21aOUcDxHeF4C94wWsQ8bI5Y9dNyzvktzY5i4G6U3pUPPDuBQ2lz/GwKO/QuVbc8g442kEtEwpdon1bZ1Ka46m1PqSxq7+qzzLqjUJQROIU24nk5DC16gkb7pYJA+zHPCJrd+hpKG1oGTGZU8uZMSw5rPeaGq4PWfc1hjurc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743190994; c=relaxed/simple; bh=flOtsZf7EBjh13FNyMsTD/5FQtLGeN9iZpmU8bbk1i0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Kc1KsTBp5XbG1vozqPsBPwXIFxWNaHoaRIgI8eo6IMtksd8LPRFMJteva9EWaIEVt8sV9cp6hRPWBvdW1dksx64EmUDqL/H3atbqLqh8/4MdtlqagPxu9fMMHzWpeNK/x69FVXZeEUuFdlP4mxjtxwX7OqiMkvJn66GLk8w2jAk= 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=XyjY05Iw; arc=none smtp.client-ip=209.85.219.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="XyjY05Iw" Received: by mail-qv1-f100.google.com with SMTP id 6a1803df08f44-6e8fa2d467fso3630346d6.2 for ; Fri, 28 Mar 2025 12:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1743190991; x=1743795791; 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=Mx6Kws4EehWQnJaxPytGf8blP84+Tos6v3LWW/hBgTg=; b=XyjY05IwJf4CtrRETT91urQ3w1rKNhpRDzT57zdo7OEYwR3ZDB64EyuaT2BxVCt4+s jZzpIxPNXfOBGdkbagHa+PPIMyZ0+FV1LJAcHr8C3jEP6+eFilqmlkapncB8zJbQQVWr qfx5Q8sWGqkidWiXE6lGInnI/xPnWTSz/5mEd+JLAlC0bKQnTLsp2UgT+RWjsMkAgTuK jylwsyFtAexyLd30ltuA04rsZbdK4u7H70y3uiCjeTiFrII9pyyNyytxd89zkhYugIRW oiCJ+MlBOnku7vM0Z3Uvzfm9Q028K61jHBqFVvmwtC7zhVfh9oi3mMm2GWvPO+jG1JqH HxRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743190991; x=1743795791; 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=Mx6Kws4EehWQnJaxPytGf8blP84+Tos6v3LWW/hBgTg=; b=oR6Kt/syJxFU3UAQ68H+hL9zJ6aSbj+E4fMEelehqsjzHBUKdgLaAoc6KCXGs8CGEG A49gXpvOCbYzs5cLa4UpgkmSqhBCP/evD/YS5E+x/1z4CL5xbCSizTNodaLTgvt76hgC jRVzrKDi+579BiDebDjvDRYTVLupnu6AIEolMjzUt18j2BqEwsBzIuViXOeaelrBqnuN Htl2gLgN/xMiWyBim6IfeAKUXQj104hRL3TDpq2QE9FsjtAZlFVeVPc/gPXY6+ciD1Ii UrWhlwTeBrWN9hm1nxD6LwPTWnyC5WN9YoZ6WjekGmUeDGOmLKpERpAyxiOQ1FEHqeGq Sfuw== X-Forwarded-Encrypted: i=1; AJvYcCVIU5Pb0h3aXaqEQoeu66WbPF94AvQN8vaQja7Hjpnhbvl3UyavNGeS0khQtkyyQ4Udz3mQ7TWT+Vj7Jno16rs=@vger.kernel.org X-Gm-Message-State: AOJu0YyWcpYg1mv36mD187xthlSQjLq0RCxq62n9l2Zs0z1IrI6vx+4y Pj3+k/6h12xWApxznjz9Nwe6enUOiFdIr4o3kE25Wssc9gMN+xtDAX7eV7hkO3YpgTNsqW4LZjK 8dmtj9C7y5RnZWTQZjPzUe3pCVugAPHfu X-Gm-Gg: ASbGncuDNGi/9KaFS5Nm9QQiV70M87VSiC5/4oDGRNSr05jx5Go+DDq57IwSfdW9Vzy JmZxXRl24hVCAi7GaP2kONPcAZoGxcJdLyiukQBHER4zn5tDn+PkITNqw3V2tWqjfkQ6Npp9fwm T2GCLFyJO8LgKw3mVq1zDvaEGOlXY8v32LBu/gBmnzPQ0pVKStKCXkiOsRaRnrQq925ofcPdaW/ wYHhwyje6g2lEe/Xm36HU1HbVPudGJHiI5DkBwoIOrnbMIswRDJ4b0L8nE5F/5KZKnm8T+3UW2j dnJQwHgLxBMhZ2lg9OW9vCjV4VrmluLICLLXmeyP376B5FAe X-Google-Smtp-Source: AGHT+IFQh9Pcs5CAbScmakAUo+ucuKKnoyChirklEpCbSZtv64yiMBBKapJk+vPUTDfe74Ad8xyLWKkPfmB2 X-Received: by 2002:ad4:596f:0:b0:6e8:9ed4:140c with SMTP id 6a1803df08f44-6eed61f0b0bmr1762166d6.7.1743190991334; Fri, 28 Mar 2025 12:43:11 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-6eec963b60bsm2865306d6.17.2025.03.28.12.43.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Mar 2025 12:43:11 -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 479CE3402DD; Fri, 28 Mar 2025 13:43:10 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 3CDC7E40DF3; Fri, 28 Mar 2025 13:42:40 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Jens Axboe , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 2/2] selftests: ublk: specify io_cmd_buf pointer type Date: Fri, 28 Mar 2025 13:42:30 -0600 Message-ID: <20250328194230.2726862-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250328194230.2726862-1-csander@purestorage.com> References: <20250328194230.2726862-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Matching the ublk driver, change the type of io_cmd_buf from char * to struct ublksrv_io_desc *. Signed-off-by: Caleb Sander Mateos --- tools/testing/selftests/ublk/kublk.c | 2 +- tools/testing/selftests/ublk/kublk.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/ublk/kublk.c b/tools/testing/selftests/ublk/kublk.c index 05147b53c361..83756f97c26e 100644 --- a/tools/testing/selftests/ublk/kublk.c +++ b/tools/testing/selftests/ublk/kublk.c @@ -320,11 +320,11 @@ static int ublk_queue_init(struct ublk_queue *q) q->state |= UBLKSRV_ZC; } cmd_buf_size = ublk_queue_cmd_buf_sz(q); off = UBLKSRV_CMD_BUF_OFFSET + q->q_id * ublk_queue_max_cmd_buf_sz(); - q->io_cmd_buf = (char *)mmap(0, cmd_buf_size, PROT_READ, + q->io_cmd_buf = mmap(0, cmd_buf_size, PROT_READ, MAP_SHARED | MAP_POPULATE, dev->fds[0], off); if (q->io_cmd_buf == MAP_FAILED) { ublk_err("ublk dev %d queue %d map io_cmd_buf failed %m\n", q->dev->dev_info.dev_id, q->q_id); goto fail; diff --git a/tools/testing/selftests/ublk/kublk.h b/tools/testing/selftests/ublk/kublk.h index f31a5c4d4143..760ff8ffb810 100644 --- a/tools/testing/selftests/ublk/kublk.h +++ b/tools/testing/selftests/ublk/kublk.h @@ -126,11 +126,11 @@ struct ublk_queue { int q_depth; unsigned int cmd_inflight; unsigned int io_inflight; struct ublk_dev *dev; const struct ublk_tgt_ops *tgt_ops; - char *io_cmd_buf; + struct ublksrv_io_desc *io_cmd_buf; struct io_uring ring; struct ublk_io ios[UBLK_QUEUE_DEPTH]; #define UBLKSRV_QUEUE_STOPPING (1U << 0) #define UBLKSRV_QUEUE_IDLE (1U << 1) #define UBLKSRV_NO_BUF (1U << 2) @@ -300,11 +300,11 @@ static inline void ublk_mark_io_done(struct ublk_io *io, int res) io->result = res; } static inline const struct ublksrv_io_desc *ublk_get_iod(const struct ublk_queue *q, int tag) { - return (struct ublksrv_io_desc *)&(q->io_cmd_buf[tag * sizeof(struct ublksrv_io_desc)]); + return &q->io_cmd_buf[tag]; } static inline void ublk_set_sqe_cmd_op(struct io_uring_sqe *sqe, __u32 cmd_op) { __u32 *addr = (__u32 *)&sqe->off;