lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 1 Nov 2015 18:48:15 +1100 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Doug Ledford <dledford@...hat.com> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Sagi Grimberg <sagig@...lanox.com>, Steve Wise <swise@...ngridcomputing.com>, "J. Bruce Fields" <bfields@...hat.com> Subject: linux-next: manual merge of the rdma tree with Linus' tree Hi Doug, Today's linux-next merge of the rdma tree got a conflict in: net/sunrpc/xprtrdma/svc_rdma_recvfrom.c between commit: c91aed989694 ("svcrdma: handle rdma read with a non-zero initial page offset") from Linus' tree and commit: 412a15c0fe53 ("svcrdma: Port to new memory registration API") from the rdma tree. I fixed it up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@...b.auug.org.au diff --cc net/sunrpc/xprtrdma/svc_rdma_recvfrom.c index f0c3ff67ca98,cb0991345816..000000000000 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c @@@ -235,17 -234,14 +235,14 @@@ int rdma_read_chunk_frmr(struct svcxprt ctxt->direction = DMA_FROM_DEVICE; ctxt->frmr = frmr; - pages_needed = min_t(int, pages_needed, xprt->sc_frmr_pg_list_len); - read = min_t(int, (pages_needed << PAGE_SHIFT) - *page_offset, - rs_length); + nents = min_t(unsigned int, nents, xprt->sc_frmr_pg_list_len); - read = min_t(int, nents << PAGE_SHIFT, rs_length); ++ read = min_t(int, (nents << PAGE_SHIFT) - *page_offset, rs_length); - frmr->kva = page_address(rqstp->rq_arg.pages[pg_no]); frmr->direction = DMA_FROM_DEVICE; frmr->access_flags = (IB_ACCESS_LOCAL_WRITE|IB_ACCESS_REMOTE_WRITE); - frmr->map_len = pages_needed << PAGE_SHIFT; - frmr->page_list_len = pages_needed; + frmr->sg_nents = nents; - for (pno = 0; pno < pages_needed; pno++) { + for (pno = 0; pno < nents; pno++) { int len = min_t(int, rs_length, PAGE_SIZE - pg_off); head->arg.pages[pg_no] = rqstp->rq_arg.pages[pg_no]; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists