Match wireshark's CRC-32 hash for easier debugging
Signed-off-by: Weston Andros Adamson <[email protected]>
---
Reposted with Trond's suggestion of splitting out hash calculation to a
separate function. Now dprintks can use a fh's CRC instead of the
multiline nfs_display_fhandle() when it makes sense.
fs/nfs/inode.c | 23 ++++++++++++++++++++---
include/linux/nfs_fs.h | 8 ++++++++
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 99a4f52..3919ceb 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -39,6 +39,7 @@
#include <linux/slab.h>
#include <linux/compat.h>
#include <linux/freezer.h>
+#include <linux/crc32.h>
#include <asm/system.h>
#include <asm/uaccess.h>
@@ -1045,7 +1046,23 @@ struct nfs_fh *nfs_alloc_fhandle(void)
return fh;
}
-/**
+#ifdef RPC_DEBUG
+/*
+ * _nfs_display_fhandle_hash - calculate the crc32 hash for the filehandle
+ * in the same way that wireshark does
+ *
+ * @fh: file handle
+ *
+ * For debugging only.
+ */
+u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh)
+{
+ /* wireshark uses 32-bit AUTODIN crc and does a bitwise
+ * not on the result */
+ return ~crc32(0xFFFFFFFF, &fh->data[0], fh->size);
+}
+
+/*
* _nfs_display_fhandle - display an NFS file handle on the console
*
* @fh: file handle to display
@@ -1053,7 +1070,6 @@ struct nfs_fh *nfs_alloc_fhandle(void)
*
* For debugging only.
*/
-#ifdef RPC_DEBUG
void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption)
{
unsigned short i;
@@ -1063,7 +1079,8 @@ void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption)
return;
}
- printk(KERN_DEFAULT "%s at %p is %u bytes:\n", caption, fh, fh->size);
+ printk(KERN_DEFAULT "%s at %p is %u bytes, crc: 0x%08x:\n",
+ caption, fh, fh->size, _nfs_display_fhandle_hash(fh));
for (i = 0; i < fh->size; i += 16) {
__be32 *pos = (__be32 *)&fh->data[i];
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index c07a757..ce8e436 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -396,6 +396,11 @@ static inline void nfs_free_fhandle(const struct nfs_fh *fh)
}
#ifdef RPC_DEBUG
+extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh);
+static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
+{
+ return _nfs_display_fhandle_hash(fh);
+}
extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
#define nfs_display_fhandle(fh, caption) \
do { \
@@ -403,6 +408,9 @@ extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
_nfs_display_fhandle(fh, caption); \
} while (0)
#else
+static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
+{
+}
static inline void nfs_display_fhandle(const struct nfs_fh *fh,
const char *caption)
{
--
1.7.4.4
T24gVHVlLCAyMDEyLTAzLTIwIGF0IDA5OjUzIC0wNDAwLCBCcnlhbiBTY2h1bWFrZXIgd3JvdGU6
DQo+IEhpIERyb3MsDQo+IA0KPiBPbiAwMy8wNi8yMDEyIDA4OjQ2IFBNLCBXZXN0b24gQW5kcm9z
IEFkYW1zb24gd3JvdGU6DQo+IA0KPiA+IE1hdGNoIHdpcmVzaGFyaydzIENSQy0zMiBoYXNoIGZv
ciBlYXNpZXIgZGVidWdnaW5nDQo+ID4gDQo+ID4gU2lnbmVkLW9mZi1ieTogV2VzdG9uIEFuZHJv
cyBBZGFtc29uIDxkcm9zQG5ldGFwcC5jb20+DQo+ID4gLS0tDQo+ID4gUmVwb3N0ZWQgd2l0aCBU
cm9uZCdzIHN1Z2dlc3Rpb24gb2Ygc3BsaXR0aW5nIG91dCBoYXNoIGNhbGN1bGF0aW9uIHRvIGEg
DQo+ID4gc2VwYXJhdGUgZnVuY3Rpb24uICBOb3cgZHByaW50a3MgY2FuIHVzZSBhIGZoJ3MgQ1JD
IGluc3RlYWQgb2YgdGhlIA0KPiA+IG11bHRpbGluZSBuZnNfZGlzcGxheV9maGFuZGxlKCkgd2hl
biBpdCBtYWtlcyBzZW5zZS4NCj4gPiANCj4gPiAgZnMvbmZzL2lub2RlLmMgICAgICAgICB8ICAg
MjMgKysrKysrKysrKysrKysrKysrKystLS0NCj4gPiAgaW5jbHVkZS9saW51eC9uZnNfZnMuaCB8
ICAgIDggKysrKysrKysNCj4gPiAgMiBmaWxlcyBjaGFuZ2VkLCAyOCBpbnNlcnRpb25zKCspLCAz
IGRlbGV0aW9ucygtKQ0KPiA+IA0KPiA+IGRpZmYgLS1naXQgYS9mcy9uZnMvaW5vZGUuYyBiL2Zz
L25mcy9pbm9kZS5jDQo+ID4gaW5kZXggOTlhNGY1Mi4uMzkxOWNlYiAxMDA2NDQNCj4gPiAtLS0g
YS9mcy9uZnMvaW5vZGUuYw0KPiA+ICsrKyBiL2ZzL25mcy9pbm9kZS5jDQo+ID4gQEAgLTM5LDYg
KzM5LDcgQEANCj4gPiAgI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4NCj4gPiAgI2luY2x1ZGUgPGxp
bnV4L2NvbXBhdC5oPg0KPiA+ICAjaW5jbHVkZSA8bGludXgvZnJlZXplci5oPg0KPiA+ICsjaW5j
bHVkZSA8bGludXgvY3JjMzIuaD4NCj4gPiAgDQo+ID4gICNpbmNsdWRlIDxhc20vc3lzdGVtLmg+
DQo+ID4gICNpbmNsdWRlIDxhc20vdWFjY2Vzcy5oPg0KPiA+IEBAIC0xMDQ1LDcgKzEwNDYsMjMg
QEAgc3RydWN0IG5mc19maCAqbmZzX2FsbG9jX2ZoYW5kbGUodm9pZCkNCj4gPiAgCXJldHVybiBm
aDsNCj4gPiAgfQ0KPiA+ICANCj4gPiAtLyoqDQo+ID4gKyNpZmRlZiBSUENfREVCVUcNCj4gPiAr
LyoNCj4gPiArICogX25mc19kaXNwbGF5X2ZoYW5kbGVfaGFzaCAtIGNhbGN1bGF0ZSB0aGUgY3Jj
MzIgaGFzaCBmb3IgdGhlIGZpbGVoYW5kbGUNCj4gPiArICogICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIGluIHRoZSBzYW1lIHdheSB0aGF0IHdpcmVzaGFyayBkb2VzDQo+ID4gKyAqDQo+ID4g
KyAqIEBmaDogZmlsZSBoYW5kbGUNCj4gPiArICoNCj4gPiArICogRm9yIGRlYnVnZ2luZyBvbmx5
Lg0KPiA+ICsgKi8NCj4gPiArdTMyIF9uZnNfZGlzcGxheV9maGFuZGxlX2hhc2goY29uc3Qgc3Ry
dWN0IG5mc19maCAqZmgpDQo+ID4gK3sNCj4gPiArCS8qIHdpcmVzaGFyayB1c2VzIDMyLWJpdCBB
VVRPRElOIGNyYyBhbmQgZG9lcyBhIGJpdHdpc2UNCj4gPiArCSAqIG5vdCBvbiB0aGUgcmVzdWx0
ICovDQo+ID4gKwlyZXR1cm4gfmNyYzMyKDB4RkZGRkZGRkYsICZmaC0+ZGF0YVswXSwgZmgtPnNp
emUpOw0KPiA+ICt9DQo+ID4gKw0KPiA+ICsvKg0KPiA+ICAgKiBfbmZzX2Rpc3BsYXlfZmhhbmRs
ZSAtIGRpc3BsYXkgYW4gTkZTIGZpbGUgaGFuZGxlIG9uIHRoZSBjb25zb2xlDQo+ID4gICAqDQo+
ID4gICAqIEBmaDogZmlsZSBoYW5kbGUgdG8gZGlzcGxheQ0KPiA+IEBAIC0xMDUzLDcgKzEwNzAs
NiBAQCBzdHJ1Y3QgbmZzX2ZoICpuZnNfYWxsb2NfZmhhbmRsZSh2b2lkKQ0KPiA+ICAgKg0KPiA+
ICAgKiBGb3IgZGVidWdnaW5nIG9ubHkuDQo+ID4gICAqLw0KPiA+IC0jaWZkZWYgUlBDX0RFQlVH
DQo+ID4gIHZvaWQgX25mc19kaXNwbGF5X2ZoYW5kbGUoY29uc3Qgc3RydWN0IG5mc19maCAqZmgs
IGNvbnN0IGNoYXIgKmNhcHRpb24pDQo+ID4gIHsNCj4gPiAgCXVuc2lnbmVkIHNob3J0IGk7DQo+
ID4gQEAgLTEwNjMsNyArMTA3OSw4IEBAIHZvaWQgX25mc19kaXNwbGF5X2ZoYW5kbGUoY29uc3Qg
c3RydWN0IG5mc19maCAqZmgsIGNvbnN0IGNoYXIgKmNhcHRpb24pDQo+ID4gIAkJcmV0dXJuOw0K
PiA+ICAJfQ0KPiA+ICANCj4gPiAtCXByaW50ayhLRVJOX0RFRkFVTFQgIiVzIGF0ICVwIGlzICV1
IGJ5dGVzOlxuIiwgY2FwdGlvbiwgZmgsIGZoLT5zaXplKTsNCj4gPiArCXByaW50ayhLRVJOX0RF
RkFVTFQgIiVzIGF0ICVwIGlzICV1IGJ5dGVzLCBjcmM6IDB4JTA4eDpcbiIsDQo+ID4gKwkgICAg
ICAgY2FwdGlvbiwgZmgsIGZoLT5zaXplLCBfbmZzX2Rpc3BsYXlfZmhhbmRsZV9oYXNoKGZoKSk7
DQo+ID4gIAlmb3IgKGkgPSAwOyBpIDwgZmgtPnNpemU7IGkgKz0gMTYpIHsNCj4gPiAgCQlfX2Jl
MzIgKnBvcyA9IChfX2JlMzIgKikmZmgtPmRhdGFbaV07DQo+ID4gIA0KPiA+IGRpZmYgLS1naXQg
YS9pbmNsdWRlL2xpbnV4L25mc19mcy5oIGIvaW5jbHVkZS9saW51eC9uZnNfZnMuaA0KPiA+IGlu
ZGV4IGMwN2E3NTcuLmNlOGU0MzYgMTAwNjQ0DQo+ID4gLS0tIGEvaW5jbHVkZS9saW51eC9uZnNf
ZnMuaA0KPiA+ICsrKyBiL2luY2x1ZGUvbGludXgvbmZzX2ZzLmgNCj4gPiBAQCAtMzk2LDYgKzM5
NiwxMSBAQCBzdGF0aWMgaW5saW5lIHZvaWQgbmZzX2ZyZWVfZmhhbmRsZShjb25zdCBzdHJ1Y3Qg
bmZzX2ZoICpmaCkNCj4gPiAgfQ0KPiA+ICANCj4gPiAgI2lmZGVmIFJQQ19ERUJVRw0KPiA+ICtl
eHRlcm4gdTMyIF9uZnNfZGlzcGxheV9maGFuZGxlX2hhc2goY29uc3Qgc3RydWN0IG5mc19maCAq
ZmgpOw0KPiA+ICtzdGF0aWMgaW5saW5lIHUzMiBuZnNfZGlzcGxheV9maGFuZGxlX2hhc2goY29u
c3Qgc3RydWN0IG5mc19maCAqZmgpDQo+ID4gK3sNCj4gPiArCXJldHVybiBfbmZzX2Rpc3BsYXlf
ZmhhbmRsZV9oYXNoKGZoKTsNCj4gPiArfQ0KPiA+ICBleHRlcm4gdm9pZCBfbmZzX2Rpc3BsYXlf
ZmhhbmRsZShjb25zdCBzdHJ1Y3QgbmZzX2ZoICpmaCwgY29uc3QgY2hhciAqY2FwdGlvbik7DQo+
ID4gICNkZWZpbmUgbmZzX2Rpc3BsYXlfZmhhbmRsZShmaCwgY2FwdGlvbikJCQlcDQo+ID4gIAlk
byB7CQkJCQkJCVwNCj4gPiBAQCAtNDAzLDYgKzQwOCw5IEBAIGV4dGVybiB2b2lkIF9uZnNfZGlz
cGxheV9maGFuZGxlKGNvbnN0IHN0cnVjdCBuZnNfZmggKmZoLCBjb25zdCBjaGFyICpjYXB0aW9u
KTsNCj4gPiAgCQkJX25mc19kaXNwbGF5X2ZoYW5kbGUoZmgsIGNhcHRpb24pOwlcDQo+ID4gIAl9
IHdoaWxlICgwKQ0KPiA+ICAjZWxzZQ0KPiA+ICtzdGF0aWMgaW5saW5lIHUzMiBuZnNfZGlzcGxh
eV9maGFuZGxlX2hhc2goY29uc3Qgc3RydWN0IG5mc19maCAqZmgpDQo+ID4gK3sNCj4gDQo+IA0K
PiBUaGlzIGZ1bmN0aW9uIHNob3VsZCByZXR1cm4gc29tZXRoaW5nLi4uIG1heWJlIDA/DQo+IA0K
PiAtIEJyeWFuDQo+IA0KPiA+ICt9DQo+ID4gIHN0YXRpYyBpbmxpbmUgdm9pZCBuZnNfZGlzcGxh
eV9maGFuZGxlKGNvbnN0IHN0cnVjdCBuZnNfZmggKmZoLA0KPiA+ICAJCQkJICAgICAgIGNvbnN0
IGNoYXIgKmNhcHRpb24pDQo+ID4gIHsNCj4gDQoNClllcy4gU3RlcGhlbiBSb3Rod2VsbCBwb2lu
dGVkIG91dCB0aGUgc2FtZSwgYW5kIHNvIEkndmUgYXBwbGllZCBoaXMNCnBhdGNoIHRvIHRoZSAn
dGVzdGluZycgYnJhbmNoIGFscmVhZHkuDQoNCkhlIGFsc28gZm91bmQgYSBidW5jaCBvZiAnc3Ry
dWN0IHJwY190YXNrJyBpbiB0aGUgc3VucnBjIGFuZCBsb2NrZCBjb2RlDQp0aGF0IHdlcmUgbWFy
a2VkIGFzICd1bnVzZWQgdmFyaWFibGUnLCBhbmQgc28gdGhlcmUgaXMgYSBwYXRjaCB0byBmaXgN
CnRoYXQgdG9vLi4uDQoNCi0tIA0KVHJvbmQgTXlrbGVidXN0DQpMaW51eCBORlMgY2xpZW50IG1h
aW50YWluZXINCg0KTmV0QXBwDQpUcm9uZC5NeWtsZWJ1c3RAbmV0YXBwLmNvbQ0Kd3d3Lm5ldGFw
cC5jb20NCg0K
Hi Dros,
On 03/06/2012 08:46 PM, Weston Andros Adamson wrote:
> Match wireshark's CRC-32 hash for easier debugging
>
> Signed-off-by: Weston Andros Adamson <[email protected]>
> ---
> Reposted with Trond's suggestion of splitting out hash calculation to a
> separate function. Now dprintks can use a fh's CRC instead of the
> multiline nfs_display_fhandle() when it makes sense.
>
> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> include/linux/nfs_fs.h | 8 ++++++++
> 2 files changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index 99a4f52..3919ceb 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -39,6 +39,7 @@
> #include <linux/slab.h>
> #include <linux/compat.h>
> #include <linux/freezer.h>
> +#include <linux/crc32.h>
>
> #include <asm/system.h>
> #include <asm/uaccess.h>
> @@ -1045,7 +1046,23 @@ struct nfs_fh *nfs_alloc_fhandle(void)
> return fh;
> }
>
> -/**
> +#ifdef RPC_DEBUG
> +/*
> + * _nfs_display_fhandle_hash - calculate the crc32 hash for the filehandle
> + * in the same way that wireshark does
> + *
> + * @fh: file handle
> + *
> + * For debugging only.
> + */
> +u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh)
> +{
> + /* wireshark uses 32-bit AUTODIN crc and does a bitwise
> + * not on the result */
> + return ~crc32(0xFFFFFFFF, &fh->data[0], fh->size);
> +}
> +
> +/*
> * _nfs_display_fhandle - display an NFS file handle on the console
> *
> * @fh: file handle to display
> @@ -1053,7 +1070,6 @@ struct nfs_fh *nfs_alloc_fhandle(void)
> *
> * For debugging only.
> */
> -#ifdef RPC_DEBUG
> void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption)
> {
> unsigned short i;
> @@ -1063,7 +1079,8 @@ void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption)
> return;
> }
>
> - printk(KERN_DEFAULT "%s at %p is %u bytes:\n", caption, fh, fh->size);
> + printk(KERN_DEFAULT "%s at %p is %u bytes, crc: 0x%08x:\n",
> + caption, fh, fh->size, _nfs_display_fhandle_hash(fh));
> for (i = 0; i < fh->size; i += 16) {
> __be32 *pos = (__be32 *)&fh->data[i];
>
> diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
> index c07a757..ce8e436 100644
> --- a/include/linux/nfs_fs.h
> +++ b/include/linux/nfs_fs.h
> @@ -396,6 +396,11 @@ static inline void nfs_free_fhandle(const struct nfs_fh *fh)
> }
>
> #ifdef RPC_DEBUG
> +extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh);
> +static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
> +{
> + return _nfs_display_fhandle_hash(fh);
> +}
> extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
> #define nfs_display_fhandle(fh, caption) \
> do { \
> @@ -403,6 +408,9 @@ extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
> _nfs_display_fhandle(fh, caption); \
> } while (0)
> #else
> +static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
> +{
This function should return something... maybe 0?
- Bryan
> +}
> static inline void nfs_display_fhandle(const struct nfs_fh *fh,
> const char *caption)
> {