{"id":2230129,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230129/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/3b7c8ef4.AUYAAJeLWk8AAAAAAAAABAMtJJMAAYKKIjQAAAAAAC-ZZgBp8da6@mailjet.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.1/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<3b7c8ef4.AUYAAJeLWk8AAAAAAAAABAMtJJMAAYKKIjQAAAAAAC-ZZgBp8da6@mailjet.com>","date":"2026-04-29T10:00:11","name":"[v2] smb: smbdirect: fix MR registration for coalesced SG lists","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6b35a1ab15f75141ede0014f5b1e5f745fe72fb3","submitter":{"id":93279,"url":"http://patchwork.ozlabs.org/api/1.1/people/93279/?format=json","name":"Yi Kuo","email":"yi@yikuo.dev"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/3b7c8ef4.AUYAAJeLWk8AAAAAAAAABAMtJJMAAYKKIjQAAAAAAC-ZZgBp8da6@mailjet.com/mbox/","series":[{"id":502029,"url":"http://patchwork.ozlabs.org/api/1.1/series/502029/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=502029","date":"2026-04-29T10:00:11","name":"[v2] smb: smbdirect: fix MR registration for coalesced SG lists","version":2,"mbox":"http://patchwork.ozlabs.org/series/502029/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230129/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230129/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n secure) header.d=yikuo.dev header.i=yi@yikuo.dev header.a=rsa-sha256\n header.s=mailjet header.b=gMrUbgBP;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=172.232.135.74; helo=sto.lore.kernel.org;\n envelope-from=linux-cifs+bounces-11270-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key)\n header.d=yikuo.dev header.i=yi@yikuo.dev header.b=\"gMrUbgBP\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=185.250.237.4","smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=yikuo.dev","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=a3119462.bnc3.mailjet.com"],"Received":["from sto.lore.kernel.org (sto.lore.kernel.org [172.232.135.74])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5CVF6F29z1yHX\n\tfor ; Wed, 29 Apr 2026 20:00:37 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 1806C300102A\n\tfor ; Wed, 29 Apr 2026 10:00:34 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id DB30236EA8C;\n\tWed, 29 Apr 2026 10:00:31 +0000 (UTC)","from o4.p38.mailjet.com (o4.p38.mailjet.com [185.250.237.4])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 56C161DFDE\n\tfor ; Wed, 29 Apr 2026 10:00:28 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777456831; cv=none;\n b=e8+zZtxhgzRHV5cttk0rwn38mAN3gk3bg2QgxyXbWkkJ1Ab7+MTzAaThg7d3yy64HQHkjMyOiuwFaaEE6NF9iQcRCvLyNCiVGx2gPc/h+a7nx16QEda0qzJKlGFLSapltCXW/YjsSbkVsRKEI+ZY6Rg/s7wEqdBIJg3jOBML52w=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777456831; c=relaxed/simple;\n\tbh=vxjuH98lz95r5OFYrZlc34xqxhXWg4UjUYUzzX5mptw=;\n\th=Message-Id:MIME-Version:From:To:Subject:Date:Cc;\n b=hDL62aq8Efm6yjVpB5GB2+yHMmQOuBxB0BTJ/SohMxybBaBnC3Q8mnFJ4iYzIDsE4/xS0yhR1/TO8ygm1DZtwUin4VxdCkH0j+FCa/9/D/ugECJDsGJjaGBFPpfj+6zOVF/c6ye3v6hAgsd0paciUKXGderUBU9nnJxn7SvzWBI=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=yikuo.dev;\n spf=pass smtp.mailfrom=a3119462.bnc3.mailjet.com;\n dkim=pass (2048-bit key) header.d=yikuo.dev header.i=yi@yikuo.dev\n header.b=gMrUbgBP; arc=none smtp.client-ip=185.250.237.4","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; q=dns/txt;\n d=yikuo.dev; i=yi@yikuo.dev; s=mailjet; t=1777456827; x=1777464027;\n h=Message-Id: MIME-Version: From: To: Subject: Date:\n List-Unsubscribe: List-Unsubscribe-Post: Cc: Feedback-Id:\n X-CSA-Complaints: X-MJ-Mid: X-MJ-SMTPGUID:\n X-REPORT-ABUSE-TO: Content-Transfer-Encoding: To: From:\n Sender: Subject: Date;\n bh=R6D6QMuIFoaRvx2O2b0MppS8qCJC9ITDHlDI6jdA3+w=;\n b=gMrUbgBPEbGeIea45WzGVAYc0OYeorBWwDzJJK6RFUOHIO/gW8DUYz+UP\n /tQ5FPc9E9o1YPzHvIpurHlziP9amI3qNJsX7Kw51zWg/5HlY5tcy+B1gi9b\n HaX35Dx5Eo4ifroBmv3T2ALq1w6n6zqeB3wYORKQDE1D4gADvoUAv6xwIniL\n 7EWdVtdLUhxErrmoDgzRw9v+sE6e136T8sYItVmJbomxwZJcT5HseYX7pmP6\n fDL4Um8jCdJQen7CYlXPaX5JDS14XBhTmvVubvRokFXpO2UJXJytNfCSmv3f\n JtGRemP1tE0xcDPsVH3LkhIjj0ddcfHTvwt0T6mEfPcLQ==","Message-Id":"\n <3b7c8ef4.AUYAAJeLWk8AAAAAAAAABAMtJJMAAYKKIjQAAAAAAC-ZZgBp8da6@mailjet.com>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","From":"Yi Kuo ","To":"smfrench@gmail.com, linkinjeon@kernel.org","Subject":"[PATCH v2] smb: smbdirect: fix MR registration for coalesced SG\n lists","Date":"Wed, 29 Apr 2026 18:00:11 +0800","List-Unsubscribe-Post":"List-Unsubscribe=One-Click","Cc":"metze@samba.org, tom@talpey.com, linux-cifs@vger.kernel.org,\n\tsamba-technical@lists.samba.org, linux-kernel@vger.kernel.org, Yi Kuo\n\t","Feedback-Id":"42.3119462.2858555:MJ","X-CSA-Complaints":"csa-complaints@eco.de","X-MJ-Mid":"\n\tAUYAAJeLWk8AAAAAAAAABAMtJJMAAYKKIjQAAAAAAC-ZZgBp8da6rX6_3ItuSmeTpgv5zbMWAwArnjs","X-MJ-SMTPGUID":"4535d1d9-c888-4a3f-91d4-e9f99aa9a4d7","X-REPORT-ABUSE-TO":"Message sent by Mailjet please report to\n\tabuse@mailjet.com with a copy of the message","Content-Transfer-Encoding":"quoted-printable"},"content":"ib_dma_map_sg() modifies the provided scatterlist and returns the\nnumber of mapped entries, which can be fewer than the requested\nmr->sgt.nents if the DMA controller coalesces contiguous memory\nsegments. Passing the original, uncoalesced count to ib_map_mr_sg()\ncauses memory registration failures if coalescing actually occurs.\n\nCapture the actual mapped count returned by ib_dma_map_sg() and pass it\nto ib_map_mr_sg() to ensure correct MR registration.\n\nAlso update the ib_dma_map_sg() error logging to drop the error\npointer formatting, since the return value is an integer count\nrather than an error code.\n\nEnsure a proper error code (-EIO) is assigned when DMA mapping or\nMR registration fails.\n\nFixes: de5ef8ec3c46 (\"smb: smbdirect: introduce smbdirect_mr.c with client mr code\")\nCloses: https://bugzilla.kernel.org/show_bug.cgi?id=221408\nSigned-off-by: Yi Kuo \n---\nv2:\n- Add proper -EIO error assignment on mapping/registration failures.\n- Add Fixes and Closes tags.\n\n fs/smb/smbdirect/mr.c | 21 ++++++++++++---------\n 1 file changed, 12 insertions(+), 9 deletions(-)","diff":"diff --git a/fs/smb/smbdirect/mr.c b/fs/smb/smbdirect/mr.c\nindex 5228e699cd5d..5a428ff1b369 100644\n--- a/fs/smb/smbdirect/mr.c\n+++ b/fs/smb/smbdirect/mr.c\n@@ -269,7 +269,7 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,\n {\n \tconst struct smbdirect_socket_parameters *sp = &sc->parameters;\n \tstruct smbdirect_mr_io *mr;\n-\tint ret, num_pages;\n+\tint ret, num_pages, num_mapped;\n \tstruct ib_reg_wr *reg_wr;\n \n \tnum_pages = iov_iter_npages(iter, sp->max_frmr_depth + 1);\n@@ -300,19 +300,22 @@ smbdirect_connection_register_mr_io(struct smbdirect_socket *sc,\n \t\tnum_pages, iov_iter_count(iter), sp->max_frmr_depth);\n \tsmbdirect_iter_to_sgt(iter, &mr->sgt, sp->max_frmr_depth);\n \n-\tret = ib_dma_map_sg(sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir);\n-\tif (!ret) {\n+\tnum_mapped = ib_dma_map_sg(sc->ib.dev, mr->sgt.sgl, mr->sgt.nents, mr->dir);\n+\tif (!num_mapped) {\n \t\tsmbdirect_log_rdma_mr(sc, SMBDIRECT_LOG_ERR,\n-\t\t\t\"ib_dma_map_sg num_pages=%u dir=%x ret=%d (%1pe)\\n\",\n-\t\t\tnum_pages, mr->dir, ret, SMBDIRECT_DEBUG_ERR_PTR(ret));\n+\t\t\t\"ib_dma_map_sg num_pages=%u dir=%x num_mapped=%d\\n\",\n+\t\t\tnum_pages, mr->dir, num_mapped);\n+\t\tret = -EIO;\n \t\tgoto dma_map_error;\n \t}\n \n-\tret = ib_map_mr_sg(mr->mr, mr->sgt.sgl, mr->sgt.nents, NULL, PAGE_SIZE);\n-\tif (ret != mr->sgt.nents) {\n+\tret = ib_map_mr_sg(mr->mr, mr->sgt.sgl, num_mapped, NULL, PAGE_SIZE);\n+\tif (ret != num_mapped) {\n \t\tsmbdirect_log_rdma_mr(sc, SMBDIRECT_LOG_ERR,\n-\t\t\t\"ib_map_mr_sg failed ret = %d nents = %u\\n\",\n-\t\t\tret, mr->sgt.nents);\n+\t\t\t\"ib_map_mr_sg failed ret = %d num_mapped = %u\\n\",\n+\t\t\tret, num_mapped);\n+\t\tif (ret >= 0)\n+\t\t\tret = -EIO;\n \t\tgoto map_mr_error;\n \t}\n \n","prefixes":["v2"]}