[Intel-wired-lan] [PATCH] net: return value of skb_linearize should be handled in Linux kernel

Zhouyi Zhou zhouzhouyi at gmail.com
Wed Dec 7 06:27:00 UTC 2016


On Wed, Dec 7, 2016 at 1:02 PM, Cong Wang <xiyou.wangcong at gmail.com> wrote:
> On Mon, Dec 5, 2016 at 11:10 PM, Zhouyi Zhou <zhouzhouyi at gmail.com> wrote:
>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
>> index 2a653ec..ab787cb 100644
>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c
>> @@ -490,7 +490,11 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
>>          */
>>         if ((fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA) &&
>>             (fctl & FC_FC_END_SEQ)) {
>> -               skb_linearize(skb);
>> +               int err = 0;
>> +
>> +               err = skb_linearize(skb);
>> +               if (err)
>> +                       return err;
>
>
> You can reuse 'rc' instead of adding 'err'.
rc here is meaningful for the length of data being ddped. If using rc
here, a successful
skb_linearize will assign rc to 0.
>
>
>
>>                 crc = (struct fcoe_crc_eof *)skb_put(skb, sizeof(*crc));
>>                 crc->fcoe_eof = FC_EOF_T;
>>         }
>> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
>> index fee1f29..4926d48 100644
>> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
>> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
>> @@ -2173,8 +2173,7 @@ static int ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
>>                                 total_rx_bytes += ddp_bytes;
>>                                 total_rx_packets += DIV_ROUND_UP(ddp_bytes,
>>                                                                  mss);
>> -                       }
>> -                       if (!ddp_bytes) {
>> +                       } else {
>>                                 dev_kfree_skb_any(skb);
>>                                 continue;
>>                         }
>
>
> This piece doesn't seem to be related.
if ddp_bytes is negative there will be some error, I think the skb
should not pass to upper layer.


More information about the Intel-wired-lan mailing list