From patchwork Wed Aug 26 11:14:37 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Shi X-Patchwork-Id: 2292629 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4hVMW52xLlz1xtN for ; Wed, 26 Aug 2026 21:14:56 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1wzBah-00049x-9W; Wed, 26 Aug 2026 11:14:47 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1wzBaf-00049p-VV for kernel-team@lists.ubuntu.com; Wed, 26 Aug 2026 11:14:46 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (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 smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id A98FD3FC9A for ; Wed, 26 Aug 2026 11:14:45 +0000 (UTC) Received: by mail-pj1-f71.google.com with SMTP id 98e67ed59e1d1-3965ba1ba3eso1191509a91.2 for ; Wed, 26 Aug 2026 04:14:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787742884; x=1788347684; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to:content-type; bh=abXbMHzDZcH8b8Gl4kTyWuwZ/B702lbvqs0WU3cwMc4=; b=QEWIA5DQ/kWmLVK6dUPDIM6qC5ukKWRBsoDM/lY4VZHad5PqCChxvDvmYZ5PzmpJAz nZP2Zx60VsgQaE7/+QBgETFMm8O+LpXu8Z1C5b+bXxE76IpqsxmRj3isFkVwkxKT1WNw /dkfz7rHrMVZDlnLHReuAxrKlwO87pbupRgGUosQcx3dfLbufL1gfafHo+Rfau51a0ao 0FtczL2XqlvDjLdFFwN9Gf/cYiBM7hD0Zn84KYMWYb5oeEXzgCCXy00YSnqiFTLpYne+ A6jjr7qJhlK3QA+fR/Ybc5ATbFFddDRwNogBRwWruPzdOAajhlbdjx0U1JbiT4tLEt9/ k6Wg== X-Gm-Message-State: AFuF++laQhMkiAV6DN4QJd6UAcCB5PSS66NeQ1y1ytaKhX81uyYEIcyz CaN64a9ezkOTjRBCBP/HBf+EXTBLF0IF3PCx5WYyKuJgz4KN+lB82tk/devxyKSM2q+eEI3ZiV+ 06gOyo+Uh1TxJTpE+cCtSOjHWbVbpzjbh/IO4QA9x48ls7RTYTVZC15o53eSdYWVBJonb/0WLMr 8iH+X5GaeqUawKol1S X-Gm-Gg: AR+sD12v/GZtTiym4iEwbtQJM8+j1PZ0A3ex5RDS3MZx65u3yqIXGPZ/RnumE83zjQC Z7sAChwj0P5AYi9yIU9UBq+GhpmAUCC+TvYYffPd8UuQ6PuCInkUcBL2ca/JgkKwo/FmDLb2qc+ NMm9GsMBcJZ+pxFyq/ImAdG7efNQ/DXk5vxXVI8bGK8bhiux5IKPw4COCtKrBluxuvQ4md6V+wW Yd+gDPRawsfB0/MFcH+/eE5YATmMm/jKH3Pzf9IetlPwgNM5O90VsU6zTd19RQ2dzxYKAgR4+A4 GYaEyIBhIFSbXSkYXirLbpBiYzjplsSZuJIpqRg6aEl8J4gPW8Qv2vFEU2InUwYR3iW5wFTbCKb UcQ== X-Received: by 2002:a17:90b:4c4c:b0:37f:e326:6557 with SMTP id 98e67ed59e1d1-3966d43edbamr11975100a91.4.1787742884000; Wed, 26 Aug 2026 04:14:44 -0700 (PDT) X-Received: by 2002:a17:90b:4c4c:b0:37f:e326:6557 with SMTP id 98e67ed59e1d1-3966d43edbamr11974846a91.4.1787742882956; Wed, 26 Aug 2026 04:14:42 -0700 (PDT) Received: from alexshi-x1 ([114.92.70.140]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-396689efae7sm3781105a91.11.2026.08.26.04.14.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2026 04:14:41 -0700 (PDT) To: kernel-team@lists.ubuntu.com Subject: [PATCH] Revert "block: Increase BLK_DEF_MAX_SECTORS_CAP" Date: Wed, 26 Aug 2026 19:14:37 +0800 Message-ID: <20260826111437.1526940-1-alex.shi@canonical.com> X-Mailer: git-send-email 2.53.0 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Alex Shi via kernel-team From: Alex Shi Reply-To: Alex Shi Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This reverts commit 9b8b84879d4adc506b0d3944e20b28d9f3f6994b to fix a OS install failure on JBOD disk on B540d-2HS M.2 controller. Buglink: https://bugs.launchpad.net/bugs/2148534 Signed-off-by: Alex Shi --- block/blk.h | 9 --------- include/linux/blkdev.h | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/block/blk.h b/block/blk.h index a7abf3be34ef..76da40c10fad 100644 --- a/block/blk.h +++ b/block/blk.h @@ -13,15 +13,6 @@ struct elv_change_ctx; -/* - * Default upper limit for the software max_sectors limit used for regular I/Os. - * This can be increased through sysfs. - * - * This should not be confused with the max_hw_sector limit that is entirely - * controlled by the block device driver, usually based on hardware limits. - */ -#define BLK_DEF_MAX_SECTORS_CAP (SZ_4M >> SECTOR_SHIFT) - #define BLK_DEV_MAX_SECTORS (LLONG_MAX >> 9) #define BLK_MIN_SEGMENT_SIZE 4096 diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ac899cd0cd70..4469f1fe409c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1315,6 +1315,15 @@ enum blk_default_limits { BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, }; +/* + * Default upper limit for the software max_sectors limit used for + * regular file system I/O. This can be increased through sysfs. + * + * Not to be confused with the max_hw_sector limit that is entirely + * controlled by the driver, usually based on hardware limits. + */ +#define BLK_DEF_MAX_SECTORS_CAP 2560u + static inline struct queue_limits *bdev_limits(struct block_device *bdev) { return &bdev_get_queue(bdev)->limits;