From: Damien Le Moal To: Jens Axboe , linux-block@vger.kernel.org Subject: [PATCH] null_blk: Fix description of the fua parameter Date: Tue, 2 Jul 2024 16:32:34 +0900 Message-ID: <20240702073234.206458-1-dlemoal@kernel.org> X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-block:93734 Newsgroups: org.kernel.vger.linux-block Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail The description of the fua module parameter is defined using MODULE_PARM_DESC() with the first argument passed being "zoned". That is the wrong name, obviously. Fix that by using the correct "fua" parameter name so that "modinfo null_blk" displays correct information. Fixes: f4f84586c8b9 ("null_blk: Introduce fua attribute") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal --- drivers/block/null_blk/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index 83a4ebe4763a..5de9ca4eceb4 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -227,7 +227,7 @@ MODULE_PARM_DESC(mbps, "Cache size in MiB for memory-backed device. Default: 0 ( static bool g_fua = true; module_param_named(fua, g_fua, bool, 0444); -MODULE_PARM_DESC(zoned, "Enable/disable FUA support when cache_size is used. Default: true"); +MODULE_PARM_DESC(fua, "Enable/disable FUA support when cache_size is used. Default: true"); static unsigned int g_mbps; module_param_named(mbps, g_mbps, uint, 0444); -- 2.45.2 . From: Anuj Gupta To: axboe@kernel.dk, hch@lst.de, martin.petersen@oracle.com, joshi.k@samsung.com Cc: linux-block@vger.kernel.org, Anuj Gupta Subject: [PATCH] block: reuse original bio_vec array for integrity during clone Date: Tue, 2 Jul 2024 15:37:53 +0530 Message-Id: <20240702100753.2168-1-anuj20.g@samsung.com> X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" References: Xref: photonic.trudheim.com org.kernel.vger.linux-block:93744 Newsgroups: org.kernel.vger.linux-block Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Modify bio_integrity_clone to reuse the original bvec array instead of allocating and copying it, similar to how bio data path is cloned. Suggested-by: Christoph Hellwig Signed-off-by: Anuj Gupta --- block/bio-integrity.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/block/bio-integrity.c b/block/bio-integrity.c index c4aed1dfa497..b78c145eb026 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c @@ -76,7 +76,7 @@ struct bio_integrity_payload *bio_integrity_alloc(struct bio *bio, &bip->bip_max_vcnt, gfp_mask); if (!bip->bip_vec) goto err; - } else { + } else if (nr_vecs) { bip->bip_vec = bip->bip_inline_vecs; } @@ -584,14 +584,11 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src, BUG_ON(bip_src == NULL); - bip = bio_integrity_alloc(bio, gfp_mask, bip_src->bip_vcnt); + bip = bio_integrity_alloc(bio, gfp_mask, 0); if (IS_ERR(bip)) return PTR_ERR(bip); - memcpy(bip->bip_vec, bip_src->bip_vec, - bip_src->bip_vcnt * sizeof(struct bio_vec)); - - bip->bip_vcnt = bip_src->bip_vcnt; + bip->bip_vec = bip_src->bip_vec; bip->bip_iter = bip_src->bip_iter; bip->bip_flags = bip_src->bip_flags & ~BIP_BLOCK_INTEGRITY; -- 2.25.1 . Date: Tue, 2 Jul 2024 21:45:49 +0800 From: kernel test robot To: Gulam Mohamed CC: , , Linux Memory Management List , Jens Axboe , Christoph Hellwig , , , Subject: [linux-next:master] [loop] 18048c1af7: ltp.ioctl_loop06.fail Message-ID: <202407022125.e7ba93db-oliver.sang@intel.com> Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Xref: photonic.trudheim.com org.kernel.vger.linux-block:93753 org.kvack.linux-mm:202170 Newsgroups: org.kernel.vger.linux-block,dev.linux.lists.oe-lkp,it.linux.lists.ltp,org.kvack.linux-mm Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hello, kernel test robot noticed "ltp.ioctl_loop06.fail" on: commit: 18048c1af7836b8e31739d9eaefebc2bf76261f7 ("loop: Fix a race between loop detach and loop open") https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git master [test failed on linux-next/master 1eb586a9782cde8e5091b9de74603e0a8386b09e] in testcase: ltp version: ltp-x86_64-14c1f76-1_20240629 with following parameters: disk: 1HDD fs: btrfs test: syscalls-01/ioctl_loop06 compiler: gcc-13 test machine: 4 threads 1 sockets Intel(R) Core(TM) i3-3220 CPU @ 3.30GHz (Ivy Bridge) with 8G memory (please refer to attached dmesg/kmsg for entire log/backtrace) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot | Closes: https://lore.kernel.org/oe-lkp/202407022125.e7ba93db-oliver.sang@intel.com Running tests....... <<>> tag=ioctl_loop06 stime=1719779316 cmdline="ioctl_loop06" contacts="" analysis=exit <<>> tst_test.c:1734: TINFO: LTP version: 20240524-67-g072f359ac tst_test.c:1618: TINFO: Timeout per run is 0h 02m 30s tst_device.c:96: TINFO: Found free device 0 '/dev/loop0' ioctl_loop06.c:74: TINFO: Using LOOP_SET_BLOCK_SIZE with arg < 512 ioctl_loop06.c:65: TPASS: Set block size failed as expected: EINVAL (22) ioctl_loop06.c:74: TINFO: Using LOOP_SET_BLOCK_SIZE with arg > PAGE_SIZE ioctl_loop06.c:65: TPASS: Set block size failed as expected: EINVAL (22) ioctl_loop06.c:74: TINFO: Using LOOP_SET_BLOCK_SIZE with arg != power_of_2 ioctl_loop06.c:65: TPASS: Set block size failed as expected: EINVAL (22) ioctl_loop06.c:74: TINFO: Using LOOP_CONFIGURE with block_size < 512 ioctl_loop06.c:67: TFAIL: Set block size failed expected EINVAL got: EBUSY (16) ioctl_loop06.c:74: TINFO: Using LOOP_CONFIGURE with block_size > PAGE_SIZE ioctl_loop06.c:67: TFAIL: Set block size failed expected EINVAL got: EBUSY (16) ioctl_loop06.c:74: TINFO: Using LOOP_CONFIGURE with block_size != power_of_2 ioctl_loop06.c:67: TFAIL: Set block size failed expected EINVAL got: EBUSY (16) Summary: passed 3 failed 3 broken 0 skipped 0 warnings 0 incrementing stop <<>> initiation_status="ok" duration=0 termination_type=exited termination_id=1 corefile=no cutime=0 cstime=23 <<>> INFO: ltp-pan reported some tests FAIL LTP Version: 20240524-67-g072f359ac ############################################################### Done executing testcases. LTP Version: 20240524-67-g072f359ac ############################################################### The kernel config and materials to reproduce are available at: https://download.01.org/0day-ci/archive/20240702/202407022125.e7ba93db-oliver.sang@intel.com -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki . From: Christoph Hellwig To: Jens Axboe Cc: "Martin K . Petersen" , Anuj Gupta , Kanchan Joshi , linux-block@vger.kernel.org Subject: more integrity cleanups v3 Date: Tue, 2 Jul 2024 17:10:18 +0200 Message-ID: <20240702151047.1746127-1-hch@lst.de> X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Xref: photonic.trudheim.com org.kernel.vger.linux-block:93759 Newsgroups: org.kernel.vger.linux-block Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail Hi Jens and Martin, this series has more cleanups to the block layer integrity code. It splits the bio integrity APIs into their own header as they are only used by very few source files, cleans up their stubs a little bit, and then in the last patch change when the bio_integrity_payload is freed when it is not owned by the block layer. This avoids having to know the submitter in the core code and will simplify adding other consuer of the API like file systems or the io_uring non-passthrough PI support. This series is based on the block for-next branch as there are conflicting changes in 6.10-rc but not in the for-6.11/block branch. Changes since v2: - stop calling bio_uninit in bio_endio - fix a commit message typo Changes since v1: - rebased to for-next Diffstat: block/bio-integrity.c | 87 ++++++++--------------- block/bio.c | 16 +++- block/blk-map.c | 3 block/blk.h | 14 +++ block/bounce.c | 2 drivers/md/dm.c | 1 drivers/nvme/host/ioctl.c | 16 +--- drivers/scsi/sd.c | 3 include/linux/bio-integrity.h | 152 ++++++++++++++++++++++++++++++++++++++++ include/linux/bio.h | 156 ------------------------------------------ include/linux/blk-integrity.h | 1 11 files changed, 222 insertions(+), 229 deletions(-) .