colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform: improve detecting ENOBUFS for recvmsg() on netlink socket

Browse Source 
libnl3 maps different error codes to NLE_NOMEM. Only resync platform cache
when we really experienced a ENOBUFS from recvmsg().
This commit is contained in:
Thomas Haller
2016-01-25 15:08:32 +01:00
parent 4ba999e41e
commit 45df49ebdd
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/platform/nm-linux-platform.c
View File

@@ -58,6 +58,9 @@
#define VLAN_FLAG_MVRP 0x8 #define VLAN_FLAG_MVRP 0x8
/* nm-internal error codes for libnl. Make sure they don't overlap. */
#define _NLE_NM_NOBUFS 500
/*********************************************************************************************/ /*********************************************************************************************/
#define IFQDISCSIZ 32 #define IFQDISCSIZ 32
@@ -5540,6 +5543,15 @@ continue_reading:
n = -NLE_AGAIN; n = -NLE_AGAIN;
} }
break; break;
case -NLE_NOMEM:
if (errno == ENOBUFS) {
/* we are very much interested in a overrun of the receive buffer.
* nl_recv() maps all kinds of errors to NLE_NOMEM, so check also
* for errno explicitly. And if so, hack our own return code to signal
* the overrun. */
n = -_NLE_NM_NOBUFS;
}
break;
} }
if (n <= 0) if (n <= 0)
@@ -5714,7 +5726,7 @@ event_handler_read_netlink (NMPlatform *platform, gboolean wait_for_acks)
case -NLE_DUMP_INTR: case -NLE_DUMP_INTR:
_LOGD ("netlink: read: uncritical failure to retrieve incoming events: %s (%d)", nl_geterror (nle), nle); _LOGD ("netlink: read: uncritical failure to retrieve incoming events: %s (%d)", nl_geterror (nle), nle);
break; break;
case -NLE_NOMEM: case -_NLE_NM_NOBUFS:
_LOGI ("netlink: read: too many netlink events. Need to resynchronize platform cache"); _LOGI ("netlink: read: too many netlink events. Need to resynchronize platform cache");
event_handler_recvmsgs (platform, FALSE); event_handler_recvmsgs (platform, FALSE);
delayed_action_wait_for_nl_response_complete_all (platform, WAIT_FOR_NL_RESPONSE_RESULT_FAILED_RESYNC); delayed_action_wait_for_nl_response_complete_all (platform, WAIT_FOR_NL_RESPONSE_RESULT_FAILED_RESYNC);