From nobody Thu Dec 18 08:39:22 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 439B1242D76 for ; Wed, 10 Dec 2025 01:44:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331095; cv=none; b=nDUQbbuAfeg041T/W2h6uQK8XFTgY7XwkdUWTRAqxcsexzSAA6kxnKg0nyreN2aQJRHSZRyxvg23JI9but/lNKiDDly1XUunhFXOHBWoitnQvArjSNjRfLpEBJ7BynseUrFCSST7Gk3XIS32d7Rth6DjfMKrkOT7IU2d8m+yOBM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331095; c=relaxed/simple; bh=monXj7+R4cpXUJkrbIONb5M7vohrDue1L1wHC5K6XC0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ujQIvng9/1bkWhSDGi+TU7I1C+WylUfrBOGDhRZxk7rTrCHmHttl98evd4pSCNLnKKn+sHGm7ujWKHgCqD7Yi3PM0/K6yMPwf+O93GjgdlK98nBzP2euHJJ3kMmHopvjzfjSfv2nnR8mbkb34EYIa5FDV5ot2KmdQ/Je8mhGif8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cNtXbt/w; arc=none smtp.client-ip=209.85.210.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cNtXbt/w" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-7b22ffa2a88so6356147b3a.1 for ; Tue, 09 Dec 2025 17:44:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765331093; x=1765935893; 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=keA9F3YxBh09o9pCPWxgnr568IGr525xE5zudb3+saA=; b=cNtXbt/wWsL6aALrH54eYTGFPpdd8phcG3lmKumZ8ur/3+nEm260LsFo3ipKsrxSsS 4Y9dhKOTuaizLVgbTsBvZcEWifp2s6WBjtiC04OkYL2sf5S4JYUPU7P4QNHis3jb3dwc MijUQ828tn1J6lL/KVloH8HoDkvvzuePJomwUKk/4JrBPZFPAZCB0IURuPDByuqW9GFB 0aFRhFRuVqjrFzU2uyUEuCSd87Z60mChKYvWkD3Xm92Mqx9Hne8WEpsca2MUT1gzXVKi 9X1yzLRblmu3cYpKdWszY/+eana7/AZREWU6Y6JOV9WhLlFkJKXoPnMXpSGAs/GFsbIq +8IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765331093; x=1765935893; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=keA9F3YxBh09o9pCPWxgnr568IGr525xE5zudb3+saA=; b=ugeUqBqozqwRVDtbXdT0tbc/1Zfg/NZC79ZkJut6K3gFXhNvFvYbtbcAwdYGViJwsm 8MV5V0sNI8eiFnoR1X5AOK9MIjVGomTX1AP0lox6bL/Dk3CZbAlzUf9Sl2MYVCVo1UVB UW37yAfU93R0xkSnX205mCnMXSca5lGnX86EQQ/ZrIdpWlMgVwZ11vxaaTM3PmXM6OwW R9wDsUe/+TVwJspqYX6XMZg+TLDnwHJlGrqoJT7HH8p0LSrQSBLBtGkLunZixiz49fDS l7zKPXRcdvTUp/Kru9h7rJkDRnyz75u1H6ceM+M2rz8jLfuwTQUHcJQykXbklYIKbc8V mzRA== X-Forwarded-Encrypted: i=1; AJvYcCXgNNZgIfTqONR9HMLCbY8MLdl6hb7K+7dCjN5P8Jivr9EKrBBnn+N0/5LqAkc034WBJVEQhb+gyN0VUpw=@vger.kernel.org X-Gm-Message-State: AOJu0YyAOTmPctxCHBYJpwNv+Ysg+/z3triz1yD3vN0Q5BZ7QzHIeeo1 llVLZwXQ/yVaikbNRn+pfhvpqeE7mbU9oFrtKJNTpG7PUSoHuGEQPZqv X-Gm-Gg: ASbGncsD0DBaI9Jesef1HdnML39X47KCaL4MYrfJTHWtKiPqC+2yUN6U8QFwkS1vbUO BhxR1w6lw4IsnE+ZU5UekrcrD0UYUIGgk/TEKFjoCE9zlxIQnIFYklYeBsHMht1D3ORukptb06K ru2swCBCIUANIreFOYnN+X7fnJtIz3RRcOGSFVKy4ABHxvO8Ul4qJReondlX1opa7Lm2QIbtQ/I asMaa399zQWP3xXVtG3plEanRIXAKvgVc5QbWOFF8lFLF8a5dZavUxsc4DdJdRXgDwku3NUVFT4 PMVihEAOUaXgdlhXzWuDi8GeBTWvv1m/BaYF3UetcXGcbZErdtIvPJrcO/KugfOenYh4XH2KgJr MDn1NgoryEp70KB7rhnZap1pIusPjhfAmkVUfoLwYrFX1iMxBTtzgUNd9+qv02V5VZo65gbAmR9 NmnqK0jmooqgdtJgj4f4/Eo1WT5+Ibb+s= X-Google-Smtp-Source: AGHT+IFei0SQ90u6Oo5qESgNgaX/ZB5xweXsWOOgXwPrIkFrPplRPh3HKFMlJlzkz4fQ2pW/0i3uYw== X-Received: by 2002:a05:7022:2384:b0:11b:b882:3ed5 with SMTP id a92af1059eb24-11f296d812bmr624718c88.37.1765331093388; Tue, 09 Dec 2025 17:44:53 -0800 (PST) Received: from deb-101020-bm01.dtc.local ([149.97.161.244]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11df76e2eefsm80274777c88.6.2025.12.09.17.44.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 17:44:53 -0800 (PST) From: sw.prabhu6@gmail.com To: James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org Cc: bvanassche@acm.org, linux-kernel@vger.kernel.org, mcgrof@kernel.org, kernel@pankajraghav.com, dlemoal@kernel.org, Swarna Prabhu , stable@vger.kernel.org, Swarna Prabhu , Pankaj Raghav Subject: [PATCH 1/2] scsi: sd: fix write_same(16/10) to enable sector size > PAGE_SIZE Date: Wed, 10 Dec 2025 01:41:36 +0000 Message-ID: <20251210014136.2549405-3-sw.prabhu6@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251210014136.2549405-1-sw.prabhu6@gmail.com> References: <20251210014136.2549405-1-sw.prabhu6@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Swarna Prabhu The WRITE SAME(16) and WRITE SAME(10) scsi commands uses a page from a dedicated mempool('sd_page_pool') for its payload. This pool was initialized to allocate single pages, which was sufficient as long as the device sector size did not exceed the PAGE_SIZE. Given that block layer now supports block size upto 64K ie beyond PAGE_SIZE, adapt sd_set_special_bvec() to accommodate that. With the above fix, enable sector sizes > PAGE_SIZE in scsi sd driver. Cc: stable@vger.kernel.org Signed-off-by: Swarna Prabhu Co-developed-by: Pankaj Raghav Signed-off-by: Pankaj Raghav --- Note: We are allocating pages of order aligned to=20 BLK_MAX_BLOCK_SIZE for the mempool page allocator 'sd_page_pool' all the time. This is because we only know that a bigger sector size device is attached at sd_probe and it might be too late to reallocate mempool with order >0. drivers/scsi/sd.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 0252d3f6bed1..17b5c1589eb2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -892,14 +892,24 @@ static void sd_config_discard(struct scsi_disk *sdkp,= struct queue_limits *lim, (logical_block_size >> SECTOR_SHIFT); } =20 -static void *sd_set_special_bvec(struct request *rq, unsigned int data_len) +static void *sd_set_special_bvec(struct scsi_cmnd *cmd, unsigned int data_= len) { struct page *page; + struct request *rq =3D scsi_cmd_to_rq(cmd); + struct scsi_device *sdp =3D cmd->device; + unsigned sector_size =3D sdp->sector_size; + unsigned int nr_pages =3D DIV_ROUND_UP(sector_size, PAGE_SIZE); + int n =3D 0; =20 page =3D mempool_alloc(sd_page_pool, GFP_ATOMIC); if (!page) return NULL; - clear_highpage(page); + + do { + clear_highpage(page + n); + n++; + } while (n < nr_pages); + bvec_set_page(&rq->special_vec, page, data_len, 0); rq->rq_flags |=3D RQF_SPECIAL_PAYLOAD; return bvec_virt(&rq->special_vec); @@ -915,7 +925,7 @@ static blk_status_t sd_setup_unmap_cmnd(struct scsi_cmn= d *cmd) unsigned int data_len =3D 24; char *buf; =20 - buf =3D sd_set_special_bvec(rq, data_len); + buf =3D sd_set_special_bvec(cmd, data_len); if (!buf) return BLK_STS_RESOURCE; =20 @@ -1004,7 +1014,7 @@ static blk_status_t sd_setup_write_same16_cmnd(struct= scsi_cmnd *cmd, u32 nr_blocks =3D sectors_to_logical(sdp, blk_rq_sectors(rq)); u32 data_len =3D sdp->sector_size; =20 - if (!sd_set_special_bvec(rq, data_len)) + if (!sd_set_special_bvec(cmd, data_len)) return BLK_STS_RESOURCE; =20 cmd->cmd_len =3D 16; @@ -1031,7 +1041,7 @@ static blk_status_t sd_setup_write_same10_cmnd(struct= scsi_cmnd *cmd, u32 nr_blocks =3D sectors_to_logical(sdp, blk_rq_sectors(rq)); u32 data_len =3D sdp->sector_size; =20 - if (!sd_set_special_bvec(rq, data_len)) + if (!sd_set_special_bvec(cmd, data_len)) return BLK_STS_RESOURCE; =20 cmd->cmd_len =3D 10; @@ -2880,10 +2890,7 @@ sd_read_capacity(struct scsi_disk *sdkp, struct queu= e_limits *lim, "assuming 512.\n"); } =20 - if (sector_size !=3D 512 && - sector_size !=3D 1024 && - sector_size !=3D 2048 && - sector_size !=3D 4096) { + if (blk_validate_block_size(sector_size)) { sd_printk(KERN_NOTICE, sdkp, "Unsupported sector size %d.\n", sector_size); /* @@ -4368,7 +4375,7 @@ static int __init init_sd(void) if (err) goto err_out; =20 - sd_page_pool =3D mempool_create_page_pool(SD_MEMPOOL_SIZE, 0); + sd_page_pool =3D mempool_create_page_pool(SD_MEMPOOL_SIZE, get_order(BLK_= MAX_BLOCK_SIZE)); if (!sd_page_pool) { printk(KERN_ERR "sd: can't init discard page pool\n"); err =3D -ENOMEM; --=20 2.51.0 From nobody Thu Dec 18 08:39:22 2025 Received: from mail-dy1-f174.google.com (mail-dy1-f174.google.com [74.125.82.174]) (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 34313248883 for ; Wed, 10 Dec 2025 01:45:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331102; cv=none; b=rS4ehTZLu08EmNV4N8j3OAkpXFH853gwW6EIEqLyovdJYqbUfYtjegvz7GnHMbV0a7AvCZGKfEZqvIb+ND3r5iblOybXspnYpy06dx/gwvhevFgK5/AOd85vniU0HjmmzI4uW59heemHMsBqlDfew0ymoJjabWcZqvhtPf+9Lwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765331102; c=relaxed/simple; bh=AMxxhUkwVWytoBdA0qFSxBu6u5veHcpEDX3IoI9In/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hgQxYMIuZH1B+q4Xbcar7puo3NiI7ZpPpZoUSFKaYuFPE0vfzejD7UNQigXNK6aTXAcBYaZIPTVCNV3c0Iwi1SlKpy402VKa1zLwYOnoxPc6P14Ld1CkT5KMCncPYBvVh3x53FQRVwZDT0Pmidnv0pY6VKk7kxUxTkBwE/EEDDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HqYfNbLe; arc=none smtp.client-ip=74.125.82.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HqYfNbLe" Received: by mail-dy1-f174.google.com with SMTP id 5a478bee46e88-2a45877bd5eso645823eec.0 for ; Tue, 09 Dec 2025 17:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765331099; x=1765935899; 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=gbXFpMWOE09JOBukAU22u0Zfr4eCRsqxYTwjQcd8SQQ=; b=HqYfNbLeGJPmcOm9em9ACh0NAn4Ic956TRjjX8kaKtPHTUhUHSJkdTqfrIUt45BgCP HQSS/aNcROVRP6Q+lu81VC5w99wCviXYy/flDkpi8gh2NP5ILjUtEproz13IqMHu6DpY v4Og2MLWAde7u3JHI43ntnEXVTLfyZpIG1aJPMvROvFl1SO0U4uZssrU8zODKsfVBlcB KeUZ91pODQarpSbF1oIiIjd+n1Hp1X0tPqqBohQ0R8xlNpyZTy/hyLVpNVDp8Ar6W5a1 0rroLHmxmMWzA5EWhT+nbujeuqB3uNds8v37L6A908+dLROp5/1wVIx9OFVAmDrb6bti K8PQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765331099; x=1765935899; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gbXFpMWOE09JOBukAU22u0Zfr4eCRsqxYTwjQcd8SQQ=; b=VL7yWgzTmBb3YqDNIGKbxu2xoQFoOciAPhwGfpSyc9BvtfQC9jWL+DW50/U5y1B2fz mXd9jUOJgmw8DQSZerWMahU+IIn35Q57rINZggm91D0zjFPOSOZ5oagsq54LWD/RXldw Z7mB0ONnLeMcE0EECh9WtaN7bnoGsNqm1rg3A4R9wF5ob7eiHMyoZXViGp4uypeCJE8R SjRfODU+SW7zQjbnl5a4y+cQENrcOioD+HonR8sRmSfpPuSEn5UbfqqbYx9zJD7h6gMj Bdk9VvR94agEF7vS7NIDL9vJKrqfOtONIoG9vFJJao5NCuNrj+qgDe0BXeyfXRHkoBr2 BTXw== X-Forwarded-Encrypted: i=1; AJvYcCXJySuLvKYxSqo+uDFEK3zABRy90zwubchZlZ9aWODE04lwbFKBDSHUm9QtZyMos2jLqXILZ6yM5Wg5GVo=@vger.kernel.org X-Gm-Message-State: AOJu0YzFz9KtS62DJAmNnwvfbwNWDg8v1wyS4U4p5BaBfsyFyI6AlD+f tsyuytEYKdEU/z+6Zg2CTHPp2RPb8Z9Zasp2zpm4nyyaKY6YCfm14hvTvHTewQ== X-Gm-Gg: AY/fxX4bxAlGEUP2r2c7xN/lusb5vUuc99UGo0oT0pIoeMyOacL9LBfPoPaLMLQOOLB s5MUCgtVOuPOpCf00eDZ9XJCfX8hM2sg1tChuP1RL9luylU/IhbNjz9M0nL8thimvy7m/l7XhIg XTEW98gpRGZv8CONt8DS4LEEHi+DHp+HcWE9XbhU1m5ClP9XD4sBUmykcuzOKn4Zg71IV2KJ89G INZf1Kc1Kn/8CYpQA0d2DYwL10VQNanrZWIH6sXrtBRt3tk1zGIuPxHnoBJKtqi5ST9nhHZ9mJM /aW16kwDXuTly5euKljk2Qib3hh55hRM4sqcJVFta1Da/baqY6jYYSE/QEYXyFkCGiPgBAT+RzS +BPg/iBOGGUHeSpOur+wUrVhwI4wdWHxc9oxgrQJ/t7xk30+I4MAIN/MBz1Rid4DC5s8+F6zEZQ /VT9I/swR6z3Gwlj2vmN8kHJQmwo/VwYU= X-Google-Smtp-Source: AGHT+IHaxVVCLR4qjhWLLVIaeb2l4lwbtf82b2bHpz7SHAJEdx3SMV20RK7Aeg91G12i3wIJ6R9g9Q== X-Received: by 2002:a05:7300:880d:b0:2a9:9837:233b with SMTP id 5a478bee46e88-2abf8dee7a2mr2305952eec.7.1765331098941; Tue, 09 Dec 2025 17:44:58 -0800 (PST) Received: from deb-101020-bm01.dtc.local ([149.97.161.244]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11df76e2eefsm80274777c88.6.2025.12.09.17.44.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Dec 2025 17:44:58 -0800 (PST) From: sw.prabhu6@gmail.com To: James.Bottomley@HansenPartnership.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org Cc: bvanassche@acm.org, linux-kernel@vger.kernel.org, mcgrof@kernel.org, kernel@pankajraghav.com, dlemoal@kernel.org, Swarna Prabhu , Swarna Prabhu Subject: [PATCH 2/2] scsi: scsi_debug: enable sdebug_sector_size > PAGE_SIZE Date: Wed, 10 Dec 2025 01:41:37 +0000 Message-ID: <20251210014136.2549405-4-sw.prabhu6@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251210014136.2549405-1-sw.prabhu6@gmail.com> References: <20251210014136.2549405-1-sw.prabhu6@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Swarna Prabhu Now that block layer can support block size > PAGE_SIZE and the issue with WRITE_SAME(16) and WRITE_SAME(10) are fixed for sector sizes > PAGE_SIZE, enable sdebug_sector_size > PAGE_SIZE in scsi_debug. Signed-off-by: Swarna Prabhu --- drivers/scsi/scsi_debug.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index b2ab97be5db3..2348976b3f70 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c @@ -8459,13 +8459,7 @@ static int __init scsi_debug_init(void) } else if (sdebug_ndelay > 0) sdebug_jdelay =3D JDELAY_OVERRIDDEN; =20 - switch (sdebug_sector_size) { - case 512: - case 1024: - case 2048: - case 4096: - break; - default: + if (blk_validate_block_size(sdebug_sector_size)) { pr_err("invalid sector_size %d\n", sdebug_sector_size); return -EINVAL; } --=20 2.51.0