| Message ID | 1501704648-20159-23-git-send-email-longli@exchange.microsoft.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: linux-cifs-owner@vger.kernel.org [mailto:linux-cifs- > owner@vger.kernel.org] On Behalf Of Long Li > Sent: Wednesday, August 2, 2017 4:11 PM > To: Steve French <sfrench@samba.org>; linux-cifs@vger.kernel.org; samba- > technical@lists.samba.org; linux-kernel@vger.kernel.org > Cc: Long Li <longli@microsoft.com> > Subject: [[PATCH v1] 22/37] [CIFS] SMBD: Implement API for upper layer to > receive data to page > > /* > + * Read a page from receive reassembly queue > + * page: the page to read data into > + * to_read: the length of data to read > + * return value: actual data read > + */ > +int cifs_rdma_read_page(struct cifs_rdma_info *info, > + struct page *page, unsigned int to_read) > +{ Same comment as for cifs_rdma_write() - this name is confusing as it does not perform an RDMA Read. Needs to be changed. Tom. -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/cifs/cifsrdma.c b/fs/cifs/cifsrdma.c index e5f6300..67a11d9 100644 --- a/fs/cifs/cifsrdma.c +++ b/fs/cifs/cifsrdma.c @@ -1316,6 +1316,36 @@ struct cifs_rdma_info* cifs_create_rdma_session( } /* + * Read a page from receive reassembly queue + * page: the page to read data into + * to_read: the length of data to read + * return value: actual data read + */ +int cifs_rdma_read_page(struct cifs_rdma_info *info, + struct page *page, unsigned int to_read) +{ + int ret; + char *to_address; + + // make sure we have the page ready for read + wait_event( + info->wait_reassembly_queue, + atomic_read(&info->reassembly_data_length) >= to_read || + info->transport_status != CIFS_RDMA_CONNECTED); + + // now we can read from reassembly queue and not sleep + to_address = kmap_atomic(page); + + log_cifs_read("reading from page=%p address=%p to_read=%d\n", + page, to_address, to_read); + + ret = cifs_rdma_read(info, to_address, to_read); + kunmap_atomic(to_address); + + return ret; +} + +/* * Read data from receive reassembly queue * All the incoming data packets are placed in reassembly queue * buf: the buffer to read data into diff --git a/fs/cifs/cifsrdma.h b/fs/cifs/cifsrdma.h index 8891e21..36f3e4c 100644 --- a/fs/cifs/cifsrdma.h +++ b/fs/cifs/cifsrdma.h @@ -215,5 +215,7 @@ struct cifs_rdma_info* cifs_create_rdma_session( // SMBDirect interface for carrying upper layer CIFS I/O int cifs_rdma_read( struct cifs_rdma_info *rdma, char *buf, unsigned int to_read); +int cifs_rdma_read_page( + struct cifs_rdma_info *rdma, struct page *page, unsigned int to_read); int cifs_rdma_write(struct cifs_rdma_info *rdma, struct smb_rqst *rqst); #endif