From: Alexander Duyck <alexander.h.duyck@intel•com>
To: Ben Hutchings <bhutchings@solarflare•com>
Cc: "davem@davemloft•net" <davem@davemloft•net>,
"Kirsher, Jeffrey T" <jeffrey.t.kirsher@intel•com>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>
Subject: Re: [ethtool PATCH 4/6] Add support for __be64 and bitops to ethtool
Date: Wed, 27 Apr 2011 09:46:07 -0700 [thread overview]
Message-ID: <4DB8484F.8030001@intel.com> (raw)
In-Reply-To: <1303919692.2875.11.camel@bwh-desktop>
On 4/27/2011 8:54 AM, Ben Hutchings wrote:
> On Thu, 2011-04-21 at 13:40 -0700, Alexander Duyck wrote:
>> This change is meant to add support for __be64 values and bitops to
>> ethtool. These changes will be needed in order to support network flow
>> classifier rule configuration.
>>
>> Signed-off-by: Alexander Duyck<alexander.h.duyck@intel•com>
>> ---
>>
>> ethtool-bitops.h | 25 +++++++++++++++++++++++++
>> ethtool-util.h | 30 ++++++++++++++++++++++++++----
>> ethtool.c | 7 -------
>> 3 files changed, 51 insertions(+), 11 deletions(-)
>> create mode 100644 ethtool-bitops.h
>>
>> diff --git a/ethtool-bitops.h b/ethtool-bitops.h
>> new file mode 100644
>> index 0000000..0ff14f1
>> --- /dev/null
>> +++ b/ethtool-bitops.h
>> @@ -0,0 +1,25 @@
>> +#ifndef ETHTOOL_BITOPS_H__
>> +#define ETHTOOL_BITOPS_H__
>> +
>> +#define BITS_PER_BYTE 8
>> +#define BITS_PER_LONG (BITS_PER_BYTE * sizeof(long))
>> +#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
>> +#define BITS_TO_LONGS(nr) DIV_ROUND_UP(nr, BITS_PER_LONG)
>> +
>> +static inline void set_bit(int nr, unsigned long *addr)
>> +{
>> + addr[nr / BITS_PER_LONG] |= 1UL<< (nr % BITS_PER_LONG);
>> +}
>> +
>> +static inline void clear_bit(int nr, unsigned long *addr)
>> +{
>> + addr[nr / BITS_PER_LONG]&= ~(1UL<< (nr % BITS_PER_LONG));
>> +}
>> +
>> +static __always_inline int test_bit(unsigned int nr, const unsigned long *addr)
>> +{
>> + return !!((1UL<< (nr % BITS_PER_LONG))&
>> + (((unsigned long *)addr)[nr / BITS_PER_LONG]));
>> +}
>
> Where is __always_inline supposed to be defined?
Sorry that should have just been inline. I forgot we have to take tools
other than gcc into account.
>> +#endif
>> diff --git a/ethtool-util.h b/ethtool-util.h
>> index f053028..3d46faf 100644
>> --- a/ethtool-util.h
>> +++ b/ethtool-util.h
>> @@ -5,15 +5,18 @@
>>
>> #include<sys/types.h>
>> #include<endian.h>
>> +#include<sys/ioctl.h>
>> +#include<net/if.h>
>> +#include "ethtool-config.h"
>> +#include "ethtool-copy.h"
>>
>> /* ethtool.h expects these to be defined by<linux/types.h> */
>> #ifndef HAVE_BE_TYPES
>> typedef __uint16_t __be16;
>> typedef __uint32_t __be32;
>> +typedef unsigned long long __be64;
>> #endif
>>
>> -#include "ethtool-copy.h"
>> -
>
> You can't move the inclusion of ethtool-copy.h; that defeats the whole
> purpose of the HAVE_BE_TYPES feature test.
You're correct. I will get that corrected so that it is located after
the definitions of the types. The key bit that mattered was getting
ethtool-config.h in there before the type declarations. I need it in
place to address the test for HAVE_BE_TYPES.
> [...]
>> +#ifndef ARRAY_SIZE
>> +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
>> +#endif
>> +
>> +#ifndef SIOCETHTOOL
>> +#define SIOCETHTOOL 0x8946
>> #endif
>>
>> /* National Semiconductor DP83815, DP83816 */
>> diff --git a/ethtool.c b/ethtool.c
>> index 9ad7000..15af86a 100644
>> --- a/ethtool.c
>> +++ b/ethtool.c
>> @@ -45,16 +45,9 @@
>> #include<linux/sockios.h>
>> #include "ethtool-util.h"
>>
>> -
>> -#ifndef SIOCETHTOOL
>> -#define SIOCETHTOOL 0x8946
>> -#endif
>> #ifndef MAX_ADDR_LEN
>> #define MAX_ADDR_LEN 32
>> #endif
>> -#ifndef ARRAY_SIZE
>> -#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
>> -#endif
>>
>> #ifndef HAVE_NETIF_MSG
>> enum {
>>
>
> Presumably this is needed by the next patch, but it has nothing to do
> with what the commit message says.
>
> Ben.
>
Yes. These two moves and the addition of certain headers to the
ethtool-util.h were to address the needs of both the rxclass.c file and
the ethtool.c file in one central location. I will probably break those
off into a separate patch.
On a side note, is there a git tree somewhere I can re-base off of? At
this point I know you have pulled in a number of patches and I figure it
would be helpful for me to clean up my tree so I am not guessing what is
there and what isn't.
Thanks,
Alex
next prev parent reply other threads:[~2011-04-27 16:46 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-21 20:40 [ethtool PATCH 0/6] Network flow classifier Alexander Duyck
2011-04-21 20:40 ` [ethtool PATCH 1/6] Add support for ESP as a separate protocol from AH Alexander Duyck
2011-04-27 15:47 ` Ben Hutchings
2011-04-21 20:40 ` [ethtool PATCH 2/6] Add support for NFC flow classifier extensions Alexander Duyck
2011-04-27 15:48 ` Ben Hutchings
2011-04-21 20:40 ` [ethtool PATCH 3/6] ethtool: remove strings based approach for displaying n-tuple Alexander Duyck
2011-04-27 18:12 ` Ben Hutchings
2011-04-21 20:40 ` [ethtool PATCH 4/6] Add support for __be64 and bitops to ethtool Alexander Duyck
2011-04-27 15:54 ` Ben Hutchings
2011-04-27 16:46 ` Alexander Duyck [this message]
2011-04-27 17:09 ` Ben Hutchings
2011-04-27 18:33 ` Alexander Duyck
2011-04-21 20:40 ` [ethtool PATCH 5/6] v4 Add RX packet classification interface Alexander Duyck
2011-04-27 18:12 ` Ben Hutchings
2011-04-27 23:00 ` Ben Hutchings
2011-04-28 20:15 ` Alexander Duyck
2011-04-21 20:40 ` [ethtool PATCH 6/6] Update documentation for -u/-U operations Alexander Duyck
2011-04-27 18:23 ` Ben Hutchings
2011-04-28 20:40 ` Alexander Duyck
2011-04-29 2:57 ` Ben Hutchings
2011-04-21 20:51 ` [ethtool PATCH 0/6] Network flow classifier Ben Hutchings
2011-04-21 21:11 ` Alexander Duyck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DB8484F.8030001@intel.com \
--to=alexander.h.duyck@intel$(echo .)com \
--cc=bhutchings@solarflare$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox