Skip to contentSkip to conversation

libceph: be explicit in masking bottom 16 bits

PATCH In review Alex Elder 2 participants 2 messages Mar 29, 2013 – Apr 3, 2013 Ceph common code (libceph)

lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 libceph: be explicit in masking bottom 16 bits

In ceph_osdc_build_request() there is a call to cpu_to_le16() which provides a 64-bit value as its argument. Because of the implied byte swapping going on it looked pretty suspect to me.

At the moment it turns out the behavior is well defined, but masking off those bottom bits explicitly eliminates this distraction, and is in fact more directly related to the purpose of the message header's data_off field.

This resolves:

    http://tracker.ceph.com/issues/4125
---
 net/ceph/osd_client.c |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
net/ceph/osd_client.c +0 -0
index 3b6657f..015bf9f 100644
@@ -419,8 +419,18 @@ void ceph_osdc_build_request(struct

ceph_osd_request *req,
p += 4;

/* data */
- if (flags & CEPH_OSD_FLAG_WRITE)
- req->r_request->hdr.data_off = cpu_to_le16(off);
+ if (flags & CEPH_OSD_FLAG_WRITE) {
+ u16 data_off;
+
+ /*
+ * The header "data_off" is a hint to the receiver
+ * allowing it to align received data into its
+ * buffers such that there's no need to re-copy
+ * it before writing it to disk (direct I/O).
+ */
+ data_off = (u16) (off & 0xffff);
+ req->r_request->hdr.data_off = cpu_to_le16(data_off);
+ }
req->r_request->hdr.data_len = cpu_to_le32(data_len);

BUG_ON(p > msg->front.iov_base + msg->front.iov_len);

Signature · 1 line
1.7.9.5
Reviewed-by on v1 1/1
#1 lore raw
Quoted 44 lines · Alex Elder

In ceph_osdc_build_request() there is a call to cpu_to_le16() which provides a 64-bit value as its argument. Because of the implied byte swapping going on it looked pretty suspect to me.

At the moment it turns out the behavior is well defined, but masking off those bottom bits explicitly eliminates this distraction, and is in fact more directly related to the purpose of the message header's data_off field.

This resolves:

     http://tracker.ceph.com/issues/4125
---
  net/ceph/osd_client.c |   14 ++++++++++++--
  1 file changed, 12 insertions(+), 2 deletions(-)
net/ceph/osd_client.c +12 -2
index 3b6657f..015bf9f 100644
@@ -419,8 +419,18 @@ void ceph_osdc_build_request(struct
 ceph_osd_request *req,
  	p += 4;
 
  	/* data */
-	if (flags & CEPH_OSD_FLAG_WRITE)
-		req->r_request->hdr.data_off = cpu_to_le16(off);
+	if (flags & CEPH_OSD_FLAG_WRITE) {
+		u16 data_off;
+
+		/*
+		 * The header "data_off" is a hint to the receiver
+		 * allowing it to align received data into its
+		 * buffers such that there's no need to re-copy
+		 * it before writing it to disk (direct I/O).
+		 */
+		data_off = (u16) (off & 0xffff);
+		req->r_request->hdr.data_off = cpu_to_le16(data_off);
+	}
  	req->r_request->hdr.data_len = cpu_to_le32(data_len);
 
  	BUG_ON(p > msg->front.iov_base + msg->front.iov_len);