From patchwork Wed Feb 10 13:56:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coly Li X-Patchwork-Id: 12080899 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 241ABC433E0 for ; Wed, 10 Feb 2021 13:58:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C5B2564E30 for ; Wed, 10 Feb 2021 13:58:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbhBJN6N (ORCPT ); Wed, 10 Feb 2021 08:58:13 -0500 Received: from mx2.suse.de ([195.135.220.15]:45326 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231278AbhBJN5p (ORCPT ); Wed, 10 Feb 2021 08:57:45 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 58C4BAC97; Wed, 10 Feb 2021 13:57:03 +0000 (UTC) From: Coly Li To: linux-bcache@vger.kernel.org Cc: linux-block@vger.kernel.org, Coly Li , kernel test robot Subject: [PATCH 1/4] bcache: correct return value in register_nvdimm_meta() Date: Wed, 10 Feb 2021 21:56:54 +0800 Message-Id: <20210210135657.35284-1-colyli@suse.de> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org 'ret' should be used a return value, thi patch fixes this error. Reported-by: kernel test robot Signed-off-by: Coly Li Reviewed-by: Chaitanya Kulkarni --- drivers/md/bcache/super.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c index c273eeef0d38..47a1225b3496 100644 --- a/drivers/md/bcache/super.c +++ b/drivers/md/bcache/super.c @@ -2554,7 +2554,7 @@ static ssize_t register_nvdimm_meta(struct kobject *k, struct kobj_attribute *at ret = -EINVAL; } - return size; + return ret; } #endif From patchwork Wed Feb 10 13:56:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coly Li X-Patchwork-Id: 12080897 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4E7F3C433DB for ; Wed, 10 Feb 2021 13:58:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ED71E64E7A for ; Wed, 10 Feb 2021 13:58:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231431AbhBJN6Q (ORCPT ); Wed, 10 Feb 2021 08:58:16 -0500 Received: from mx2.suse.de ([195.135.220.15]:45358 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231440AbhBJN5t (ORCPT ); Wed, 10 Feb 2021 08:57:49 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 32FC5ACBF; Wed, 10 Feb 2021 13:57:06 +0000 (UTC) From: Coly Li To: linux-bcache@vger.kernel.org Cc: linux-block@vger.kernel.org, Coly Li , kernel test robot , Jianpeng Ma , Qiaowei Ren Subject: [PATCH 2/4] bcache: use div_u64() in init_owner_info() Date: Wed, 10 Feb 2021 21:56:55 +0800 Message-Id: <20210210135657.35284-2-colyli@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210210135657.35284-1-colyli@suse.de> References: <20210210135657.35284-1-colyli@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Kernel test robot reports the build-in u64/u32 in init_owner_info() doesn't work for m68k arch, the explict div_u64() should be used. This patch explicit uses div_u64() to do the u64/u32 division on 32bit m68k arch. Reported-by: kernel test robot Signed-off-by: Coly Li Cc: Jianpeng Ma Cc: Qiaowei Ren Reviewed-by: Chaitanya Kulkarni --- drivers/md/bcache/nvm-pages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c index c350dcd696dd..8be761467d8f 100644 --- a/drivers/md/bcache/nvm-pages.c +++ b/drivers/md/bcache/nvm-pages.c @@ -521,7 +521,7 @@ static int init_owner_info(struct bch_nvm_namespace *ns) only_set->owner_list_size = owner_list_head->size; only_set->owner_list_used = owner_list_head->used; - remove_owner_space(ns, 0, ns->pages_offset/ns->page_size); + remove_owner_space(ns, 0, div_u64(ns->pages_offset, ns->page_size)); for (i = 0; i < owner_list_head->used; i++) { owner_head = &owner_list_head->heads[i]; From patchwork Wed Feb 10 13:56:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coly Li X-Patchwork-Id: 12080901 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E560C4332D for ; Wed, 10 Feb 2021 13:58:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE31A64E6F for ; Wed, 10 Feb 2021 13:58:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231337AbhBJN6Z (ORCPT ); Wed, 10 Feb 2021 08:58:25 -0500 Received: from mx2.suse.de ([195.135.220.15]:45380 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231699AbhBJN5u (ORCPT ); Wed, 10 Feb 2021 08:57:50 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 39004ADCD; Wed, 10 Feb 2021 13:57:08 +0000 (UTC) From: Coly Li To: linux-bcache@vger.kernel.org Cc: linux-block@vger.kernel.org, Coly Li Subject: [PATCH 3/4] bcache: unify code comments style in nvm-pages.c Date: Wed, 10 Feb 2021 21:56:56 +0800 Message-Id: <20210210135657.35284-3-colyli@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210210135657.35284-1-colyli@suse.de> References: <20210210135657.35284-1-colyli@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org Make nvm-pages.c follow code comments style of other bcache code. Signed-off-by: Coly Li Reviewed-by: Chaitanya Kulkarni --- drivers/md/bcache/nvm-pages.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c index 8be761467d8f..3ea27ea3dd54 100644 --- a/drivers/md/bcache/nvm-pages.c +++ b/drivers/md/bcache/nvm-pages.c @@ -270,7 +270,7 @@ static void write_owner_info(void) owner_list_head->size = BCH_MAX_OWNER_LIST; WARN_ON(only_set->owner_list_used > owner_list_head->size); - // in-memory owner maybe not contain alloced-pages. + /* in-memory owner maybe not contain alloced-pages. */ for (i = 0; i < only_set->owner_list_used; i++) { owner_head = &owner_list_head->heads[i]; owner_list = only_set->owner_lists[i]; @@ -569,14 +569,14 @@ static int init_owner_info(struct bch_nvm_namespace *ns) extent->nr = rec->nr; WARN_ON(!is_power_of_2(extent->nr)); - /*init struct page: index/private */ + /* init struct page: index/private */ order = ilog2(extent->nr); page = nvm_vaddr_to_page(ns, extent->kaddr); set_page_private(page, order); page->index = rec->pgoff; list_add_tail(&extent->list, &extents->extent_head); - /*remove already alloced space*/ + /* remove already alloced space */ remove_owner_space(extents->ns, rec->pgoff, rec->nr); } extents->nr += nvm_pgalloc_recs->used; From patchwork Wed Feb 10 13:56:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coly Li X-Patchwork-Id: 12080903 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ACB7C433E6 for ; Wed, 10 Feb 2021 13:58:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4786764E77 for ; Wed, 10 Feb 2021 13:58:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231873AbhBJN6d (ORCPT ); Wed, 10 Feb 2021 08:58:33 -0500 Received: from mx2.suse.de ([195.135.220.15]:45404 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231910AbhBJN5y (ORCPT ); Wed, 10 Feb 2021 08:57:54 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3B6F0AE1B; Wed, 10 Feb 2021 13:57:11 +0000 (UTC) From: Coly Li To: linux-bcache@vger.kernel.org Cc: linux-block@vger.kernel.org, Coly Li , Dan Carpenter , "Reported-by : kernel test robot" , Jianpeng Ma , Qiaowei Ren Subject: [PATCH 4/4] bcache: fix a typo in nvme-pages.c Date: Wed, 10 Feb 2021 21:56:57 +0800 Message-Id: <20210210135657.35284-4-colyli@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210210135657.35284-1-colyli@suse.de> References: <20210210135657.35284-1-colyli@suse.de> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org This patch fixes a typo in init_owner_info() which causes an invalid pointer checking from a kazlloc(). Reported-by: Dan Carpenter Reported-by: Reported-by: kernel test robot Signed-off-by: Coly Li Cc: Jianpeng Ma Cc: Qiaowei Ren Reviewed-by: Chaitanya Kulkarni --- drivers/md/bcache/nvm-pages.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c index 3ea27ea3dd54..9cf69dc36f3a 100644 --- a/drivers/md/bcache/nvm-pages.c +++ b/drivers/md/bcache/nvm-pages.c @@ -561,7 +561,7 @@ static int init_owner_info(struct bch_nvm_namespace *ns) for (k = 0; k < nvm_pgalloc_recs->used; k++) { rec = &nvm_pgalloc_recs->recs[k]; extent = kzalloc(sizeof(*extent), GFP_KERNEL); - if (!extents) { + if (!extent) { mutex_unlock(&only_set->lock); return -ENOMEM; }