<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns:p="urn:schemas-microsoft-com:office:powerpoint" xmlns:a="urn:schemas-microsoft-com:office:access" xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882" xmlns:s="uuid:BDC6E3F0-6DA3-11d1-A2A3-00AA00C14882" xmlns:rs="urn:schemas-microsoft-com:rowset" xmlns:z="#RowsetSchema" xmlns:b="urn:schemas-microsoft-com:office:publisher" xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns:c="urn:schemas-microsoft-com:office:component:spreadsheet" xmlns:odc="urn:schemas-microsoft-com:office:odc" xmlns:oa="urn:schemas-microsoft-com:office:activation" xmlns:html="http://www.w3.org/TR/REC-html40" xmlns:q="http://schemas.xmlsoap.org/soap/envelope/" xmlns:rtc="http://microsoft.com/officenet/conferencing" xmlns:D="DAV:" xmlns:Repl="http://schemas.microsoft.com/repl/" xmlns:mt="http://schemas.microsoft.com/sharepoint/soap/meetings/" xmlns:x2="http://schemas.microsoft.com/office/excel/2003/xml" xmlns:ppda="http://www.passport.com/NameSpace.xsd" xmlns:ois="http://schemas.microsoft.com/sharepoint/soap/ois/" xmlns:dir="http://schemas.microsoft.com/sharepoint/soap/directory/" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dsp="http://schemas.microsoft.com/sharepoint/dsp" xmlns:udc="http://schemas.microsoft.com/data/udc" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sub="http://schemas.microsoft.com/sharepoint/soap/2002/1/alerts/" xmlns:ec="http://www.w3.org/2001/04/xmlenc#" xmlns:sp="http://schemas.microsoft.com/sharepoint/" xmlns:sps="http://schemas.microsoft.com/sharepoint/soap/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:udcs="http://schemas.microsoft.com/data/udc/soap" xmlns:udcxf="http://schemas.microsoft.com/data/udc/xmlfile" xmlns:udcp2p="http://schemas.microsoft.com/data/udc/parttopart" xmlns:wf="http://schemas.microsoft.com/sharepoint/soap/workflow/" xmlns:dsss="http://schemas.microsoft.com/office/2006/digsig-setup" xmlns:dssi="http://schemas.microsoft.com/office/2006/digsig" xmlns:mdssi="http://schemas.openxmlformats.org/package/2006/digital-signature" xmlns:mver="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns:mrels="http://schemas.openxmlformats.org/package/2006/relationships" xmlns:spwp="http://microsoft.com/sharepoint/webpartpages" xmlns:ex12t="http://schemas.microsoft.com/exchange/services/2006/types" xmlns:ex12m="http://schemas.microsoft.com/exchange/services/2006/messages" xmlns:pptsl="http://schemas.microsoft.com/sharepoint/soap/SlideLibrary/" xmlns:spsl="http://microsoft.com/webservices/SharePointPortalServer/PublishedLinksService" xmlns:Z="urn:schemas-microsoft-com:" xmlns:st="" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 12 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:Consolas;
panose-1:2 11 6 9 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:10.5pt;
font-family:Consolas;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:Consolas;}
span.EmailStyle19
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle20
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle21
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="color:#1F497D">You are very right.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Please commit.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Tzachi<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> Smith, Stan [mailto:stan.smith@intel.com]
<br>
<b>Sent:</b> Tuesday, October 04, 2011 12:11 AM<br>
<b>To:</b> Tzachi Dar; ofw@lists.openfabrics.org<br>
<b>Subject:</b> RE: [ofw] patch: [ipoib] when checking if a packet is a dhcp packet, make sure to check the offset and not the flags<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Hello,<o:p></o:p></p>
<p class="MsoNormal"> Oops, there are cases where the offset+flags word is not handled correctly.<o:p></o:p></p>
<p class="MsoNormal"> While applying this patch, I realized we already have a macro defined in ip_packet.h which embodies your patch: IP_FRAGMENT_OFFSET().<o:p></o:p></p>
<p class="MsoNormal">By using IP_FRAGMENT() instead of <span style="color:#1F497D">
‘</span>cl_ntoh16(((ip_hdr_t*)p_ip_hdr)->offset_flags) & OFFSET_MASK’ it cleans the code up and we do not need the #define OFFSET_MASK.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">The patch becomes<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Index: inc/kernel/ip_packet.h<o:p></o:p></p>
<p class="MsoNormal">===================================================================<o:p></o:p></p>
<p class="MsoNormal">--- inc/kernel/ip_packet.h (revision 7290)<o:p></o:p></p>
<p class="MsoNormal">+++ inc/kernel/ip_packet.h (working copy)<o:p></o:p></p>
<p class="MsoNormal">@@ -221,7 +221,7 @@<o:p></o:p></p>
<p class="MsoNormal"> uint8_t svc_type;<o:p></o:p></p>
<p class="MsoNormal"> net16_t length;<o:p></o:p></p>
<p class="MsoNormal"> net16_t id;<o:p></o:p></p>
<p class="MsoNormal">- net16_t offset;<o:p></o:p></p>
<p class="MsoNormal">+ net16_t offset_flags;<o:p></o:p></p>
<p class="MsoNormal"> uint8_t ttl;<o:p></o:p></p>
<p class="MsoNormal"> uint8_t prot;<o:p></o:p></p>
<p class="MsoNormal"> net16_t chksum;<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">--- ulp/ipoib/kernel/ipoib_port.cpp Fri Sep 23 11:57:50 2011<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">+++ ulp/ipoib/kernel/ipoib_port.cpp
</span>(working copy) <span style="font-family:"Courier New"">Mon Oct 03 14:51:35 2011<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">@@ -451,7 +451,7 @@<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> p_ip_hdr->svc_type,<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> cl_ntoh16( p_ip_hdr->length ),<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> cl_ntoh16( p_ip_hdr->id ),<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">- cl_ntoh16( p_ip_hdr->offset ),<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">+ cl_ntoh16( p_ip_hdr->offset_flags ),<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> p_ip_hdr->ttl,<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> p_ip_hdr->prot,<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> cl_ntoh16( p_ip_hdr->chksum ),<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">@@ -2987,7 +2987,7 @@<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> break;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> }<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">- if( p_ipoib->type.ip.hdr.offset ||<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">+ if( IP_FRAGMENT_OFFSET(&p_ipoib->type.ip.hdr) ||<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> p_ipoib->type.ip.hdr.prot != IP_PROT_UDP )<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> {<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> /* Unfiltered. Setup the ethernet header and report. */<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">@@ -5415,7 +5415,7 @@<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> PERF_DECLARE( FilterDhcp );<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> XIPOIB_ENTER( IPOIB_DBG_SEND );<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">- if ( (ethertype == ETH_PROT_TYPE_IP) && ((ip_hdr_t*)p_ip_hdr)->offset > 0 )
<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">+ if ( (ethertype == ETH_PROT_TYPE_IP) && IP_FRAGMENT_OFFSET((ip_hdr_t*)p_ip_hdr) > 0 )
<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> {<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> /* This is a fragmented part of UDP packet<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> * Only first packet will contain UDP header in such case<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">@@ -9713,7 +9721,7 @@<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> uint16_t* p_hdr = (uint16_t*)p_ip_hdr;<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> p_ip_hdr->length = cl_hton16( fragment_size ); // bytes<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">- p_ip_hdr->offset = cl_hton16( fragment_offset ); // 8-byte units<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New"">+ p_ip_hdr->offset_flags = cl_hton16( fragment_offset ); // 8-byte units<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""><o:p> </o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> if( more_fragments )<o:p></o:p></span></p>
<p class="MsoPlainText"><span style="font-family:"Courier New""> {<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="color:#1F497D">Thoughts?<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D">Stan.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="color:#1F497D"><o:p> </o:p></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> ofw-bounces@lists.openfabrics.org [mailto:ofw-bounces@lists.openfabrics.org]
<b>On Behalf Of </b>Tzachi Dar<br>
<b>Sent:</b> Sunday, October 02, 2011 2:44 AM<br>
<b>To:</b> ofw@lists.openfabrics.org<br>
<b>Subject:</b> [ofw] patch: [ipoib] when checking if a packet is a dhcp packet, make sure to check the offset and not the flags<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">On an ip header there are 3 bits flags and 13 bits of offset.<o:p></o:p></p>
<p class="MsoNormal">We used to look at them as one word, which cause us not to use flags well.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">The following code fixes this.<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Thanks<o:p></o:p></p>
<p class="MsoNormal">Tzachi<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">Index: inc/kernel/ip_packet.h<o:p></o:p></p>
<p class="MsoNormal">===================================================================<o:p></o:p></p>
<p class="MsoNormal">--- inc/kernel/ip_packet.h (revision 7290)<o:p></o:p></p>
<p class="MsoNormal">+++ inc/kernel/ip_packet.h (working copy)<o:p></o:p></p>
<p class="MsoNormal">@@ -221,7 +221,7 @@<o:p></o:p></p>
<p class="MsoNormal"> uint8_t svc_type;<o:p></o:p></p>
<p class="MsoNormal"> net16_t length;<o:p></o:p></p>
<p class="MsoNormal"> net16_t id;<o:p></o:p></p>
<p class="MsoNormal">- net16_t offset;<o:p></o:p></p>
<p class="MsoNormal">+ net16_t offset_flags;<o:p></o:p></p>
<p class="MsoNormal"> uint8_t ttl;<o:p></o:p></p>
<p class="MsoNormal"> uint8_t prot;<o:p></o:p></p>
<p class="MsoNormal"> net16_t chksum;<o:p></o:p></p>
<p class="MsoNormal">@@ -264,6 +264,10 @@<o:p></o:p></p>
<p class="MsoNormal">* SEE ALSO<o:p></o:p></p>
<p class="MsoNormal">* IB Network Drivers, eth_hdr_t, arp_pkt_t, tcp_hdr_t, udp_hdr_t<o:p></o:p></p>
<p class="MsoNormal">*********/<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">+#define OFFSET_MASK 0x1fff<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">+<o:p></o:p></p>
<p class="MsoNormal">#include <complib/cl_packoff.h><o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"> #include <complib/cl_packon.h><o:p></o:p></p>
<p class="MsoNormal">Index: ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp<o:p></o:p></p>
<p class="MsoNormal">===================================================================<o:p></o:p></p>
<p class="MsoNormal">--- ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp (revision 7290)<o:p></o:p></p>
<p class="MsoNormal">+++ ulp/ipoib_NDIS6_CM/kernel/ipoib_port.cpp (working copy)<o:p></o:p></p>
<p class="MsoNormal">@@ -441,7 +441,7 @@<o:p></o:p></p>
<p class="MsoNormal"> p_ip_hdr->svc_type,<o:p></o:p></p>
<p class="MsoNormal"> cl_ntoh16( p_ip_hdr->length ),<o:p></o:p></p>
<p class="MsoNormal"> cl_ntoh16( p_ip_hdr->id ),<o:p></o:p></p>
<p class="MsoNormal">- cl_ntoh16( p_ip_hdr->offset ),<o:p></o:p></p>
<p class="MsoNormal">+ cl_ntoh16( p_ip_hdr->offset_flags ),<o:p></o:p></p>
<p class="MsoNormal"> p_ip_hdr->ttl,<o:p></o:p></p>
<p class="MsoNormal"> p_ip_hdr->prot,<o:p></o:p></p>
<p class="MsoNormal"> cl_ntoh16( p_ip_hdr->chksum ),<o:p></o:p></p>
<p class="MsoNormal">@@ -2821,7 +2821,7 @@<o:p></o:p></p>
<p class="MsoNormal"> break;<o:p></o:p></p>
<p class="MsoNormal"> }<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">- if( p_ipoib->type.ip.hdr.offset ||<o:p></o:p></p>
<p class="MsoNormal">+ if( (cl_ntoh16(p_ipoib->type.ip.hdr.offset_flags) & OFFSET_MASK) ||
<o:p></o:p></p>
<p class="MsoNormal"> p_ipoib->type.ip.hdr.prot != IP_PROT_UDP )<o:p></o:p></p>
<p class="MsoNormal"> {<o:p></o:p></p>
<p class="MsoNormal"> /* Unfiltered. Setup the ethernet header and report. */<o:p></o:p></p>
<p class="MsoNormal">@@ -5102,7 +5102,7 @@<o:p></o:p></p>
<p class="MsoNormal"> PERF_DECLARE( FilterDhcp );<o:p></o:p></p>
<p class="MsoNormal"> IPOIB_ENTER( IPOIB_DBG_SEND );<o:p></o:p></p>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal">- if ( (ethertype == ETH_PROT_TYPE_IP) && ((ip_hdr_t*)p_ip_hdr)->offset > 0 )
<o:p></o:p></p>
<p class="MsoNormal">+ if ( (ethertype == ETH_PROT_TYPE_IP) && (cl_ntoh16(((ip_hdr_t*)p_ip_hdr)->offset_flags) & OFFSET_MASK) > 0 )<o:p></o:p></p>
<p class="MsoNormal"> {<o:p></o:p></p>
<p class="MsoNormal"> /* This is a fragmented part of UDP packet<o:p></o:p></p>
<p class="MsoNormal"> * Only first packet will contain UDP header in such case<o:p></o:p></p>
</div>
</div>
</div>
</body>
</html>